mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-06 10:45:43 +00:00

* feat: default custom message text * feat: org custom message text * feat: org custom message text * feat: custom messages query side * feat: default messages * feat: message text user fields * feat: check for inactive user * feat: fix send password reset * feat: fix custom org text * feat: add variables to docs * feat: custom text tests * feat: fix notifications * feat: add custom text feature * feat: add custom text feature * feat: feature in custom message texts * feat: add custom text feature in frontend * feat: merge main * feat: feature tests * feat: change phone message in setup * fix: remove unused code, add event translation * fix: merge main and fix problems * fix: english translation file * fix: migration versions * fix: setup * fix: custom login text * feat: add all possible custom texts for login * feat: iam login texts * feat: org login texts * feat: protos * fix: custom text in admin api * fix: add success login text * fix: docs * fix: add custom login texts to management api * fix: add sub messages to custom login texts * fix: setup custom texts * feat: get org login texts * feat: get org login texts * feat: handler in adminapi * feat: handlers in auth and admin * feat: render login texts * feat: custom login text * feat: add all login text keys * feat: handle correct login texts * feat: custom login texts in command side * feat: custom login texts in command side * feat: fix yaml file * feat: merge master and add confirmation text * feat: fix html * feat: read default login texts * feat: get default text files * feat: get custom texts org * feat: tests * feat: change translator handling * fix translator from authReq * feat: change h1 on login screens * feat: add custom login text for remove * feat: add custom login text for remove * feat: cache translation files * feat: cache translation files * feat: zitadel user in env var * feat: add registration user description * feat: better func naming * feat: tests * feat: add mutex to read file * feat: add mutex to read file * fix mutex for accessing translation map * fix: translation key Co-authored-by: Livio Amstutz <livio.a@gmail.com>
88 lines
2.9 KiB
Go
88 lines
2.9 KiB
Go
package handler
|
|
|
|
import (
|
|
http_mw "github.com/caos/zitadel/internal/api/http/middleware"
|
|
"github.com/caos/zitadel/internal/domain"
|
|
"net/http"
|
|
)
|
|
|
|
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, "MFA Verify", errID, errMessage)
|
|
if verificationStep == nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
switch selectedProvider {
|
|
case domain.MFATypeU2F:
|
|
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
|
|
default:
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), 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
|
|
}
|