SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 class AclUserObserver
 {
 
-    public function saving($model)
-    {
-        if ($model->isDirty('profile_picture')) {
-            \Media::deleteImage($model->getOriginal('profile_picture'));
-        }
-    }
+	public function saving($model)
+	{
+		if ($model->isDirty('profile_picture')) {
+			\Media::deleteImage($model->getOriginal('profile_picture'));
+		}
+	}
 
-    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::oauthClients()->revokeAccessToken($token);
-            });
-        }
-    }
+				\Core::oauthClients()->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)
+	{
+		//
+	}
 }

src/Modules/Users/Routes/api.php

Indentation +24 added lines, -24 removed lines

@@ -15,30 +15,30 @@
 
 Route::group(['prefix' => 'users'], function () {
 
-    Route::get('/', 'UserController@index');
-    Route::get('/{id}', 'UserController@find');
-    Route::post('/', 'UserController@insert');
-    Route::put('/', 'UserController@update');
-    Route::delete('/{id}', 'UserController@delete');
-    Route::get('list/deleted', 'UserController@deleted');
-    Route::patch('restore/{id}', 'UserController@restore');
-    Route::get('block/{id}', 'UserController@block');
-    Route::get('unblock/{id}', 'UserController@unblock');
-    Route::post('assign/roles', 'UserController@assignRoles');
+	Route::get('/', 'UserController@index');
+	Route::get('/{id}', 'UserController@find');
+	Route::post('/', 'UserController@insert');
+	Route::put('/', 'UserController@update');
+	Route::delete('/{id}', 'UserController@delete');
+	Route::get('list/deleted', 'UserController@deleted');
+	Route::patch('restore/{id}', 'UserController@restore');
+	Route::get('block/{id}', 'UserController@block');
+	Route::get('unblock/{id}', 'UserController@unblock');
+	Route::post('assign/roles', 'UserController@assignRoles');
 
-    Route::group(['prefix' => 'account'], function () {
+	Route::group(['prefix' => 'account'], function () {
 
-        Route::get('my', 'UserController@account');
-        Route::get('logout', 'UserController@logout');
-        Route::post('refresh/token', 'UserController@refreshToken');
-        Route::post('save', 'UserController@saveProfile');
-        Route::post('register', 'UserController@register');
-        Route::post('login', 'UserController@login');
-        Route::post('login/social', 'UserController@loginSocial');
-        Route::post('send/reset', 'UserController@sendReset');
-        Route::post('reset/password', 'UserController@resetPassword');
-        Route::post('change/password', 'UserController@changePassword');
-        Route::post('confirm/email', 'UserController@confirmEmail');
-        Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
-    });
+		Route::get('my', 'UserController@account');
+		Route::get('logout', 'UserController@logout');
+		Route::post('refresh/token', 'UserController@refreshToken');
+		Route::post('save', 'UserController@saveProfile');
+		Route::post('register', 'UserController@register');
+		Route::post('login', 'UserController@login');
+		Route::post('login/social', 'UserController@loginSocial');
+		Route::post('send/reset', 'UserController@sendReset');
+		Route::post('reset/password', 'UserController@resetPassword');
+		Route::post('change/password', 'UserController@changePassword');
+		Route::post('confirm/email', 'UserController@confirmEmail');
+		Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation');
+	});
 });

src/Modules/Users/Database/Seeds/UsersTableSeeder.php

Indentation +99 added lines, -99 removed lines

@@ -8,105 +8,105 @@
 
 class UsersTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Create Default roles.
-         */
-        $role = Role::updateOrInsert([
-            'name' => 'Admin',
-        ],[
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Create Default roles.
+		 */
+		$role = Role::updateOrInsert([
+			'name' => 'Admin',
+		],[
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Create Default user.
-         */
-        AclUser::updateOrInsert([
-            'email' => 'admin@user.com',
-        ],[
-            'name'       => 'Admin',
-            'password'   => \Hash::make('123456'),
-            'confirmed'  => 1,
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+		/**
+		 * Create Default user.
+		 */
+		AclUser::updateOrInsert([
+			'email' => 'admin@user.com',
+		],[
+			'name'       => 'Admin',
+			'password'   => \Hash::make('123456'),
+			'confirmed'  => 1,
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Insert the permissions related to users table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Users model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'insert',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'delete',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignRoles',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'block',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unblock',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+		/**
+		 * Insert the permissions related to users table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'insert',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignRoles',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'block',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unblock',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/Users/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin role.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['user'])->each(function ($permission) use ($adminRoleId) {
-            \DB::table('permission_role')->insert(
-                [
-                'permission_id' => $permission->id,
-                'role_id'       => $adminRoleId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin role.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['user'])->each(function ($permission) use ($adminRoleId) {
+			\DB::table('permission_role')->insert(
+				[
+				'permission_id' => $permission->id,
+				'role_id'       => $adminRoleId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

src/Modules/Users/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['user']);
-        \DB::table('permission_role')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['user']);
+		\DB::table('permission_role')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/Users/AclUser.php

Indentation +127 added lines, -127 removed lines

@@ -10,133 +10,133 @@
 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'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = \Hash::make($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany(OauthClient::class, 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = \Hash::make($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany(Notification::class, 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany(Role::class, 'role_user', 'user_id', 'role_id')->whereNull('role_user.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany(OauthClient::class, 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::oauthClients()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/Users/Reppsitories/UserRepository.php

Indentation +45 added lines, -45 removed lines

@@ -6,52 +6,52 @@
 
 class UserRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   AclUser $model
-     * @return  void
-     */
-    public function __construct(AclUser $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   AclUser $model
+	 * @return  void
+	 */
+	public function __construct(AclUser $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Detach all roles from the given role.
-     *
-     * @param  mixed $role
-     * @return object
-     */
-    public function detachRoles($role)
-    {
-        $role = ! is_int($role) ? $role : $this->find($role);
-        $role->roles()->detach();
-    }
+	/**
+	 * Detach all roles from the given role.
+	 *
+	 * @param  mixed $role
+	 * @return object
+	 */
+	public function detachRoles($role)
+	{
+		$role = ! is_int($role) ? $role : $this->find($role);
+		$role->roles()->detach();
+	}
 
-    /**
-     * Attach role ids to the given role.
-     *
-     * @param  mixed $role
-     * @param  array $roleIds
-     * @return object
-     */
-    public function attachRoles($role, $roleIds)
-    {
-        $role = ! is_int($role) ? $role : $this->find($role);
-        $role->roles()->attach($roleIds);
-    }
+	/**
+	 * Attach role ids to the given role.
+	 *
+	 * @param  mixed $role
+	 * @param  array $roleIds
+	 * @return object
+	 */
+	public function attachRoles($role, $roleIds)
+	{
+		$role = ! is_int($role) ? $role : $this->find($role);
+		$role->roles()->attach($roleIds);
+	}
 
-    /**
-     * Count the given user the given roles.
-     *
-     * @param  mixed    $user
-     * @param  string[] $roles
-     * @return boolean
-     */
-    public function countRoles($user, $roles)
-    {
-        $user = ! is_int($user) ? $user : $this->find($user);
-        return $user->roles()->whereIn('name', $roles)->count();
-    }
+	/**
+	 * Count the given user the given roles.
+	 *
+	 * @param  mixed    $user
+	 * @param  string[] $roles
+	 * @return boolean
+	 */
+	public function countRoles($user, $roles)
+	{
+		$user = ! is_int($user) ? $user : $this->find($user);
+		return $user->roles()->whereIn('name', $roles)->count();
+	}
 }

src/Modules/Users/Http/Controllers/UserController.php

Indentation +221 added lines, -221 removed lines

@@ -24,225 +24,225 @@
 
 class UserController extends BaseApiController
 {
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * Init new object.
-     *
-     * @param   UserService $service
-     * @return  void
-     */
-    public function __construct(UserService $service)
-    {
-        parent::__construct($service);
-    }
-
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertUser $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
-
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateUser $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateUser $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function account(Request $request)
-    {
-        return new $this->modelResource($this->service->account($request->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->service->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->service->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->service->logout());
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param Register $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Register $request)
-    {
-        return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param Login $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Login $request)
-    {
-        $result = $this->service->login($request->get('email'), $request->get('password'), $request->get('admin'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param LoginSocial $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(LoginSocial $request)
-    {
-        $result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given roles to the given user.
-     *
-     * @param AssignRoles $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assignRoles(AssignRoles $request)
-    {
-        return new $this->modelResource($this->service->assignRoles($request->get('user_id'), $request->get('role_ids')));
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param SendReset $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendReset(SendReset $request)
-    {
-        return new GeneralResource($this->service->sendReset($request->get('email')));
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param ResetPassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPassword(ResetPassword $request)
-    {
-        return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param ChangePassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(ChangePassword $request)
-    {
-        return new GeneralResource($this->service->changePassword($request->get('password') , $request->get('old_password')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param ConfirmEmail $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(ConfirmEmail $request)
-    {
-        return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param ResendEmailConfirmation $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
-    {
-        return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param RefreshToken $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshToken(RefreshToken $request)
-    {
-        return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param SaveProfile $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(SaveProfile $request)
-    {
-        return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
-    }
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserService $service
+	 * @return  void
+	 */
+	public function __construct(UserService $service)
+	{
+		parent::__construct($service);
+	}
+
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertUser $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
+
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateUser $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateUser $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account(Request $request)
+	{
+		return new $this->modelResource($this->service->account($request->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->service->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->service->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->service->logout());
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param Register $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Register $request)
+	{
+		return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param Login $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Login $request)
+	{
+		$result = $this->service->login($request->get('email'), $request->get('password'), $request->get('admin'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param LoginSocial $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(LoginSocial $request)
+	{
+		$result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given roles to the given user.
+	 *
+	 * @param AssignRoles $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignRoles(AssignRoles $request)
+	{
+		return new $this->modelResource($this->service->assignRoles($request->get('user_id'), $request->get('role_ids')));
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param SendReset $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendReset(SendReset $request)
+	{
+		return new GeneralResource($this->service->sendReset($request->get('email')));
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param ResetPassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetPassword(ResetPassword $request)
+	{
+		return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param ChangePassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(ChangePassword $request)
+	{
+		return new GeneralResource($this->service->changePassword($request->get('password') , $request->get('old_password')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param ConfirmEmail $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(ConfirmEmail $request)
+	{
+		return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param ResendEmailConfirmation $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
+	{
+		return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param RefreshToken $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshToken(RefreshToken $request)
+	{
+		return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param SaveProfile $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(SaveProfile $request)
+	{
+		return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
+	}
 }

src/Modules/Users/Proxy/LoginProxy.php

Indentation +53 added lines, -53 removed lines

@@ -5,64 +5,64 @@
 
 class LoginProxy
 {
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return array
-     */
-    public function login($email, $password)
-    {
-        return $this->proxy('password', [
-            'username' => $email,
-            'password' => $password
-        ]);
-    }
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return array
+	 */
+	public function login($email, $password)
+	{
+		return $this->proxy('password', [
+			'username' => $email,
+			'password' => $password
+		]);
+	}
 
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
+	/**
+	 * Attempt to refresh the access token using 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
-        ]);
+	/**
+	 * 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 = \ApiConsumer::post('/oauth/token', $data);
+		$response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
-            if ($grantType == 'refresh_token') {
-                \ErrorHandler::invalidRefreshToken();
-            }
+		if (! $response->isSuccessful()) {
+			if ($grantType == 'refresh_token') {
+				\ErrorHandler::invalidRefreshToken();
+			}
 
-            \ErrorHandler::loginFailed();
-        }
+			\ErrorHandler::loginFailed();
+		}
 
-        $data = json_decode($response->getContent());
+		$data = json_decode($response->getContent());
 
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
 }