robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Code Activity

исправил конфликты после обновления ветки

Browse Source
This commit is contained in:
ashen-1-dev
2020-12-16 20:57:35 +07:00
parent 3fe74339d2 1726a499d1
commit 74565e78e3
24 changed files with 427 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,8 @@ class Authenticate extends Middleware
*/
protected function redirectTo($request)
{
if (! $request->expectsJson()) {
return route('login');
}
//if (! $request->expectsJson()) {
// return route('login');
//}
}
}

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

@@ -22,7 +22,7 @@ class Role
$roles = explode($this->delimetr, $roles);
if (!auth()->user()->hasRole($roles)) {
return response()->json('',404);
return response()->json(null,404);
}
return $next($request);
}