SherifElfadaly / Laravel-Api-Skeleton

src/Modules/PushNotificationDevices/Repositories/PushNotificationDeviceRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      * Register the given device to the logged in user.
      *
      * @param  array $data
-     * @return void
+     * @return boolean
      */
     public function registerDevice($data)
     {

Indentation +49 added lines, -49 removed lines

@@ -8,60 +8,60 @@
 
 class PushNotificationDeviceRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   PushNotificationDevice $model
-     * @return  void
-     */
-    public function __construct(PushNotificationDevice $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   PushNotificationDevice $model
+	 * @return  void
+	 */
+	public function __construct(PushNotificationDevice $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function registerDevice($data)
-    {
-        $data['access_token'] = \Auth::user()->token();
-        $data['user_id']      = \Auth::id();
-        $device               = $this->model->where('device_token', $data['device_token'])->
-                                              where('user_id', $data['user_id'])->
-                                              first();
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function registerDevice($data)
+	{
+		$data['access_token'] = \Auth::user()->token();
+		$data['user_id']      = \Auth::id();
+		$device               = $this->model->where('device_token', $data['device_token'])->
+											  where('user_id', $data['user_id'])->
+											  first();
 
-        if ($device) {
-            $data['id'] = $device->id;
-        }
+		if ($device) {
+			$data['id'] = $device->id;
+		}
 
-        return $this->save($data);
-    }
+		return $this->save($data);
+	}
 
-    /**
-     * Generate the given message data.
-     *
-     * @param  string $title
-     * @param  string $message
-     * @param  array  $data
-     * @return void
-     */
-    public function generateMessageData($title, $message, $data = [])
-    {
-        $optionBuilder       = new OptionsBuilder();
-        $notificationBuilder = new PayloadNotificationBuilder($title);
-        $dataBuilder         = new PayloadDataBuilder();
+	/**
+	 * Generate the given message data.
+	 *
+	 * @param  string $title
+	 * @param  string $message
+	 * @param  array  $data
+	 * @return void
+	 */
+	public function generateMessageData($title, $message, $data = [])
+	{
+		$optionBuilder       = new OptionsBuilder();
+		$notificationBuilder = new PayloadNotificationBuilder($title);
+		$dataBuilder         = new PayloadDataBuilder();
 
-        $optionBuilder->setTimeToLive(60 * 20);
-        $notificationBuilder->setBody($message);
-        $dataBuilder->addData($data);
+		$optionBuilder->setTimeToLive(60 * 20);
+		$notificationBuilder->setBody($message);
+		$dataBuilder->addData($data);
 
-        $options             = $optionBuilder->build();
-        $notification        = $notificationBuilder->build();
-        $data                = $dataBuilder->build();
+		$options             = $optionBuilder->build();
+		$notification        = $notificationBuilder->build();
+		$data                = $dataBuilder->build();
 
-        return compact('options', 'notification', 'data');
-    }
+		return compact('options', 'notification', 'data');
+	}
 }

src/Modules/PushNotificationDevices/Routes/api.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
-
 /*
 |--------------------------------------------------------------------------
 | API Routes

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 |
 */
 
-Route::group(['prefix' => 'push/notification/devices'], function () {
+Route::group(['prefix' => 'push/notification/devices'], function() {
         
     Route::get('/', 'PushNotificationDeviceController@index');
     Route::get('/{id}', 'PushNotificationDeviceController@find');

Indentation +8 added lines, -8 removed lines

@@ -15,12 +15,12 @@
 
 Route::group(['prefix' => 'push/notification/devices'], function () {
         
-    Route::get('/', 'PushNotificationDeviceController@index');
-    Route::get('/{id}', 'PushNotificationDeviceController@find');
-    Route::post('/', 'PushNotificationDeviceController@insert');
-    Route::put('/', 'PushNotificationDeviceController@update');
-    Route::delete('/{id}', 'PushNotificationDeviceController@delete');
-    Route::get('list/deleted', 'PushNotificationDeviceController@deleted');
-    Route::patch('restore/{id}', 'PushNotificationDeviceController@restore');
-    Route::post('register/device', 'PushNotificationDeviceController@registerDevice');
+	Route::get('/', 'PushNotificationDeviceController@index');
+	Route::get('/{id}', 'PushNotificationDeviceController@find');
+	Route::post('/', 'PushNotificationDeviceController@insert');
+	Route::put('/', 'PushNotificationDeviceController@update');
+	Route::delete('/{id}', 'PushNotificationDeviceController@delete');
+	Route::get('list/deleted', 'PushNotificationDeviceController@deleted');
+	Route::patch('restore/{id}', 'PushNotificationDeviceController@restore');
+	Route::post('register/device', 'PushNotificationDeviceController@registerDevice');
 });

src/Modules/Users/Reppsitories/UserRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
      *
      * @param  array   $credentials
      * @param  boolean $skipConfirmEmail
-     * @return array
+     * @return boolean
      */
     public function register($credentials, $skipConfirmEmail = false)
     {
@@ -344,7 +344,7 @@ 
      * Save the given data to the logged in user.
      *
      * @param  array $data
-     * @return void
+     * @return boolean
      */
     public function saveProfile($data)
     {

Indentation +380 added lines, -380 removed lines

@@ -6,391 +6,391 @@
 
 class UserRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   AclUser $model
-     * @return  void
-     */
-    public function __construct(AclUser $model)
-    {
-        parent::__construct($model);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = $this->find(\Auth::id(), $relations);
-        foreach ($user->roles()->get() as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user
-     * has the given permissions on the given model.
-     *
-     * @param  string $nameOfPermission
-     * @param  string $model
-     * @param  mixed  $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false)
-    {
-        $user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
-        $permissions = [];
-
-        $user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
-        });
-
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed $user
-     * @return boolean
-     */
-    public function hasRole($roles, $user = false)
-    {
-        $user = $user ?: $this->find(\Auth::id());
-        return $user->roles->whereIn('name', $roles)->count() ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        \DB::transaction(function () use ($userId, $roleIds) {
-            $user = $this->find($userId);
-            $user->roles()->detach();
-            $user->roles()->attach($roleIds);
-        });
-
-        return $this->find($userId);
-    }
-
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
-            \ErrorHandler::loginFailed();
-        } elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
-            \ErrorHandler::loginFailed();
-        } elseif ($user->blocked) {
-            \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \ErrorHandler::emailNotConfirmed();
-        }
-
-        return $user;
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user         = \Socialite::driver($type)->userFromToken($access_token);
-
-        if (! $user->email) {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if (! $this->model->where('email', $user->email)->first()) {
-            $this->register(['email' => $user->email, 'password' => ''], true);
-        }
-
-        $loginProxy = \App::make('App\Modules\Users\Proxy\LoginProxy');
-        return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   AclUser $model
+	 * @return  void
+	 */
+	public function __construct(AclUser $model)
+	{
+		parent::__construct($model);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = $this->find(\Auth::id(), $relations);
+		foreach ($user->roles()->get() as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user
+	 * has the given permissions on the given model.
+	 *
+	 * @param  string $nameOfPermission
+	 * @param  string $model
+	 * @param  mixed  $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false)
+	{
+		$user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
+		$permissions = [];
+
+		$user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
+		});
+
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed $user
+	 * @return boolean
+	 */
+	public function hasRole($roles, $user = false)
+	{
+		$user = $user ?: $this->find(\Auth::id());
+		return $user->roles->whereIn('name', $roles)->count() ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		\DB::transaction(function () use ($userId, $roleIds) {
+			$user = $this->find($userId);
+			$user->roles()->detach();
+			$user->roles()->attach($roleIds);
+		});
+
+		return $this->find($userId);
+	}
+
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if (! $user = $this->first(['email' => $credentials['email']])) {
+			\ErrorHandler::loginFailed();
+		} elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
+			\ErrorHandler::loginFailed();
+		} elseif ($user->blocked) {
+			\ErrorHandler::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\ErrorHandler::emailNotConfirmed();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user         = \Socialite::driver($type)->userFromToken($access_token);
+
+		if (! $user->email) {
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if (! $this->model->where('email', $user->email)->first()) {
+			$this->register(['email' => $user->email, 'password' => ''], true);
+		}
+
+		$loginProxy = \App::make('App\Modules\Users\Proxy\LoginProxy');
+		return $loginProxy->login(['email' => $user->email, 'password' => config('skeleton.social_pass')], 0);
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  array   $credentials
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($credentials, $skipConfirmEmail = false)
-    {
-        $user = $this->save($credentials);
-
-        if ($skipConfirmEmail) {
-            $user->confirmed = 1;
-            $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($credentials, $skipConfirmEmail = false)
+	{
+		$user = $this->save($credentials);
+
+		if ($skipConfirmEmail) {
+			$user->confirmed = 1;
+			$user->save();
+		} elseif (! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (! $user = $this->find($userId)) {
-            \ErrorHandler::notFound('user');
-        }
-        if (! $this->hasRole(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        } elseif (\Auth::id() == $userId) {
-            \ErrorHandler::noPermissions();
-        } elseif ($user->roles->pluck('name')->search('Admin', true) !== false) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (! $user = $this->find($userId)) {
+			\ErrorHandler::notFound('user');
+		}
+		if (! $this->hasRole(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		} elseif (\Auth::id() == $userId) {
+			\ErrorHandler::noPermissions();
+		} elseif ($user->roles->pluck('name')->search('Admin', true) !== false) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        if (! $this->hasRole(['Admin'])) {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($userId);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->model->where('email', $email)->first()) {
-            \ErrorHandler::notFound('email');
-        }
-
-        $token = \Password::getRepository()->create($user);
-        \Core::notifications()->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return string|null
-     */
-    public function resetPassword($credentials)
-    {
-        $response = \Password::reset($credentials, function ($user, $password) {
-            $user->password = $password;
-            $user->save();
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-                //no break
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-                //no break
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-                //no break
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->first(['email' => $email]);
-        if ($user->confirmed) {
-            \ErrorHandler::emailAlreadyConfirmed();
-        }
-
-        $user->confirmed         = 0;
-        $user->confirmation_code = sha1(microtime());
-        $user->save();
-        \Core::notifications()->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Paginate all users in the given role based on the given conditions.
-     *
-     * @param  string  $roleName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function role($conditions, $roleName, $relations, $perPage, $sortBy, $desc)
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->with($relations);
-
-        $model->whereHas('roles', function ($q) use ($roleName) {
-            $q->where('name', $roleName);
-        });
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		if (! $this->hasRole(['Admin'])) {
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($userId);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->model->where('email', $email)->first()) {
+			\ErrorHandler::notFound('email');
+		}
+
+		$token = \Password::getRepository()->create($user);
+		\Core::notifications()->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return string|null
+	 */
+	public function resetPassword($credentials)
+	{
+		$response = \Password::reset($credentials, function ($user, $password) {
+			$user->password = $password;
+			$user->save();
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+				//no break
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+				//no break
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+				//no break
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($credentials['old_password'], $user->password)) {
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->first(['email' => $email]);
+		if ($user->confirmed) {
+			\ErrorHandler::emailAlreadyConfirmed();
+		}
+
+		$user->confirmed         = 0;
+		$user->confirmation_code = sha1(microtime());
+		$user->save();
+		\Core::notifications()->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Paginate all users in the given role based on the given conditions.
+	 *
+	 * @param  string  $roleName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function role($conditions, $roleName, $relations, $perPage, $sortBy, $desc)
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->with($relations);
+
+		$model->whereHas('roles', function ($q) use ($roleName) {
+			$q->where('name', $roleName);
+		});
 
         
-        if (count($conditions['conditionValues'])) {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        if (Arr::has($data, 'profile_picture')) {
-            $data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
-        }
+		if (count($conditions['conditionValues'])) {
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) {
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		if (Arr::has($data, 'profile_picture')) {
+			$data['profile_picture'] = \Media::uploadImageBas64($data['profile_picture'], 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->save($data);
-    }
-
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+		$data['id'] = \Auth::id();
+		return $this->save($data);
+	}
+
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        \DB::table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		\DB::table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
         $permissions = [];
         $user        = $this->find(\Auth::id(), $relations);
         foreach ($user->roles()->get() as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -51,7 +51,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['roles.permissions']);
         $permissions = [];
 
-        $user->roles->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+        $user->roles->pluck('permissions')->each(function($permission) use (&$permissions, $model) {
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
         });
 
@@ -80,7 +80,7 @@ 
      */
     public function assignRoles($userId, $roleIds)
     {
-        \DB::transaction(function () use ($userId, $roleIds) {
+        \DB::transaction(function() use ($userId, $roleIds) {
             $user = $this->find($userId);
             $user->roles()->detach();
             $user->roles()->attach($roleIds);
@@ -99,15 +99,15 @@ 
      */
     public function login($credentials, $adminLogin = false)
     {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
+        if ( ! $user = $this->first(['email' => $credentials['email']])) {
             \ErrorHandler::loginFailed();
         } elseif ($adminLogin && ! $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
+        } elseif ( ! $adminLogin && $user->roles->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
         } elseif ($user->blocked) {
             \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \ErrorHandler::emailNotConfirmed();
         }
 
@@ -127,11 +127,11 @@ 
         $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user         = \Socialite::driver($type)->userFromToken($access_token);
 
-        if (! $user->email) {
+        if ( ! $user->email) {
             \ErrorHandler::noSocialEmail();
         }
 
-        if (! $this->model->where('email', $user->email)->first()) {
+        if ( ! $this->model->where('email', $user->email)->first()) {
             $this->register(['email' => $user->email, 'password' => ''], true);
         }
 
@@ -153,7 +153,7 @@ 
         if ($skipConfirmEmail) {
             $user->confirmed = 1;
             $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
+        } elseif ( ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -168,10 +168,10 @@ 
      */
     public function block($userId)
     {
-        if (! $user = $this->find($userId)) {
+        if ( ! $user = $this->find($userId)) {
             \ErrorHandler::notFound('user');
         }
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         } elseif (\Auth::id() == $userId) {
             \ErrorHandler::noPermissions();
@@ -193,7 +193,7 @@ 
      */
     public function unblock($userId)
     {
-        if (! $this->hasRole(['Admin'])) {
+        if ( ! $this->hasRole(['Admin'])) {
             \ErrorHandler::noPermissions();
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->model->where('email', $email)->first()) {
+        if ( ! $user = $this->model->where('email', $email)->first()) {
             \ErrorHandler::notFound('email');
         }
 
@@ -228,7 +228,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });
@@ -263,7 +263,7 @@ 
     public function changePassword($credentials)
     {
         $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
+        if ( ! \Hash::check($credentials['old_password'], $user->password)) {
             \ErrorHandler::invalidOldPassword();
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) {
             \ErrorHandler::invalidConfirmationCode();
         }
 
@@ -324,7 +324,7 @@ 
         $sort       = $desc ? 'desc' : 'asc';
         $model      = $this->model->with($relations);
 
-        $model->whereHas('roles', function ($q) use ($roleName) {
+        $model->whereHas('roles', function($q) use ($roleName) {
             $q->where('name', $roleName);
         });
 

src/Modules/Users/Routes/api.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
-
 /*
 |--------------------------------------------------------------------------
 | API Routes

Indentation +25 added lines, -25 removed lines

@@ -15,31 +15,31 @@
 
 Route::group(['prefix' => 'users'], function () {
 
-    Route::get('/', 'UserController@index');
-    Route::get('/{id}', 'UserController@find');
-    Route::post('/', 'UserController@insert');
-    Route::put('/', 'UserController@update');
-    Route::delete('/{id}', 'UserController@delete');
-    Route::get('list/deleted', 'UserController@deleted');
-    Route::patch('restore/{id}', 'UserController@restore');
-    Route::get('block/{id}', 'UserController@block');
-    Route::get('unblock/{id}', 'UserController@unblock');
-    Route::post('assign/roles', 'UserController@assignRoles');
-    Route::post('role/{roleName}', 'UserController@role');
+	Route::get('/', 'UserController@index');
+	Route::get('/{id}', 'UserController@find');
+	Route::post('/', 'UserController@insert');
+	Route::put('/', 'UserController@update');
+	Route::delete('/{id}', 'UserController@delete');
+	Route::get('list/deleted', 'UserController@deleted');
+	Route::patch('restore/{id}', 'UserController@restore');
+	Route::get('block/{id}', 'UserController@block');
+	Route::get('unblock/{id}', 'UserController@unblock');
+	Route::post('assign/roles', 'UserController@assignRoles');
+	Route::post('role/{roleName}', 'UserController@role');
 
-    Route::group(['prefix' => 'account'], function () {
+	Route::group(['prefix' => 'account'], function () {
 
-        Route::get('my', 'UserController@account');
-        Route::get('logout', 'UserController@logout');
-        Route::post('refresh/token', 'UserController@refreshToken');
-        Route::post('save', 'UserController@saveProfile');
-        Route::post('register', 'UserController@register');
-        Route::post('login', 'UserController@login');
-        Route::post('login/social', 'UserController@loginSocial');
-        Route::post('send/reset', 'UserController@sendReset');
-        Route::post('reset/password', 'UserController@resetPassword');
-        Route::post('change/password', 'UserController@changePassword');
-        Route::post('confirm/email', 'UserController@confirmEmail');
-        Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
-    });
+		Route::get('my', 'UserController@account');
+		Route::get('logout', 'UserController@logout');
+		Route::post('refresh/token', 'UserController@refreshToken');
+		Route::post('save', 'UserController@saveProfile');
+		Route::post('register', 'UserController@register');
+		Route::post('login', 'UserController@login');
+		Route::post('login/social', 'UserController@loginSocial');
+		Route::post('send/reset', 'UserController@sendReset');
+		Route::post('reset/password', 'UserController@resetPassword');
+		Route::post('change/password', 'UserController@changePassword');
+		Route::post('confirm/email', 'UserController@confirmEmail');
+		Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
+	});
 });

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 |
 */
 
-Route::group(['prefix' => 'users'], function () {
+Route::group(['prefix' => 'users'], function() {
 
     Route::get('/', 'UserController@index');
     Route::get('/{id}', 'UserController@find');
@@ -27,7 +27,7 @@ 
     Route::post('assign/roles', 'UserController@assignRoles');
     Route::post('role/{roleName}', 'UserController@role');
 
-    Route::group(['prefix' => 'account'], function () {
+    Route::group(['prefix' => 'account'], function() {
 
         Route::get('my', 'UserController@account');
         Route::get('logout', 'UserController@logout');

files/auth.php

Indentation +35 added lines, -35 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Defaults
     |--------------------------------------------------------------------------
@@ -13,12 +13,12 @@ 
     |
     */
 
-    'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
-    ],
+	'defaults' => [
+		'guard' => 'web',
+		'passwords' => 'users',
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Guards
     |--------------------------------------------------------------------------
@@ -35,19 +35,19 @@ 
     |
     */
 
-    'guards' => [
-        'web' => [
-            'driver' => 'session',
-            'provider' => 'users',
-        ],
+	'guards' => [
+		'web' => [
+			'driver' => 'session',
+			'provider' => 'users',
+		],
 
-        'api' => [
-            'driver' => 'passport',
-            'provider' => 'users',
-        ],
-    ],
+		'api' => [
+			'driver' => 'passport',
+			'provider' => 'users',
+		],
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | User Providers
     |--------------------------------------------------------------------------
@@ -64,19 +64,19 @@ 
     |
     */
 
-    'providers' => [
-        'users' => [
-            'driver' => 'eloquent',
-            'model' => App\Modules\Users\AclUser::class,
-        ],
+	'providers' => [
+		'users' => [
+			'driver' => 'eloquent',
+			'model' => App\Modules\Users\AclUser::class,
+		],
 
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
-    ],
+		// 'users' => [
+		//     'driver' => 'database',
+		//     'table' => 'users',
+		// ],
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Resetting Passwords
     |--------------------------------------------------------------------------
@@ -91,12 +91,12 @@ 
     |
     */
 
-    'passwords' => [
-        'users' => [
-            'provider' => 'users',
-            'table' => 'password_resets',
-            'expire' => 60,
-        ],
-    ],
+	'passwords' => [
+		'users' => [
+			'provider' => 'users',
+			'table' => 'password_resets',
+			'expire' => 60,
+		],
+	],
 
 ];

config/skeleton.php

Indentation +136 added lines, -136 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Disable Confirm Email
     |--------------------------------------------------------------------------
@@ -11,9 +11,9 @@ 
     |
     */
 
-    'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false),
+	'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Confirm Email URL
     |--------------------------------------------------------------------------
@@ -22,9 +22,9 @@ 
     |
     */
    
-    'confrim_email_url' => env('CONFIRM_EMAIL_URL'),
+	'confrim_email_url' => env('CONFIRM_EMAIL_URL'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Reset Password URL
     |--------------------------------------------------------------------------
@@ -33,9 +33,9 @@ 
     |
     */
    
-    'reset_password_url' => env('RESET_PASSWORD_URL'),
+	'reset_password_url' => env('RESET_PASSWORD_URL'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Passport Client Id
     |--------------------------------------------------------------------------
@@ -44,9 +44,9 @@ 
     |
     */
    
-    'passport_client_id' => env('PASSWORD_CLIENT_ID'),
+	'passport_client_id' => env('PASSWORD_CLIENT_ID'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Passport Client Secret
     |--------------------------------------------------------------------------
@@ -55,9 +55,9 @@ 
     |
     */
    
-    'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),
+	'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Social Pass
     |--------------------------------------------------------------------------
@@ -66,9 +66,9 @@ 
     |
     */
 
-    'social_pass' => env('SOCIAL_PASS', false),
+	'social_pass' => env('SOCIAL_PASS', false),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Relations Between Models
     |--------------------------------------------------------------------------
@@ -77,88 +77,88 @@ 
     |
     */
     
-    'relations' => [
-        'user' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'account'    => [],
-            'group'      => [],
-            'deleted'    => [],
-        ],
-        'permission' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'deleted'    => [],
-        ],
-        'group' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'deleted'    => [],
-        ],
-        'oauthClient' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'account'    => [],
-            'group'      => [],
-            'deleted'    => [],
-        ],
-        'notification' => [
-            'list'   => [],
-            'unread' => [],
-        ],
-        'pushNotificationDevice' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'deleted'    => [],
-        ],
-        'report' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'deleted'    => [],
-        ],
-        'setting' => [
-            'list'       => [],
-            'find'       => [],
-            'findby'     => [],
-            'paginate'   => [],
-            'paginateby' => [],
-            'first'      => [],
-            'search'     => [],
-            'deleted'    => [],
-        ]
-    ],
+	'relations' => [
+		'user' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'account'    => [],
+			'group'      => [],
+			'deleted'    => [],
+		],
+		'permission' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'deleted'    => [],
+		],
+		'group' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'deleted'    => [],
+		],
+		'oauthClient' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'account'    => [],
+			'group'      => [],
+			'deleted'    => [],
+		],
+		'notification' => [
+			'list'   => [],
+			'unread' => [],
+		],
+		'pushNotificationDevice' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'deleted'    => [],
+		],
+		'report' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'deleted'    => [],
+		],
+		'setting' => [
+			'list'       => [],
+			'find'       => [],
+			'findby'     => [],
+			'paginate'   => [],
+			'paginateby' => [],
+			'first'      => [],
+			'search'     => [],
+			'deleted'    => [],
+		]
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Cache Configurations
     |--------------------------------------------------------------------------
@@ -167,46 +167,46 @@ 
     |
     */
 
-    'cache_config' => [
-        'oauthClient' => [
-            'cache' => [
-                'all',
-                'find',
-                'findBy',
-                'paginate',
-                'paginateBy',
-                'first',
-                'search',
-                'deleted'
-            ],
-            'clear' => [
-                'update'           => ['oauthClients', 'users', 'groups'],
-                'save'             => ['oauthClients', 'users', 'groups'],
-                'delete'           => ['oauthClients', 'users', 'groups'],
-                'restore'          => ['oauthClients', 'users', 'groups'],
-                'revoke'           => ['oauthClients', 'users', 'groups'],
-                'ubRevoke'         => ['oauthClients', 'users', 'groups'],
-                'regenerateSecret' => ['oauthClients', 'users', 'groups'],
-            ],
-        ],
-        'setting' => [
-            'cache' => [
-                'all',
-                'find',
-                'findBy',
-                'paginate',
-                'paginateBy',
-                'first',
-                'search',
-                'deleted'
-            ],
-            'clear' => [
-                'update'   => ['settings'],
-                'save'     => ['settings'],
-                'delete'   => ['settings'],
-                'restore'  => ['settings'],
-                'saveMany' => ['settings'],
-            ]
-        ]
-    ]
+	'cache_config' => [
+		'oauthClient' => [
+			'cache' => [
+				'all',
+				'find',
+				'findBy',
+				'paginate',
+				'paginateBy',
+				'first',
+				'search',
+				'deleted'
+			],
+			'clear' => [
+				'update'           => ['oauthClients', 'users', 'groups'],
+				'save'             => ['oauthClients', 'users', 'groups'],
+				'delete'           => ['oauthClients', 'users', 'groups'],
+				'restore'          => ['oauthClients', 'users', 'groups'],
+				'revoke'           => ['oauthClients', 'users', 'groups'],
+				'ubRevoke'         => ['oauthClients', 'users', 'groups'],
+				'regenerateSecret' => ['oauthClients', 'users', 'groups'],
+			],
+		],
+		'setting' => [
+			'cache' => [
+				'all',
+				'find',
+				'findBy',
+				'paginate',
+				'paginateBy',
+				'first',
+				'search',
+				'deleted'
+			],
+			'clear' => [
+				'update'   => ['settings'],
+				'save'     => ['settings'],
+				'delete'   => ['settings'],
+				'restore'  => ['settings'],
+				'saveMany' => ['settings'],
+			]
+		]
+	]
 ];

src/Modules/Users/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 class AclUserObserver
 {
 
-    public function saving($model)
-    {
-        if ($model->isDirty('profile_picture')) {
-            \Media::deleteImage($model->getOriginal('profile_picture'));
-        }
-    }
+	public function saving($model)
+	{
+		if ($model->isDirty('profile_picture')) {
+			\Media::deleteImage($model->getOriginal('profile_picture'));
+		}
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) {
+			$model->tokens()->each(function ($token) {
 
-                \Core::users()->revokeAccessToken($token);
-            });
-        }
-    }
+				\Core::users()->revokeAccessToken($token);
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) {
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function updated($model)
     {
         if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
+            $model->tokens()->each(function($token) {
 
                 \Core::users()->revokeAccessToken($token);
             });

src/Modules/Users/Providers/ModuleServiceProvider.php

Indentation +21 added lines, -21 removed lines

@@ -6,27 +6,27 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
 
-        $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app'));
-    }
+		$this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app'));
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

src/Modules/Users/Providers/RouteServiceProvider.php

Indentation +62 added lines, -62 removed lines

@@ -7,73 +7,73 @@
 
 class RouteServiceProvider extends ServiceProvider
 {
-    /**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Modules\Users\Http\Controllers';
+	/**
+	 * This namespace is applied to your controller routes.
+	 *
+	 * In addition, it is set as the URL generator's root namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'App\Modules\Users\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
+	/**
+	 * Define your route model bindings, pattern filters, etc.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		//
 
-        parent::boot();
-    }
+		parent::boot();
+	}
 
-    /**
-     * Define the routes for the module.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
+	/**
+	 * Define the routes for the module.
+	 *
+	 * @return void
+	 */
+	public function map()
+	{
+		$this->mapWebRoutes();
 
-        $this->mapApiRoutes();
+		$this->mapApiRoutes();
 
-        //
-    }
+		//
+	}
 
-    /**
-     * Define the "web" routes for the module.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::group([
-            'middleware' => 'web',
-            'namespace'  => $this->namespace,
-        ], function ($router) {
-            require module_path('users', 'Routes/web.php', 'app');
-        });
-    }
+	/**
+	 * Define the "web" routes for the module.
+	 *
+	 * These routes all receive session state, CSRF protection, etc.
+	 *
+	 * @return void
+	 */
+	protected function mapWebRoutes()
+	{
+		Route::group([
+			'middleware' => 'web',
+			'namespace'  => $this->namespace,
+		], function ($router) {
+			require module_path('users', 'Routes/web.php', 'app');
+		});
+	}
 
-    /**
-     * Define the "api" routes for the module.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::group([
-            'middleware' => 'api',
-            'namespace'  => $this->namespace,
-            'prefix'     => 'api',
-        ], function ($router) {
-            require module_path('users', 'Routes/api.php', 'app');
-        });
-    }
+	/**
+	 * Define the "api" routes for the module.
+	 *
+	 * These routes are typically stateless.
+	 *
+	 * @return void
+	 */
+	protected function mapApiRoutes()
+	{
+		Route::group([
+			'middleware' => 'api',
+			'namespace'  => $this->namespace,
+			'prefix'     => 'api',
+		], function ($router) {
+			require module_path('users', 'Routes/api.php', 'app');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         Route::group([
             'middleware' => 'web',
             'namespace'  => $this->namespace,
-        ], function ($router) {
+        ], function($router) {
             require module_path('users', 'Routes/web.php', 'app');
         });
     }
@@ -72,7 +72,7 @@ 
             'middleware' => 'api',
             'namespace'  => $this->namespace,
             'prefix'     => 'api',
-        ], function ($router) {
+        ], function($router) {
             require module_path('users', 'Routes/api.php', 'app');
         });
     }