SherifElfadaly / Laravel-Api-Skeleton

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

Indentation +22 added lines, -22 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         return [
             'name'     => 'nullable|string',
-            'email'    => 'required|email|unique:users,email,' . $this->route('id'),
+            'email'    => 'required|email|unique:users,email,'.$this->route('id'),
             'password' => 'nullable|min:6'
         ];
     }

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

Indentation +21 added lines, -21 removed lines

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

src/Modules/Users/AclUser.php

Indentation +107 added lines, -107 removed lines

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

src/Modules/Roles/Http/Requests/AssignPermissions.php

Indentation +21 added lines, -21 removed lines

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

src/Modules/Roles/Http/Requests/StoreRole.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class StoreRole extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function rules()
     {
         return [
-            'name' => 'required|string|max:100|unique:roles,name,' . $this->route('id')
+            'name' => 'required|string|max:100|unique:roles,name,'.$this->route('id')
         ];
     }
 }

src/Modules/Roles/Repositories/RoleRepository.php

Indentation +33 added lines, -33 removed lines

@@ -7,39 +7,39 @@
 
 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);
+	}
 
-    /**
-     * Detach all permissions from the given role.
-     *
-     * @param  mixed $role
-     * @return object
-     */
-    public function detachPermissions($role)
-    {
-        $role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
-        $role->permissions()->detach();
-    }
+	/**
+	 * Detach all permissions from the given role.
+	 *
+	 * @param  mixed $role
+	 * @return object
+	 */
+	public function detachPermissions($role)
+	{
+		$role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
+		$role->permissions()->detach();
+	}
 
-    /**
-     * Attach permission ids to the given role.
-     *
-     * @param  mixed $role
-     * @param  array $permissionIds
-     * @return object
-     */
-    public function attachPermissions($role, $permissionIds)
-    {
-        $role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
-        $role->permissions()->attach($permissionIds);
-    }
+	/**
+	 * Attach permission ids to the given role.
+	 *
+	 * @param  mixed $role
+	 * @param  array $permissionIds
+	 * @return object
+	 */
+	public function attachPermissions($role, $permissionIds)
+	{
+		$role = ! filter_var($role, FILTER_VALIDATE_INT) ? $role : $this->find($role);
+		$role->permissions()->attach($permissionIds);
+	}
 }

src/Modules/OauthClients/Services/OauthClientService.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function revoke($clientId)
     {
-        \DB::transaction(function () use ($clientId) {
+        \DB::transaction(function() use ($clientId) {
             $client = $this->repo->find($clientId);
             $this->repo->revokeClientTokens($client);
             $this->repo->save(['id'=> $clientId, 'revoked' => true]);

Indentation +55 added lines, -55 removed lines

@@ -7,63 +7,63 @@
 
 class OauthClientService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   OauthClientRepository $repo
-     * @return  void
-     */
-    public function __construct(OauthClientRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   OauthClientRepository $repo
+	 * @return  void
+	 */
+	public function __construct(OauthClientRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
-        \DB::transaction(function () use ($clientId) {
-            $client = $this->repo->find($clientId);
-            $this->repo->revokeClientTokens($client);
-            $this->repo->save(['id'=> $clientId, 'revoked' => true]);
-        });
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
+		\DB::transaction(function () use ($clientId) {
+			$client = $this->repo->find($clientId);
+			$this->repo->revokeClientTokens($client);
+			$this->repo->save(['id'=> $clientId, 'revoked' => true]);
+		});
+	}
 
-    /**
-     * UnRevoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function unRevoke($clientId)
-    {
-        $this->repo->save(['id'=> $clientId, 'revoked' => false]);
-    }
+	/**
+	 * UnRevoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function unRevoke($clientId)
+	{
+		$this->repo->save(['id'=> $clientId, 'revoked' => false]);
+	}
 
-    /**
-     * Ensure access token hasn't expired or revoked.
-     *
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        return $this->repo->accessTokenExpiredOrRevoked($accessToken);
-    }
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 *
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		return $this->repo->accessTokenExpiredOrRevoked($accessToken);
+	}
 
-    /**
-     * Revoke the given access token and all
-     * associated refresh tokens.
-     *
-     * @param  oject $accessToken
-     * @return void
-     */
-    public function revokeAccessToken($accessToken)
-    {
-        return $this->repo->revokeAccessToken($accessToken);
-    }
+	/**
+	 * Revoke the given access token and all
+	 * associated refresh tokens.
+	 *
+	 * @param  oject $accessToken
+	 * @return void
+	 */
+	public function revokeAccessToken($accessToken)
+	{
+		return $this->repo->revokeAccessToken($accessToken);
+	}
 }

src/Modules/OauthClients/Repositories/OauthClientRepository.php

Indentation +54 added lines, -54 removed lines

@@ -7,64 +7,64 @@
 
 class OauthClientRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   OauthClient $model
-     * @return  void
-     */
-    public function __construct(OauthClient $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   OauthClient $model
+	 * @return  void
+	 */
+	public function __construct(OauthClient $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Revoke the given client tokens.
-     *
-     * @param  mixed  $client
-     * @return void
-     */
-    public function revokeClientTokens($client)
-    {
-        $client = ! filter_var($client, FILTER_VALIDATE_INT) ? $client : $this->find($client);
-        $client->tokens()->update(['revoked' => true]);
-    }
+	/**
+	 * Revoke the given client tokens.
+	 *
+	 * @param  mixed  $client
+	 * @return void
+	 */
+	public function revokeClientTokens($client)
+	{
+		$client = ! filter_var($client, FILTER_VALIDATE_INT) ? $client : $this->find($client);
+		$client->tokens()->update(['revoked' => true]);
+	}
 
-    /**
-     * 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();
+	/**
+	 * 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;
-        }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) {
+			return true;
+		}
 
-        return false;
-    }
+		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
-            ]);
+	/**
+	 * 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();
-    }
+		$accessToken->revoke();
+	}
 }

src/Modules/Core/Core.php

Indentation +25 added lines, -25 removed lines

@@ -6,30 +6,30 @@
 
 class Core implements BaseFactoryInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
-            $model = ucfirst(\Str::singular($name));
-            if(count($arguments) == 1 && $arguments[0]) {
-                $class = $nameSpace . '\\Services\\' . $model . 'Service';
-            } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
-            }
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'] ;
+			$model = ucfirst(\Str::singular($name));
+			if(count($arguments) == 1 && $arguments[0]) {
+				$class = $nameSpace . '\\Services\\' . $model . 'Service';
+			} else {
+				$class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+			}
 
-            if (class_exists($class)) {
-                return \App::make($class);
-            }
-        }
-    }
+			if (class_exists($class)) {
+				return \App::make($class);
+			}
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -19,12 +19,12 @@
     public function __call($name, $arguments)
     {
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
             $model = ucfirst(\Str::singular($name));
-            if(count($arguments) == 1 && $arguments[0]) {
-                $class = $nameSpace . '\\Services\\' . $model . 'Service';
+            if (count($arguments) == 1 && $arguments[0]) {
+                $class = $nameSpace.'\\Services\\'.$model.'Service';
             } else {
-                $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+                $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
             }
 
             if (class_exists($class)) {