From 21dee08b4d48b8632042a6ff993136d162a65f50 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 26 Mar 2020 15:32:01 +0100
Subject: [PATCH 1/2] Add issuer to otp config

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 app/config/config.yml          | 1 +
 app/config/parameters.yml.dist | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/config/config.yml b/app/config/config.yml
index 4eea0531b..a9afca10b 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -209,6 +209,7 @@ scheb_two_factor:
 
     google:
         enabled: "%twofactor_auth%"
+        issuer: "%server_name%"
         template: WallabagUserBundle:Authentication:form.html.twig
 
     email:
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 92047121e..dcaf4dffb 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -24,6 +24,7 @@ parameters:
     database_charset: utf8mb4
 
     domain_name: https://your-wallabag-url-instance.com
+    server_name: "Your wallabag instance"
 
     mailer_transport:  smtp
     mailer_user:       ~

From 71680cdb610379ed381dd64389ff1ffb4cb5f1a7 Mon Sep 17 00:00:00 2001
From: Kevin Decherf <kevin@kdecherf.com>
Date: Sat, 19 Dec 2020 00:44:16 +0100
Subject: [PATCH 2/2] views: fix corrupted qrcode image for 2FA

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
---
 .../Resources/views/themes/baggy/Config/otp_app.html.twig       | 2 +-
 .../Resources/views/themes/material/Config/otp_app.html.twig    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig
index 1d3685ae6..b16e6a050 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig
@@ -13,7 +13,7 @@
             <p>
                 <img id="2faQrcode" class="hide-on-med-and-down" />
                 <script>
-                    document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}');
+                    document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code|raw }}');
                 </script>
             </p>
         </li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
index a98e74e0b..bf8c431f4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
@@ -17,7 +17,7 @@
                             <p>
                                 <img id="2faQrcode" class="hide-on-med-and-down" />
                                 <script>
-                                    document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}');
+                                    document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code|raw }}');
                                 </script>
                             </p>