TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix DefaultOTPEmailURLV2

Browse Source
This commit is contained in:
Elio Bischof
2023-09-27 13:22:27 +02:00
parent 63fbf4f22c
commit fa34d4d2a8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/defaults.yaml
View File

@@ -307,7 +307,7 @@ Login:
MaxAge: 12h # ZITADEL_LOGIN_CACHE_MAXAGE MaxAge: 12h # ZITADEL_LOGIN_CACHE_MAXAGE
# 168h is 7 days, one week # 168h is 7 days, one week
SharedMaxAge: 168h # ZITADEL_LOGIN_CACHE_SHAREDMAXAGE SharedMaxAge: 168h # ZITADEL_LOGIN_CACHE_SHAREDMAXAGE
DefaultOTPEmailURLV2: "/otp/verify?loginName={{.LoginName}}&code={{.Code}}" # ZITADEL_LOGIN_CACHE_DEFAULTOTPEMAILURLV2 DefaultOTPEmailURLV2: "/ui/login/mfa/otp/verify?loginName={{.LoginName}}&code={{.Code}}" # ZITADEL_LOGIN_CACHE_DEFAULTOTPEMAILURLV2
Console: Console:
ShortCache: ShortCache:

10
internal/notification/handlers/user_notifier_test.go
View File

@@ -48,7 +48,7 @@ const (
externalPort = 3000 externalPort = 3000
externalSecure = false externalSecure = false
externalProtocol = "http" externalProtocol = "http"
defaultOTPEmailTemplate = "/otp/verify?loginName={{.LoginName}}&code={{.Code}}" defaultOTPEmailTemplate = "/ui/login/mfa/otp/verify?loginName={{.LoginName}}&code={{.Code}}"
) )
func Test_userNotifier_reduceInitCodeAdded(t *testing.T) { func Test_userNotifier_reduceInitCodeAdded(t *testing.T) {
@@ -1137,7 +1137,7 @@ func Test_userNotifier_reduceOTPEmailChallenged(t *testing.T) {
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, commands *mock.MockCommands) (f fields, a args, w want) { test: func(ctrl *gomock.Controller, queries *mock.MockQueries, commands *mock.MockCommands) (f fields, a args, w want) {
givenTemplate := "{{.URL}}" givenTemplate := "{{.URL}}"
testCode := "testcode" testCode := "testcode"
expectContent := fmt.Sprintf("%s/ui/login/otp/verify?loginName=%s&code=%s", eventOrigin, preferredLoginName, testCode) expectContent := fmt.Sprintf("%s/ui/login/mfa/otp/verify?loginName=%s&code=%s", eventOrigin, preferredLoginName, testCode)
w.message = messages.Email{ w.message = messages.Email{
Recipients: []string{verifiedEmail}, Recipients: []string{verifiedEmail},
Subject: expectMailSubject, Subject: expectMailSubject,
@@ -1175,7 +1175,7 @@ func Test_userNotifier_reduceOTPEmailChallenged(t *testing.T) {
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, commands *mock.MockCommands) (f fields, a args, w want) { test: func(ctrl *gomock.Controller, queries *mock.MockQueries, commands *mock.MockCommands) (f fields, a args, w want) {
givenTemplate := "{{.URL}}" givenTemplate := "{{.URL}}"
testCode := "testcode" testCode := "testcode"
expectContent := fmt.Sprintf("%s://%s:%d/ui/login/otp/verify?loginName=%s&code=%s", externalProtocol, instancePrimaryDomain, externalPort, preferredLoginName, testCode) expectContent := fmt.Sprintf("%s://%s:%d/ui/login/mfa/otp/verify?loginName=%s&code=%s", externalProtocol, instancePrimaryDomain, externalPort, preferredLoginName, testCode)
w.message = messages.Email{ w.message = messages.Email{
Recipients: []string{verifiedEmail}, Recipients: []string{verifiedEmail},
Subject: expectMailSubject, Subject: expectMailSubject,
@@ -1219,14 +1219,14 @@ func Test_userNotifier_reduceOTPEmailChallenged(t *testing.T) {
testCode := "testcode" testCode := "testcode"
expectContent := fmt.Sprintf("https://my.custom.url/user/%s/verify", preferredLoginName) expectContent := fmt.Sprintf("https://my.custom.url/user/%s/verify", preferredLoginName)
w.message = messages.Email{ w.message = messages.Email{
Recipients: []string{lastEmail}, Recipients: []string{verifiedEmail},
Subject: expectMailSubject, Subject: expectMailSubject,
Content: expectContent, Content: expectContent,
} }
codeAlg, code := cryptoValue(t, ctrl, testCode) codeAlg, code := cryptoValue(t, ctrl, testCode)
expectTemplateQueries(queries, givenTemplate) expectTemplateQueries(queries, givenTemplate)
queries.EXPECT().SessionByID(gomock.Any(), gomock.Any(), userID, gomock.Any()).Return(&query.Session{}, nil) queries.EXPECT().SessionByID(gomock.Any(), gomock.Any(), userID, gomock.Any()).Return(&query.Session{}, nil)
commands.EXPECT().HumanPasswordlessInitCodeSent(gomock.Any(), userID, orgID, codeID).Return(nil) commands.EXPECT().OTPEmailSent(gomock.Any(), userID, orgID).Return(nil)
return fields{ return fields{
queries: queries, queries: queries,
commands: commands, commands: commands,