mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-22 18:01:32 +00:00

* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> 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, false)
|
|
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)
|
|
}
|