TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 03:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: set correct enum type for u2f and otp init (#2224)

Browse Source
This commit is contained in:
Livio Amstutz
2021-08-18 08:08:50 +02:00
committed by GitHub
parent 90f1647bb9
commit 261b652b82
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/ui/login/handler/mfa_init_u2f.go
View File

@@ -2,11 +2,10 @@ package handler
import ( import (
"encoding/base64" "encoding/base64"
"github.com/caos/zitadel/internal/domain"
"net/http" "net/http"
http_mw "github.com/caos/zitadel/internal/api/http/middleware" http_mw "github.com/caos/zitadel/internal/api/http/middleware"
"github.com/caos/zitadel/internal/auth_request/model" "github.com/caos/zitadel/internal/domain"
) )
const ( const (
@@ -15,7 +14,7 @@ const (
type u2fInitData struct { type u2fInitData struct {
webAuthNData webAuthNData
MFAType model.MFAType MFAType domain.MFAType
} }
func (l *Login) renderRegisterU2F(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, err error) { func (l *Login) renderRegisterU2F(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, err error) {
@@ -35,7 +34,7 @@ func (l *Login) renderRegisterU2F(w http.ResponseWriter, r *http.Request, authRe
userData: l.getUserData(r, authReq, "Register WebAuthNToken", errID, errMessage), userData: l.getUserData(r, authReq, "Register WebAuthNToken", errID, errMessage),
CredentialCreationData: credentialData, CredentialCreationData: credentialData,
}, },
MFAType: model.MFATypeU2F, MFAType: domain.MFATypeU2F,
} }
l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAU2FInit], data, nil) l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAU2FInit], data, nil)
} }

3
internal/ui/login/handler/renderer.go
View File

@@ -13,7 +13,6 @@ import (
"golang.org/x/text/language" "golang.org/x/text/language"
http_mw "github.com/caos/zitadel/internal/api/http/middleware" http_mw "github.com/caos/zitadel/internal/api/http/middleware"
"github.com/caos/zitadel/internal/auth_request/model"
"github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/domain"
caos_errs "github.com/caos/zitadel/internal/errors" caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/i18n" "github.com/caos/zitadel/internal/i18n"
@@ -149,7 +148,7 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, staticStorage
"mfaPromptUrl": func() string { "mfaPromptUrl": func() string {
return path.Join(r.pathPrefix, EndpointMFAPrompt) return path.Join(r.pathPrefix, EndpointMFAPrompt)
}, },
"mfaPromptChangeUrl": func(id string, provider model.MFAType) string { "mfaPromptChangeUrl": func(id string, provider domain.MFAType) string {
return path.Join(r.pathPrefix, fmt.Sprintf("%s?%s=%s;%s=%v", EndpointMFAPrompt, queryAuthRequestID, id, "provider", provider)) return path.Join(r.pathPrefix, fmt.Sprintf("%s?%s=%s;%s=%v", EndpointMFAPrompt, queryAuthRequestID, id, "provider", provider))
}, },
"mfaInitVerifyUrl": func() string { "mfaInitVerifyUrl": func() string {