mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-24 07:21:37 +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>
66 lines
1.9 KiB
Go
66 lines
1.9 KiB
Go
package handler
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"github.com/caos/zitadel/internal/domain"
|
|
"net/http"
|
|
|
|
http_mw "github.com/caos/zitadel/internal/api/http/middleware"
|
|
"github.com/caos/zitadel/internal/auth_request/model"
|
|
)
|
|
|
|
const (
|
|
tmplMFAU2FInit = "mfainitu2f"
|
|
)
|
|
|
|
type u2fInitData struct {
|
|
webAuthNData
|
|
MFAType model.MFAType
|
|
}
|
|
|
|
func (l *Login) renderRegisterU2F(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, err error) {
|
|
var errID, errMessage, credentialData string
|
|
var u2f *domain.WebAuthNToken
|
|
if err == nil {
|
|
u2f, err = l.command.HumanAddU2FSetup(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID, true)
|
|
}
|
|
if err != nil {
|
|
errID, errMessage = l.getErrorMessage(r, err)
|
|
}
|
|
if u2f != nil {
|
|
credentialData = base64.RawURLEncoding.EncodeToString(u2f.CredentialCreationData)
|
|
}
|
|
data := &u2fInitData{
|
|
webAuthNData: webAuthNData{
|
|
userData: l.getUserData(r, authReq, "Register WebAuthNToken", errID, errMessage),
|
|
CredentialCreationData: credentialData,
|
|
},
|
|
MFAType: model.MFATypeU2F,
|
|
}
|
|
l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAU2FInit], data, nil)
|
|
}
|
|
|
|
func (l *Login) handleRegisterU2F(w http.ResponseWriter, r *http.Request) {
|
|
data := new(webAuthNFormData)
|
|
authReq, err := l.getAuthRequestAndParseData(r, data)
|
|
if err != nil {
|
|
l.renderError(w, r, authReq, err)
|
|
return
|
|
}
|
|
credData, err := base64.URLEncoding.DecodeString(data.CredentialData)
|
|
if err != nil {
|
|
l.renderRegisterU2F(w, r, authReq, err)
|
|
return
|
|
}
|
|
|
|
userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context())
|
|
if _, err = l.command.HumanVerifyU2FSetup(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID, data.Name, userAgentID, credData); err != nil {
|
|
l.renderRegisterU2F(w, r, authReq, err)
|
|
return
|
|
}
|
|
done := &mfaDoneData{
|
|
MFAType: domain.MFATypeU2F,
|
|
}
|
|
l.renderMFAInitDone(w, r, authReq, done)
|
|
}
|