Fix #71 - Cannot view old TOTP entries on latest Docker Image

Bubka · May 11, 2022 · 42c3bd8 · 42c3bd8
1 parent a75ea1b
commit 42c3bd8
Showing 1 changed file with 31 additions and 10 deletions.
diff --git a/database/migrations/2021_09_14_195451_change_nullable_in_twofaccounts_table.php b/database/migrations/2021_09_14_195451_change_nullable_in_twofaccounts_table.php
@@ -16,16 +16,6 @@ class ChangeNullableInTwofaccountsTable extends Migration
      */
     public function up()
     {
-        Schema::table('twofaccounts', function (Blueprint $table) {
-            $table->text('account')->nullable(false)->change();
-            $table->string('service')->nullable()->change();
-            $table->string('otp_type', 10)->nullable(false)->change();
-            $table->text('secret')->nullable(false)->change();
-            $table->string('algorithm', 20)->nullable(false)->change();
-            $table->unsignedSmallInteger('digits')->nullable(false)->change();
-        });
-
-
         $twofaccounts = DB::table('twofaccounts')->select('id', 'legacy_uri')->get();
         $settingService = resolve('App\Services\SettingService');
 
@@ -48,8 +38,39 @@ public function up()
             catch(Exception $ex)
             {
                 Log::error($ex->getMessage());
+                Log::error("TwoFAccount with id #" . $twofaccount->id . " could not be splited");
             }
         }
+
+        $twofaccounts = DB::table('twofaccounts')
+            ->whereNull('account')
+            ->orWhereNull('otp_type')
+            ->orWhereNull('secret')
+            ->orWhereNull('algorithm')
+            ->orWhereNull('digits')
+            ->get();
+
+        foreach ($twofaccounts as $twofaccount) {
+
+            $affected = DB::table('twofaccounts')
+            ->where('id', $twofaccount->id)
+            ->update([
+                'account'  => $twofaccount->account === null ? 'account (invalid)' : $twofaccount->account + ' (invalid)',
+                'otp_type'  => $twofaccount->otp_type === null ? 'totp' : $twofaccount->otp_type,
+                'secret'    => $twofaccount->secret === null ? 'secret' : $twofaccount->secret,
+                'algorithm' => $twofaccount->algorithm === null ? 'sha1' : $twofaccount->algorithm,
+                'digits'    => $twofaccount->digits === null ? 6 : $twofaccount->digits,
+            ]);
+        }
+
+        Schema::table('twofaccounts', function (Blueprint $table) {
+            $table->text('account')->nullable(false)->change();
+            $table->string('service')->nullable()->change();
+            $table->string('otp_type', 10)->nullable(false)->change();
+            $table->text('secret')->nullable(false)->change();
+            $table->string('algorithm', 20)->nullable(false)->change();
+            $table->unsignedSmallInteger('digits')->nullable(false)->change();
+        });
     }
 
     /**