SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Services/UserServiceInterface.php

Indentation +148 added lines, -148 removed lines

@@ -7,152 +7,152 @@
 
 interface UserServiceInterface extends BaseServiceInterface
 {
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return Model
-     */
-    public function account(array $relations = ['roles.permissions']): Model;
-
-    /**
-     * 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  int    $userId
-     * @return bool
-     */
-    public function can(string $permissionName, string $model, int $userId = 0): bool;
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  array $roles
-     * @param  int   $user
-     * @return bool
-     */
-    public function hasRoles(array $roles, int $user = 0): bool;
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  int   $userId
-     * @param  array $roleIds
-     * @return Model
-     */
-    public function assignRoles(int $userId, array $roleIds): Model;
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return array
-     */
-    public function login(string $email, string $password): array;
-
-    /**
-     * Handle the social login request to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial(string $authCode, string $accessToken, string $type): array;
-
-    /**
-     * Handle the registration request.
-     *
-     * @param  array $data
-     * @param  bool  $skipConfirmEmail
-     * @param  int   $roleId
-     * @return Model
-     */
-    public function register(array $data, bool $skipConfirmEmail = false, int $roleId = 0): Model;
-
-    /**
-     * Block the user.
-     *
-     * @param  int $userId
-     * @return Model
-     */
-    public function block(int $userId): Model;
-
-    /**
-     * Unblock the user.
-     *
-     * @param  int $userId
-     * @return Model
-     */
-    public function unblock(int $userId): Model;
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return bool
-     */
-    public function sendReset(string $email): bool;
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string
-     */
-    public function resetPassword(string $email, string $password, string $passwordConfirmation, string $token): string;
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return bool
-     */
-    public function changePassword(string $password, string $oldPassword): bool;
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return bool
-     */
-    public function confirmEmail(string $confirmationCode): bool;
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return bool
-     */
-    public function sendConfirmationEmail(string $email): bool;
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return Model
-     */
-    public function saveProfile(array $data): Model;
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return bool
-     */
-    public function logout(): bool;
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken(string $refreshToken): array;
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return Model
+	 */
+	public function account(array $relations = ['roles.permissions']): Model;
+
+	/**
+	 * 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  int    $userId
+	 * @return bool
+	 */
+	public function can(string $permissionName, string $model, int $userId = 0): bool;
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  array $roles
+	 * @param  int   $user
+	 * @return bool
+	 */
+	public function hasRoles(array $roles, int $user = 0): bool;
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  int   $userId
+	 * @param  array $roleIds
+	 * @return Model
+	 */
+	public function assignRoles(int $userId, array $roleIds): Model;
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return array
+	 */
+	public function login(string $email, string $password): array;
+
+	/**
+	 * Handle the social login request to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial(string $authCode, string $accessToken, string $type): array;
+
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  array $data
+	 * @param  bool  $skipConfirmEmail
+	 * @param  int   $roleId
+	 * @return Model
+	 */
+	public function register(array $data, bool $skipConfirmEmail = false, int $roleId = 0): Model;
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  int $userId
+	 * @return Model
+	 */
+	public function block(int $userId): Model;
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  int $userId
+	 * @return Model
+	 */
+	public function unblock(int $userId): Model;
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return bool
+	 */
+	public function sendReset(string $email): bool;
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string
+	 */
+	public function resetPassword(string $email, string $password, string $passwordConfirmation, string $token): string;
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return bool
+	 */
+	public function changePassword(string $password, string $oldPassword): bool;
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return bool
+	 */
+	public function confirmEmail(string $confirmationCode): bool;
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return bool
+	 */
+	public function sendConfirmationEmail(string $email): bool;
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return Model
+	 */
+	public function saveProfile(array $data): Model;
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return bool
+	 */
+	public function logout(): bool;
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken(string $refreshToken): array;
 }

src/Modules/Users/Services/UserService.php

Indentation +363 added lines, -363 removed lines

@@ -19,367 +19,367 @@
 
 class UserService extends BaseService implements UserServiceInterface
 {
-    /**
-     * @var PermissionServiceInterface
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationServiceInterface
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientServiceInterface
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepositoryInterface $repo
-     * @param   PermissionServiceInterface $permissionService
-     * @param   LoginProxy $loginProxy
-     * @param   NotificationServiceInterface $notificationService
-     * @param   OauthClientServiceInterface $oauthClientService
-     * @return  void
-     */
-    public function __construct(
-        UserRepositoryInterface $repo,
-        PermissionServiceInterface $permissionService,
-        LoginProxy $loginProxy,
-        NotificationServiceInterface $notificationService,
-        OauthClientServiceInterface $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 Model
-     */
-    public function account(array $relations = ['roles.permissions']): Model
-    {
-        $permissions = [];
-        $user        = $this->repo->find(Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[] = $permission;
-            });
-        }
-        $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  int    $userId
-     * @return bool
-     */
-    public function can(string $permissionName, string $model, int $userId = 0): bool
-    {
-        $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  array $roles
-     * @param  int   $user
-     * @return bool
-     */
-    public function hasRoles(array $roles, int $user = 0): bool
-    {
-        return $this->repo->countRoles($user ?: Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  int   $userId
-     * @param  array $roleIds
-     * @return Model
-     */
-    public function assignRoles(int $userId, array $roleIds): Model
-    {
-        $user = new Model();
-        DB::transaction(function () use ($userId, $roleIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachRoles($user);
-            $this->repo->attachRoles($user, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return array
-     */
-    public function login(string $email, string $password): array
-    {
-        if (!$user = $this->repo->first(['email' => $email])) {
-            Errors::loginFailed();
-        } elseif ($user->blocked) {
-            Errors::userIsBlocked();
-        } elseif (!config('user.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
-     * @param  string $type
-     * @return array
-     */
-    public function loginSocial(string $authCode, string $accessToken, string $type): array
-    {
-        $accessToken = $authCode ? Arr::get(Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user        = Socialite::driver($type)->userFromToken($accessToken)->user;
-
-        if (!Arr::has($user, 'email')) {
-            Errors::noSocialEmail();
-        }
-
-        if (!$this->repo->first(['email' => $user['email']]) && !$this->repo->deleted(['email' => $user['email']])->total()) {
-            $this->register(Arr::get($user, 'name'), $user['email'], '', true);
-        }
-
-        return $this->login($user['email'], config('user.social_pass'));
-    }
-
-    /**
-     * Handle the registration request.
-     *
-     * @param  array $data
-     * @param  bool  $skipConfirmEmail
-     * @param  int   $roleId
-     * @return Model
-     */
-    public function register(array $data, bool $skipConfirmEmail = false, int $roleId = 0): Model
-    {
-        $data['confirmed'] = $skipConfirmEmail;
-
-        if ($roleId) {
-            $data['roles'] = [['id' => $roleId]];
-        }
-
-        $user = $this->repo->save($data);
-
-        if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  int $userId
-     * @return Model
-     */
-    public function block(int $userId): Model
-    {
-        if (Auth::id() == $userId) {
-            Errors::noPermissions();
-        }
-
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  int $userId
-     * @return Model
-     */
-    public function unblock(int $userId): Model
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return bool
-     */
-    public function sendReset(string $email): bool
-    {
-        if (!$user = $this->repo->first(['email' => $email])) {
-            Errors::notFound('email');
-        }
-
-        $token = Password::createToken($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-
-        return true;
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string
-     */
-    public function resetPassword(string $email, string $password, string $passwordConfirmation, string $token): string
-    {
-        $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_USER:
-                Errors::notFound('user');
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return bool
-     */
-    public function changePassword(string $password, string $oldPassword): bool
-    {
-        $user = Auth::user();
-        if (!Hash::check($oldPassword, $user->password)) {
-            Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-
-        return true;
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return bool
-     */
-    public function confirmEmail(string $confirmationCode): bool
-    {
-        if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-
-        return true;
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return bool
-     */
-    public function sendConfirmationEmail(string $email): bool
-    {
-        $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');
-
-        return true;
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $data
-     * @return Model
-     */
-    public function saveProfile(array $data): Model
-    {
-        $data['id'] = Auth::id();
-        return $this->repo->save($data);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return bool
-     */
-    public function logout(): bool
-    {
-        $this->oauthClientService->revokeAccessToken(Auth::user()->token());
-        return true;
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken(string $refreshToken): array
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+	/**
+	 * @var PermissionServiceInterface
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationServiceInterface
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientServiceInterface
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepositoryInterface $repo
+	 * @param   PermissionServiceInterface $permissionService
+	 * @param   LoginProxy $loginProxy
+	 * @param   NotificationServiceInterface $notificationService
+	 * @param   OauthClientServiceInterface $oauthClientService
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepositoryInterface $repo,
+		PermissionServiceInterface $permissionService,
+		LoginProxy $loginProxy,
+		NotificationServiceInterface $notificationService,
+		OauthClientServiceInterface $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 Model
+	 */
+	public function account(array $relations = ['roles.permissions']): Model
+	{
+		$permissions = [];
+		$user        = $this->repo->find(Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[] = $permission;
+			});
+		}
+		$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  int    $userId
+	 * @return bool
+	 */
+	public function can(string $permissionName, string $model, int $userId = 0): bool
+	{
+		$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  array $roles
+	 * @param  int   $user
+	 * @return bool
+	 */
+	public function hasRoles(array $roles, int $user = 0): bool
+	{
+		return $this->repo->countRoles($user ?: Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  int   $userId
+	 * @param  array $roleIds
+	 * @return Model
+	 */
+	public function assignRoles(int $userId, array $roleIds): Model
+	{
+		$user = new Model();
+		DB::transaction(function () use ($userId, $roleIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachRoles($user);
+			$this->repo->attachRoles($user, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return array
+	 */
+	public function login(string $email, string $password): array
+	{
+		if (!$user = $this->repo->first(['email' => $email])) {
+			Errors::loginFailed();
+		} elseif ($user->blocked) {
+			Errors::userIsBlocked();
+		} elseif (!config('user.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
+	 * @param  string $type
+	 * @return array
+	 */
+	public function loginSocial(string $authCode, string $accessToken, string $type): array
+	{
+		$accessToken = $authCode ? Arr::get(Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user        = Socialite::driver($type)->userFromToken($accessToken)->user;
+
+		if (!Arr::has($user, 'email')) {
+			Errors::noSocialEmail();
+		}
+
+		if (!$this->repo->first(['email' => $user['email']]) && !$this->repo->deleted(['email' => $user['email']])->total()) {
+			$this->register(Arr::get($user, 'name'), $user['email'], '', true);
+		}
+
+		return $this->login($user['email'], config('user.social_pass'));
+	}
+
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  array $data
+	 * @param  bool  $skipConfirmEmail
+	 * @param  int   $roleId
+	 * @return Model
+	 */
+	public function register(array $data, bool $skipConfirmEmail = false, int $roleId = 0): Model
+	{
+		$data['confirmed'] = $skipConfirmEmail;
+
+		if ($roleId) {
+			$data['roles'] = [['id' => $roleId]];
+		}
+
+		$user = $this->repo->save($data);
+
+		if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  int $userId
+	 * @return Model
+	 */
+	public function block(int $userId): Model
+	{
+		if (Auth::id() == $userId) {
+			Errors::noPermissions();
+		}
+
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  int $userId
+	 * @return Model
+	 */
+	public function unblock(int $userId): Model
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return bool
+	 */
+	public function sendReset(string $email): bool
+	{
+		if (!$user = $this->repo->first(['email' => $email])) {
+			Errors::notFound('email');
+		}
+
+		$token = Password::createToken($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+
+		return true;
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string
+	 */
+	public function resetPassword(string $email, string $password, string $passwordConfirmation, string $token): string
+	{
+		$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_USER:
+				Errors::notFound('user');
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return bool
+	 */
+	public function changePassword(string $password, string $oldPassword): bool
+	{
+		$user = Auth::user();
+		if (!Hash::check($oldPassword, $user->password)) {
+			Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+
+		return true;
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return bool
+	 */
+	public function confirmEmail(string $confirmationCode): bool
+	{
+		if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+
+		return true;
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return bool
+	 */
+	public function sendConfirmationEmail(string $email): bool
+	{
+		$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');
+
+		return true;
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $data
+	 * @return Model
+	 */
+	public function saveProfile(array $data): Model
+	{
+		$data['id'] = Auth::id();
+		return $this->repo->save($data);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return bool
+	 */
+	public function logout(): bool
+	{
+		$this->oauthClientService->revokeAccessToken(Auth::user()->token());
+		return true;
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken(string $refreshToken): array
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -74,7 +74,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;
             });
         }
@@ -137,7 +137,7 @@ 
     public function assignRoles(int $userId, array $roleIds): Model
     {
         $user = new Model();
-        DB::transaction(function () use ($userId, $roleIds, &$user) {
+        DB::transaction(function() use ($userId, $roleIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachRoles($user);
             $this->repo->attachRoles($user, $roleIds);
@@ -155,11 +155,11 @@ 
      */
     public function login(string $email, string $password): array
     {
-        if (!$user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             Errors::loginFailed();
         } elseif ($user->blocked) {
             Errors::userIsBlocked();
-        } elseif (!config('user.disable_confirm_email') && !$user->confirmed) {
+        } elseif ( ! config('user.disable_confirm_email') && ! $user->confirmed) {
             Errors::emailNotConfirmed();
         }
 
@@ -179,11 +179,11 @@ 
         $accessToken = $authCode ? Arr::get(Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user        = Socialite::driver($type)->userFromToken($accessToken)->user;
 
-        if (!Arr::has($user, 'email')) {
+        if ( ! Arr::has($user, 'email')) {
             Errors::noSocialEmail();
         }
 
-        if (!$this->repo->first(['email' => $user['email']]) && !$this->repo->deleted(['email' => $user['email']])->total()) {
+        if ( ! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->total()) {
             $this->register(Arr::get($user, 'name'), $user['email'], '', true);
         }
 
@@ -208,7 +208,7 @@ 
 
         $user = $this->repo->save($data);
 
-        if (!$skipConfirmEmail && !config('user.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -249,7 +249,7 @@ 
      */
     public function sendReset(string $email): bool
     {
-        if (!$user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             Errors::notFound('email');
         }
 
@@ -275,7 +275,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(string $password, string $oldPassword): bool
     {
         $user = Auth::user();
-        if (!Hash::check($oldPassword, $user->password)) {
+        if ( ! Hash::check($oldPassword, $user->password)) {
             Errors::invalidOldPassword();
         }
 
@@ -321,7 +321,7 @@ 
      */
     public function confirmEmail(string $confirmationCode): bool
     {
-        if (!$user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             Errors::invalidConfirmationCode();
         }
 

src/Modules/Users/Providers/ModuleServiceProvider.php

Indentation +28 added lines, -28 removed lines

@@ -10,35 +10,35 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
 
-        $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('users', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('users', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
 
-        /**
-         * Bind interfaces to implmentations.
-         */
-        $this->app->bind(UserServiceInterface::class, UserService::class);
-        $this->app->bind(UserRepositoryInterface::class, UserRepository::class);
-    }
+		/**
+		 * Bind interfaces to implmentations.
+		 */
+		$this->app->bind(UserServiceInterface::class, UserService::class);
+		$this->app->bind(UserRepositoryInterface::class, UserRepository::class);
+	}
 }

src/Modules/Users/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -10,61 +10,61 @@
 class AclUserObserver
 {
 
-    public function saving($model)
-    {
-        if ($model->isDirty('profile_picture')) {
-            Core::fileManager()->delete($model->getOriginal('profile_picture'), 'path');
-        }
-    }
+	public function saving($model)
+	{
+		if ($model->isDirty('profile_picture')) {
+			Core::fileManager()->delete($model->getOriginal('profile_picture'), 'path');
+		}
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
-                \Core::oauthClients()->revokeAccessToken($token);
-            });
-        }
-    }
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) {
+			$model->tokens()->each(function ($token) {
+				\Core::oauthClients()->revokeAccessToken($token);
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) {
-            \Errors::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) {
+			\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/AclUser.php

Indentation +103 added lines, -103 removed lines

@@ -12,108 +12,108 @@
 
 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'];
-    public $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone', 'blocked', 'confirmed'];
-
-    /**
-     * 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('user.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'];
+	public $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone', 'blocked', 'confirmed'];
+
+	/**
+	 * 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('user.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/Core/Repositories/SettingRepository.php

Indentation +10 added lines, -10 removed lines

@@ -7,14 +7,14 @@
 
 class SettingRepository extends BaseRepository implements SettingRepositoryInterface
 {
-    /**
-     * Init new object.
-     *
-     * @param   Setting $model
-     * @return  void
-     */
-    public function __construct(Setting $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Setting $model
+	 * @return  void
+	 */
+	public function __construct(Setting $model)
+	{
+		parent::__construct($model);
+	}
 }

src/Modules/Core/Http/Controllers/SettingController.php

Indentation +32 added lines, -32 removed lines

@@ -9,39 +9,39 @@
 
 class SettingController extends BaseApiController
 {
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest = 'App\Modules\Core\Http\Requests\StoreSetting';
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest = 'App\Modules\Core\Http\Requests\StoreSetting';
 
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\Core\Http\Resources\Setting';
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\Core\Http\Resources\Setting';
 
-    /**
-     * Init new object.
-     *
-     * @param   SettingServiceInterface $service
-     * @return  void
-     */
-    public function __construct(SettingServiceInterface $service)
-    {
-        parent::__construct($service);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   SettingServiceInterface $service
+	 * @return  void
+	 */
+	public function __construct(SettingServiceInterface $service)
+	{
+		parent::__construct($service);
+	}
 
-    /**
-     * Save list of settings.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveMany(Request $request)
-    {
-        return new GeneralResource($this->service->saveMany($request->all()));
-    }
+	/**
+	 * Save list of settings.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveMany(Request $request)
+	{
+		return new GeneralResource($this->service->saveMany($request->all()));
+	}
 }

src/Modules/Core/Http/Middleware/CheckPermissions.php

Indentation +58 added lines, -58 removed lines

@@ -12,68 +12,68 @@
 
 class CheckPermissions
 {
-    protected $route;
-    protected $auth;
-    protected $authMiddleware;
-    protected $userService;
-    protected $arr;
+	protected $route;
+	protected $auth;
+	protected $authMiddleware;
+	protected $userService;
+	protected $arr;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route          $route
-     * @param   Auth           $auth
-     * @param   AuthMiddleware $authMiddleware
-     * @param   UserService    $userService
-     * @param   Arr            $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
-    {
-        $this->route = $route;
-        $this->auth = $auth;
-        $this->authMiddleware = $authMiddleware;
-        $this->userService = $userService;
-        $this->arr = $arr;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route          $route
+	 * @param   Auth           $auth
+	 * @param   AuthMiddleware $authMiddleware
+	 * @param   UserService    $userService
+	 * @param   Arr            $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
+	{
+		$this->route = $route;
+		$this->auth = $auth;
+		$this->authMiddleware = $authMiddleware;
+		$this->userService = $userService;
+		$this->arr = $arr;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions        = explode('@', $this->route->currentRouteAction());
-        $reflectionClass     = new \ReflectionClass($routeActions[0]);
-        $classProperties     = $reflectionClass->getDefaultProperties();
-        $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
-        $skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
-        $modelName           = explode('\\', $routeActions[0]);
-        $modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
-        $permission          = $routeActions[1];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions        = explode('@', $this->route->currentRouteAction());
+		$reflectionClass     = new \ReflectionClass($routeActions[0]);
+		$classProperties     = $reflectionClass->getDefaultProperties();
+		$skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
+		$skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
+		$modelName           = explode('\\', $routeActions[0]);
+		$modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
+		$permission          = $routeActions[1];
 
-        $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
-                $user             = $this->auth->user();
-                $isPasswordClient = $user->token() ? $user->token()->client->password_client : false;
+		$this->auth->shouldUse('api');
+		if (! in_array($permission, $skipLoginCheck)) {
+			$this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
+				$user             = $this->auth->user();
+				$isPasswordClient = $user->token() ? $user->token()->client->password_client : false;
     
-                if ($user->blocked) {
-                    Errors::userIsBlocked();
-                }
+				if ($user->blocked) {
+					Errors::userIsBlocked();
+				}
     
-                if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
-                } else {
-                    Errors::noPermissions();
-                }
-            });
-        }
+				if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
+				} elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+				} else {
+					Errors::noPermissions();
+				}
+			});
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -57,8 +57,8 @@ 
         $permission          = $routeActions[1];
 
         $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $permission) {
+        if ( ! in_array($permission, $skipLoginCheck)) {
+            $this->authMiddleware->handle($request, function($request) use ($modelName, $skipPermissionCheck, $permission) {
                 $user             = $this->auth->user();
                 $isPasswordClient = $user->token() ? $user->token()->client->password_client : false;
     
@@ -67,7 +67,7 @@ 
                 }
     
                 if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+                } elseif ( ! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
                 } else {
                     Errors::noPermissions();
                 }

src/Modules/Core/BaseClasses/BaseService.php

Indentation +227 added lines, -227 removed lines

@@ -10,254 +10,254 @@
 
 abstract class BaseService implements BaseServiceInterface
 {
-    /**
-     * @var BaseRepositoryInterface
-     */
-    public $repo;
+	/**
+	 * @var BaseRepositoryInterface
+	 */
+	public $repo;
 
-    /**
-     * Init new object.
-     *
-     * @param   BaseRepositoryInterface $repo
-     * @return  void
-     */
-    public function __construct(BaseRepositoryInterface $repo)
-    {
-        $this->repo = $repo;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   BaseRepositoryInterface $repo
+	 * @return  void
+	 */
+	public function __construct(BaseRepositoryInterface $repo)
+	{
+		$this->repo = $repo;
+	}
 
-    /**
-     * Fetch records with relations based on the given params.
-     *
-     * @param   string $local
-     * @param   array  $relations
-     * @param   array  $conditions
-     * @param   int    $perPage
-     * @param   string $sortBy
-     * @param   bool   $desc
-     * @param   bool   $trashed
-     * @return LengthAwarePaginator
-     */
-    public function list(string $local, array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator
-    {
-        $translatable = $this->repo->model->translatable ?? [];
-        $filters = $this->constructFilters($conditions, $local);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . $local : $sortBy;
+	/**
+	 * Fetch records with relations based on the given params.
+	 *
+	 * @param   string $local
+	 * @param   array  $relations
+	 * @param   array  $conditions
+	 * @param   int    $perPage
+	 * @param   string $sortBy
+	 * @param   bool   $desc
+	 * @param   bool   $trashed
+	 * @return LengthAwarePaginator
+	 */
+	public function list(string $local, array $relations = [], array $conditions = [], int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, bool $trashed = false): LengthAwarePaginator
+	{
+		$translatable = $this->repo->model->translatable ?? [];
+		$filters = $this->constructFilters($conditions, $local);
+		$sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . $local : $sortBy;
 
-        if ($trashed) {
-            return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if ($trashed) {
+			return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        if (count($filters)) {
-            return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if (count($filters)) {
+			return $this->paginateBy(['and' => $filters], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-    }
+		return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+	}
 
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        return $this->repo->all($relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function all(array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		return $this->repo->all($relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginate(int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return LengthAwarePaginator
-     */
-    public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function paginateBy(array $conditions, int $perPage = 15, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return Model
-     */
-    public function save(array $data): Model
-    {
-        $model = $this->repo->save($data);
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return Model
+	 */
+	public function save(array $data): Model
+	{
+		$model = $this->repo->save($data);
 
-        return $model;
-    }
+		return $model;
+	}
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  string $value condition value
-     * @param  string $attribute condition column name
-     * @return bool
-     */
-    public function delete(string $value, string $attribute = 'id'): bool
-    {
-        return $this->repo->delete($value, $attribute);
-    }
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  string $value condition value
+	 * @param  string $attribute condition column name
+	 * @return bool
+	 */
+	public function delete(string $value, string $attribute = 'id'): bool
+	{
+		return $this->repo->delete($value, $attribute);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  int   $id
-     * @param  array $relations
-     * @param  array $columns
-     * @return object
-     */
-    public function find(int $id, array $relations = [], array $columns = ['*']): Model
-    {
-        return $this->repo->find($id, $relations, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  int   $id
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return object
+	 */
+	public function find(int $id, array $relations = [], array $columns = ['*']): Model
+	{
+		return $this->repo->find($id, $relations, $columns);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  array  $relations
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
-    {
-        return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  array  $relations
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function findBy(array $conditions, array $relations = [], string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): Collection
+	{
+		return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array $conditions array of conditions
-     * @param  array $relations
-     * @param  array $columns
-     * @return Model
-     */
-    public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
-    {
-        return $this->repo->first($conditions, $relations, $columns);
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array $conditions array of conditions
+	 * @param  array $relations
+	 * @param  array $columns
+	 * @return Model
+	 */
+	public function first(array $conditions, array $relations = [], array $columns = ['*']): Model
+	{
+		return $this->repo->first($conditions, $relations, $columns);
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  array  $conditions array of conditions
-     * @param  int    $perPage
-     * @param  string $sortBy
-     * @param  bool   $desc
-     * @param  array  $columns
-     * @return LengthAwarePaginator
-     */
-    public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
-    {
-        return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  array  $conditions array of conditions
+	 * @param  int    $perPage
+	 * @param  string $sortBy
+	 * @param  bool   $desc
+	 * @param  array  $columns
+	 * @return LengthAwarePaginator
+	 */
+	public function deleted(array $conditions, int $perPage = 15, string $sortBy = 'created_at', bool $desc = true, array $columns = ['*']): LengthAwarePaginator
+	{
+		return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  int $id
-     * @return bool
-     */
-    public function restore(int $id): bool
-    {
-        return $this->repo->restore($id);
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  int $id
+	 * @return bool
+	 */
+	public function restore(int $id): bool
+	{
+		return $this->repo->restore($id);
+	}
 
-    /**
-     * Prepare filters for repo.
-     *
-     * @param  array $conditions
-     * @param  string $local
-     * @return array
-     */
-    protected function constructFilters(array $conditions, string $local): array
-    {
-        $filters = [];
-        $translatable = $this->repo->model->translatable ?? [];
-        foreach ($conditions as $key => $value) {
-            if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
-                /**
-                 * Prepare key based on the the requested lang if it was translatable.
-                 */
-                $key = in_array($key, $translatable) ? $key . '->' . $local : $key;
+	/**
+	 * Prepare filters for repo.
+	 *
+	 * @param  array $conditions
+	 * @param  string $local
+	 * @return array
+	 */
+	protected function constructFilters(array $conditions, string $local): array
+	{
+		$filters = [];
+		$translatable = $this->repo->model->translatable ?? [];
+		foreach ($conditions as $key => $value) {
+			if ((in_array($key, $this->repo->model->fillable ?? []) || method_exists($this->repo->model, $key) || in_array($key, ['or', 'and'])) && $key !== 'trashed') {
+				/**
+				 * Prepare key based on the the requested lang if it was translatable.
+				 */
+				$key = in_array($key, $translatable) ? $key . '->' . $local : $key;
 
-                /**
-                 * Convert 0/1 or true/false to boolean in case of not foreign key.
-                 */
-                if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && !is_null($value)) {
-                    $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+				/**
+				 * Convert 0/1 or true/false to boolean in case of not foreign key.
+				 */
+				if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && !is_null($value)) {
+					$filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
 
-                    /**
-                     * Use in operator in case of foreign and comma seperated values.
-                     */
-                } elseif (!is_array($value) && strpos($key, '_id') && $value) {
-                    $filters[$key] = [
-                        'op' => 'in',
-                        'val' => explode(',', $value)
-                    ];
+					/**
+					 * Use in operator in case of foreign and comma seperated values.
+					 */
+				} elseif (!is_array($value) && strpos($key, '_id') && $value) {
+					$filters[$key] = [
+						'op' => 'in',
+						'val' => explode(',', $value)
+					];
 
-                    /**
-                     * Use null operator in case of 0 value and foreign.
-                     */
-                } elseif (strpos($key, '_id') && $value == 0) {
-                    $filters[$key] = [
-                        'op' => 'null'
-                    ];
+					/**
+					 * Use null operator in case of 0 value and foreign.
+					 */
+				} elseif (strpos($key, '_id') && $value == 0) {
+					$filters[$key] = [
+						'op' => 'null'
+					];
 
-                    /**
-                     * Consider values as a sub conditions if it is array.
-                     */
-                } elseif (is_array($value)) {
-                    $filters[$key] = $value;
+					/**
+					 * Consider values as a sub conditions if it is array.
+					 */
+				} elseif (is_array($value)) {
+					$filters[$key] = $value;
 
-                    /**
-                     * Default string filteration.
-                     */
-                } elseif ($value) {
-                    $key = 'LOWER(' . $key . ')';
-                    $value = strtolower($value);
-                    $filters[$key] = [
-                        'op' => 'like',
-                        'val' => '%' . $value . '%'
-                    ];
-                }
-            }
-        }
+					/**
+					 * Default string filteration.
+					 */
+				} elseif ($value) {
+					$key = 'LOWER(' . $key . ')';
+					$value = strtolower($value);
+					$filters[$key] = [
+						'op' => 'like',
+						'val' => '%' . $value . '%'
+					];
+				}
+			}
+		}
 
-        return $filters;
-    }
+		return $filters;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     {
         $translatable = $this->repo->model->translatable ?? [];
         $filters = $this->constructFilters($conditions, $local);
-        $sortBy = in_array($sortBy, $translatable) ? $sortBy . '->' . $local : $sortBy;
+        $sortBy = in_array($sortBy, $translatable) ? $sortBy.'->'.$local : $sortBy;
 
         if ($trashed) {
             return $this->deleted(['and' => $filters], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
@@ -213,18 +213,18 @@ 
                 /**
                  * Prepare key based on the the requested lang if it was translatable.
                  */
-                $key = in_array($key, $translatable) ? $key . '->' . $local : $key;
+                $key = in_array($key, $translatable) ? $key.'->'.$local : $key;
 
                 /**
                  * Convert 0/1 or true/false to boolean in case of not foreign key.
                  */
-                if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && !is_null($value)) {
+                if (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null && strpos($key, '_id') === false && ! is_null($value)) {
                     $filters[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
 
                     /**
                      * Use in operator in case of foreign and comma seperated values.
                      */
-                } elseif (!is_array($value) && strpos($key, '_id') && $value) {
+                } elseif ( ! is_array($value) && strpos($key, '_id') && $value) {
                     $filters[$key] = [
                         'op' => 'in',
                         'val' => explode(',', $value)
@@ -248,11 +248,11 @@ 
                      * Default string filteration.
                      */
                 } elseif ($value) {
-                    $key = 'LOWER(' . $key . ')';
+                    $key = 'LOWER('.$key.')';
                     $value = strtolower($value);
                     $filters[$key] = [
                         'op' => 'like',
-                        'val' => '%' . $value . '%'
+                        'val' => '%'.$value.'%'
                     ];
                 }
             }