kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +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

4
app/Http/Middleware/AuthenticateTwoFactor.php
View File

@@ -61,7 +61,7 @@ class AuthenticateTwoFactor
public function handle($request, Closure $next, ...$guards)
{
if ($this->auth->guest()) {
return redirect()->guest('login');
return response()->redirectTo(route('login'));
}
$is2faEnabled = app('preferences')->get('twoFactorAuthEnabled', false)->data;
@@ -71,7 +71,7 @@ class AuthenticateTwoFactor
if ($is2faEnabled && $has2faSecret && !$is2faAuthed) {
Log::debug('Does not seem to be 2 factor authed, redirect.');
return redirect(route('two-factor.index'));
return response()->redirectTo(route('two-factor.index'));
}
return $next($request);

4
app/Http/Middleware/IsAdmin.php
View File

@@ -48,12 +48,12 @@ class IsAdmin
return response('Unauthorized.', 401);
}
return redirect()->guest('login');
return response()->redirectTo(route('login'));
}
/** @var User $user */
$user = auth()->user();
if (!$user->hasRole('owner')) {
return redirect(route('home'));
return response()->redirectTo(route('home'));
}
return $next($request);

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);

2
app/Http/Middleware/IsSandStormUser.php
View File

@@ -51,7 +51,7 @@ class IsSandStormUser
if (1 === intval(getenv('SANDSTORM'))) {
Session::flash('warning', strval(trans('firefly.sandstorm_not_available')));
return redirect(route('index'));
return response()->redirectTo(route('index'));
}
return $next($request);

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -43,7 +43,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect(route('index'));
return response()->redirectTo(route('index'));
}
return $next($request);

2
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -51,7 +51,7 @@ class RedirectIfTwoFactorAuthenticated
$is2faAuthed = 'true' === $request->cookie('twoFactorAuthenticated');
if ($is2faEnabled && $has2faSecret && $is2faAuthed) {
return redirect(route('index'));
return response()->redirectTo(route('index'));
}
}