Merge branch 'release/0.6.0'

# Conflicts:
#	app/Http/Controllers/Import/MapController.php
#	config/importer.php

Author: JC5

.env.example

@@ -59,6 +59,15 @@ SPECTRE_SECRET=
 #
 USE_CACHE=false
 
+#
+# If set to true, the data import will not complain about running into duplicates.
+# This will give you cleaner import mails if you run regular imports.
+#
+# Of course, if something goes wrong *because* the transaction is a duplicate you will
+# NEVER know unless you start digging in your log files. So be careful with this.
+#
+IGNORE_DUPLICATE_ERRORS=false
+
 #
 # Auto import settings. Due to security constraints, you MUST enable each feature individually.
 # You must also set a secret. The secret is used for the web routes.

app/Handlers/Events/ImportedTransactionsEventHandler.php

@@ -54,10 +54,15 @@ public function sendReportOverMail(ImportedTransactions $event): void
             'warnings' => $event->warnings,
             'errors'   => $event->errors,
         ];
-        app('log')->info('Will send report message.');
-        app('log')->debug('If no error below this line, mail was sent!');
-        Mail::to(config('mail.destination'))->send(new ImportReportMail($log));
-        app('log')->debug('If no error above this line, mail was sent!');
+        if (count($event->messages) > 0 || count($event->warnings) > 0 || count($event->errors) > 0) {
+            app('log')->info('Will send report message.');
+            app('log')->debug('If no error below this line, mail was sent!');
+            Mail::to(config('mail.destination'))->send(new ImportReportMail($log));
+            app('log')->debug('If no error above this line, mail was sent!');
+        }
+        if (0 === count($event->messages) && 0 === count($event->warnings) && 0 === count($event->errors)) {
+            app('log')->info('There is nothing to report, will not send a message.');
+        }
     }
 
 }

app/Http/Controllers/DebugController.php

@@ -67,7 +67,7 @@ public function index(Request $request)
         $isDocker       = env('IS_DOCKER', false);
 
         if(file_exists('/var/www/counter-main.txt')) {
-            $buildNr = file_get_contents('/var/www/counter-main.txt');
+            $buildNr = trim(file_get_contents('/var/www/counter-main.txt'));
         }
 
         // get latest log file:

app/Http/Controllers/Import/MapController.php

@@ -80,12 +80,14 @@ public function index()
         $roles         = [];
 
         if ('csv' === $configuration->getFlow()) {
+            Log::debug('Get mapping data for CSV');
             $roles = $configuration->getRoles();
             $data  = $this->getCSVMapInformation();
         }
 
         // nordigen, spectre and others:
         if ('csv' !== $configuration->getFlow()) {
+            Log::debug('Get mapping data for nordigen and spectre');
             $roles = [];
             $data  = $this->getImporterMapInformation();
         }
@@ -94,6 +96,12 @@ public function index()
         if (0 === count($data)) {
             // set map config as complete.
             session()->put(Constants::MAPPING_COMPLETE_INDICATOR, true);
+
+            // if CSV, now ready for conversion
+            if ('csv' === $configuration->getFlow()) {
+                Log::debug('Its CSV, also set ready for conversion.');
+                session()->put(Constants::READY_FOR_CONVERSION, true);
+            }
             return redirect()->route('007-convert.index');
         }
 

app/Http/Controllers/TokenController.php

@@ -205,25 +205,23 @@ public function submitClientId(Request $request)
      * This method will check if Firefly III accepts the access_token from the cookie
      * and the base URL (also from the cookie). The base_url is NEVER the vanity URL.§
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      */
-    public function doValidate(Request $request): JsonResponse
+    public function doValidate(): JsonResponse
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
         $response = ['result' => 'OK', 'message' => null];
 
         // get values from secret manager:
         $url     = SecretManager::getBaseUrl();
         $token   = SecretManager::getAccessToken();
-        $request = new SystemInformationRequest($url, $token);
+        $infoRequest = new SystemInformationRequest($url, $token);
 
-        $request->setVerify(config('importer.connection.verify'));
-        $request->setTimeOut(config('importer.connection.timeout'));
+        $infoRequest->setVerify(config('importer.connection.verify'));
+        $infoRequest->setTimeOut(config('importer.connection.timeout'));
 
         try {
-            $result = $request->get();
+            $result = $infoRequest->get();
         } catch (ApiHttpException $e) {
             Log::error(sprintf('Could not connect to Firefly III: %s', $e->getMessage()));
 

app/Http/Request/AutoUploadRequest.php

@@ -45,7 +45,7 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'csv'  => 'required|file',
+            'csv'  => 'file',
             'json' => 'required|file',
         ];
 

app/Services/CSV/Configuration/ConfigFileProcessor.php

@@ -51,7 +51,7 @@ public static function convertConfigFile(string $fileName): Configuration
             $content = StorageService::getContent($fileName);
         } catch (FileNotFoundException $e) {
             app('log')->error($e->getMessage());
-            throw new ImporterErrorException(sprintf('Cpuld not find config file: %s', $e->getMessage()));
+            throw new ImporterErrorException(sprintf('Could not find config file: %s', $e->getMessage()));
         }
         try {
             $json = json_decode($content, true, 512, JSON_THROW_ON_ERROR);

app/Services/Shared/Authentication/SecretManager.php

@@ -37,7 +37,7 @@ class SecretManager
     public const ACCESS_TOKEN  = 'access_token';
     public const BASE_URL      = 'base_url';
     public const REFRESH_TOKEN = 'refresh_token';
-    public const VANITY_URL    = 'base_url';
+    public const VANITY_URL    = 'vanity_url';
 
     /**
      * Will return true if the session / cookies hold valid secrets (access token, URLs)

app/Services/Shared/Configuration/Configuration.php

@@ -164,7 +164,7 @@ public static function fromRequest(array $array): self
         $delimiters             = config('csv.delimiters_reversed');
         $object                 = new self;
         $object->version        = self::VERSION;
-        $object->headers        = $array['headers'];
+        $object->headers        = $array['headers'] ?? false;
         $object->date           = $array['date'];
         $object->defaultAccount = $array['default_account'];
         $object->delimiter      = $delimiters[$array['delimiter']] ?? 'comma';

app/Services/Shared/Conversion/RoutineStatusManager.php

@@ -177,16 +177,17 @@ public static function startOrFindConversion(string $identifier): ConversionStat
     {
         app('log')->debug(sprintf('Now in startOrFindConversion(%s)', $identifier));
         $disk = Storage::disk(self::DISK_NAME);
-        app('log')->debug(sprintf('Try to see if file exists for conversion "%s".', $identifier));
+        //app('log')->debug(sprintf('Try to see if file exists for conversion "%s".', $identifier));
         if ($disk->exists($identifier)) {
-            app('log')->debug(sprintf('Status file exists for conversion "%s".', $identifier));
+            //app('log')->debug(sprintf('Status file exists for conversion "%s".', $identifier));
             try {
                 $array  = json_decode($disk->get($identifier), true, 512, JSON_THROW_ON_ERROR);
                 $status = ConversionStatus::fromArray($array);
             } catch (FileNotFoundException | JsonException $e) {
                 app('log')->error($e->getMessage());
                 $status = new ConversionStatus;
             }
+            app('log')->debug(sprintf('Conversion status is "%s"', $status->status));
 
             return $status;