IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-01 11:47:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Middleware does not fire when user is not logged in.

Browse Source
This commit is contained in:
James Cole 2017-12-21 19:55:28 +01:00
parent 707af8bb4e
commit 4b869f0d9e
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,12 +45,9 @@ class IsDemoUser
public function handle(Request $request, Closure $next, $guard = null) public function handle(Request $request, Closure $next, $guard = null)
{ {
if (Auth::guard($guard)->guest()) { if (Auth::guard($guard)->guest()) {
if ($request->ajax()) { // don't care when not logged in, usual stuff applies:
return response('Unauthorized.', 401); return $next($request);
} }
return redirect()->guest('login');
}
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
if ($user->hasRole('demo')) { if ($user->hasRole('demo')) {

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

@ -45,11 +45,8 @@ class IsSandStormUser
public function handle(Request $request, Closure $next, $guard = null) public function handle(Request $request, Closure $next, $guard = null)
{ {
if (Auth::guard($guard)->guest()) { if (Auth::guard($guard)->guest()) {
if ($request->ajax()) { // don't care when not logged in, usual stuff applies:
return response('Unauthorized.', 401); return $next($request);
}
return redirect()->guest('login');
} }
if (1 === intval(getenv('SANDSTORM'))) { if (1 === intval(getenv('SANDSTORM'))) {