IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Catch OpenSSL error.

Browse Source
This commit is contained in:
James Cole
2018-05-23 14:08:37 +02:00
parent 2b2f37a8c9
commit 82538ba4fc
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Import/Prerequisites/BunqPrerequisites.php
View File

@@ -26,6 +26,7 @@ use bunq\Context\ApiContext;
use bunq\Exception\BadRequestException;
use bunq\Exception\BunqException;
use bunq\Util\BunqEnumApiEnvironmentType;
use Exception;
use FireflyIII\Services\IP\IPRetrievalInterface;
use FireflyIII\User;
use Illuminate\Support\MessageBag;
@@ -122,9 +123,16 @@ class BunqPrerequisites implements PrerequisitesInterface
$deviceDescription,
$permittedIps
);
} catch (BadRequestException $e) {
} catch (BadRequestException|BunqException|Exception $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
$message = $e->getMessage();
if (stripos($message, 'Generating a new private key failed')) {
$message = 'Could not generate key-material. Please make sure OpenSSL is installed and configured: http://bit.ly/FF3-openSSL';
}
$messages = new MessageBag();
$messages->add('bunq_error', $e->getMessage());
$messages->add('bunq_error', $message);
return $messages;
}