Fix some cache issues and a version bump.

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 26,
+    appVersion = 27,
-    appMarketingVersion = (defaultText = "4.7.16"),
+    appMarketingVersion = (defaultText = "4.7.17"),
 
     actions = [
       # Define your "new document" handlers here.

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.7.16
+  - VERSION=4.7.17
 
 dist: xenial
 

app/Http/Controllers/System/InstallController.php

@@ -28,10 +28,13 @@ use Artisan;
 use Exception;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
+use FireflyIII\Support\Preferences;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Arr;
 use Laravel\Passport\Passport;
 use Log;
 use phpseclib\Crypt\RSA;
+use Cache;
 
 /**
  * Class InstallController
@@ -75,11 +78,16 @@ class InstallController extends Controller
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
             if (strpos($e->getMessage(), 'open_basedir restriction in effect')) {
+                Cache::clear();
                 return response()->json(['error' => true, 'message' => self::BASEDIR_ERROR]);
             }
 
             return response()->json(['error' => true, 'message' => self::OTHER_ERROR . ' ' . $e->getMessage()]);
         }
+        // clear cache as well.
+        Cache::clear();
+        Preferences::mark();
+
 
         return response()->json(['error' => false, 'message' => 'OK']);
     }
@@ -118,8 +126,12 @@ class InstallController extends Controller
             return response()->json(['error' => false, 'message' => 'OK']);
         }
 
-        file_put_contents($publicKey, array_get($keys, 'publickey'));
+        file_put_contents($publicKey, Arr::get($keys, 'publickey'));
-        file_put_contents($privateKey, array_get($keys, 'privatekey'));
+        file_put_contents($privateKey, Arr::get($keys, 'privatekey'));
+
+        // clear cache as well.
+        Cache::clear();
+        Preferences::mark();
 
         return response()->json(['error' => false, 'message' => 'OK']);
     }
@@ -148,6 +160,9 @@ class InstallController extends Controller
 
             return response()->json(['error' => true, 'message' => self::OTHER_ERROR]);
         }
+        // clear cache as well.
+        Cache::clear();
+        Preferences::mark();
 
 
         return response()->json(['error' => false, 'message' => 'OK']);
@@ -176,6 +191,9 @@ class InstallController extends Controller
 
             return response()->json(['error' => true, 'message' => self::OTHER_ERROR . ' ' . $e->getMessage()]);
         }
+        // clear cache as well.
+        Cache::clear();
+        Preferences::mark();
 
         return response()->json(['error' => false, 'message' => 'OK']);
     }
@@ -203,6 +221,9 @@ class InstallController extends Controller
 
             return response()->json(['error' => true, 'message' => self::OTHER_ERROR . ' ' . $e->getMessage()]);
         }
+        // clear cache as well.
+        Cache::clear();
+        Preferences::mark();
 
         return response()->json(['error' => false, 'message' => 'OK']);
     }

app/Http/Middleware/StartFireflySession.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Illuminate\Session\Middleware\StartSession;
+use Log;
 
 /**
  * Class StartFireflySession.
@@ -42,8 +43,13 @@ class StartFireflySession extends StartSession
     {
         $uri    = $request->fullUrl();
         $strpos = strpos($uri, 'jscript');
+
         if (false === $strpos && 'GET' === $request->method() && !$request->ajax()) {
             $session->setPreviousUrl($uri);
+            Log::debug(sprintf('Will set previous URL to %s', $uri));
+
+            return;
         }
+        Log::debug(sprintf('Will NOT set previous URL to %s', $uri));
     }
 }

composer.lock

@@ -1765,16 +1765,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.1.4",
+            "version": "9.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "9c8ad06fb5d747c149875beb6133566c00eaa481"
+                "reference": "f3a3c69b6e152417e1b62d995bcad2237b053cc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/9c8ad06fb5d747c149875beb6133566c00eaa481",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/f3a3c69b6e152417e1b62d995bcad2237b053cc6",
-                "reference": "9c8ad06fb5d747c149875beb6133566c00eaa481",
+                "reference": "f3a3c69b6e152417e1b62d995bcad2237b053cc6",
                 "shasum": ""
             },
             "require": {
@@ -1783,7 +1783,7 @@
             },
             "require-dev": {
                 "ext-curl": "*",
-                "friendsofphp/php-cs-fixer": "^2.0",
+                "friendsofphp/php-cs-fixer": "^2.12",
                 "phpstan/phpstan": "^0.9.2",
                 "phpstan/phpstan-phpunit": "^0.9.4",
                 "phpstan/phpstan-strict-rules": "^0.9.0",
@@ -1828,7 +1828,7 @@
                 "read",
                 "write"
             ],
-            "time": "2018-05-01T18:32:48+00:00"
+            "time": "2019-03-08T06:56:16+00:00"
         },
         {
             "name": "league/event",

config/firefly.php

@@ -93,7 +93,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'                   => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
-    'version'                      => '4.7.16',
+    'version'                      => '4.7.17',
     'api_version'                  => '0.9.2',
     'db_version'                   => 9,
     'maxUploadSize'                => 15242880,

resources/views/v1/install/index.twig

@@ -20,7 +20,7 @@
         var upgradeUri = '{{ route('installer.upgrade') }}';
         var verifyUri = '{{ route('installer.verify') }}';
         var decryptUri = '{{ route('installer.decrypt') }}';
-        var homeUri = '{{ route('home') }}';
+        var homeUri = '{{ route('flush') }}';
     </script>
     <script type="text/javascript" src="v1/js/ff/install/index.js"></script>
 {% endblock %}