Merge branch 'v2.2'

Author: Rubén Domínguez

src/lib/Plugin.php

@@ -209,29 +209,29 @@ public function getJsResources()
     /**
      * Devuelve el autor del plugin
      *
-     * @return string
+     * @return string|null
      */
-    public function getAuthor()
+    public function getAuthor(): ?string
     {
         return 'Rubén D.';
     }
 
     /**
      * Devuelve la versión del plugin
      *
-     * @return array
+     * @return array|null
      */
-    public function getVersion()
+    public function getVersion(): ?array
     {
-        return [2, 2, 1];
+        return [2, 2, 2];
     }
 
     /**
      * Devuelve la versión compatible de sysPass
      *
-     * @return array
+     * @return array|null
      */
-    public function getCompatibleVersion()
+    public function getCompatibleVersion(): ?array
     {
         return [3, 2];
     }
@@ -249,9 +249,9 @@ public function getCssResources()
     /**
      * Devuelve el nombre del plugin
      *
-     * @return string
+     * @return string|null
      */
-    public function getName()
+    public function getName(): ?string
     {
         return self::PLUGIN_NAME;
     }

src/lib/Services/AuthenticatorService.php

@@ -25,6 +25,9 @@
 namespace SP\Modules\Web\Plugins\Authenticator\Services;
 
 use BaconQrCode\Renderer\Image\Png;
+use BaconQrCode\Renderer\Image\SvgImageBackEnd;
+use BaconQrCode\Renderer\ImageRenderer;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
 use Base2n;
 use Defuse\Crypto\Exception\CryptoException;
@@ -176,11 +179,13 @@ public function getUserQRUrl(string $login, string $iv): string
      */
     public function getQrCodeFromServer(string $login, string $iv): string
     {
-        $renderer = new Png();
-        $renderer->setHeight(200);
-        $renderer->setWidth(200);
+        $renderer = new ImageRenderer(
+            new RendererStyle(200),
+            new SvgImageBackEnd()
+        );
 
         $writer = new Writer($renderer);
+
         return base64_encode($writer->writeString('otpauth://totp/sysPass:syspass/' . $login . '?secret=' . $iv . '&issuer=sysPass'));
     }
 

src/themes/material-blue/views/userpreferences/preferences-security.inc

@@ -50,7 +50,7 @@ $chk2FAEnabled = $_getvar('chk2FAEnabled');
 
                     if (!$chk2FAEnabled && $qrCode): ?>
                         <div id="qr_code">
-                            <img id="qrcode" src="data:image/gif;base64,<?php echo $qrCode; ?>" alt="QR Code"/>
+                            <img id="qrcode" src="data:image/svg+xml;base64,<?php echo $qrCode; ?>" alt="QR Code"/>
                         </div>
                     <?php elseif ($qrCode === false): ?>
                         <p class="ui-state-error"><?php echo _t('authenticator', 'Error while getting the QR code. Please, try it again'); ?></p>

version.json

@@ -1,6 +1,6 @@
 {
   "Authenticator": {
-    "version": "2.2.1",
-    "build": "21011601"
+    "version": "2.2.2",
+    "build": "21031301"
   }
 }