SherifElfadaly / Laravel-Api-Skeleton

src/Modules/OauthClients/Resources/Lang/ar/errors.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
+	/**
+	 * Here goes your error messages.
+	 */
 
 ];

src/Modules/Roles/Resources/Lang/en/errors.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
+	/**
+	 * Here goes your error messages.
+	 */
 
 ];

src/Modules/Roles/Resources/Lang/ar/errors.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
+	/**
+	 * Here goes your error messages.
+	 */
 
 ];

src/Modules/Roles/ModelObservers/RoleObserver.php

Indentation +56 added lines, -56 removed lines

@@ -7,69 +7,69 @@
  */
 class RoleObserver
 {
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the admin role.
-     *
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal('name') == 'Admin') {
-            \Errors::noPermissions();
-        }
-    }
+	/**
+	 * Prevent updating of the admin role.
+	 *
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal('name') == 'Admin') {
+			\Errors::noPermissions();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent deleting the admin role.
-     *
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        if ($model->getOriginal('name') == 'Admin') {
-            \Errors::noPermissions();
-        }
-    }
+	/**
+	 * Prevent deleting the admin role.
+	 *
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		if ($model->getOriginal('name') == 'Admin') {
+			\Errors::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)
+	{
+		//
+	}
 }

src/Modules/Users/Resources/Lang/en/errors.php

Indentation +16 added lines, -16 removed lines

@@ -2,21 +2,21 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'unAuthorized'            => 'Please login before any action',
-    'invalidRefreshToken'     => 'Invalid refresh token',
-    'noPermissions'           => 'No permissions',
-    'loginFailed'             => 'Wrong mail or password',
-    'noSocialEmail'           => 'Couldn\'t retrieve email',
-    'userAlreadyRegistered'   => 'User already registered. Please login using email and password',
-    'userIsBlocked'           => 'You have been blocked',
-    'invalidResetToken'       => 'Reset password token is invalid',
-    'invalidResetPassword'    => 'Reset password is invalid',
-    'invalidOldPassword'      => 'Old password is invalid',
-    'invalidConfirmationCode' => 'Confirmation link expired or already used',
-    'emailNotConfirmed'       => 'Your email isn\'t confirmed',
-    'emailAlreadyConfirmed'   => 'Your email is already confirmed'
+	/**
+	 * Here goes your error messages.
+	 */
+	'unAuthorized'            => 'Please login before any action',
+	'invalidRefreshToken'     => 'Invalid refresh token',
+	'noPermissions'           => 'No permissions',
+	'loginFailed'             => 'Wrong mail or password',
+	'noSocialEmail'           => 'Couldn\'t retrieve email',
+	'userAlreadyRegistered'   => 'User already registered. Please login using email and password',
+	'userIsBlocked'           => 'You have been blocked',
+	'invalidResetToken'       => 'Reset password token is invalid',
+	'invalidResetPassword'    => 'Reset password is invalid',
+	'invalidOldPassword'      => 'Old password is invalid',
+	'invalidConfirmationCode' => 'Confirmation link expired or already used',
+	'emailNotConfirmed'       => 'Your email isn\'t confirmed',
+	'emailAlreadyConfirmed'   => 'Your email is already confirmed'
 
 ];

src/Modules/Users/Resources/Lang/ar/errors.php

Indentation +16 added lines, -16 removed lines

@@ -2,21 +2,21 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'unAuthorized'            => 'من فضلك قم بتسجيل الدخول',
-    'invalidRefreshToken'     => 'رمز التحديث غير صالح',
-    'noPermissions'           => 'لا توجد صلاحية',
-    'loginFailed'             => 'خطأ في البريد لاكتروني او كلمة المرور',
-    'noSocialEmail'           => 'لا يمكن الحصول علي تابريد الاكتروني',
-    'userAlreadyRegistered'   => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
-    'userIsBlocked'           => 'لقد تم حظرك',
-    'invalidResetToken'       => 'رمز تعديل كلمة المرور خطا',
-    'invalidResetPassword'    => 'خطا في نعديل كلمة المرور',
-    'invalidOldPassword'      => 'كلمة السر القديمه خطا',
-    'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل',
-    'emailNotConfirmed'       => 'بريدك الاكتروني غير مفعل',
-    'emailAlreadyConfirmed'   => 'البريد الاكتروني مفع بالقعل'
+	/**
+	 * Here goes your error messages.
+	 */
+	'unAuthorized'            => 'من فضلك قم بتسجيل الدخول',
+	'invalidRefreshToken'     => 'رمز التحديث غير صالح',
+	'noPermissions'           => 'لا توجد صلاحية',
+	'loginFailed'             => 'خطأ في البريد لاكتروني او كلمة المرور',
+	'noSocialEmail'           => 'لا يمكن الحصول علي تابريد الاكتروني',
+	'userAlreadyRegistered'   => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر',
+	'userIsBlocked'           => 'لقد تم حظرك',
+	'invalidResetToken'       => 'رمز تعديل كلمة المرور خطا',
+	'invalidResetPassword'    => 'خطا في نعديل كلمة المرور',
+	'invalidOldPassword'      => 'كلمة السر القديمه خطا',
+	'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل',
+	'emailNotConfirmed'       => 'بريدك الاكتروني غير مفعل',
+	'emailAlreadyConfirmed'   => 'البريد الاكتروني مفع بالقعل'
 
 ];

src/Modules/Users/Http/Controllers/UserController.php

Indentation +221 added lines, -221 removed lines

@@ -24,225 +24,225 @@
 
 class UserController extends BaseApiController
 {
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * Init new object.
-     *
-     * @param   UserService $service
-     * @return  void
-     */
-    public function __construct(UserService $service)
-    {
-        parent::__construct($service);
-    }
-
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertUser $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
-
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateUser $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function account(Request $request)
-    {
-        return new $this->modelResource($this->service->account($request->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->service->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->service->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->service->logout());
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param Register $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Register $request)
-    {
-        return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param Login $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Login $request)
-    {
-        $result = $this->service->login($request->get('email'), $request->get('password'), $request->get('admin'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param LoginSocial $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(LoginSocial $request)
-    {
-        $result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given roles to the given user.
-     *
-     * @param AssignRoles $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assignRoles(AssignRoles $request)
-    {
-        return new $this->modelResource($this->service->assignRoles($request->get('user_id'), $request->get('role_ids')));
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param SendReset $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendReset(SendReset $request)
-    {
-        return new GeneralResource($this->service->sendReset($request->get('email')));
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param ResetPassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPassword(ResetPassword $request)
-    {
-        return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param ChangePassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(ChangePassword $request)
-    {
-        return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param ConfirmEmail $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(ConfirmEmail $request)
-    {
-        return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param ResendEmailConfirmation $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
-    {
-        return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param RefreshToken $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshToken(RefreshToken $request)
-    {
-        return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param SaveProfile $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(SaveProfile $request)
-    {
-        return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
-    }
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserService $service
+	 * @return  void
+	 */
+	public function __construct(UserService $service)
+	{
+		parent::__construct($service);
+	}
+
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertUser $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
+
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateUser $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account(Request $request)
+	{
+		return new $this->modelResource($this->service->account($request->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->service->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->service->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->service->logout());
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param Register $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Register $request)
+	{
+		return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param Login $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Login $request)
+	{
+		$result = $this->service->login($request->get('email'), $request->get('password'), $request->get('admin'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param LoginSocial $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(LoginSocial $request)
+	{
+		$result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given roles to the given user.
+	 *
+	 * @param AssignRoles $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignRoles(AssignRoles $request)
+	{
+		return new $this->modelResource($this->service->assignRoles($request->get('user_id'), $request->get('role_ids')));
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param SendReset $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendReset(SendReset $request)
+	{
+		return new GeneralResource($this->service->sendReset($request->get('email')));
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param ResetPassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetPassword(ResetPassword $request)
+	{
+		return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param ChangePassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(ChangePassword $request)
+	{
+		return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param ConfirmEmail $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(ConfirmEmail $request)
+	{
+		return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param ResendEmailConfirmation $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
+	{
+		return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param RefreshToken $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshToken(RefreshToken $request)
+	{
+		return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param SaveProfile $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(SaveProfile $request)
+	{
+		return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
+	}
 }

src/Modules/Users/Errors/UsersErrors.php

Indentation +52 added lines, -52 removed lines

@@ -4,68 +4,68 @@
 
 class UsersErrors
 {
-    public function unAuthorized()
-    {
-        abort(401, trans('users::errors.unAuthorized'));
-    }
+	public function unAuthorized()
+	{
+		abort(401, trans('users::errors.unAuthorized'));
+	}
 
-    public function noPermissions()
-    {
-        abort(403, trans('users::errors.noPermissions'));
-    }
+	public function noPermissions()
+	{
+		abort(403, trans('users::errors.noPermissions'));
+	}
 
-    public function userIsBlocked()
-    {
-        abort(403, trans('users::errors.userIsBlocked'));
-    }
+	public function userIsBlocked()
+	{
+		abort(403, trans('users::errors.userIsBlocked'));
+	}
 
-    public function emailNotConfirmed()
-    {
-        abort(403, trans('users::errors.emailNotConfirmed'));
-    }
+	public function emailNotConfirmed()
+	{
+		abort(403, trans('users::errors.emailNotConfirmed'));
+	}
 
-    public function loginFailed()
-    {
-        abort(400, trans('users::errors.loginFailed'));
-    }
+	public function loginFailed()
+	{
+		abort(400, trans('users::errors.loginFailed'));
+	}
 
-    public function emailAlreadyConfirmed()
-    {
-        abort(400, trans('users::errors.emailAlreadyConfirmed'));
-    }
+	public function emailAlreadyConfirmed()
+	{
+		abort(400, trans('users::errors.emailAlreadyConfirmed'));
+	}
 
-    public function noSocialEmail()
-    {
-        abort(400, trans('users::errors.noSocialEmail'));
-    }
+	public function noSocialEmail()
+	{
+		abort(400, trans('users::errors.noSocialEmail'));
+	}
 
-    public function userAlreadyRegistered()
-    {
-        abort(400, trans('users::errors.userAlreadyRegistered'));
-    }
+	public function userAlreadyRegistered()
+	{
+		abort(400, trans('users::errors.userAlreadyRegistered'));
+	}
 
-    public function invalidRefreshToken()
-    {
-        abort(422, trans('users::errors.invalidRefreshToken'));
-    }
+	public function invalidRefreshToken()
+	{
+		abort(422, trans('users::errors.invalidRefreshToken'));
+	}
 
-    public function invalidResetToken()
-    {
-        abort(422, trans('users::errors.invalidResetToken'));
-    }
+	public function invalidResetToken()
+	{
+		abort(422, trans('users::errors.invalidResetToken'));
+	}
 
-    public function invalidResetPassword()
-    {
-        abort(422, trans('users::errors.invalidResetPassword'));
-    }
+	public function invalidResetPassword()
+	{
+		abort(422, trans('users::errors.invalidResetPassword'));
+	}
 
-    public function invalidOldPassword()
-    {
-        abort(422, trans('users::errors.invalidOldPassword'));
-    }
+	public function invalidOldPassword()
+	{
+		abort(422, trans('users::errors.invalidOldPassword'));
+	}
 
-    public function invalidConfirmationCode()
-    {
-        abort(422, trans('users::errors.invalidConfirmationCode'));
-    }
+	public function invalidConfirmationCode()
+	{
+		abort(422, trans('users::errors.invalidConfirmationCode'));
+	}
 }

src/Modules/Users/Services/UserService.php

Indentation +370 added lines, -370 removed lines

@@ -12,378 +12,378 @@
 
 class UserService extends BaseService
 {
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationService
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientService
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepository       $repo
-     * @param   PermissionService    $permissionService
-     * @param   LoginProxy           $loginProxy
-     * @param   NotificationService  $notificationService
-     * @param   OauthClientService   $oauthClientService
-     * @return  void
-     */
-    public function __construct(
-        UserRepository $repo,
-        PermissionService $permissionService,
-        LoginProxy $loginProxy,
-        NotificationService $notificationService,
-        OauthClientService $oauthClientService
-    ) {
-        $this->permissionService   = $permissionService;
-        $this->loginProxy          = $loginProxy;
-        $this->notificationService = $notificationService;
-        $this->oauthClientService  = $oauthClientService;
-        parent::__construct($repo);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = ['roles.permissions'])
-    {
-        $permissions = [];
-        $user        = $this->repo->find(\Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->repo][$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 $permissionName
-     * @param  string $model
-     * @param  mixed  $userId
-     * @return boolean
-     */
-    public function can($permissionName, $model, $userId = false)
-    {
-        $permission = $this->permissionService->first([
-            'and' => [
-                'model' => $model,
-                'name'  => $permissionName,
-                'roles' => [
-                    'op' => 'has',
-                    'val' => [
-                        'users' => [
-                            'op' => 'has',
-                            'val' => [
-                                'users.id' => $userId ?: \Auth::id()
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        return $permission ? true : false;
-    }
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed    $user
-     * @return boolean
-     */
-    public function hasRoles($roles, $user = false)
-    {
-        return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachPermissions($userId);
-            $this->repo->attachPermissions($userId, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $adminLogin
-     * @return object
-     */
-    public function login($email, $password, $adminLogin = false)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::loginFailed();
-        } elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
-            \Errors::loginFailed();
-        } elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
-            \Errors::loginFailed();
-        } elseif ($user->blocked) {
-            \Errors::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
-            \Errors::emailNotConfirmed();
-        }
-
-        return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
-    }
-
-    /**
-     * 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) {
-            \Errors::noSocialEmail();
-        }
-
-        if (! $this->repo->first(['email' => $user->email])) {
-            $this->register($user->email, '', true);
-        }
-
-        return $this->loginProxy->login($user->email, config('skeleton.social_pass'));
-    }
+	/**
+	 * @var PermissionService
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationService
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientService
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepository       $repo
+	 * @param   PermissionService    $permissionService
+	 * @param   LoginProxy           $loginProxy
+	 * @param   NotificationService  $notificationService
+	 * @param   OauthClientService   $oauthClientService
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepository $repo,
+		PermissionService $permissionService,
+		LoginProxy $loginProxy,
+		NotificationService $notificationService,
+		OauthClientService $oauthClientService
+	) {
+		$this->permissionService   = $permissionService;
+		$this->loginProxy          = $loginProxy;
+		$this->notificationService = $notificationService;
+		$this->oauthClientService  = $oauthClientService;
+		parent::__construct($repo);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = ['roles.permissions'])
+	{
+		$permissions = [];
+		$user        = $this->repo->find(\Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->repo][$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 $permissionName
+	 * @param  string $model
+	 * @param  mixed  $userId
+	 * @return boolean
+	 */
+	public function can($permissionName, $model, $userId = false)
+	{
+		$permission = $this->permissionService->first([
+			'and' => [
+				'model' => $model,
+				'name'  => $permissionName,
+				'roles' => [
+					'op' => 'has',
+					'val' => [
+						'users' => [
+							'op' => 'has',
+							'val' => [
+								'users.id' => $userId ?: \Auth::id()
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		return $permission ? true : false;
+	}
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed    $user
+	 * @return boolean
+	 */
+	public function hasRoles($roles, $user = false)
+	{
+		return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		$user = false;
+		\DB::transaction(function () use ($userId, $roleIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachPermissions($userId);
+			$this->repo->attachPermissions($userId, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $adminLogin
+	 * @return object
+	 */
+	public function login($email, $password, $adminLogin = false)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::loginFailed();
+		} elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
+			\Errors::loginFailed();
+		} elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
+			\Errors::loginFailed();
+		} elseif ($user->blocked) {
+			\Errors::userIsBlocked();
+		} elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+			\Errors::emailNotConfirmed();
+		}
+
+		return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
+	}
+
+	/**
+	 * 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) {
+			\Errors::noSocialEmail();
+		}
+
+		if (! $this->repo->first(['email' => $user->email])) {
+			$this->register($user->email, '', true);
+		}
+
+		return $this->loginProxy->login($user->email, config('skeleton.social_pass'));
+	}
     
-    /**
-     * Handle a registration request.
-     *
-     * @param  string  $name
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($name, $email, $password, $skipConfirmEmail = false)
-    {
-        $user = $this->repo->save([
-            'name'      => $name,
-            'email'     => $email,
-            'password'  => $password,
-            'confirmed' => $skipConfirmEmail
-        ]);
-
-        if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  string  $name
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($name, $email, $password, $skipConfirmEmail = false)
+	{
+		$user = $this->repo->save([
+			'name'      => $name,
+			'email'     => $email,
+			'password'  => $password,
+			'confirmed' => $skipConfirmEmail
+		]);
+
+		if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (\Auth::id() == $userId || $this->hasRoles(['Admin'], $user) !== false) {
-            \Errors::noPermissions();
-        }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId || $this->hasRoles(['Admin'], $user) !== false) {
+			\Errors::noPermissions();
+		}
         
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::notFound('email');
-        }
-
-        $token = \Password::getService()->create($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string|void
-     */
-    public function resetPassword($email, $password, $passwordConfirmation, $token)
-    {
-        $response = \Password::reset([
-            'email'                 => $email,
-            'password'              => $password,
-            'password_confirmation' => $passwordConfirmation,
-            'token'                 => $token
-        ], function ($user, $password) {
-            $this->repo->save(['id' => $user->id, 'password' => $password]);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-                break;
-
-            case \Password::INVALID_TOKEN:
-                \Errors::invalidResetToken();
-                break;
-
-            case \Password::INVALID_PASSWORD:
-                \Errors::invalidResetPassword();
-                break;
-
-            case \Password::INVALID_USER:
-                \Errors::notFound('user');
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return void
-     */
-    public function changePassword($password, $oldPassword)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
-            \Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            \Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->repo->first(['email' => $email]);
-        if ($user->confirmed) {
-            \Errors::emailAlreadyConfirmed();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
-        $this->notificationService->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  string $name
-     * @param  string $email
-     * @param  string $profilePicture
-     * @return void
-     */
-    public function saveProfile($name, $email, $profilePicture = false)
-    {
-        if ($profilePicture) {
-            $data['profile_picture'] = \Media::uploadImageBas64($profilePicture, 'admins/profile_pictures');
-        }
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::notFound('email');
+		}
+
+		$token = \Password::getService()->create($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string|void
+	 */
+	public function resetPassword($email, $password, $passwordConfirmation, $token)
+	{
+		$response = \Password::reset([
+			'email'                 => $email,
+			'password'              => $password,
+			'password_confirmation' => $passwordConfirmation,
+			'token'                 => $token
+		], function ($user, $password) {
+			$this->repo->save(['id' => $user->id, 'password' => $password]);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+				break;
+
+			case \Password::INVALID_TOKEN:
+				\Errors::invalidResetToken();
+				break;
+
+			case \Password::INVALID_PASSWORD:
+				\Errors::invalidResetPassword();
+				break;
+
+			case \Password::INVALID_USER:
+				\Errors::notFound('user');
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return void
+	 */
+	public function changePassword($password, $oldPassword)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($oldPassword, $user->password)) {
+			\Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			\Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->repo->first(['email' => $email]);
+		if ($user->confirmed) {
+			\Errors::emailAlreadyConfirmed();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
+		$this->notificationService->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  string $name
+	 * @param  string $email
+	 * @param  string $profilePicture
+	 * @return void
+	 */
+	public function saveProfile($name, $email, $profilePicture = false)
+	{
+		if ($profilePicture) {
+			$data['profile_picture'] = \Media::uploadImageBas64($profilePicture, 'admins/profile_pictures');
+		}
         
-        $data['id'] = \Auth::id();
-        return $this->repo->save([
-            'id'             => \Auth::id(),
-            'name'           => $name,
-            'email'          => $email,
-            'profilePicture' => $profilePicture,
-        ]);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->oauthClientService->revokeAccessToken(\Auth::user()->token());
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+		$data['id'] = \Auth::id();
+		return $this->repo->save([
+			'id'             => \Auth::id(),
+			'name'           => $name,
+			'email'          => $email,
+			'profilePicture' => $profilePicture,
+		]);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->oauthClientService->revokeAccessToken(\Auth::user()->token());
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
         $permissions = [];
         $user        = $this->repo->find(\Auth::id(), $relations);
         foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->repo][$permission->id] = $permission->name;
             });
         }
@@ -130,7 +130,7 @@ 
     public function assignRoles($userId, $roleIds)
     {
         $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
+        \DB::transaction(function() use ($userId, $roleIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachPermissions($userId);
             $this->repo->attachPermissions($userId, $roleIds);
@@ -149,15 +149,15 @@ 
      */
     public function login($email, $password, $adminLogin = false)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::loginFailed();
         } elseif ($adminLogin && ! $this->hasRoles(['Admin'], $user)) {
             \Errors::loginFailed();
-        } elseif (! $adminLogin && $this->hasRoles(['Admin'], $user)) {
+        } elseif ( ! $adminLogin && $this->hasRoles(['Admin'], $user)) {
             \Errors::loginFailed();
         } elseif ($user->blocked) {
             \Errors::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \Errors::emailNotConfirmed();
         }
 
@@ -177,11 +177,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) {
             \Errors::noSocialEmail();
         }
 
-        if (! $this->repo->first(['email' => $user->email])) {
+        if ( ! $this->repo->first(['email' => $user->email])) {
             $this->register($user->email, '', true);
         }
 
@@ -206,7 +206,7 @@ 
             'confirmed' => $skipConfirmEmail
         ]);
 
-        if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -247,7 +247,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -271,7 +271,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -304,7 +304,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -319,7 +319,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }