@@ -103,24 +103,19 @@ discard block |
||
| 103 | 103 | if ( ! $user = $this->first(['email' => $credentials['email']])) |
| 104 | 104 | { |
| 105 | 105 | \ErrorHandler::loginFailed(); |
| 106 | - } |
|
| 107 | - else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) |
|
| 106 | + } else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) |
|
| 108 | 107 | { |
| 109 | 108 | \ErrorHandler::loginFailed(); |
| 110 | - } |
|
| 111 | - else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 109 | + } else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 112 | 110 | { |
| 113 | 111 | \ErrorHandler::loginFailed(); |
| 114 | - } |
|
| 115 | - else if ($user->blocked) |
|
| 112 | + } else if ($user->blocked) |
|
| 116 | 113 | { |
| 117 | 114 | \ErrorHandler::userIsBlocked(); |
| 118 | - } |
|
| 119 | - else if ($token = \JWTAuth::attempt($credentials)) |
|
| 115 | + } else if ($token = \JWTAuth::attempt($credentials)) |
|
| 120 | 116 | { |
| 121 | 117 | return ['token' => $token]; |
| 122 | - } |
|
| 123 | - else |
|
| 118 | + } else |
|
| 124 | 119 | { |
| 125 | 120 | \ErrorHandler::loginFailed(); |
| 126 | 121 | } |
@@ -146,8 +141,7 @@ discard block |
||
| 146 | 141 | { |
| 147 | 142 | $data = ['email' => $user->email, 'password' => '']; |
| 148 | 143 | return $this->register($data); |
| 149 | - } |
|
| 150 | - else |
|
| 144 | + } else |
|
| 151 | 145 | { |
| 152 | 146 | if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => ''])) |
| 153 | 147 | { |
@@ -193,12 +187,10 @@ discard block |
||
| 193 | 187 | if ( ! $this->hasGroup('Admin')) |
| 194 | 188 | { |
| 195 | 189 | \ErrorHandler::noPermissions(); |
| 196 | - } |
|
| 197 | - else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
| 190 | + } else if (\JWTAuth::parseToken()->authenticate()->id == $user_id) |
|
| 198 | 191 | { |
| 199 | 192 | \ErrorHandler::noPermissions(); |
| 200 | - } |
|
| 201 | - else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 193 | + } else if ($user->groups->pluck('name')->search('Admin', true) !== false) |
|
| 202 | 194 | { |
| 203 | 195 | \ErrorHandler::noPermissions(); |
| 204 | 196 | } |