kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Better catch for key restauration problems.

Browse Source
This commit is contained in:
James Cole
2021-12-21 16:35:28 +01:00
parent 4d933e1ef7
commit 45fbf83971
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Console/Commands/Integrity/RestoreOAuthKeys.php
View File

@@ -74,8 +74,16 @@ class RestoreOAuthKeys extends Command
}
if ($this->keysInDatabase() && !$this->keysOnDrive()) {
Log::debug('Keys are in DB and keys are not on the drive. Restore.');
$this->restoreKeysFromDB();
$this->line('Restored OAuth keys from database.');
$result = $this->restoreKeysFromDB();
if(true === $result) {
$this->line('Restored OAuth keys from database.');
return;
}
Log::warning('Could not restore keys. Will create new ones.');
$this->generateKeys();
$this->storeKeysInDB();
$this->line('Generated and stored new keys.');
return;
}
@@ -124,8 +132,8 @@ class RestoreOAuthKeys extends Command
/**
*
*/
private function restoreKeysFromDB(): void
private function restoreKeysFromDB(): bool
{
OAuthKeys::restoreKeysFromDB();
return OAuthKeys::restoreKeysFromDB();
}
}