SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Utl/CoreConfig.php

Indentation +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-        return [
+	public function getConfig()
+	{
+		return [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -14,5 +14,5 @@ 
 			 */
 			'cacheConfig' =>  config('skeleton.cache_config'),
 		];
-    }
+	}
 }
\ No newline at end of file

src/ApiSkeletonServiceProvider.php

Indentation +32 added lines, -32 removed lines

@@ -6,38 +6,38 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/Modules'                               => app_path('Modules'),
-            __DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),
-            __DIR__.'/../lang'                               => base_path('resources/lang'),
-            __DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),
-            __DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),
-            __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),
-            __DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),
-        ]);
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/Modules'                               => app_path('Modules'),
+			__DIR__.'/Modules/Core/Resources/Assets'         => base_path('public/doc/assets'),
+			__DIR__.'/../lang'                               => base_path('resources/lang'),
+			__DIR__.'/../files/Handler.php'                  => app_path('Exceptions/Handler.php'),
+			__DIR__.'/../files/AuthServiceProvider.php'      => app_path('Providers/AuthServiceProvider.php'),
+			__DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'),
+			__DIR__.'/../files/Kernel.php'                   => app_path('Console/Kernel.php'),
+		]);
 
-        $this->publishes([
-            __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
-            __DIR__.'/../files/auth.php'      => config_path('auth.php'),
-        ], 'config');
-    }
+		$this->publishes([
+			__DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
+			__DIR__.'/../files/auth.php'      => config_path('auth.php'),
+		], 'config');
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/skeleton.php', 'skeleton'
-        );
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../config/skeleton.php', 'skeleton'
+		);
+	}
 }
\ No newline at end of file

src/Modules/Core/Utl/ErrorHandler.php

Indentation +113 added lines, -113 removed lines

@@ -2,117 +2,117 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidRefreshToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
-        abort($error['status'], $error['message']);
-    }
-
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noSocialEmail()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userAlreadyRegistered()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function connectionError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailNotConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailAlreadyConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidOldPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.generalError')];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidRefreshToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noSocialEmail()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userAlreadyRegistered()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function connectionError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailNotConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailAlreadyConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidOldPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.generalError')];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

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

Indentation +248 added lines, -248 removed lines

@@ -6,283 +6,283 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     * 
-     * @var array
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var array
+	 */
+	protected $config;
 
-    /**
-     * The relations implementation.
-     * 
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * The relations implementation.
+	 * 
+	 * @var array
+	 */
+	protected $relations;
 
-    /**
-     * The repo implementation.
-     * 
-     * @var object
-     */
-    protected $repo;
+	/**
+	 * The repo implementation.
+	 * 
+	 * @var object
+	 */
+	protected $repo;
 
-    public function __construct()
-    {        
-        $this->config              = \CoreConfig::getConfig();
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
-        $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];
+	public function __construct()
+	{        
+		$this->config              = \CoreConfig::getConfig();
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
+		$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->middleware(function ($request, $next) {
+		$this->middleware(function ($request, $next) {
             
-            $this->repo = call_user_func_array("\Core::{$this->model}", []);            
-            return $next($request);
-        });
+			$this->repo = call_user_func_array("\Core::{$this->model}", []);            
+			return $next($request);
+		});
 
-        $this->checkPermission($route);
-        $this->setRelations($route);
-        $this->setSessions();
-    }
+		$this->checkPermission($route);
+		$this->setRelations($route);
+		$this->setSessions();
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     * 
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 * 
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * 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 \Response::json($this->repo->find($id, $this->relations), 200);
-    }
+	/**
+	 * 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 \Response::json($this->repo->find($id, $this->relations), 200);
+	}
 
-    /**
-     * Paginate all records with relations from storage
-     * that matche the given query.
-     * 
-     * @param  string  $query   The search text.
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all records with relations from storage
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query   The search text.
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request) 
-    {
-        return \Response::json($this->repo->first($request->all(), $this->relations), 200);
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request) 
+	{
+		return \Response::json($this->repo->first($request->all(), $this->relations), 200);
+	}
 
-    /**
-     * Paginate all records with relations from storage.
-     * 
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all records with relations from storage.
+	 * 
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Save the given model to storage.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
+	/**
+	 * Save the given model to storage.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
 
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
+		$this->validate($request, $this->validationRules);
 
-        return \Response::json($this->repo->save($request->all()), 200);
-    }
+		return \Response::json($this->repo->save($request->all()), 200);
+	}
 
-    /**
-     * Delete by the given id from storage.
-     * 
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id) 
-    {
-        return \Response::json($this->repo->delete($id), 200);
-    }
+	/**
+	 * Delete by the given id from storage.
+	 * 
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id) 
+	{
+		return \Response::json($this->repo->delete($id), 200);
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Restore the deleted model.
-     * 
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id) 
-    {
-        return \Response::json($this->repo->restore($id), 200);
-    }
+	/**
+	 * Restore the deleted model.
+	 * 
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id) 
+	{
+		return \Response::json($this->repo->restore($id), 200);
+	}
 
-    /**
-     * 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]);
+	/**
+	 * 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();
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
+		if ( ! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) 
+		{
+			$user             = \Auth::user();
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
 
-            if ($user->blocked)
-            {
-                \ErrorHandler::userIsBlocked();
-            }
+			if ($user->blocked)
+			{
+				\ErrorHandler::userIsBlocked();
+			}
 
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-            {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
-            {}
-            else
-            {
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
+			{}
+			elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+			{}
+			else
+			{
 
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
+				\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);
+	/**
+	 * 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;
+		$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 'ar':
+			\App::setLocale('ar');
+			\Session::put('locale', 'ar');
+			break;
 
-            case 'all':
-            \App::setLocale('en');
-            \Session::put('locale', 'all');
-            break;
+			case 'all':
+			\App::setLocale('en');
+			\Session::put('locale', 'all');
+			break;
 
-            default:
-            \App::setLocale('en');
-            \Session::put('locale', 'en');
-            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       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
+	/**
+	 * Set relation based on the called api.
+	 * 
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
 }

src/Modules/Acl/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -5,63 +5,63 @@
  */
 class AclUserObserver {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) 
-        {
-            $model->tokens()->each(function($token){
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) 
+		{
+			$model->tokens()->each(function($token){
 
-                \Core::users()->revokeAccessToken($token);
+				\Core::users()->revokeAccessToken($token);
 
-            });
-        }
-    }
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/Acl/Proxy/LoginProxy.php

Indentation +91 added lines, -91 removed lines

@@ -5,95 +5,95 @@
 
 class LoginProxy
 {
-    private $apiConsumer;
-
-    private $auth;
-
-    private $request;
-
-    private $userRepository;
-
-    public function __construct(Application $app) 
-    {
-
-        $this->userRepository = $app->make('App\Modules\Acl\Repositories\UserRepository');
-        $this->apiConsumer    = $app->make('apiconsumer');
-        $this->auth           = $app->make('auth');
-        $this->request        = $app->make('request');
-    }
-
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        $this->userRepository->login($credentials, $adminLogin);
-
-        return $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
-    }
-
-    /**
-     * Attempt to refresh the access token useing the given refresh token.
-     * 
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshtoken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
-
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array 
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => config('skeleton.passport_client_id'),
-            'client_secret' => config('skeleton.passport_client_secret'),
-            'grant_type'    => $grantType
-        ]);
-
-        $response = $this->apiConsumer->post('/oauth/token', $data);
-
-        if ( ! $response->isSuccessful()) 
-        {
-            if ($grantType == 'refresh_token') 
-            {
-                \ErrorHandler::invalidRefreshToken();
-            }
-
-            \ErrorHandler::loginFailed();
-        }
-
-        $data = json_decode($response->getContent());
-
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
-
-    /**
-     * Logs out the user. We revoke access token and refresh token.
-     * 
-     * @return void
-     */
-    public function logout()
-    {
-        \Core::users()->revokeAccessToken($this->auth->user()->token());
-    }
+	private $apiConsumer;
+
+	private $auth;
+
+	private $request;
+
+	private $userRepository;
+
+	public function __construct(Application $app) 
+	{
+
+		$this->userRepository = $app->make('App\Modules\Acl\Repositories\UserRepository');
+		$this->apiConsumer    = $app->make('apiconsumer');
+		$this->auth           = $app->make('auth');
+		$this->request        = $app->make('request');
+	}
+
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		$this->userRepository->login($credentials, $adminLogin);
+
+		return $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
+	}
+
+	/**
+	 * Attempt to refresh the access token useing the given refresh token.
+	 * 
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshtoken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
+
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array 
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => config('skeleton.passport_client_id'),
+			'client_secret' => config('skeleton.passport_client_secret'),
+			'grant_type'    => $grantType
+		]);
+
+		$response = $this->apiConsumer->post('/oauth/token', $data);
+
+		if ( ! $response->isSuccessful()) 
+		{
+			if ($grantType == 'refresh_token') 
+			{
+				\ErrorHandler::invalidRefreshToken();
+			}
+
+			\ErrorHandler::loginFailed();
+		}
+
+		$data = json_decode($response->getContent());
+
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
+
+	/**
+	 * Logs out the user. We revoke access token and refresh token.
+	 * 
+	 * @return void
+	 */
+	public function logout()
+	{
+		\Core::users()->revokeAccessToken($this->auth->user()->token());
+	}
 }
\ No newline at end of file

config/skeleton.php

Indentation +136 added lines, -136 removed lines

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

src/Modules/Notifications/Notifications/ResetPassword.php

Indentation +33 added lines, -33 removed lines

@@ -10,41 +10,41 @@
 
 class ResetPassword extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    protected $token;
+	protected $token;
 
-    /**
-     * Create a new notification instance.
-     */
-    public function __construct($token)
-    {
-        $this->token = $token;
-    }
+	/**
+	 * Create a new notification instance.
+	 */
+	public function __construct($token)
+	{
+		$this->token = $token;
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Reset passowrd')
-            ->line('Reset passowrd')
-            ->line('To reset your password click on the button below')
-            ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Reset passowrd')
+			->line('Reset passowrd')
+			->line('To reset your password click on the button below')
+			->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
+	}
 }
\ No newline at end of file

src/Modules/Notifications/Notifications/ConfirmEmail.php

Indentation +32 added lines, -32 removed lines

@@ -10,39 +10,39 @@
 
 class ConfirmEmail extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    /**
-     * Create a new notification instance.
-     */
-    public function __construct()
-    {
-        //
-    }
+	/**
+	 * Create a new notification instance.
+	 */
+	public function __construct()
+	{
+		//
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Email verification')
-            ->line('Email verification')
-            ->line('To validate your email click on the button below')
-            ->action('Verify your email', config('skeleton.confrim_email_url') . '/' . $notifiable->confirmation_code);
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Email verification')
+			->line('Email verification')
+			->line('To validate your email click on the button below')
+			->action('Verify your email', config('skeleton.confrim_email_url') . '/' . $notifiable->confirmation_code);
+	}
 }
\ No newline at end of file