extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-02-03 03:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix icon fetched twice or forgotten during import

Browse Source
This commit is contained in:
Bubka 2023-03-29 17:43:41 +02:00
parent 3724f3e87c
commit e4c9e87522
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Migrators/TwoFAuthMigrator.php
View File

@ -103,7 +103,7 @@ public function migrate(mixed $migrationPayload) : Collection
try { try {
$twofaccounts[$key] = new TwoFAccount; $twofaccounts[$key] = new TwoFAccount;
$twofaccounts[$key]->fillWithOtpParameters($parameters); $twofaccounts[$key]->fillWithOtpParameters($parameters, Arr::has($parameters, 'iconExt'));
if (Arr::has($parameters, 'iconExt')) { if (Arr::has($parameters, 'iconExt')) {
$twofaccounts[$key]->setIcon($parameters['icon_file'], $parameters['iconExt']); $twofaccounts[$key]->setIcon($parameters['icon_file'], $parameters['iconExt']);
} }

1
resources/js/views/twofaccounts/Import.vue
View File

@ -308,6 +308,7 @@
this.form.account = twofaccount.account this.form.account = twofaccount.account
this.form.service = twofaccount.service this.form.service = twofaccount.service
this.form.otp_type = twofaccount.otp_type this.form.otp_type = twofaccount.otp_type
this.form.icon = twofaccount.icon
this.form.secret = twofaccount.secret this.form.secret = twofaccount.secret
this.form.algorithm = twofaccount.algorithm this.form.algorithm = twofaccount.algorithm
this.form.digits = twofaccount.digits this.form.digits = twofaccount.digits