Merge pull request #487 from igophper/fix_google_migrate

Fixes #447: Unable to import google authenticator

Author: Bubka

app/Factories/MigratorFactory.php

@@ -30,7 +30,7 @@ public function create(string $migrationPayload) : Migrator
             return App::make(AegisMigrator::class);
         } elseif ($this->is2FASv2($migrationPayload)) {
             return App::make(TwoFASMigrator::class);
-        } elseif ($this->isGoogleAuth($migrationPayload)) {
+        } elseif (self::isGoogleAuth($migrationPayload)) {
             return App::make(GoogleAuthMigrator::class);
         } elseif ($this->isBitwardenJson($migrationPayload)) {
             return App::make(BitwardenMigrator::class);
@@ -46,7 +46,7 @@ public function create(string $migrationPayload) : Migrator
      *
      * @param  string  $migrationPayload  The payload to analyse
      */
-    private function isGoogleAuth(string $migrationPayload) : bool
+    public static function isGoogleAuth(string $migrationPayload) : bool
     {
         // - Google Auth migration URI : a string starting with otpauth-migration://offline?data= on a single line
 

app/Services/QrCodeService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Factories\MigratorFactory;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
 use Illuminate\Support\Facades\Log;
@@ -68,7 +69,10 @@ public static function decode(\Illuminate\Http\UploadedFile $file)
             }
         }
 
-        $data = urldecode($text);
+        $data = $text;
+        if (!MigratorFactory::isGoogleAuth($text)) {
+            $data = urldecode($text);
+        }
 
         Log::info('QR code decoded');