From 328da56a28b9dd436c8ca4c961e4e10f3517c4b1 Mon Sep 17 00:00:00 2001 From: JakobDev <jakobdev@gmx.de> Date: Wed, 11 Oct 2023 22:12:54 +0200 Subject: [PATCH] Don't show Link to TOTP if not set up (#27585) --- routers/web/auth/webauthn.go | 8 ++++++++ templates/user/auth/webauthn.tmpl | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/routers/web/auth/webauthn.go b/routers/web/auth/webauthn.go index 88413caea6..9b516ce396 100644 --- a/routers/web/auth/webauthn.go +++ b/routers/web/auth/webauthn.go @@ -37,6 +37,14 @@ func WebAuthn(ctx *context.Context) { return } + hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, ctx.Session.Get("twofaUid").(int64)) + if err != nil { + ctx.ServerError("HasTwoFactorByUID", err) + return + } + + ctx.Data["HasTwoFactor"] = hasTwoFactor + ctx.HTML(http.StatusOK, tplWebAuthn) } diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl index f738937025..722da02f54 100644 --- a/templates/user/auth/webauthn.tmpl +++ b/templates/user/auth/webauthn.tmpl @@ -14,9 +14,11 @@ <div class="is-loading" style="width: 40px; height: 40px"></div> {{ctx.Locale.Tr "webauthn_press_button"}} </div> - <div class="ui attached segment"> - <a href="{{AppSubUrl}}/user/two_factor">{{ctx.Locale.Tr "webauthn_use_twofa"}}</a> - </div> + {{if .HasTwoFactor}} + <div class="ui attached segment"> + <a href="{{AppSubUrl}}/user/two_factor">{{ctx.Locale.Tr "webauthn_use_twofa"}}</a> + </div> + {{end}} </div> </div> </div>