From 261b652b826398e092413da527b7751e0837936f Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Wed, 18 Aug 2021 08:08:50 +0200
Subject: [PATCH] fix: set correct enum type for u2f and otp init (#2224)

---
 internal/ui/login/handler/mfa_init_u2f.go | 7 +++----
 internal/ui/login/handler/renderer.go     | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/internal/ui/login/handler/mfa_init_u2f.go b/internal/ui/login/handler/mfa_init_u2f.go
index 96224e8fc..a945581ce 100644
--- a/internal/ui/login/handler/mfa_init_u2f.go
+++ b/internal/ui/login/handler/mfa_init_u2f.go
@@ -2,11 +2,10 @@ 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"
+	"github.com/caos/zitadel/internal/domain"
 )
 
 const (
@@ -15,7 +14,7 @@ const (
 
 type u2fInitData struct {
 	webAuthNData
-	MFAType model.MFAType
+	MFAType domain.MFAType
 }
 
 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),
 			CredentialCreationData: credentialData,
 		},
-		MFAType: model.MFATypeU2F,
+		MFAType: domain.MFATypeU2F,
 	}
 	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplMFAU2FInit], data, nil)
 }
diff --git a/internal/ui/login/handler/renderer.go b/internal/ui/login/handler/renderer.go
index 91f61f95d..a71535896 100644
--- a/internal/ui/login/handler/renderer.go
+++ b/internal/ui/login/handler/renderer.go
@@ -13,7 +13,6 @@ import (
 	"golang.org/x/text/language"
 
 	http_mw "github.com/caos/zitadel/internal/api/http/middleware"
-	"github.com/caos/zitadel/internal/auth_request/model"
 	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/i18n"
@@ -149,7 +148,7 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, staticStorage
 		"mfaPromptUrl": func() string {
 			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))
 		},
 		"mfaInitVerifyUrl": func() string {