SherifElfadaly / Laravel-Api-Skeleton

files/Handler.php

Indentation +61 added lines, -61 removed lines

@@ -7,69 +7,69 @@
 

 class Handler extends ExceptionHandler

 {

-    /**

-     * A list of the exception types that are not reported.

-     *

-     * @var array

-     */

-    protected $dontReport = [

-        \League\OAuth2\Server\Exception\OAuthServerException::class,

-    ];

+	/**

+	 * A list of the exception types that are not reported.

+	 *

+	 * @var array

+	 */

+	protected $dontReport = [

+		\League\OAuth2\Server\Exception\OAuthServerException::class,

+	];

 

-    /**

-     * A list of the inputs that are never flashed for validation exceptions.

-     *

-     * @var array

-     */

-    protected $dontFlash = [

-        'password',

-        'password_confirmation',

-    ];

+	/**

+	 * A list of the inputs that are never flashed for validation exceptions.

+	 *

+	 * @var array

+	 */

+	protected $dontFlash = [

+		'password',

+		'password_confirmation',

+	];

 

-    /**

-     * Report or log an exception.

-     *

-     * @param  \Throwable  $exception

-     * @return void

-     *

-     * @throws \Exception

-     */

-    public function report(Throwable $exception)

-    {

-        parent::report($exception);

-    }

+	/**

+	 * Report or log an exception.

+	 *

+	 * @param  \Throwable  $exception

+	 * @return void

+	 *

+	 * @throws \Exception

+	 */

+	public function report(Throwable $exception)

+	{

+		parent::report($exception);

+	}

 

-    /**

-     * Render an exception into an HTTP response.

-     *

-     * @param  \Illuminate\Http\Request  $request

-     * @param  \Throwable  $exception

-     * @return \Symfony\Component\HttpFoundation\Response

-     *

-     * @throws \Throwable

-     */

-    public function render($request, Throwable $exception)

-    {

-        if ($request->wantsJson()) {

-            if ($exception instanceof \Illuminate\Auth\AuthenticationException) {

-                \Errors::unAuthorized();

-            }

-            if ($exception instanceof \Illuminate\Database\QueryException) {

-                \Errors::dbQueryError();

-            } elseif ($exception instanceof \predis\connection\connectionexception) {

-                \Errors::redisNotRunning();

-            } elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {

-                \Errors::connectionError();

-            } elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {

-                $errors = $exception-> getStatusCode() === 404 ? 'not found' : $exception-> getMessage();

-                return \Response::json(['errors' => [$errors]], $exception-> getStatusCode());

-            } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

-                return \Response::json(['errors' => $exception-> errors()], 422);

-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

-                return parent::render($request, $exception);

-            }

-        }

+	/**

+	 * Render an exception into an HTTP response.

+	 *

+	 * @param  \Illuminate\Http\Request  $request

+	 * @param  \Throwable  $exception

+	 * @return \Symfony\Component\HttpFoundation\Response

+	 *

+	 * @throws \Throwable

+	 */

+	public function render($request, Throwable $exception)

+	{

+		if ($request->wantsJson()) {

+			if ($exception instanceof \Illuminate\Auth\AuthenticationException) {

+				\Errors::unAuthorized();

+			}

+			if ($exception instanceof \Illuminate\Database\QueryException) {

+				\Errors::dbQueryError();

+			} elseif ($exception instanceof \predis\connection\connectionexception) {

+				\Errors::redisNotRunning();

+			} elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {

+				\Errors::connectionError();

+			} elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {

+				$errors = $exception-> getStatusCode() === 404 ? 'not found' : $exception-> getMessage();

+				return \Response::json(['errors' => [$errors]], $exception-> getStatusCode());

+			} elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

+				return \Response::json(['errors' => $exception-> errors()], 422);

+			} elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

+				return parent::render($request, $exception);

+			}

+		}

         

-        return parent::render($request, $exception);

-    }

+		return parent::render($request, $exception);

+	}

 }

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
                 return \Response::json(['errors' => [$errors]], $exception-> getStatusCode());

             } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

                 return \Response::json(['errors' => $exception-> errors()], 422);

-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

+            } elseif ( ! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

                 return parent::render($request, $exception);

             }

         }

files/AuthServiceProvider.php

Indentation +25 added lines, -25 removed lines

@@ -7,31 +7,31 @@
 

 class AuthServiceProvider extends ServiceProvider

 {

-    /**

-     * The policy mappings for the application.

-     *

-     * @var array

-     */

-    protected $policies = [

-        'App\Model' => 'App\Policies\ModelPolicy',

-    ];

+	/**

+	 * The policy mappings for the application.

+	 *

+	 * @var array

+	 */

+	protected $policies = [

+		'App\Model' => 'App\Policies\ModelPolicy',

+	];

 

-    /**

-     * Register any authentication / authorization services.

-     *

-     * @return void

-     */

-    public function boot()

-    {

-        $this->registerPolicies();

+	/**

+	 * Register any authentication / authorization services.

+	 *

+	 * @return void

+	 */

+	public function boot()

+	{

+		$this->registerPolicies();

 

-        Passport::routes(function ($router) {

-            $router->forAuthorization();

-            $router->forAccessTokens();

-            $router->forPersonalAccessTokens();

-            $router->forTransientTokens();

-        });

-        Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60));

-        Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400));

-    }

+		Passport::routes(function ($router) {

+			$router->forAuthorization();

+			$router->forAccessTokens();

+			$router->forPersonalAccessTokens();

+			$router->forTransientTokens();

+		});

+		Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(60));

+		Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addMinutes(14400));

+	}

 }

src/Modules/Reporting/Report.php

Indentation +11 added lines, -11 removed lines

@@ -9,16 +9,16 @@
 class Report extends Model
 {
 
-    use SoftDeletes;
-    protected $table = 'reports';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id'];
-    public $fillable = ['report_name', 'view_name'];
+	use SoftDeletes;
+	protected $table = 'reports';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id'];
+	public $fillable = ['report_name', 'view_name'];
     
-    public static function boot()
-    {
-        parent::boot();
-        Report::observe(ReportObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Report::observe(ReportObserver::class);
+	}
 }

src/Modules/Reporting/Database/Migrations/2016_01_19_112350_reports.php

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 
 class Reports extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('reports', function (Blueprint $table) {
-            increments('id');
-            $table->string('report_name', 100);
-            $table->string('view_name', 100);
-            $table->softDeletes();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('reports', function (Blueprint $table) {
+			increments('id');
+			$table->string('report_name', 100);
+			$table->string('view_name', 100);
+			$table->softDeletes();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('reports');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('reports');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('reports', function (Blueprint $table) {
+        Schema::create('reports', function(Blueprint $table) {
             increments('id');
             $table->string('report_name', 100);
             $table->string('view_name', 100);

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'];
-
-    /**
-     * 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'];
+
+	/**
+	 * 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/Users/Database/Migrations/2015_12_20_124153_users.php

Indentation +32 added lines, -32 removed lines

@@ -5,37 +5,37 @@
 
 class Users extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $table) {
-            increments('id');
-            $table->string('profile_picture', 150)->nullable();
-            $table->string('name', 100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60)->nullable();
-            $table->boolean('blocked')->default(0);
-            $table->boolean('confirmed')->default(0);
-            $table->string('confirmation_code')->nullable();
-            $table->string('locale', 2)->default('en');
-            $table->string('timezone', 50)->default('Africa/Cairo');
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('users', function (Blueprint $table) {
+			increments('id');
+			$table->string('profile_picture', 150)->nullable();
+			$table->string('name', 100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60)->nullable();
+			$table->boolean('blocked')->default(0);
+			$table->boolean('confirmed')->default(0);
+			$table->string('confirmation_code')->nullable();
+			$table->string('locale', 2)->default('en');
+			$table->string('timezone', 50)->default('Africa/Cairo');
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('users');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('users', function (Blueprint $table) {
+        Schema::create('users', function(Blueprint $table) {
             increments('id');
             $table->string('profile_picture', 150)->nullable();
             $table->string('name', 100)->nullable();

src/Modules/Users/Services/UserService.php

Indentation +361 added lines, -361 removed lines

@@ -12,368 +12,368 @@
 
 class UserService extends BaseService
 {
-    /**
-     * @var PermissionService
-     */
-    protected $permissionService;
-
-    /**
-     * @var LoginProxy
-     */
-    protected $loginProxy;
-
-    /**
-     * @var NotificationService
-     */
-    protected $notificationService;
-
-    /**
-     * @var OauthClientService
-     */
-    protected $oauthClientService;
-
-    /**
-     * Init new object.
-     *
-     * @param   UserRepository       $repo
-     * @param   PermissionService    $permissionService
-     * @param   LoginProxy           $loginProxy
-     * @param   NotificationService  $notificationService
-     * @param   OauthClientService   $oauthClientService
-     * @return  void
-     */
-    public function __construct(
-        UserRepository $repo,
-        PermissionService $permissionService,
-        LoginProxy $loginProxy,
-        NotificationService $notificationService,
-        OauthClientService $oauthClientService
-    ) {
-        $this->permissionService   = $permissionService;
-        $this->loginProxy          = $loginProxy;
-        $this->notificationService = $notificationService;
-        $this->oauthClientService  = $oauthClientService;
-        parent::__construct($repo);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = ['roles.permissions'])
-    {
-        $permissions = [];
-        $user        = $this->repo->find(\Auth::id(), $relations);
-        foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
-                $permissions[$permission->repo][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-        return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user
-     * has the given permissions on the given model.
-     *
-     * @param  string $permissionName
-     * @param  string $model
-     * @param  mixed  $userId
-     * @return boolean
-     */
-    public function can($permissionName, $model, $userId = false)
-    {
-        $permission = $this->permissionService->first([
-            'and' => [
-                'model' => $model,
-                'name'  => $permissionName,
-                'roles' => [
-                    'op' => 'has',
-                    'val' => [
-                        'users' => [
-                            'op' => 'has',
-                            'val' => [
-                                'users.id' => $userId ?: \Auth::id()
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]);
-
-        return $permission ? true : false;
-    }
-
-    /**
-     * Check if the logged in or the given user has the given role.
-     *
-     * @param  string[] $roles
-     * @param  mixed    $user
-     * @return boolean
-     */
-    public function hasRoles($roles, $user = false)
-    {
-        return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
-    }
-
-    /**
-     * Assign the given role ids to the given user.
-     *
-     * @param  integer $userId
-     * @param  array   $roleIds
-     * @return object
-     */
-    public function assignRoles($userId, $roleIds)
-    {
-        $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
-            $user = $this->repo->find($userId);
-            $this->repo->detachPermissions($userId);
-            $this->repo->attachPermissions($userId, $roleIds);
-        });
-
-        return $user;
-    }
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return object
-     */
-    public function login($email, $password)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::loginFailed();
-        } elseif ($user->blocked) {
-            \Errors::userIsBlocked();
-        } elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
-            \Errors::emailNotConfirmed();
-        }
-
-        return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
-    }
-
-    /**
-     * Handle the social login request to the application.
-     *
-     * @param  string $authCode
-     * @param  string $accessToken
-     * @return array
-     */
-    public function loginSocial($authCode, $accessToken, $type)
-    {
-        $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user         = \Socialite::driver($type)->userFromToken($access_token);
-
-        if (! $user->email) {
-            \Errors::noSocialEmail();
-        }
-
-        if (! $this->repo->first(['email' => $user->email])) {
-            $this->register($user->email, '', true);
-        }
-
-        return $this->loginProxy->login($user->email, config('user.social_pass'));
-    }
+	/**
+	 * @var PermissionService
+	 */
+	protected $permissionService;
+
+	/**
+	 * @var LoginProxy
+	 */
+	protected $loginProxy;
+
+	/**
+	 * @var NotificationService
+	 */
+	protected $notificationService;
+
+	/**
+	 * @var OauthClientService
+	 */
+	protected $oauthClientService;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserRepository       $repo
+	 * @param   PermissionService    $permissionService
+	 * @param   LoginProxy           $loginProxy
+	 * @param   NotificationService  $notificationService
+	 * @param   OauthClientService   $oauthClientService
+	 * @return  void
+	 */
+	public function __construct(
+		UserRepository $repo,
+		PermissionService $permissionService,
+		LoginProxy $loginProxy,
+		NotificationService $notificationService,
+		OauthClientService $oauthClientService
+	) {
+		$this->permissionService   = $permissionService;
+		$this->loginProxy          = $loginProxy;
+		$this->notificationService = $notificationService;
+		$this->oauthClientService  = $oauthClientService;
+		parent::__construct($repo);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = ['roles.permissions'])
+	{
+		$permissions = [];
+		$user        = $this->repo->find(\Auth::id(), $relations);
+		foreach ($user->roles as $role) {
+			$role->permissions->each(function ($permission) use (&$permissions) {
+				$permissions[$permission->repo][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+		return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user
+	 * has the given permissions on the given model.
+	 *
+	 * @param  string $permissionName
+	 * @param  string $model
+	 * @param  mixed  $userId
+	 * @return boolean
+	 */
+	public function can($permissionName, $model, $userId = false)
+	{
+		$permission = $this->permissionService->first([
+			'and' => [
+				'model' => $model,
+				'name'  => $permissionName,
+				'roles' => [
+					'op' => 'has',
+					'val' => [
+						'users' => [
+							'op' => 'has',
+							'val' => [
+								'users.id' => $userId ?: \Auth::id()
+							]
+						]
+					]
+				]
+			]
+		]);
+
+		return $permission ? true : false;
+	}
+
+	/**
+	 * Check if the logged in or the given user has the given role.
+	 *
+	 * @param  string[] $roles
+	 * @param  mixed    $user
+	 * @return boolean
+	 */
+	public function hasRoles($roles, $user = false)
+	{
+		return $this->repo->countRoles($user ?: \Auth::id(), $roles) ? true : false;
+	}
+
+	/**
+	 * Assign the given role ids to the given user.
+	 *
+	 * @param  integer $userId
+	 * @param  array   $roleIds
+	 * @return object
+	 */
+	public function assignRoles($userId, $roleIds)
+	{
+		$user = false;
+		\DB::transaction(function () use ($userId, $roleIds, &$user) {
+			$user = $this->repo->find($userId);
+			$this->repo->detachPermissions($userId);
+			$this->repo->attachPermissions($userId, $roleIds);
+		});
+
+		return $user;
+	}
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return object
+	 */
+	public function login($email, $password)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::loginFailed();
+		} elseif ($user->blocked) {
+			\Errors::userIsBlocked();
+		} elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
+			\Errors::emailNotConfirmed();
+		}
+
+		return ['user' => $user, 'tokens' => $this->loginProxy->login($user->email, $password)];
+	}
+
+	/**
+	 * Handle the social login request to the application.
+	 *
+	 * @param  string $authCode
+	 * @param  string $accessToken
+	 * @return array
+	 */
+	public function loginSocial($authCode, $accessToken, $type)
+	{
+		$access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user         = \Socialite::driver($type)->userFromToken($access_token);
+
+		if (! $user->email) {
+			\Errors::noSocialEmail();
+		}
+
+		if (! $this->repo->first(['email' => $user->email])) {
+			$this->register($user->email, '', true);
+		}
+
+		return $this->loginProxy->login($user->email, config('user.social_pass'));
+	}
     
-    /**
-     * Handle the registration request.
-     *
-     * @param  string  $name
-     * @param  string  $email
-     * @param  string  $password
-     * @param  boolean $skipConfirmEmail
-     * @return array
-     */
-    public function register($name, $email, $password, $skipConfirmEmail = false)
-    {
-        $user = $this->repo->save([
-            'name'      => $name,
-            'email'     => $email,
-            'password'  => $password,
-            'confirmed' => $skipConfirmEmail
-        ]);
-
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  string  $name
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @param  boolean $skipConfirmEmail
+	 * @return array
+	 */
+	public function register($name, $email, $password, $skipConfirmEmail = false)
+	{
+		$user = $this->repo->save([
+			'name'      => $name,
+			'email'     => $email,
+			'password'  => $password,
+			'confirmed' => $skipConfirmEmail
+		]);
+
+		if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
+			$this->sendConfirmationEmail($user->email);
+		}
+
+		return $user;
+	}
     
-    /**
-     * Block the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function block($userId)
-    {
-        if (\Auth::id() == $userId) {
-            \Errors::noPermissions();
-        }
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function block($userId)
+	{
+		if (\Auth::id() == $userId) {
+			\Errors::noPermissions();
+		}
         
-        return $this->repo->save(['id' => $userId, 'blocked' => 1]);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $userId
-     * @return object
-     */
-    public function unblock($userId)
-    {
-        return $this->repo->save(['id' => $userId, 'blocked' => 0]);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if (! $user = $this->repo->first(['email' => $email])) {
-            \Errors::notFound('email');
-        }
-
-        $token = \Password::createToken($user);
-        $this->notificationService->notify($user, 'ResetPassword', $token);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param   string  $email
-     * @param   string  $password
-     * @param   string  $passwordConfirmation
-     * @param   string  $token
-     * @return string|void
-     */
-    public function resetPassword($email, $password, $passwordConfirmation, $token)
-    {
-        $response = \Password::reset([
-            'email'                 => $email,
-            'password'              => $password,
-            'password_confirmation' => $passwordConfirmation,
-            'token'                 => $token
-        ], function ($user, $password) {
-            $this->repo->save(['id' => $user->id, 'password' => $password]);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return 'success';
-                break;
-
-            case \Password::INVALID_TOKEN:
-                \Errors::invalidResetToken();
-                break;
-
-            case \Password::INVALID_PASSWORD:
-                \Errors::invalidResetPassword();
-                break;
-
-            case \Password::INVALID_USER:
-                \Errors::notFound('user');
-                break;
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  string  $password
-     * @param  string  $oldPassword
-     * @return void
-     */
-    public function changePassword($password, $oldPassword)
-    {
-        $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
-            \Errors::invalidOldPassword();
-        }
-
-        $this->repo->save(['id' => $user->id, 'password' => $password]);
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param  string $confirmationCode
-     * @return void
-     */
-    public function confirmEmail($confirmationCode)
-    {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
-            \Errors::invalidConfirmationCode();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
-    }
-
-    /**
-     * Send the confirmation mail.
-     *
-     * @param  string $email
-     * @return void
-     */
-    public function sendConfirmationEmail($email)
-    {
-        $user = $this->repo->first(['email' => $email]);
-        if ($user->confirmed) {
-            \Errors::emailAlreadyConfirmed();
-        }
-
-        $this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
-        $this->notificationService->notify($user, 'ConfirmEmail');
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  string $name
-     * @param  string $email
-     * @param  string $profilePicture
-     * @return void
-     */
-    public function saveProfile($name, $email, $profilePicture = false)
-    {
-        $data['id'] = \Auth::id();
-        return $this->repo->save([
-            'id'             => \Auth::id(),
-            'name'           => $name,
-            'email'          => $email,
-            'profilePicture' => $profilePicture,
-        ]);
-    }
-
-    /**
-     * Logs out the user, revoke access token and refresh token.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->oauthClientService->revokeAccessToken(\Auth::user()->token());
-    }
-
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->loginProxy->refreshToken($refreshToken);
-    }
+		return $this->repo->save(['id' => $userId, 'blocked' => 1]);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $userId
+	 * @return object
+	 */
+	public function unblock($userId)
+	{
+		return $this->repo->save(['id' => $userId, 'blocked' => 0]);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if (! $user = $this->repo->first(['email' => $email])) {
+			\Errors::notFound('email');
+		}
+
+		$token = \Password::createToken($user);
+		$this->notificationService->notify($user, 'ResetPassword', $token);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param   string  $email
+	 * @param   string  $password
+	 * @param   string  $passwordConfirmation
+	 * @param   string  $token
+	 * @return string|void
+	 */
+	public function resetPassword($email, $password, $passwordConfirmation, $token)
+	{
+		$response = \Password::reset([
+			'email'                 => $email,
+			'password'              => $password,
+			'password_confirmation' => $passwordConfirmation,
+			'token'                 => $token
+		], function ($user, $password) {
+			$this->repo->save(['id' => $user->id, 'password' => $password]);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return 'success';
+				break;
+
+			case \Password::INVALID_TOKEN:
+				\Errors::invalidResetToken();
+				break;
+
+			case \Password::INVALID_PASSWORD:
+				\Errors::invalidResetPassword();
+				break;
+
+			case \Password::INVALID_USER:
+				\Errors::notFound('user');
+				break;
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  string  $password
+	 * @param  string  $oldPassword
+	 * @return void
+	 */
+	public function changePassword($password, $oldPassword)
+	{
+		$user = \Auth::user();
+		if (! \Hash::check($oldPassword, $user->password)) {
+			\Errors::invalidOldPassword();
+		}
+
+		$this->repo->save(['id' => $user->id, 'password' => $password]);
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param  string $confirmationCode
+	 * @return void
+	 */
+	public function confirmEmail($confirmationCode)
+	{
+		if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+			\Errors::invalidConfirmationCode();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmed' => 1, 'confirmation_code' => null]);
+	}
+
+	/**
+	 * Send the confirmation mail.
+	 *
+	 * @param  string $email
+	 * @return void
+	 */
+	public function sendConfirmationEmail($email)
+	{
+		$user = $this->repo->first(['email' => $email]);
+		if ($user->confirmed) {
+			\Errors::emailAlreadyConfirmed();
+		}
+
+		$this->repo->save(['id' => $user->id, 'confirmation_code' => sha1(microtime())]);
+		$this->notificationService->notify($user, 'ConfirmEmail');
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  string $name
+	 * @param  string $email
+	 * @param  string $profilePicture
+	 * @return void
+	 */
+	public function saveProfile($name, $email, $profilePicture = false)
+	{
+		$data['id'] = \Auth::id();
+		return $this->repo->save([
+			'id'             => \Auth::id(),
+			'name'           => $name,
+			'email'          => $email,
+			'profilePicture' => $profilePicture,
+		]);
+	}
+
+	/**
+	 * Logs out the user, revoke access token and refresh token.
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->oauthClientService->revokeAccessToken(\Auth::user()->token());
+	}
+
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->loginProxy->refreshToken($refreshToken);
+	}
 }

src/Modules/Users/Routes/api.php

Indentation +23 added lines, -23 removed lines

@@ -15,29 +15,29 @@
 
 Route::group(['prefix' => 'users'], function () {
     
-    Route::get('/', 'UserController@index');
-    Route::get('{id}', 'UserController@show');
-    Route::post('/', 'UserController@store');
-    Route::patch('{id}', 'UserController@update');
-    Route::delete('{id}', 'UserController@destroy');
-    Route::patch('restore/{id}', 'UserController@restore');
-    Route::patch('block/{id}', 'UserController@block');
-    Route::patch('unblock/{id}', 'UserController@unblock');
-    Route::patch('assign/roles/{id}', 'UserController@assignRoles');
+	Route::get('/', 'UserController@index');
+	Route::get('{id}', 'UserController@show');
+	Route::post('/', 'UserController@store');
+	Route::patch('{id}', 'UserController@update');
+	Route::delete('{id}', 'UserController@destroy');
+	Route::patch('restore/{id}', 'UserController@restore');
+	Route::patch('block/{id}', 'UserController@block');
+	Route::patch('unblock/{id}', 'UserController@unblock');
+	Route::patch('assign/roles/{id}', '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');
+	});
 });

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 |
 */
 
-Route::group(['prefix' => 'users'], function () {
+Route::group(['prefix' => 'users'], function() {
     
     Route::get('/', 'UserController@index');
     Route::get('{id}', 'UserController@show');
@@ -25,7 +25,7 @@ 
     Route::patch('unblock/{id}', 'UserController@unblock');
     Route::patch('assign/roles/{id}', 'UserController@assignRoles');
 
-    Route::group(['prefix' => 'account'], function () {
+    Route::group(['prefix' => 'account'], function() {
 
         Route::get('my', 'UserController@account');
         Route::get('logout', 'UserController@logout');

src/Modules/Users/Repositories/UserRepository.php

Indentation +45 added lines, -45 removed lines

@@ -8,52 +8,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 user.
-     *
-     * @param  mixed $user
-     * @return object
-     */
-    public function detachRoles($user)
-    {
-        $user = ! is_int($user) ? $user : $this->find($user);
-        $user->roles()->detach();
-    }
+	/**
+	 * Detach all roles from the given user.
+	 *
+	 * @param  mixed $user
+	 * @return object
+	 */
+	public function detachRoles($user)
+	{
+		$user = ! is_int($user) ? $user : $this->find($user);
+		$user->roles()->detach();
+	}
 
-    /**
-     * Attach role ids to the given user.
-     *
-     * @param  mixed $user
-     * @param  array $roleIds
-     * @return object
-     */
-    public function attachRoles($user, $roleIds)
-    {
-        $user = ! is_int($user) ? $user : $this->find($user);
-        $user->roles()->attach($roleIds);
-    }
+	/**
+	 * Attach role ids to the given user.
+	 *
+	 * @param  mixed $user
+	 * @param  array $roleIds
+	 * @return object
+	 */
+	public function attachRoles($user, $roleIds)
+	{
+		$user = ! is_int($user) ? $user : $this->find($user);
+		$user->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();
+	}
 }