Fix #1056

app/Http/Controllers/Admin/ConfigurationController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use FireflyIII\Http\Requests\ConfigurationRequest;
 use FireflyIII\Support\Facades\FireflyConfig;
 use Preferences;
@@ -51,7 +52,8 @@ class ConfigurationController extends Controller
                 return $next($request);
             }
         );
-        $this->middleware(IsLimitedUser::class)->except(['index']);
+        $this->middleware(IsDemoUser::class)->except(['index']);
+        $this->middleware(IsSandStormUser::class);
     }
 
     /**

app/Http/Controllers/Admin/HomeController.php

@@ -24,7 +24,8 @@ namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use Illuminate\Http\Request;
 use Log;
 use Session;
@@ -40,7 +41,8 @@ class HomeController extends Controller
     public function __construct()
     {
         parent::__construct();
-        $this->middleware(IsLimitedUser::class)->except(['index']);
+        $this->middleware(IsDemoUser::class)->except(['index']);
+        $this->middleware(IsSandStormUser::class)->except(['index']);
     }
 
 

app/Http/Controllers/Admin/LinkController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use FireflyIII\Http\Requests\LinkTypeFormRequest;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
@@ -51,7 +52,7 @@ class LinkController extends Controller
                 return $next($request);
             }
         );
-        $this->middleware(IsLimitedUser::class)->except(['index', 'show']);
+        $this->middleware(IsDemoUser::class)->except(['index', 'show']);
     }
 
     /**

app/Http/Controllers/Admin/UserController.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use FireflyIII\Http\Requests\UserFormRequest;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
@@ -52,7 +53,8 @@ class UserController extends Controller
                 return $next($request);
             }
         );
-        $this->middleware(IsLimitedUser::class)->except(['index', 'show']);
+        $this->middleware(IsDemoUser::class)->except(['index', 'show']);
+        $this->middleware(IsSandStormUser::class);
     }
 
     /**

app/Http/Controllers/HomeController.php

@@ -27,7 +27,8 @@ use Carbon\Carbon;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -55,7 +56,8 @@ class HomeController extends Controller
         parent::__construct();
         app('view')->share('title', 'Firefly III');
         app('view')->share('mainTitleIcon', 'fa-fire');
-        $this->middleware(IsLimitedUser::class)->except(['dateRange', 'index']);
+        $this->middleware(IsDemoUser::class)->except(['dateRange', 'index']);
+        $this->middleware(IsSandStormUser::class)->only('routes');
     }
 
     /**

app/Http/Controllers/Import/ConfigurationController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Import;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Import\Configuration\ConfiguratorInterface;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
@@ -57,7 +57,7 @@ class ConfigurationController extends Controller
                 return $next($request);
             }
         );
-        $this->middleware(IsLimitedUser::class)->except(['index']);
+        $this->middleware(IsDemoUser::class)->except(['index']);
     }
 
     /**

app/Http/Controllers/Import/IndexController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Import;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Import\Routine\ImportRoutine;
 use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Models\ImportJob;
@@ -61,7 +61,7 @@ class IndexController extends Controller
             }
         );
 
-        $this->middleware(IsLimitedUser::class)->except(['create','index']);
+        $this->middleware(IsDemoUser::class)->except(['create','index']);
     }
 
     /**

app/Http/Controllers/ProfileController.php

@@ -26,7 +26,8 @@ use Auth;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\ValidationException;
-use FireflyIII\Http\Middleware\IsLimitedUser;
+use FireflyIII\Http\Middleware\IsDemoUser;
+use FireflyIII\Http\Middleware\IsSandStormUser;
 use FireflyIII\Http\Requests\DeleteAccountFormRequest;
 use FireflyIII\Http\Requests\EmailFormRequest;
 use FireflyIII\Http\Requests\ProfileFormRequest;
@@ -62,7 +63,8 @@ class ProfileController extends Controller
                 return $next($request);
             }
         );
-        $this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'index', 'undoEmailChange']);
+        $this->middleware(IsDemoUser::class)->except(['index']);
+        $this->middleware(IsSandStormUser::class)->except('index');
     }
 
     /**

app/Http/Middleware/IsDemoUser.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * IsLimitedUser.php
+ * IsDemoUser.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
  *
  * This file is part of Firefly III.
@@ -29,9 +29,9 @@ use Illuminate\Support\Facades\Auth;
 use Session;
 
 /**
- * Class IsAdmin.
+ * Class IsDemoUser.
  */
-class IsLimitedUser
+class IsDemoUser
 {
     /**
      * Handle an incoming request. May not be a limited user (ie. Sandstorm env. or demo user).
@@ -59,12 +59,6 @@ class IsLimitedUser
             return redirect(route('index'));
         }
 
-        if (1 === intval(getenv('SANDSTORM'))) {
-            Session::flash('warning', strval(trans('firefly.sandstorm_not_available')));
-
-            return redirect(route('index'));
-        }
-
         return $next($request);
     }
 }

app/Http/Middleware/IsSandStormUser.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * IsSandStormUser.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use FireflyIII\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Session;
+
+/**
+ * Class IsSandStormUser.
+ */
+class IsSandStormUser
+{
+    /**
+     * Handle an incoming request. May not be a limited user (ie. Sandstorm env. or demo user).
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @param string|null              $guard
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            }
+
+            return redirect()->guest('login');
+        }
+
+        if (1 === intval(getenv('SANDSTORM'))) {
+            Session::flash('warning', strval(trans('firefly.sandstorm_not_available')));
+
+            return redirect(route('index'));
+        }
+
+        return $next($request);
+    }
+}