Merge branch 'release/0.7.0'

Author: JC5

app/Exceptions/Handler.php

@@ -24,6 +24,7 @@
 
 namespace App\Exceptions;
 
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 /**
@@ -40,6 +41,7 @@ class Handler extends ExceptionHandler
         //
     ];
 
+
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
@@ -49,4 +51,19 @@ class Handler extends ExceptionHandler
         'password',
         'password_confirmation',
     ];
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @param Throwable                $e
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
+     * @throws \Throwable
+     */
+    public function render($request, Throwable $e)
+    {
+        if($e instanceof ImporterErrorException || $e instanceof ImporterHttpException) {
+            $isDebug = config('app.debug');
+            return response()->view('errors.exception', ['exception' => $e, 'debug' => $isDebug], 500);
+        }
+        return parent::render($request, $e);
+    }
 }

app/Http/Controllers/Import/ConfigurationController.php

@@ -120,7 +120,7 @@ public function index(Request $request)
         // get list of asset accounts:
         $url   = SecretManager::getBaseUrl();
         $token = SecretManager::getAccessToken();
-
+        $fireflyAccounts = 0;
 
         $request = new GetAccountsRequest($url, $token);
         $request->setType(GetAccountsRequest::ASSET);
@@ -131,6 +131,7 @@ public function index(Request $request)
         /** @var Account $account */
         foreach ($response as $account) {
             $accounts[self::ASSET_ACCOUNTS][$account->id] = $account;
+            $fireflyAccounts++;
         }
 
         // also get liabilities
@@ -144,6 +145,7 @@ public function index(Request $request)
         /** @var Account $account */
         foreach ($response as $account) {
             $accounts[self::LIABILITIES][$account->id] = $account;
+            $fireflyAccounts++;
         }
 
         // possibilities for duplicate detection (unique columns)
@@ -175,7 +177,7 @@ public function index(Request $request)
 
         return view(
             'import.004-configure.index',
-            compact('mainTitle', 'subTitle', 'accounts', 'configuration', 'flow', 'importerAccounts', 'uniqueColumns')
+            compact('mainTitle', 'subTitle', 'fireflyAccounts','accounts', 'configuration', 'flow', 'importerAccounts', 'uniqueColumns')
         );
     }
 
@@ -187,7 +189,7 @@ public function index(Request $request)
      */
     private function getNordigenAccounts(string $identifier): array
     {
-        if (Cache::has($identifier)) {
+        if (Cache::has($identifier) && config('importer.use_cache')) {
             $result = Cache::get($identifier);
             $return = [];
             foreach ($result as $arr) {

app/Http/Controllers/NavController.php

@@ -55,6 +55,16 @@ public function toRoles()
         return redirect(route('005-roles.index'));
     }
 
+    /**
+     * @return Application|RedirectResponse|Redirector
+     */
+    public function toConversion()
+    {
+        app('log')->debug(__METHOD__);
+        session()->forget(Constants::CONVERSION_COMPLETE_INDICATOR);
+        return redirect(route('005-roles.index'));
+    }
+
     /**
      * Return back to index. Needs no session updates.
      */

app/Http/Controllers/TokenController.php

@@ -31,14 +31,14 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
-use InvalidArgumentException;
 use JsonException;
 use Str;
 use Throwable;
@@ -61,17 +61,18 @@ class TokenController extends Controller
     public function callback(Request $request)
     {
         app('log')->debug(sprintf('Now at %s', __METHOD__));
-        $state        = (string) $request->session()->pull('state');
+        $state        = (string) session()->pull('state');
         $codeVerifier = (string) $request->session()->pull('code_verifier');
         $clientId     = (int) $request->session()->pull('form_client_id');
         $baseURL      = (string) $request->session()->pull('form_base_url');
         $vanityURL    = (string) $request->session()->pull('form_vanity_url');
         $code         = $request->get('code');
 
-        throw_unless(
-            strlen($state) > 0 && $state === $request->state,
-            InvalidArgumentException::class
-        );
+        if (0 === strlen($state) || $state !== $request->state) {
+            app('log')->error(sprintf('State according to session: "%s"', $state));
+            app('log')->error(sprintf('State returned in request : "%s"', $request->state));
+            throw new ImporterErrorException('The "state" returned from your server doesn\'t match the state that was sent.');
+        }
         // always POST to the base URL, never the vanity URL.
         $finalURL = sprintf('%s/oauth/token', $baseURL);
         $params   = [
@@ -93,11 +94,14 @@ public function callback(Request $request)
         ];
         try {
             $response = (new Client($opts))->post($finalURL, $params);
-        } catch (ClientException $e) {
-            $body = (string) $e->getResponse()->getBody();
-            app('log')->error(sprintf('Client exception when decoding response: %s', $e->getMessage()));
-            app('log')->error(sprintf('Response from server: "%s"', $body));
-            app('log')->error($e->getTraceAsString());
+        } catch (ClientException | RequestException $e) {
+            $body = $e->getMessage();
+            if ($e->hasResponse()) {
+                $body = (string) $e->getResponse()->getBody();
+                app('log')->error(sprintf('Client exception when decoding response: %s', $e->getMessage()));
+                app('log')->error(sprintf('Response from server: "%s"', $body));
+                app('log')->error($e->getTraceAsString());
+            }
 
             return view('error')->with('message', $e->getMessage())->with('body', $body);
         }

app/Services/Nordigen/Conversion/Routine/GenerateTransactions.php

@@ -224,6 +224,7 @@ private function generateTransaction(string $accountId, Transaction $entry): arr
             'tags'               => [],
             'category_name'      => null,
             'category_id'        => null,
+            'notes'              => $entry->getNotes(),
             'external_id'        => $entry->transactionId,
             'internal_reference' => $entry->accountIdentifier,
         ];

app/Services/Nordigen/Model/Transaction.php

@@ -355,6 +355,21 @@ public function getSourceIban(): ?string
         return null;
     }
 
+    /**
+     * Returns notes based on info in the transaction.
+     * @return string
+     */
+    public function getNotes(): string
+    {
+        $notes = '';
+        if ('' !== $this->additionalInformation) {
+            $notes = $this->additionalInformation;
+        }
+        // room for other fields
+
+        return $notes;
+    }
+
     /**
      * Return account number of the source account.
      *

app/Services/Nordigen/Request/ListAccountsRequest.php

@@ -66,6 +66,7 @@ public function setIdentifier(string $identifier): void
     public function get(): Response
     {
         $json = $this->authenticatedGet();
+
         return new ListAccountsResponse($json);
     }
 

app/Services/Nordigen/Response/ListAccountsResponse.php

@@ -47,8 +47,11 @@ public function __construct(array $data)
     {
         $this->accounts = [];
 
+        app('log')->debug('ListAccountsResponse:', $data ?? []);
+
         /** @var string $account */
         foreach ($data['accounts'] as $account) {
+            app('log')->debug(sprintf('ListAccountsResponse includes account "%s"', $account));
             $this->accounts[] = Account::createFromIdentifier($account);
         }
         $this->collection = new Collection($this->accounts);

app/Services/Nordigen/Services/AccountInformationCollector.php

@@ -74,13 +74,6 @@ public static function collectInformation(Account $account): Account
                 $balanceAccount->setStatus('no-balance');
             }
         }
-        // overrule settings to test layout:
-//        $balanceAccount->setIban('');
-//        $balanceAccount->setName('');
-//        $balanceAccount->setDisplayName('');
-//        $balanceAccount->setOwnerName('');
-//        $balanceAccount->setStatus('no-info');
-
         return $balanceAccount;
     }
 

changelog.md

@@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.7.0 - 2022-01-22
+
+- ⚠️ Using Nordigen? This release WILL create duplicate transactions. Don't import large batches.
+
+A special thanks to the excellent folks over at @nordigen for some quick debugging and fixing.
+
+### Added
+- A special 500 page so you can see what's happening.
+- Nordigen will now import transaction details in notes.
+- If you have no Firefly III accounts, the importer will warn you.
+- Extra account details debug information.
+
+### Fixed
+- A missing method broke navigation.
+- Sometimes session details would get lost in translation.
+
 ## 0.6.5 - 2022-01-15
 
 ### Fixed