load U2F js only on pages which need it (#11585)

* load U2F js only on pages which need it

* Update templates/base/head.tmpl

diff --git a/routers/user/setting/security.go b/routers/user/setting/security.go
index 787ac922ec4c909fb77b4afe243800427bf54223..87e2ba1c02ec33047d6f8a8249276e1e398e1b95 100644 (file)
--- 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 3c2371f0e964494fb731291cea1397cf259dfad7..1dcaea8560a00ed7a8535db08ec5f0ba87386591 100644 (file)
--- 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}},