IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changes to repair API auth

Browse Source
This commit is contained in:
James Cole
2018-02-04 13:41:59 +01:00
parent 58bdf14f6b
commit 1ef28cbc02
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,9 @@ class Authenticate
return redirect()->guest('login'); return redirect()->guest('login');
} }
if (1 === intval(auth()->user()->blocked)) { if (1 === intval(Auth::guard($guard)->user()->blocked)) {
$message = strval(trans('firefly.block_account_logout')); $message = strval(trans('firefly.block_account_logout'));
if ('email_changed' === auth()->user()->blocked_code) { if ('email_changed' === Auth::guard($guard)->user()->blocked_code) {
$message = strval(trans('firefly.email_changed_logout')); $message = strval(trans('firefly.email_changed_logout'));
} }

4
app/Providers/RouteServiceProvider.php
View File

@@ -65,8 +65,8 @@ class RouteServiceProvider extends ServiceProvider
*/ */
protected function mapApiRoutes() protected function mapApiRoutes()
{ {
Route::prefix('api') Route::prefix('api/v1')
->middleware('api') ->middleware('auth:api')
->namespace($this->namespace) ->namespace($this->namespace)
->group(base_path('routes/api.php')); ->group(base_path('routes/api.php'));
} }