Merge branch 'release/3.3.8'

getgrav · Dec 11, 2020 · 16b882f · 16b882f
2 parents 88944f7 + 6d78c0b
commit 16b882f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v3.3.8
+## 12/11/2020
+
+1. [](#bugfix)
+   * Fixed saving another user in Admin with 2FA enabled regenerating 2FA secret [#268](https://github.com/getgrav/grav-plugin-login/issues/268)
+
 # v3.3.7
 ## 12/02/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Login
 slug: login
 type: plugin
-version: 3.3.7
+version: 3.3.8
 testing: false
 description: Enables user authentication and login screen.
 icon: sign-in

diff --git a/templates/forms/fields/2fa_secret/2fa_secret.html.twig b/templates/forms/fields/2fa_secret/2fa_secret.html.twig
@@ -3,7 +3,7 @@
 {% block input %}
     <div class="form-input-wrapper twofa-wrapper">
         {% try %}
-            {% set user = grav.user %}
+            {% set user = form.object ?? grav.user %}
 
             {% set secret = user.twofa_secret ?: grav.login.twoFactorAuth.createSecret() %}
             {% set image = grav.login.twoFactorAuth.getQrImageData(user.username, secret) %}