SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Permissions/Permission.php

Indentation +15 added lines, -15 removed lines

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

src/Modules/Roles/Role.php

Indentation +19 added lines, -19 removed lines

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

src/Modules/PushNotificationDevices/PushNotificationDevice.php

Indentation +25 added lines, -25 removed lines

@@ -10,32 +10,32 @@
 class PushNotificationDevice extends Model
 {
 
-    use SoftDeletes;
-    protected $table = 'push_notification_devices';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at', 'access_token'];
-    protected $guarded = ['id'];
-    public $fillable = ['device_token', 'user_id', 'access_token'];
+	use SoftDeletes;
+	protected $table = 'push_notification_devices';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at', 'access_token'];
+	protected $guarded = ['id'];
+	public $fillable = ['device_token', 'user_id', 'access_token'];
     
-    public function user()
-    {
-        return $this->belongsTo(AclUser::class);
-    }
+	public function user()
+	{
+		return $this->belongsTo(AclUser::class);
+	}
 
-    /**
-     * Encrypt the access_token attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setLoginTokenAttribute($value)
-    {
-        $this->attributes['access_token'] = encrypt($value);
-    }
+	/**
+	 * Encrypt the access_token attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setLoginTokenAttribute($value)
+	{
+		$this->attributes['access_token'] = encrypt($value);
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        PushNotificationDevice::observe(PushNotificationDeviceObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		PushNotificationDevice::observe(PushNotificationDeviceObserver::class);
+	}
 }

src/Modules/PushNotificationDevices/Database/Seeds/PushNotificationDevicesTableSeeder.php

Indentation +60 added lines, -60 removed lines

@@ -6,64 +6,64 @@
 
 class PushNotificationDevicesTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to settings table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * pushNotificationDevices model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'pushNotificationDevice',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to settings table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * pushNotificationDevices model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'pushNotificationDevice',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/OauthClients/OauthClient.php

Indentation +11 added lines, -11 removed lines

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

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

Indentation +32 added lines, -32 removed lines

@@ -8,40 +8,40 @@
 
 class SetSessions
 {
-    protected $app;
-    protected $session;
+	protected $app;
+	protected $session;
     
-    /**
-     * Init new object.
-     *
-     * @param   App      $app
-     * @param   Session  $session
-     *
-     * @return  void
-     */
-    public function __construct(App $app, Session $session)
-    {
-        $this->app = $app;
-        $this->session = $session;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   App      $app
+	 * @param   Session  $session
+	 *
+	 * @return  void
+	 */
+	public function __construct(App $app, Session $session)
+	{
+		$this->app = $app;
+		$this->session = $session;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $locale = $request->header('Accept-Language', 'en');
-        $locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
-        $timeZone = $request->header('time-zone', 0);
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$locale = $request->header('Accept-Language', 'en');
+		$locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
+		$timeZone = $request->header('time-zone', 0);
 
-        $this->session->put('time-zone', $timeZone);
-        $this->session->put('locale', $locale);
-        $this->app->setLocale($locale);
+		$this->session->put('time-zone', $timeZone);
+		$this->session->put('locale', $locale);
+		$this->app->setLocale($locale);
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

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

Indentation +32 added lines, -32 removed lines

@@ -8,39 +8,39 @@
 
 class SetRelations
 {
-    protected $arr;
-    protected $route;
+	protected $arr;
+	protected $route;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route  $route
-     * @param   Arr    $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Arr $arr)
-    {
-        $this->arr = $arr;
-        $this->route = $route;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route  $route
+	 * @param   Arr    $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Arr $arr)
+	{
+		$this->arr = $arr;
+		$this->route = $route;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions       = explode('@', $this->route->currentRouteAction());
-        $modelName          = explode('\\', $routeActions[0]);
-        $modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
-        $route              = explode('@', $this->route->currentRouteAction())[1];
-        $relations          = $this->arr->get(config('core.relations'), $modelName, false);
-        $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions       = explode('@', $this->route->currentRouteAction());
+		$modelName          = explode('\\', $routeActions[0]);
+		$modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
+		$route              = explode('@', $this->route->currentRouteAction())[1];
+		$relations          = $this->arr->get(config('core.relations'), $modelName, false);
+		$request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

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

Indentation +58 added lines, -58 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'connectionError'         => 'Connection error',
-    'redisNotRunning'         => 'Your redis notification server is\'t running',
-    'dbQueryError'            => 'Please check the given inputes',
-    'cannotCreateSetting'     => 'Can\'t create setting',
-    'cannotUpdateSettingKey'  => 'Can\'t update setting key',
-    'notFound'                => 'The requested :replace not found',
-    'cannotUploadImage'       => 'Can\'t upload the given image'
+	/**
+	 * Here goes your error messages.
+	 */
+	'connectionError'         => 'Connection error',
+	'redisNotRunning'         => 'Your redis notification server is\'t running',
+	'dbQueryError'            => 'Please check the given inputes',
+	'cannotCreateSetting'     => 'Can\'t create setting',
+	'cannotUpdateSettingKey'  => 'Can\'t update setting key',
+	'notFound'                => 'The requested :replace not found',
+	'cannotUploadImage'       => 'Can\'t upload the given image'
 
 ];