@@ -7,9 +7,9 @@ |
||
7 | 7 | |
8 | 8 | class User extends Authenticatable implements |
9 | 9 | \Illuminate\Contracts\Auth\Authenticatable, |
10 | - \Illuminate\Contracts\Auth\Access\Authorizable, |
|
11 | - \Illuminate\Contracts\Auth\CanResetPassword, |
|
12 | - \Tymon\JWTAuth\Contracts\JWTSubject |
|
10 | + \Illuminate\Contracts\Auth\Access\Authorizable, |
|
11 | + \Illuminate\Contracts\Auth\CanResetPassword, |
|
12 | + \Tymon\JWTAuth\Contracts\JWTSubject |
|
13 | 13 | { |
14 | 14 | use Notifiable; |
15 | 15 | use \Silber\Bouncer\Database\HasRolesAndAbilities; |
@@ -23,9 +23,9 @@ |
||
23 | 23 | if (count($user->groups)) { |
24 | 24 | // remove the users existing database roles before assigning new ones |
25 | 25 | \DB::table('assigned_roles') |
26 | - ->where('entity_id', $authUser->id) |
|
27 | - ->where('entity_type', get_class($authUser)) |
|
28 | - ->delete(); |
|
26 | + ->where('entity_id', $authUser->id) |
|
27 | + ->where('entity_type', get_class($authUser)) |
|
28 | + ->delete(); |
|
29 | 29 | // add the user to each group they are assigned |
30 | 30 | $authUser->assign($user->groups); |
31 | 31 | } |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | if (count($user->groups)) { |
24 | 24 | // remove the users existing database roles before assigning new ones |
25 | 25 | \DB::table('assigned_roles') |
26 | - ->where('entity_id', $authUser->id) |
|
27 | - ->where('entity_type', get_class($authUser)) |
|
28 | - ->delete(); |
|
26 | + ->where('entity_id', $authUser->id) |
|
27 | + ->where('entity_type', get_class($authUser)) |
|
28 | + ->delete(); |
|
29 | 29 | // add the user to each group they are assigned |
30 | 30 | $authUser->assign($user->groups); |
31 | 31 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | // Check to see if there is an intended destination url saved |
40 | 40 | $destination = $request->session() |
41 | - ->get('oauthIntendedUrl'); |
|
41 | + ->get('oauthIntendedUrl'); |
|
42 | 42 | // If there is no intended destination url, use the default |
43 | 43 | if(! $destination) { |
44 | 44 | $destination = config('azure-oath.redirect_on_login'); |