kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Expand exception code and fix demo user redirect.

Browse Source
This commit is contained in:
James Cole
2018-03-07 05:51:51 +01:00
parent f349aa47ce
commit d52d8d7970
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Middleware/IsDemoUser.php
View File

@@ -23,9 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Exceptions\IsDemoUserException;
use FireflyIII\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Session;
/**
@@ -38,7 +38,6 @@ class IsDemoUser
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string[] ...$guards
*
* @return mixed
*/
@@ -51,11 +50,14 @@ class IsDemoUser
}
if ($user->hasRole('demo')) {
Session::flash('info', strval(trans('firefly.not_available_demo_user')));
$request->session()->flash('info', strval(trans('firefly.not_available_demo_user')));
$current = $request->url();
$previous = $request->session()->previousUrl();
if ($current !== $previous) {
return response()->redirectTo($previous);
}
redirect($request->session()->previousUrl());
return $next($request);
return response()->redirectTo(route('index'));
}
return $next($request);