mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-27 23:31:01 +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>
106 lines
3.0 KiB
Go
106 lines
3.0 KiB
Go
package login
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
|
|
caos_errs "github.com/zitadel/zitadel/internal/errors"
|
|
)
|
|
|
|
const (
|
|
tmplMFAPrompt = "mfaprompt"
|
|
)
|
|
|
|
type mfaPromptData struct {
|
|
MFAProvider domain.MFAType `schema:"provider"`
|
|
Skip bool `schema:"skip"`
|
|
}
|
|
|
|
func (l *Login) handleMFAPrompt(w http.ResponseWriter, r *http.Request) {
|
|
data := new(mfaPromptData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
if !data.Skip {
|
|
mfaVerifyData := new(mfaVerifyData)
|
|
mfaVerifyData.MFAType = data.MFAProvider
|
|
l.handleMFACreation(w, r, authReq, mfaVerifyData)
|
|
return
|
|
}
|
|
err = l.command.HumanSkipMFAInit(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
l.handleLogin(w, r)
|
|
}
|
|
|
|
func (l *Login) handleMFAPromptSelection(w http.ResponseWriter, r *http.Request) {
|
|
data := new(mfaPromptData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
|
|
l.renderNextStep(w, r, authReq)
|
|
}
|
|
|
|
func (l *Login) renderMFAPrompt(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, mfaPromptData *domain.MFAPromptStep, err error) {
|
|
var errID, errMessage string
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
translator := l.getTranslator(r.Context(), authReq)
|
|
data := mfaData{
|
|
baseData: l.getBaseData(r, authReq, "InitMFAPrompt.Title", "InitMFAPrompt.Description", errID, errMessage),
|
|
profileData: l.getProfileData(authReq),
|
|
}
|
|
|
|
if mfaPromptData == nil {
|
|
l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-XU0tj", "Errors.User.MFA.NoProviders"))
|
|
return
|
|
}
|
|
|
|
data.MFAProviders = mfaPromptData.MFAProviders
|
|
data.MFARequired = mfaPromptData.Required
|
|
|
|
if len(mfaPromptData.MFAProviders) == 1 && mfaPromptData.Required {
|
|
data := &mfaVerifyData{
|
|
MFAType: mfaPromptData.MFAProviders[0],
|
|
}
|
|
l.handleMFACreation(w, r, authReq, data)
|
|
return
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAPrompt], data, nil)
|
|
}
|
|
|
|
func (l *Login) handleMFACreation(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaVerifyData) {
|
|
switch data.MFAType {
|
|
case domain.MFATypeOTP:
|
|
l.handleOTPCreation(w, r, authReq, data)
|
|
return
|
|
case domain.MFATypeU2F:
|
|
l.renderRegisterU2F(w, r, authReq, nil)
|
|
return
|
|
}
|
|
l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-Or3HO", "Errors.User.MFA.NoProviders"))
|
|
}
|
|
|
|
func (l *Login) handleOTPCreation(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaVerifyData) {
|
|
otp, err := l.command.AddHumanOTP(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
|
|
data.otpData = otpData{
|
|
Secret: otp.SecretString,
|
|
Url: otp.Url,
|
|
}
|
|
l.renderMFAInitVerify(w, r, authReq, data, nil)
|
|
}
|