From 26da20aa93b474b1bf47b2ab650e0252f88a41cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Doma=C5=84ski?= <kamil@domanski.co>
Date: Wed, 20 Jan 2021 22:17:46 +0100
Subject: [PATCH] load U2F js only on pages which need it (#11585)
* load U2F js only on pages which need it
* Update templates/base/head.tmpl
---
routers/user/setting/security.go | 2 +-
templates/base/head.tmpl | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/routers/user/setting/security.go b/routers/user/setting/security.go
index 787ac922ec..87e2ba1c02 100644
--- a/routers/user/setting/security.go
+++ b/routers/user/setting/security.go
@@ -21,6 +21,7 @@ const (
func Security(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsSecurity"] = true
+ ctx.Data["RequireU2F"] = true
if ctx.Query("openid.return_to") != "" {
settingsOpenIDVerify(ctx)
@@ -68,7 +69,6 @@ func loadSecurityData(ctx *context.Context) {
ctx.ServerError("GetU2FRegistrationsByUID", err)
return
}
- ctx.Data["RequireU2F"] = true
}
tokens, err := models.ListAccessTokens(models.ListAccessTokensOptions{UserID: ctx.User.ID})
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 3c2371f0e9..1dcaea8560 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -36,7 +36,6 @@
HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}},
SimpleMDE: {{if .RequireSimpleMDE}}true{{else}}false{{end}},
Tribute: {{if .RequireTribute}}true{{else}}false{{end}},
- U2F: {{if .RequireU2F}}true{{else}}false{{end}},
NotificationSettings: {
MinTimeout: {{NotificationSettings.MinTimeout}},
TimeoutStep: {{NotificationSettings.TimeoutStep}},