extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-04-29 20:04:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bubka 2022-05-11 23:09:20 +02:00
parent a75ea1b463
commit 42c3bd8936
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
database/migrations/2021_09_14_195451_change_nullable_in_twofaccounts_table.php
View File

@ -16,16 +16,6 @@ class ChangeNullableInTwofaccountsTable extends Migration
*/ */
public function up() 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(); $twofaccounts = DB::table('twofaccounts')->select('id', 'legacy_uri')->get();
$settingService = resolve('App\Services\SettingService'); $settingService = resolve('App\Services\SettingService');
@ -48,8 +38,39 @@ public function up()
catch(Exception $ex) catch(Exception $ex)
{ {
Log::error($ex->getMessage()); 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();
});
} }
/** /**