mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-07 23:12:02 +00:00
* get key by id and cache them
* userinfo from events for v2 tokens
* improve keyset caching
* concurrent token and client checks
* client and project in single query
* logging and otel
* drop owner_removed column on apps and authN tables
* userinfo and project roles in go routines
* get oidc user info from projections and add actions
* add avatar URL
* some cleanup
* pull oidc work branch
* remove storage from server
* add config flag for experimental introspection
* legacy introspection flag
* drop owner_removed column on user projections
* drop owner_removed column on useer_metadata
* query userinfo unit test
* query introspection client test
* add user_grants to the userinfo query
* handle PAT scopes
* bring triggers back
* test instance keys query
* add userinfo unit tests
* unit test keys
* go mod tidy
* solve some bugs
* fix missing preferred login name
* do not run triggers in go routines, they seem to deadlock
* initialize the trigger handlers late with a sync.OnceValue
* Revert "do not run triggers in go routines, they seem to deadlock"
This reverts commit 2a03da2127.
* add missing translations
* chore: update go version for linting
* pin oidc version
* parse a global time location for query test
* fix linter complains
* upgrade go lint
* fix more linting issues
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
122 lines
3.7 KiB
Go
122 lines
3.7 KiB
Go
package login
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
)
|
|
|
|
const (
|
|
queryCode = "code"
|
|
queryUserID = "userID"
|
|
|
|
tmplMailVerification = "mail_verification"
|
|
tmplMailVerified = "mail_verified"
|
|
)
|
|
|
|
type mailVerificationFormData struct {
|
|
Code string `schema:"code"`
|
|
UserID string `schema:"userID"`
|
|
Resend bool `schema:"resend"`
|
|
}
|
|
|
|
type mailVerificationData struct {
|
|
baseData
|
|
profileData
|
|
UserID string
|
|
}
|
|
|
|
func MailVerificationLink(origin, userID, code, orgID string) string {
|
|
return fmt.Sprintf("%s%s?userID=%s&code=%s&orgID=%s", externalLink(origin), EndpointMailVerification, userID, code, orgID)
|
|
}
|
|
|
|
func (l *Login) handleMailVerification(w http.ResponseWriter, r *http.Request) {
|
|
userID := r.FormValue(queryUserID)
|
|
code := r.FormValue(queryCode)
|
|
if code != "" {
|
|
l.checkMailCode(w, r, nil, userID, code)
|
|
return
|
|
}
|
|
l.renderMailVerification(w, r, nil, userID, nil)
|
|
}
|
|
|
|
func (l *Login) handleMailVerificationCheck(w http.ResponseWriter, r *http.Request) {
|
|
data := new(mailVerificationFormData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
if !data.Resend {
|
|
l.checkMailCode(w, r, authReq, data.UserID, data.Code)
|
|
return
|
|
}
|
|
userOrg := ""
|
|
if authReq != nil {
|
|
userOrg = authReq.UserOrgID
|
|
}
|
|
emailCodeGenerator, err := l.query.InitEncryptionGenerator(r.Context(), domain.SecretGeneratorTypeVerifyEmailCode, l.userCodeAlg)
|
|
if err != nil {
|
|
l.checkMailCode(w, r, authReq, data.UserID, data.Code)
|
|
return
|
|
}
|
|
_, err = l.command.CreateHumanEmailVerificationCode(setContext(r.Context(), userOrg), data.UserID, userOrg, emailCodeGenerator)
|
|
l.renderMailVerification(w, r, authReq, data.UserID, err)
|
|
}
|
|
|
|
func (l *Login) checkMailCode(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, userID, code string) {
|
|
userOrg := ""
|
|
if authReq != nil {
|
|
userID = authReq.UserID
|
|
userOrg = authReq.UserOrgID
|
|
}
|
|
emailCodeGenerator, err := l.query.InitEncryptionGenerator(r.Context(), domain.SecretGeneratorTypeVerifyEmailCode, l.userCodeAlg)
|
|
if err != nil {
|
|
l.renderMailVerification(w, r, authReq, userID, err)
|
|
return
|
|
}
|
|
_, err = l.command.VerifyHumanEmail(setContext(r.Context(), userOrg), userID, code, userOrg, emailCodeGenerator)
|
|
if err != nil {
|
|
l.renderMailVerification(w, r, authReq, userID, err)
|
|
return
|
|
}
|
|
l.renderMailVerified(w, r, authReq, userOrg)
|
|
}
|
|
|
|
func (l *Login) renderMailVerification(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, userID string, err error) {
|
|
var errID, errMessage string
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
if userID == "" {
|
|
userID = authReq.UserID
|
|
}
|
|
|
|
translator := l.getTranslator(r.Context(), authReq)
|
|
data := mailVerificationData{
|
|
baseData: l.getBaseData(r, authReq, "EmailVerification.Title", "EmailVerification.Description", errID, errMessage),
|
|
UserID: userID,
|
|
profileData: l.getProfileData(authReq),
|
|
}
|
|
if authReq == nil {
|
|
user, err := l.query.GetUserByID(r.Context(), false, userID)
|
|
if err == nil {
|
|
l.customTexts(r.Context(), translator, user.ResourceOwner)
|
|
}
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMailVerification], data, nil)
|
|
}
|
|
|
|
func (l *Login) renderMailVerified(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, orgID string) {
|
|
translator := l.getTranslator(r.Context(), authReq)
|
|
data := mailVerificationData{
|
|
baseData: l.getBaseData(r, authReq, "EmailVerificationDone.Title", "EmailVerificationDone.Description", "", ""),
|
|
profileData: l.getProfileData(authReq),
|
|
}
|
|
if authReq == nil {
|
|
l.customTexts(r.Context(), translator, orgID)
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMailVerified], data, nil)
|
|
}
|