SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Roles/Http/Controllers/RoleController.php

Indentation +43 added lines, -43 removed lines

@@ -10,51 +10,51 @@
 
 class RoleController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = [];
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = [];
 
-    /**
-     * Init new object.
-     *
-     * @param   RoleRepository $repo
-     * @param   CoreConfig      $config
-     * @return  void
-     */
-    public function __construct(RoleRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Roles\Http\Resources\Role');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   RoleRepository $repo
+	 * @param   CoreConfig      $config
+	 * @return  void
+	 */
+	public function __construct(RoleRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Roles\Http\Resources\Role');
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertRole $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertRole $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertRole $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertRole $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateRole $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateRole $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateRole $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateRole $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 }

src/Modules/Roles/Reppsitories/RoleRepository.php

Indentation +10 added lines, -10 removed lines

@@ -5,14 +5,14 @@
 
 class RoleRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   Role $model
-     * @return  void
-     */
-    public function __construct(Role $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Role $model
+	 * @return  void
+	 */
+	public function __construct(Role $model)
+	{
+		parent::__construct($model);
+	}
 }

src/Modules/Roles/Routes/api.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
 
 Route::group(['prefix' => 'roles'], function () {
 
-    Route::get('/', 'RoleController@index');
-    Route::get('/{id}', 'RoleController@find');
-    Route::post('/', 'RoleController@insert');
-    Route::put('/', 'RoleController@update');
-    Route::delete('/{id}', 'RoleController@delete');
-    Route::get('list/deleted', 'RoleController@deleted');
-    Route::patch('restore/{id}', 'RoleController@restore');
+	Route::get('/', 'RoleController@index');
+	Route::get('/{id}', 'RoleController@find');
+	Route::post('/', 'RoleController@insert');
+	Route::put('/', 'RoleController@update');
+	Route::delete('/{id}', 'RoleController@delete');
+	Route::get('list/deleted', 'RoleController@deleted');
+	Route::patch('restore/{id}', 'RoleController@restore');
 });

src/Modules/Users/Reppsitories/UserRepository.php

Indentation +380 added lines, -380 removed lines

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

src/Modules/PushNotificationDevices/Repositories/PushNotificationDeviceRepository.php

Indentation +49 added lines, -49 removed lines

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

src/Modules/Core/Utl/ApiConsumer.php

Indentation +198 added lines, -198 removed lines

@@ -7,202 +7,202 @@
 class ApiConsumer
 {
 
-    private $app;
-
-    private $router;
-
-    private $request;
-
-    private $disableMiddleware = false;
-
-    /**
-     * @param \Illuminate\Foundation\Application $app
-     * @param \Illuminate\Http\Request $request,
-     * @param \Illuminate\Routing\Router $router
-     */
-    public function __construct(Application $app, Request $request, LaravelRouter $router)
-    {
-        $this->app = $app;
-        $this->request = $request;
-        $this->router = $router;
-    }
-
-    /**
-     * @return \Illuminate\Http\Response
-     */
-    public function get()
-    {
-        return $this->quickCall('GET', func_get_args());
-    }
-
-    /**
-     * @return \Illuminate\Http\Response
-     */
-    public function post()
-    {
-        return $this->quickCall('POST', func_get_args());
-    }
-
-    /**
-     * @return \Illuminate\Http\Response
-     */
-    public function put()
-    {
-        return $this->quickCall('PUT', func_get_args());
-    }
-
-    /**
-     * @return \Illuminate\Http\Response
-     */
-    public function delete()
-    {
-        return $this->quickCall('DELETE', func_get_args());
-    }
-
-    /**
-     * @param  array $requests An array of requests
-     * @return array
-     */
-    public function batchRequest(array $requests)
-    {
-        foreach ($requests as $i => $request) {
-            $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request);
-        }
-
-        return $requests;
-    }
-
-    /**
-     * @param  string $method
-     * @param  array  $args
-     * @return \Illuminate\Http\Response
-     */
-    public function quickCall($method, array $args)
-    {
-        array_unshift($args, $method);
-        return call_user_func_array([$this, "singleRequest"], $args);
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        // Save the current request so we can reset the router back to it
-        // after we've completed our internal request.
-        $currentRequest = $this->request->instance()->duplicate();
-
-        $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers);
-
-        if ($this->disableMiddleware) {
-            $this->app->instance('middleware.disable', true);
-        }
-
-        $response = $this->request($method, $uri, $data, $headers, $content);
-
-        if ($this->disableMiddleware) {
-            $this->app->instance('middleware.disable', false);
-        }
-
-        // Once the request has completed we reset the currentRequest of the router
-        // to match the original request.
-        $this->request->instance()->initialize(
-            $currentRequest->query->all(),
-            $currentRequest->request->all(),
-            $currentRequest->attributes->all(),
-            $currentRequest->cookies->all(),
-            $currentRequest->files->all(),
-            $currentRequest->server->all(),
-            $currentRequest->content
-        );
-
-        return $response;
-    }
-
-    private function overrideHeaders(array $default, array $headers)
-    {
-        $headers = $this->transformHeadersToUppercaseUnderscoreType($headers);
-        return array_merge($default, $headers);
-    }
-
-    public function enableMiddleware()
-    {
-        $this->disableMiddleware = false;
-    }
-
-    public function disableMiddleware()
-    {
-        $this->disableMiddleware = true;
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Response
-     */
-    private function request($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        // Create a new request object for the internal request
-        $request = $this->createRequest($method, $uri, $data, $headers, $content);
-
-        // Handle the request in the kernel and prepare a response
-        $response = $this->router->prepareResponse($request, $this->app->handle($request));
-
-        return $response;
-    }
-
-    /**
-     * @param  string $method
-     * @param  string $uri
-     * @param  array  $data
-     * @param  array  $headers
-     * @param  string $content
-     * @return \Illuminate\Http\Request
-     */
-    private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null)
-    {
-        $server = $this->transformHeadersToServerVariables($headers);
-
-        return $this->request->create($uri, $method, $data, [], [], $server, $content);
-    }
-
-    private function transformHeadersToUppercaseUnderscoreType($headers)
-    {
-        $transformed = [];
-
-        foreach ($headers as $headerType => $headerValue) {
-            $headerType = strtoupper(str_replace('-', '_', $headerType));
-
-            $transformed[$headerType] = $headerValue;
-        }
-
-        return $transformed;
-    }
-
-    /**
-     * https://github.com/symfony/symfony/issues/5074
-     *
-     * @param  array $headers
-     * @return array
-     */
-    private function transformHeadersToServerVariables($headers)
-    {
-        $server = [];
-
-        foreach ($headers as $headerType => $headerValue) {
-            $headerType = 'HTTP_' . $headerType;
-
-            $server[$headerType] = $headerValue;
-        }
-
-        return $server;
-    }
+	private $app;
+
+	private $router;
+
+	private $request;
+
+	private $disableMiddleware = false;
+
+	/**
+	 * @param \Illuminate\Foundation\Application $app
+	 * @param \Illuminate\Http\Request $request,
+	 * @param \Illuminate\Routing\Router $router
+	 */
+	public function __construct(Application $app, Request $request, LaravelRouter $router)
+	{
+		$this->app = $app;
+		$this->request = $request;
+		$this->router = $router;
+	}
+
+	/**
+	 * @return \Illuminate\Http\Response
+	 */
+	public function get()
+	{
+		return $this->quickCall('GET', func_get_args());
+	}
+
+	/**
+	 * @return \Illuminate\Http\Response
+	 */
+	public function post()
+	{
+		return $this->quickCall('POST', func_get_args());
+	}
+
+	/**
+	 * @return \Illuminate\Http\Response
+	 */
+	public function put()
+	{
+		return $this->quickCall('PUT', func_get_args());
+	}
+
+	/**
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete()
+	{
+		return $this->quickCall('DELETE', func_get_args());
+	}
+
+	/**
+	 * @param  array $requests An array of requests
+	 * @return array
+	 */
+	public function batchRequest(array $requests)
+	{
+		foreach ($requests as $i => $request) {
+			$requests[$i] = call_user_func_array([$this, 'singleRequest'], $request);
+		}
+
+		return $requests;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  array  $args
+	 * @return \Illuminate\Http\Response
+	 */
+	public function quickCall($method, array $args)
+	{
+		array_unshift($args, $method);
+		return call_user_func_array([$this, "singleRequest"], $args);
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		// Save the current request so we can reset the router back to it
+		// after we've completed our internal request.
+		$currentRequest = $this->request->instance()->duplicate();
+
+		$headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers);
+
+		if ($this->disableMiddleware) {
+			$this->app->instance('middleware.disable', true);
+		}
+
+		$response = $this->request($method, $uri, $data, $headers, $content);
+
+		if ($this->disableMiddleware) {
+			$this->app->instance('middleware.disable', false);
+		}
+
+		// Once the request has completed we reset the currentRequest of the router
+		// to match the original request.
+		$this->request->instance()->initialize(
+			$currentRequest->query->all(),
+			$currentRequest->request->all(),
+			$currentRequest->attributes->all(),
+			$currentRequest->cookies->all(),
+			$currentRequest->files->all(),
+			$currentRequest->server->all(),
+			$currentRequest->content
+		);
+
+		return $response;
+	}
+
+	private function overrideHeaders(array $default, array $headers)
+	{
+		$headers = $this->transformHeadersToUppercaseUnderscoreType($headers);
+		return array_merge($default, $headers);
+	}
+
+	public function enableMiddleware()
+	{
+		$this->disableMiddleware = false;
+	}
+
+	public function disableMiddleware()
+	{
+		$this->disableMiddleware = true;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Response
+	 */
+	private function request($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		// Create a new request object for the internal request
+		$request = $this->createRequest($method, $uri, $data, $headers, $content);
+
+		// Handle the request in the kernel and prepare a response
+		$response = $this->router->prepareResponse($request, $this->app->handle($request));
+
+		return $response;
+	}
+
+	/**
+	 * @param  string $method
+	 * @param  string $uri
+	 * @param  array  $data
+	 * @param  array  $headers
+	 * @param  string $content
+	 * @return \Illuminate\Http\Request
+	 */
+	private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null)
+	{
+		$server = $this->transformHeadersToServerVariables($headers);
+
+		return $this->request->create($uri, $method, $data, [], [], $server, $content);
+	}
+
+	private function transformHeadersToUppercaseUnderscoreType($headers)
+	{
+		$transformed = [];
+
+		foreach ($headers as $headerType => $headerValue) {
+			$headerType = strtoupper(str_replace('-', '_', $headerType));
+
+			$transformed[$headerType] = $headerValue;
+		}
+
+		return $transformed;
+	}
+
+	/**
+	 * https://github.com/symfony/symfony/issues/5074
+	 *
+	 * @param  array $headers
+	 * @return array
+	 */
+	private function transformHeadersToServerVariables($headers)
+	{
+		$server = [];
+
+		foreach ($headers as $headerType => $headerValue) {
+			$headerType = 'HTTP_' . $headerType;
+
+			$server[$headerType] = $headerValue;
+		}
+
+		return $server;
+	}
 }

src/Modules/Core/Console/Commands/MakeModuleCommand.php

Indentation +232 added lines, -232 removed lines

@@ -10,242 +10,242 @@
 
 class MakeModuleCommand extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'generate:module
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'generate:module
         {slug : The slug of the module}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new module';
-
-    /**
-     * The modules instance.
-     *
-     * @var RepositoryManager
-     */
-    protected $module;
-
-    /**
-     * The filesystem instance.
-     *
-     * @var Filesystem
-     */
-    protected $files;
-
-    /**
-     * Array to store the configuration details.
-     *
-     * @var array
-     */
-    protected $container;
-
-    /**
-     * Array of folder mappings.
-     *
-     * @var Array
-     */
-    protected $mapping = [
-        'Database/Factories'  => 'Database/Factories',
-        'Database/Migrations' => 'Database/Migrations',
-        'Database/Seeds'      => 'Database/Seeds',
-        'Http/Controllers'    => 'Http/Controllers',
-        'Http/Requests'       => 'Http/Requests',
-        'Http/Resources'      => 'Http/Resources',
-        'ModelObservers'      => 'ModelObservers',
-        'Providers'           => 'Providers',
-        'Repositories'        => 'Repositories',
-        'Routes'              => 'Routes'
-    ];
-
-    /**
-     * Create a new command instance.
-     *
-     * @param Filesystem $files
-     * @param RepositoryManager $module
-     */
-    public function __construct(Filesystem $files, RepositoryManager $module)
-    {
-        parent::__construct();
-
-        $this->files = $files;
-        $this->module = $module;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->container['slug']        = Str::slug($this->argument('slug'));
-        $this->container['name']        = Str::studly($this->container['slug']);
-        $this->container['version']     = '1.0';
-        $this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
-        $this->container['location']    = config('modules.default_location');
-        $this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
-        $this->container['basename']    = Str::studly($this->container['slug']);
-        $this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
-
-        return $this->generate();
-    }
-
-    /**
-     * Generate the module.
-     */
-    protected function generate()
-    {
-        $steps = [
-            'Generating module...' => 'generateModule',
-            'Optimizing module cache...' => 'optimizeModules',
-            'Generating migrations...' => 'generateMigration',
-        ];
-
-        $progress = new ProgressBar($this->output, count($steps));
-        $progress->start();
-
-        foreach ($steps as $message => $function) {
-            $progress->setMessage($message);
-
-            $this->$function();
-
-            $progress->advance();
-        }
-
-        $progress->finish();
-
-        event($this->container['slug'] . '.module.made');
-
-        $this->info("\nModule generated successfully.");
-    }
-
-    /**
-     * Generate defined module folders.
-     */
-    protected function generateModule()
-    {
-        $location = $this->container['location'];
-        $root     = module_path(null, '', $location);
-        $manifest = config("modules.locations.$location.manifest") ?: 'module.json';
-        $provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
-
-        if (!$this->files->isDirectory($root)) {
-            $this->files->makeDirectory($root);
-        }
-
-        $directory = module_path(null, $this->container['basename'], $location);
-        $source    = __DIR__ . '/Stubs/Module';
-
-        $this->files->makeDirectory($directory);
-
-        $sourceFiles = $this->files->allFiles($source, true);
-
-        if (!empty($this->mapping)) {
-            $search = array_keys($this->mapping);
-            $replace = array_values($this->mapping);
-        }
-
-        foreach ($sourceFiles as $file) {
-            $contents = $this->replacePlaceholders($file->getContents());
-            $subPath = $file->getRelativePathname();
-
-            if (!empty($this->mapping)) {
-                $subPath = str_replace($search, $replace, $subPath);
-            }
-
-            $filePath = $directory . '/' . $subPath;
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Create a new module';
+
+	/**
+	 * The modules instance.
+	 *
+	 * @var RepositoryManager
+	 */
+	protected $module;
+
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * Array to store the configuration details.
+	 *
+	 * @var array
+	 */
+	protected $container;
+
+	/**
+	 * Array of folder mappings.
+	 *
+	 * @var Array
+	 */
+	protected $mapping = [
+		'Database/Factories'  => 'Database/Factories',
+		'Database/Migrations' => 'Database/Migrations',
+		'Database/Seeds'      => 'Database/Seeds',
+		'Http/Controllers'    => 'Http/Controllers',
+		'Http/Requests'       => 'Http/Requests',
+		'Http/Resources'      => 'Http/Resources',
+		'ModelObservers'      => 'ModelObservers',
+		'Providers'           => 'Providers',
+		'Repositories'        => 'Repositories',
+		'Routes'              => 'Routes'
+	];
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @param Filesystem $files
+	 * @param RepositoryManager $module
+	 */
+	public function __construct(Filesystem $files, RepositoryManager $module)
+	{
+		parent::__construct();
+
+		$this->files = $files;
+		$this->module = $module;
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$this->container['slug']        = Str::slug($this->argument('slug'));
+		$this->container['name']        = Str::studly($this->container['slug']);
+		$this->container['version']     = '1.0';
+		$this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
+		$this->container['location']    = config('modules.default_location');
+		$this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
+		$this->container['basename']    = Str::studly($this->container['slug']);
+		$this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
+
+		return $this->generate();
+	}
+
+	/**
+	 * Generate the module.
+	 */
+	protected function generate()
+	{
+		$steps = [
+			'Generating module...' => 'generateModule',
+			'Optimizing module cache...' => 'optimizeModules',
+			'Generating migrations...' => 'generateMigration',
+		];
+
+		$progress = new ProgressBar($this->output, count($steps));
+		$progress->start();
+
+		foreach ($steps as $message => $function) {
+			$progress->setMessage($message);
+
+			$this->$function();
+
+			$progress->advance();
+		}
+
+		$progress->finish();
+
+		event($this->container['slug'] . '.module.made');
+
+		$this->info("\nModule generated successfully.");
+	}
+
+	/**
+	 * Generate defined module folders.
+	 */
+	protected function generateModule()
+	{
+		$location = $this->container['location'];
+		$root     = module_path(null, '', $location);
+		$manifest = config("modules.locations.$location.manifest") ?: 'module.json';
+		$provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
+
+		if (!$this->files->isDirectory($root)) {
+			$this->files->makeDirectory($root);
+		}
+
+		$directory = module_path(null, $this->container['basename'], $location);
+		$source    = __DIR__ . '/Stubs/Module';
+
+		$this->files->makeDirectory($directory);
+
+		$sourceFiles = $this->files->allFiles($source, true);
+
+		if (!empty($this->mapping)) {
+			$search = array_keys($this->mapping);
+			$replace = array_values($this->mapping);
+		}
+
+		foreach ($sourceFiles as $file) {
+			$contents = $this->replacePlaceholders($file->getContents());
+			$subPath = $file->getRelativePathname();
+
+			if (!empty($this->mapping)) {
+				$subPath = str_replace($search, $replace, $subPath);
+			}
+
+			$filePath = $directory . '/' . $subPath;
             
-            // if the file is module.json, replace it with the custom manifest file name
-            if ($file->getFilename() === 'module.json' && $manifest) {
-                $filePath = str_replace('module.json', $manifest, $filePath);
-            }
+			// if the file is module.json, replace it with the custom manifest file name
+			if ($file->getFilename() === 'module.json' && $manifest) {
+				$filePath = str_replace('module.json', $manifest, $filePath);
+			}
             
-            // if the file is ModuleServiceProvider.php, replace it with the custom provider file name
-            if ($file->getFilename() === 'ModuleServiceProvider.php') {
-                $filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
-            }
-            $filePath = $this->replacePlaceholders($filePath);
+			// if the file is ModuleServiceProvider.php, replace it with the custom provider file name
+			if ($file->getFilename() === 'ModuleServiceProvider.php') {
+				$filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
+			}
+			$filePath = $this->replacePlaceholders($filePath);
             
-            $dir = dirname($filePath);
+			$dir = dirname($filePath);
             
-            if (! $this->files->isDirectory($dir)) {
-                $this->files->makeDirectory($dir, 0755, true);
-            }
-
-            $this->files->put($filePath, $contents);
-        }
-    }
-
-    /**
-     * @param string $contents
-     *
-     * @return string
-     */
-    protected function replacePlaceholders($contents)
-    {
-        $modelName = \Str::camel($this->container['slug']);
-        $modelNameSingular = \Str::singular($modelName);
-
-        $find = [
-            'DummyFactory',
-            'DummyModelName',
-            'DummyModuleSlug',
-            'DummyModule',
-            'DummyModel',
-            'DummyDatabaseSeeder',
-            'DummyTableSeeder',
-            'DummyController',
-            'DummyRepository',
-            'InsertDummy',
-            'UpdateDummy',
-            'DummyResource',
-            'DummyObserver',
-            'DummyTableName',
-            'DummyRoutePrefix',
-        ];
-
-        $replace = [
-            ucfirst($modelNameSingular) . 'Factory',
-            $modelNameSingular,
-            $this->container['slug'],
-            ucfirst($modelName),
-            ucfirst($modelNameSingular),
-            ucfirst($modelName) . 'DatabaseSeeder',
-            ucfirst($modelName) . 'TableSeeder',
-            ucfirst($modelNameSingular) . 'Controller',
-            ucfirst($modelNameSingular) . 'Repository',
-            'Insert' . ucfirst($modelNameSingular),
-            'Update' . ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular) . 'Observer',
-            $modelName,
-            $modelName,
-        ];
-
-        return str_replace($find, $replace, $contents);
-    }
-
-    /**
-     * Reset module cache of enabled and disabled modules.
-     */
-    protected function optimizeModules()
-    {
-        return $this->callSilent('module:optimize');
-    }
-
-    /**
-     * Generate table migrations.
-     */
-    protected function generateMigration()
-    {
-        $modelName = $this->container['slug'];
-        return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
-    }
+			if (! $this->files->isDirectory($dir)) {
+				$this->files->makeDirectory($dir, 0755, true);
+			}
+
+			$this->files->put($filePath, $contents);
+		}
+	}
+
+	/**
+	 * @param string $contents
+	 *
+	 * @return string
+	 */
+	protected function replacePlaceholders($contents)
+	{
+		$modelName = \Str::camel($this->container['slug']);
+		$modelNameSingular = \Str::singular($modelName);
+
+		$find = [
+			'DummyFactory',
+			'DummyModelName',
+			'DummyModuleSlug',
+			'DummyModule',
+			'DummyModel',
+			'DummyDatabaseSeeder',
+			'DummyTableSeeder',
+			'DummyController',
+			'DummyRepository',
+			'InsertDummy',
+			'UpdateDummy',
+			'DummyResource',
+			'DummyObserver',
+			'DummyTableName',
+			'DummyRoutePrefix',
+		];
+
+		$replace = [
+			ucfirst($modelNameSingular) . 'Factory',
+			$modelNameSingular,
+			$this->container['slug'],
+			ucfirst($modelName),
+			ucfirst($modelNameSingular),
+			ucfirst($modelName) . 'DatabaseSeeder',
+			ucfirst($modelName) . 'TableSeeder',
+			ucfirst($modelNameSingular) . 'Controller',
+			ucfirst($modelNameSingular) . 'Repository',
+			'Insert' . ucfirst($modelNameSingular),
+			'Update' . ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular) . 'Observer',
+			$modelName,
+			$modelName,
+		];
+
+		return str_replace($find, $replace, $contents);
+	}
+
+	/**
+	 * Reset module cache of enabled and disabled modules.
+	 */
+	protected function optimizeModules()
+	{
+		return $this->callSilent('module:optimize');
+	}
+
+	/**
+	 * Generate table migrations.
+	 */
+	protected function generateMigration()
+	{
+		$modelName = $this->container['slug'];
+		return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
+	}
 }

src/Modules/Core/Console/Commands/GenerateDoc.php

Indentation +223 added lines, -223 removed lines

@@ -7,255 +7,255 @@
 
 class GenerateDoc extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'doc:generate';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'doc:generate';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate api documentation';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generate api documentation';
 
-    /**
-     * Init new object.
-     *
-     * @return  void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @return  void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $docData           = [];
-        $docData['models'] = [];
-        $routes            = $this->getRoutes();
-        foreach ($routes as $route) {
-            if ($route) {
-                $actoinArray = explode('@', $route['action']);
-                if (Arr::get($actoinArray, 1, false)) {
-                    $controller       = $actoinArray[0];
-                    $method           = $actoinArray[1];
-                    $route['name']    = $method !== 'index' ? $method : 'list';
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$docData           = [];
+		$docData['models'] = [];
+		$routes            = $this->getRoutes();
+		foreach ($routes as $route) {
+			if ($route) {
+				$actoinArray = explode('@', $route['action']);
+				if (Arr::get($actoinArray, 1, false)) {
+					$controller       = $actoinArray[0];
+					$method           = $actoinArray[1];
+					$route['name']    = $method !== 'index' ? $method : 'list';
                     
-                    $reflectionClass  = new \ReflectionClass($controller);
-                    $reflectionMethod = $reflectionClass->getMethod($method);
-                    $classProperties  = $reflectionClass->getDefaultProperties();
-                    $skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
-                    $validationRules  = Arr::get($classProperties, 'validationRules', false);
+					$reflectionClass  = new \ReflectionClass($controller);
+					$reflectionMethod = $reflectionClass->getMethod($method);
+					$classProperties  = $reflectionClass->getDefaultProperties();
+					$skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
+					$validationRules  = Arr::get($classProperties, 'validationRules', false);
 
-                    dd($classProperties);
-                    $this->processDocBlock($route, $reflectionMethod);
-                    $this->getHeaders($route, $method, $skipLoginCheck);
-                    $this->getPostData($route, $reflectionMethod, $validationRules);
+					dd($classProperties);
+					$this->processDocBlock($route, $reflectionMethod);
+					$this->getHeaders($route, $method, $skipLoginCheck);
+					$this->getPostData($route, $reflectionMethod, $validationRules);
 
-                    $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
+					$route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
 
-                    preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
-                    $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route;
+					preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
+					$docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route;
 
-                    $this->getModels($classProperties['model'], $docData);
-                }
-            }
-        }
+					$this->getModels($classProperties['model'], $docData);
+				}
+			}
+		}
         
-        $docData['errors']  = $this->getErrors();
-        $docData['reports'] = \Core::reports()->all();
-        \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
-    }
+		$docData['errors']  = $this->getErrors();
+		$docData['reports'] = \Core::reports()->all();
+		\File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
+	}
 
-    /**
-     * Get list of all registered routes.
-     *
-     * @return collection
-     */
-    protected function getRoutes()
-    {
-        return collect(\Route::getRoutes())->map(function ($route) {
-            if (strpos($route->uri(), 'api/') !== false) {
-                return [
-                    'method' => $route->methods()[0],
-                    'uri'    => $route->uri(),
-                    'action' => $route->getActionName(),
-                    'prefix' => $route->getPrefix()
-                ];
-            }
-            return false;
-        })->all();
-    }
+	/**
+	 * Get list of all registered routes.
+	 *
+	 * @return collection
+	 */
+	protected function getRoutes()
+	{
+		return collect(\Route::getRoutes())->map(function ($route) {
+			if (strpos($route->uri(), 'api/') !== false) {
+				return [
+					'method' => $route->methods()[0],
+					'uri'    => $route->uri(),
+					'action' => $route->getActionName(),
+					'prefix' => $route->getPrefix()
+				];
+			}
+			return false;
+		})->all();
+	}
 
-    /**
-     * Generate headers for the given route.
-     *
-     * @param  array  &$route
-     * @param  string $method
-     * @param  array  $skipLoginCheck
-     * @return void
-     */
-    protected function getHeaders(&$route, $method, $skipLoginCheck)
-    {
-        $route['headers'] = [
-        'Accept'       => 'application/json',
-        'Content-Type' => 'application/json',
-        'locale'       => 'The language of the returned data: ar, en or all.',
-        'time-zone'    => 'Your locale time zone',
-        ];
+	/**
+	 * Generate headers for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  string $method
+	 * @param  array  $skipLoginCheck
+	 * @return void
+	 */
+	protected function getHeaders(&$route, $method, $skipLoginCheck)
+	{
+		$route['headers'] = [
+		'Accept'       => 'application/json',
+		'Content-Type' => 'application/json',
+		'locale'       => 'The language of the returned data: ar, en or all.',
+		'time-zone'    => 'Your locale time zone',
+		];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
-            $route['headers']['Authorization'] = 'Bearer {token}';
-        }
-    }
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
+			$route['headers']['Authorization'] = 'Bearer {token}';
+		}
+	}
 
-    /**
-     * Generate description and params for the given route
-     * based on the docblock.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return void
-     */
-    protected function processDocBlock(&$route, $reflectionMethod)
-    {
-        $factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
-        $docblock                = $factory->create($reflectionMethod->getDocComment());
-        $route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
-        $params                  = $docblock->getTagsByName('param');
-        $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
-        foreach ($params as $param) {
-            $name = $param->getVariableName();
-            if ($name !== 'request') {
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
-            }
-        }
-    }
+	/**
+	 * Generate description and params for the given route
+	 * based on the docblock.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return void
+	 */
+	protected function processDocBlock(&$route, $reflectionMethod)
+	{
+		$factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
+		$docblock                = $factory->create($reflectionMethod->getDocComment());
+		$route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
+		$params                  = $docblock->getTagsByName('param');
+		$route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
+		foreach ($params as $param) {
+			$name = $param->getVariableName();
+			if ($name !== 'request') {
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
+			}
+		}
+	}
 
-    /**
-     * Generate post body for the given route.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @param  array  $validationRules
-     * @return void
-     */
-    protected function getPostData(&$route, $reflectionMethod, $validationRules)
-    {
-        if ($route['method'] == 'POST') {
-            $body = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate post body for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @param  array  $validationRules
+	 * @return void
+	 */
+	protected function getPostData(&$route, $reflectionMethod, $validationRules)
+	{
+		if ($route['method'] == 'POST') {
+			$body = $this->getMethodBody($reflectionMethod);
 
-            preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
-            if (count($match)) {
-                if ($match[1] == '$this->validationRules') {
-                    $route['body'] = $validationRules;
-                } else {
-                    $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';');
-                }
+			preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
+			if (count($match)) {
+				if ($match[1] == '$this->validationRules') {
+					$route['body'] = $validationRules;
+				} else {
+					$route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';');
+				}
 
-                foreach ($route['body'] as &$rule) {
-                    if (strpos($rule, 'unique')) {
-                        $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-                    } elseif (strpos($rule, 'exists')) {
-                        $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
-                    }
-                }
-            } else {
-                $route['body'] = 'conditions';
-            }
-        }
-    }
+				foreach ($route['body'] as &$rule) {
+					if (strpos($rule, 'unique')) {
+						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
+					} elseif (strpos($rule, 'exists')) {
+						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
+					}
+				}
+			} else {
+				$route['body'] = 'conditions';
+			}
+		}
+	}
 
-    /**
-     * Generate application errors.
-     *
-     * @return array
-     */
-    protected function getErrors()
-    {
-        $errors          = [];
-        $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
-        foreach ($reflectionClass->getMethods() as $method) {
-            $methodName       = $method->name;
-            $reflectionMethod = $reflectionClass->getMethod($methodName);
-            $body             = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate application errors.
+	 *
+	 * @return array
+	 */
+	protected function getErrors()
+	{
+		$errors          = [];
+		$reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
+		foreach ($reflectionClass->getMethods() as $method) {
+			$methodName       = $method->name;
+			$reflectionMethod = $reflectionClass->getMethod($methodName);
+			$body             = $this->getMethodBody($reflectionMethod);
 
-            preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
+			preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
 
-            if (count($match)) {
-                $errors[$match[1]][] = $methodName;
-            }
-        }
+			if (count($match)) {
+				$errors[$match[1]][] = $methodName;
+			}
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    /**
-     * Get the given method body code.
-     *
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return string
-     */
-    protected function getMethodBody($reflectionMethod)
-    {
-        $filename   = $reflectionMethod->getFileName();
-        $start_line = $reflectionMethod->getStartLine() - 1;
-        $end_line   = $reflectionMethod->getEndLine();
-        $length     = $end_line - $start_line;
-        $source     = file($filename);
-        $body       = implode("", array_slice($source, $start_line, $length));
-        $body       = trim(preg_replace('/\s+/', '', $body));
+	/**
+	 * Get the given method body code.
+	 *
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return string
+	 */
+	protected function getMethodBody($reflectionMethod)
+	{
+		$filename   = $reflectionMethod->getFileName();
+		$start_line = $reflectionMethod->getStartLine() - 1;
+		$end_line   = $reflectionMethod->getEndLine();
+		$length     = $end_line - $start_line;
+		$source     = file($filename);
+		$body       = implode("", array_slice($source, $start_line, $length));
+		$body       = trim(preg_replace('/\s+/', '', $body));
 
-        return $body;
-    }
+		return $body;
+	}
 
-    /**
-     * Get example object of all availble models.
-     *
-     * @param  string $modelName
-     * @param  array  $docData
-     * @return string
-     */
-    protected function getModels($modelName, &$docData)
-    {
-        if ($modelName && ! Arr::has($docData['models'], $modelName)) {
-            $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
-            $model      = factory($modelClass)->make();
-            $modelArr   = $model->toArray();
+	/**
+	 * Get example object of all availble models.
+	 *
+	 * @param  string $modelName
+	 * @param  array  $docData
+	 * @return string
+	 */
+	protected function getModels($modelName, &$docData)
+	{
+		if ($modelName && ! Arr::has($docData['models'], $modelName)) {
+			$modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
+			$model      = factory($modelClass)->make();
+			$modelArr   = $model->toArray();
 
-            if ($model->trans && ! $model->trans->count()) {
-                $modelArr['trans'] = [
-                    'en' => factory($modelClass.'Translation')->make()->toArray()
-                ];
-            }
+			if ($model->trans && ! $model->trans->count()) {
+				$modelArr['trans'] = [
+					'en' => factory($modelClass.'Translation')->make()->toArray()
+				];
+			}
 
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
-        }
-    }
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
+		}
+	}
 
-    /**
-     * Get the route response object type.
-     *
-     * @param  string $modelName
-     * @param  string $method
-     * @param  string $returnDocBlock
-     * @return array
-     */
-    protected function getResponseObject($modelName, $method, $returnDocBlock)
-    {
-        $config    = \CoreConfig::getConfig();
-        $relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
-        $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
+	/**
+	 * Get the route response object type.
+	 *
+	 * @param  string $modelName
+	 * @param  string $method
+	 * @param  string $returnDocBlock
+	 * @return array
+	 */
+	protected function getResponseObject($modelName, $method, $returnDocBlock)
+	{
+		$config    = \CoreConfig::getConfig();
+		$relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
+		$modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
 
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
-    }
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +199 added lines, -199 removed lines

@@ -10,204 +10,204 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   \App\Modules\Core\Utl\CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->list($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->relations));
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   \App\Modules\Core\Utl\CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->list($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->relations));
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }