@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations); |
| 27 | 27 | foreach ($user->groups()->get() as $group) |
| 28 | 28 | { |
| 29 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
| 29 | + $group->permissions->each(function($permission) use (&$permissions){ |
|
| 30 | 30 | $permissions[$permission->model][$permission->id] = $permission->name; |
| 31 | 31 | }); |
| 32 | 32 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * @param boolean $user |
| 45 | 45 | * @return boolean |
| 46 | 46 | */ |
| 47 | - public function can($nameOfPermission, $model, $user = false ) |
|
| 47 | + public function can($nameOfPermission, $model, $user = false) |
|
| 48 | 48 | { |
| 49 | 49 | $user = $user ?: \JWTAuth::parseToken()->authenticate(); |
| 50 | 50 | $permissions = []; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | \ErrorHandler::tokenExpired(); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){ |
|
| 57 | + $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){ |
|
| 58 | 58 | $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); |
| 59 | 59 | }); |
| 60 | 60 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public function assignGroups($user_id, $group_ids) |
| 84 | 84 | { |
| 85 | - \DB::transaction(function () use ($user_id, $group_ids) { |
|
| 85 | + \DB::transaction(function() use ($user_id, $group_ids) { |
|
| 86 | 86 | $user = $this->find($user_id); |
| 87 | 87 | $user->groups()->detach(); |
| 88 | 88 | $user->groups()->attach($group_ids); |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | $view->with(['url' => $url]); |
| 243 | 243 | }); |
| 244 | 244 | |
| 245 | - $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) { |
|
| 245 | + $response = \Password::sendResetLink($email, function(\Illuminate\Mail\Message $message) { |
|
| 246 | 246 | $message->subject('Your Password Reset Link'); |
| 247 | 247 | }); |
| 248 | 248 | |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | public function resetPassword($credentials) |
| 263 | 263 | { |
| 264 | 264 | $token = false; |
| 265 | - $response = \Password::reset($credentials, function ($user, $password) use (&$token) { |
|
| 265 | + $response = \Password::reset($credentials, function($user, $password) use (&$token) { |
|
| 266 | 266 | $user->password = bcrypt($password); |
| 267 | 267 | $user->save(); |
| 268 | 268 | |
@@ -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 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('users', function (Blueprint $table) { |
|
| 15 | + Schema::create('users', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name', 100)->default(''); |
| 18 | 18 | $table->string('email')->unique(); |