mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-28 04:50:50 +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>
95 lines
3.2 KiB
Go
95 lines
3.2 KiB
Go
package login
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
http_mw "github.com/zitadel/zitadel/internal/api/http/middleware"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
)
|
|
|
|
const (
|
|
tmplMFAVerify = "mfaverify"
|
|
)
|
|
|
|
type mfaVerifyFormData struct {
|
|
MFAType domain.MFAType `schema:"mfaType"`
|
|
Code string `schema:"code"`
|
|
SelectedProvider domain.MFAType `schema:"provider"`
|
|
}
|
|
|
|
func (l *Login) handleMFAVerify(w http.ResponseWriter, r *http.Request) {
|
|
data := new(mfaVerifyFormData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
step, ok := authReq.PossibleSteps[0].(*domain.MFAVerificationStep)
|
|
if !ok {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
if data.Code == "" {
|
|
l.renderMFAVerifySelected(w, r, authReq, step, data.SelectedProvider, nil)
|
|
return
|
|
}
|
|
if data.MFAType == domain.MFATypeOTP {
|
|
userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context())
|
|
err = l.authRepo.VerifyMFAOTP(setContext(r.Context(), authReq.UserOrgID), authReq.ID, authReq.UserID, authReq.UserOrgID, data.Code, userAgentID, domain.BrowserInfoFromRequest(r))
|
|
if err != nil {
|
|
l.renderMFAVerifySelected(w, r, authReq, step, domain.MFATypeOTP, err)
|
|
return
|
|
}
|
|
}
|
|
l.renderNextStep(w, r, authReq)
|
|
}
|
|
|
|
func (l *Login) renderMFAVerify(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, verificationStep *domain.MFAVerificationStep, err error) {
|
|
if verificationStep == nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
provider := verificationStep.MFAProviders[len(verificationStep.MFAProviders)-1]
|
|
l.renderMFAVerifySelected(w, r, authReq, verificationStep, provider, err)
|
|
}
|
|
|
|
func (l *Login) renderMFAVerifySelected(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, verificationStep *domain.MFAVerificationStep, selectedProvider domain.MFAType, err error) {
|
|
var errID, errMessage string
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
data := l.getUserData(r, authReq, "", "", errID, errMessage)
|
|
if verificationStep == nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
translator := l.getTranslator(r.Context(), authReq)
|
|
|
|
switch selectedProvider {
|
|
case domain.MFATypeU2F:
|
|
data.Title = translator.LocalizeWithoutArgs("VerifyMFAU2F.Title")
|
|
data.Description = translator.LocalizeWithoutArgs("VerifyMFAU2F.Description")
|
|
l.renderU2FVerification(w, r, authReq, removeSelectedProviderFromList(verificationStep.MFAProviders, domain.MFATypeU2F), nil)
|
|
return
|
|
case domain.MFATypeOTP:
|
|
data.MFAProviders = removeSelectedProviderFromList(verificationStep.MFAProviders, domain.MFATypeOTP)
|
|
data.SelectedMFAProvider = domain.MFATypeOTP
|
|
data.Title = translator.LocalizeWithoutArgs("VerifyMFAOTP.Title")
|
|
data.Description = translator.LocalizeWithoutArgs("VerifyMFAOTP.Description")
|
|
default:
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAVerify], data, nil)
|
|
}
|
|
|
|
func removeSelectedProviderFromList(providers []domain.MFAType, selected domain.MFAType) []domain.MFAType {
|
|
for i := len(providers) - 1; i >= 0; i-- {
|
|
if providers[i] == selected {
|
|
copy(providers[i:], providers[i+1:])
|
|
return providers[:len(providers)-1]
|
|
}
|
|
}
|
|
return providers
|
|
}
|