SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Notifications/Notification.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 class Notification extends DatabaseNotification
 {
-    //
+	//
 }

src/Modules/Users/AclUser.php

Indentation +112 added lines, -112 removed lines

@@ -12,117 +12,117 @@
 
 class AclUser extends User
 {
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = \Hash::make($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany(OauthClient::class, 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = \Hash::make($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany(OauthClient::class, 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(AclUserObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(AclUserObserver::class);
+	}
 }

src/Modules/Users/Services/UserService.php

Indentation +365 added lines, -365 removed lines

@@ -12,373 +12,373 @@
 
 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 the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @param  string  $role
-     * @return object
-     */
-    public function login($email, $password, $role = false)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \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 the social login request to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @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 the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  string  $role
+	 * @return object
+	 */
+	public function login($email, $password, $role = false)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\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 the social login request to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @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 the 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 the 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) {
-            \Errors::noPermissions();
-        }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId) {
+			\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, 'users/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, 'users/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 +11 added lines, -11 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,11 +149,11 @@ 
      */
     public function login($email, $password, $role = false)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \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();
         }
 
@@ -172,11 +172,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);
         }
 
@@ -201,7 +201,7 @@ 
             'confirmed' => $skipConfirmEmail
         ]);
 
-        if (! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -242,7 +242,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -266,7 +266,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -299,7 +299,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -314,7 +314,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }
 

src/Modules/Users/Http/Requests/Login.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class Login extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'email'    => 'required|email',
-            'password' => 'required|min:6'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'email'    => 'required|email',
+			'password' => 'required|min:6'
+		];
+	}
 }

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 the 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 the 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'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle the social login request 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 the 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 the 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'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle the social login request 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/OauthClients/OauthClient.php

Indentation +11 added lines, -11 removed lines

@@ -8,17 +8,17 @@
 
 class OauthClient extends Client
 {
-    protected $dates    = ['created_at', 'updated_at'];
-    protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
+	protected $dates    = ['created_at', 'updated_at'];
+	protected $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked'];
     
-    public function user()
-    {
-        return $this->belongsTo(AclUser::class);
-    }
+	public function user()
+	{
+		return $this->belongsTo(AclUser::class);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        OauthClient::observe(OauthClientObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		OauthClient::observe(OauthClientObserver::class);
+	}
 }

src/Modules/Roles/Role.php

Indentation +19 added lines, -19 removed lines

@@ -11,26 +11,26 @@
 class Role extends Model
 {
 
-    use SoftDeletes;
-    protected $table    = 'roles';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name'];
+	use SoftDeletes;
+	protected $table    = 'roles';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name'];
 
-    public function users()
-    {
-        return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
+	public function users()
+	{
+		return $this->belongsToMany(AclUser::class, 'role_user', 'role_id', 'user_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
 
-    public function permissions()
-    {
-        return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps();
-    }
+	public function permissions()
+	{
+		return $this->belongsToMany(Permission::class, 'permission_role', 'role_id', 'permission_id')->whereNull('permission_role.deleted_at')->withTimestamps();
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Role::observe(RoleObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Role::observe(RoleObserver::class);
+	}
 }