SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Roles/Config/role.php

Indentation +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Disable Confirm Email
     |--------------------------------------------------------------------------
@@ -11,9 +11,9 @@ 
     |
     */
 
-    'admin_email' => 'admin@user.com',
+	'admin_email' => 'admin@user.com',
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Confirm Email URL
     |--------------------------------------------------------------------------
@@ -22,5 +22,5 @@ 
     |
     */
    
-    'admin_password' => '123456',
+	'admin_password' => '123456',
 ];

src/Modules/Roles/Providers/ModuleServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -6,29 +6,29 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'roles');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'roles');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'roles');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'roles');
 
-        $this->loadMigrationsFrom(module_path('roles', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('roles', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('roles', 'Database/Migrations', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('roles', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'roles');
 
         $this->loadMigrationsFrom(module_path('roles', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('roles', 'Config', 'app'));
         }
     }

src/Modules/Roles/Database/Seeds/RolesTableSeeder.php

Indentation +91 added lines, -91 removed lines

@@ -9,98 +9,98 @@
 
 class RolesTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {      
-        /**
-         * Create Default roles.
-         */
-        Role::updateOrInsert([
-            'name' => RoleEnum::ADMIN,
-        ]);
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{      
+		/**
+		 * Create Default roles.
+		 */
+		Role::updateOrInsert([
+			'name' => RoleEnum::ADMIN,
+		]);
   
-        /**
-         * Create Default user.
-         */
-        AclUser::firstOrCreate([
-            'email' => config('role.admin_email'),
-        ],[
-            'name'       => 'Admin',
-            'password'   => config('role.admin_password'),
-            'confirmed'  => 1
-        ]);
+		/**
+		 * Create Default user.
+		 */
+		AclUser::firstOrCreate([
+			'email' => config('role.admin_email'),
+		],[
+			'name'       => 'Admin',
+			'password'   => config('role.admin_password'),
+			'confirmed'  => 1
+		]);
 
-        /**
-         * Assign default users to admin roles.
-         */
-        $adminRoleId = Role::where('name', RoleEnum::ADMIN)->select('id')->first()->id;;
-        $adminUserId = AclUser::where('email', 'admin@user.com')->select('id')->first()->id;
-        \DB::table('role_user')->updateOrInsert([
-            'user_id' => $adminUserId,
-            'role_id' => $adminRoleId,
-        ],[]);
+		/**
+		 * Assign default users to admin roles.
+		 */
+		$adminRoleId = Role::where('name', RoleEnum::ADMIN)->select('id')->first()->id;;
+		$adminUserId = AclUser::where('email', 'admin@user.com')->select('id')->first()->id;
+		\DB::table('role_user')->updateOrInsert([
+			'user_id' => $adminUserId,
+			'role_id' => $adminRoleId,
+		],[]);
 
-        /**
-         * Insert the permissions related to roles table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Roles model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignPermissions',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-            ]
-        );
-    }
+		/**
+		 * Insert the permissions related to roles table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Roles model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignPermissions',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
          */
         AclUser::firstOrCreate([
             'email' => config('role.admin_email'),
-        ],[
+        ], [
             'name'       => 'Admin',
             'password'   => config('role.admin_password'),
             'confirmed'  => 1
@@ -37,12 +37,12 @@ 
         /**
          * Assign default users to admin roles.
          */
-        $adminRoleId = Role::where('name', RoleEnum::ADMIN)->select('id')->first()->id;;
+        $adminRoleId = Role::where('name', RoleEnum::ADMIN)->select('id')->first()->id; ;
         $adminUserId = AclUser::where('email', 'admin@user.com')->select('id')->first()->id;
         \DB::table('role_user')->updateOrInsert([
             'user_id' => $adminUserId,
             'role_id' => $adminRoleId,
-        ],[]);
+        ], []);
 
         /**
          * Insert the permissions related to roles table.

src/Modules/Roles/Database/Factories/RoleFactory.php

Indentation +19 added lines, -19 removed lines

@@ -7,24 +7,24 @@
 
 class RoleFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Role::class;
+	/**
+	 * The name of the factory's corresponding model.
+	 *
+	 * @var string
+	 */
+	protected $model = Role::class;
 
-    /**
-     * Define the model's default state.
-     *
-     * @return array
-     */
-    public function definition()
-    {
-        return [
-            'name'       => $this->faker->unique->word(),
-            'created_at' => $this->faker->dateTimeBetween('-1 years', 'now'),
-            'updated_at' => $this->faker->dateTimeBetween('-1 years', 'now')
-        ];
-    }
+	/**
+	 * Define the model's default state.
+	 *
+	 * @return array
+	 */
+	public function definition()
+	{
+		return [
+			'name'       => $this->faker->unique->word(),
+			'created_at' => $this->faker->dateTimeBetween('-1 years', 'now'),
+			'updated_at' => $this->faker->dateTimeBetween('-1 years', 'now')
+		];
+	}
 }

src/Modules/Users/Providers/ModuleServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -6,29 +6,29 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
 
-        $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
-            $this->loadConfigsFrom(module_path('users', 'Config', 'app'));
-        }
-    }
+		$this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
+		if (!$this->app->configurationIsCached()) {
+			$this->loadConfigsFrom(module_path('users', 'Config', 'app'));
+		}
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users');
 
         $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app'));
-        if (!$this->app->configurationIsCached()) {
+        if ( ! $this->app->configurationIsCached()) {
             $this->loadConfigsFrom(module_path('users', 'Config', 'app'));
         }
     }

src/Modules/Users/Http/Resources/AclUser.php

Indentation +30 added lines, -30 removed lines

@@ -10,35 +10,35 @@
 
 class AclUser extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        if (! $this->resource) {
-            return [];
-        }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		if (! $this->resource) {
+			return [];
+		}
 
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'email' => $this->email,
-            'profilePicture' => $this->profile_picture ? url(\Storage::url($this->profile_picture)) : null,
-            'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
-            'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
-            'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
-            'roles' => RoleResource::collection($this->whenLoaded('roles')),
-            'permissions' => $this->when($this->permissions, function () {
-                return PermissionResource::collection($this->permissions);
-            }),
-            'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
-            'locale' => $this->locale,
-            'timezone' => $this->timezone,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'email' => $this->email,
+			'profilePicture' => $this->profile_picture ? url(\Storage::url($this->profile_picture)) : null,
+			'notifications' => NotificationResource::collection($this->whenLoaded('notifications')),
+			'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
+			'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
+			'roles' => RoleResource::collection($this->whenLoaded('roles')),
+			'permissions' => $this->when($this->permissions, function () {
+				return PermissionResource::collection($this->permissions);
+			}),
+			'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),
+			'locale' => $this->locale,
+			'timezone' => $this->timezone,
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function toArray($request)
     {
-        if (! $this->resource) {
+        if ( ! $this->resource) {
             return [];
         }
 
@@ -31,7 +31,7 @@ 
             'readNotifications' => NotificationResource::collection($this->whenLoaded('readNotifications')),
             'unreadNotifications' => NotificationResource::collection($this->whenLoaded('unreadNotifications')),
             'roles' => RoleResource::collection($this->whenLoaded('roles')),
-            'permissions' => $this->when($this->permissions, function () {
+            'permissions' => $this->when($this->permissions, function() {
                 return PermissionResource::collection($this->permissions);
             }),
             'oauthClients' => OauthClientResource::collection($this->whenLoaded('oauthClients')),

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

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class LoginSocial 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 [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google,apple'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google,apple'
+		];
+	}
 }

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

Indentation +229 added lines, -229 removed lines

@@ -20,233 +20,233 @@
 
 class UserController extends BaseApiController
 {
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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 the registration request.
-     *
-     * @param Register $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Register $request)
-    {
-        return new $this->modelResource($this->service->register($request->validated()));
-    }
-
-    /**
-     * Handle the 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'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle the social login request 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
-     * @param integer     $id
-     * @return \Illuminate\Http\Response
-     */
-    public function assignRoles(AssignRoles $request, $id)
-    {
-        return new $this->modelResource($this->service->assignRoles($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')));
-    }
-
-    /**
-     * Render reset password page.
-     *
-     * @param string $resetToken
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPasswordPage($resetToken)
-    {
-        return view('users::reset_password', ['reset_token' => $resetToken]);
-    }
-
-    /**
-     * 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')));
-    }
-
-    /**
-     * Render confirm email page using the confirmation code.
-     *
-     * @param string $confirmationToken
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmailPage($confirmationToken)
-    {
-        return view('users::confirm_email', ['confirmation_token' => $confirmationToken]);
-    }
-
-    /**
-     * 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->validated()));
-    }
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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 the registration request.
+	 *
+	 * @param Register $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Register $request)
+	{
+		return new $this->modelResource($this->service->register($request->validated()));
+	}
+
+	/**
+	 * Handle the 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'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle the social login request 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
+	 * @param integer     $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignRoles(AssignRoles $request, $id)
+	{
+		return new $this->modelResource($this->service->assignRoles($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')));
+	}
+
+	/**
+	 * Render reset password page.
+	 *
+	 * @param string $resetToken
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetPasswordPage($resetToken)
+	{
+		return view('users::reset_password', ['reset_token' => $resetToken]);
+	}
+
+	/**
+	 * 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')));
+	}
+
+	/**
+	 * Render confirm email page using the confirmation code.
+	 *
+	 * @param string $confirmationToken
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmailPage($confirmationToken)
+	{
+		return view('users::confirm_email', ['confirmation_token' => $confirmationToken]);
+	}
+
+	/**
+	 * 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->validated()));
+	}
 }

src/Modules/Users/Services/UserService.php

Indentation +354 added lines, -354 removed lines

@@ -12,360 +12,360 @@
 
 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;
-            });
-        }
-        $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->detachRoles($user);
-            $this->repo->attachRoles($user, $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)
-    {
-        $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
-        $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
-
-        if (! Arr::has($user, 'email')) {
-            \Errors::noSocialEmail();
-        }
-
-        if (! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->count()) {
-            $this->register(Arr::get($user, 'name'), $user['email'], '', true);
-        }
-
-        return $this->login($user['email'], config('user.social_pass'));
-    }
-    /**
-     * Handle the registration request.
-     *
-     * @param  array   $data
-     * @param  boolean $skipConfirmEmail
-     * @param  integer $roleId
-     * @return object
-     */
-    public function register($data, $skipConfirmEmail = false, $roleId = false)
-    {
-        $data['confirmed'] = $skipConfirmEmail;
-
-        if($roleId){
-            $data ['roles'] = [['id' => $roleId]];
-        }
-
-        $user = $this->repo->save($data);
-
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
-            $this->sendConfirmationEmail($user->email);
-        }
-
-        return $user;
-    }
+	/**
+	 * @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;
+			});
+		}
+		$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->detachRoles($user);
+			$this->repo->attachRoles($user, $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)
+	{
+		$accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
+		$user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
+
+		if (! Arr::has($user, 'email')) {
+			\Errors::noSocialEmail();
+		}
+
+		if (! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->count()) {
+			$this->register(Arr::get($user, 'name'), $user['email'], '', true);
+		}
+
+		return $this->login($user['email'], config('user.social_pass'));
+	}
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param  array   $data
+	 * @param  boolean $skipConfirmEmail
+	 * @param  integer $roleId
+	 * @return object
+	 */
+	public function register($data, $skipConfirmEmail = false, $roleId = false)
+	{
+		$data['confirmed'] = $skipConfirmEmail;
+
+		if($roleId){
+			$data ['roles'] = [['id' => $roleId]];
+		}
+
+		$user = $this->repo->save($data);
+
+		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  array $data
-     * @return void
-     */
-    public function saveProfile($data)
-    {
-        $data['id'] = \Auth::id();
-        return $this->repo->save($data);
-    }
-
-    /**
-     * 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  array $data
+	 * @return void
+	 */
+	public function saveProfile($data)
+	{
+		$data['id'] = \Auth::id();
+		return $this->repo->save($data);
+	}
+
+	/**
+	 * 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);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
         $permissions = [];
         $user        = $this->repo->find(\Auth::id(), $relations);
         foreach ($user->roles as $role) {
-            $role->permissions->each(function ($permission) use (&$permissions) {
+            $role->permissions->each(function($permission) use (&$permissions) {
                 $permissions[] = $permission;
             });
         }
@@ -130,7 +130,7 @@ 
     public function assignRoles($userId, $roleIds)
     {
         $user = false;
-        \DB::transaction(function () use ($userId, $roleIds, &$user) {
+        \DB::transaction(function() use ($userId, $roleIds, &$user) {
             $user = $this->repo->find($userId);
             $this->repo->detachRoles($user);
             $this->repo->attachRoles($user, $roleIds);
@@ -148,11 +148,11 @@ 
      */
     public function login($email, $password)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::loginFailed();
         } elseif ($user->blocked) {
             \Errors::userIsBlocked();
-        } elseif (! config('user.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('user.disable_confirm_email') && ! $user->confirmed) {
             \Errors::emailNotConfirmed();
         }
 
@@ -171,11 +171,11 @@ 
         $accessToken = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user        = \Socialite::driver($type)->userFromToken($accessToken)->user;
 
-        if (! Arr::has($user, 'email')) {
+        if ( ! Arr::has($user, 'email')) {
             \Errors::noSocialEmail();
         }
 
-        if (! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->count()) {
+        if ( ! $this->repo->first(['email' => $user['email']]) && ! $this->repo->deleted(['email' => $user['email']])->count()) {
             $this->register(Arr::get($user, 'name'), $user['email'], '', true);
         }
 
@@ -193,13 +193,13 @@ 
     {
         $data['confirmed'] = $skipConfirmEmail;
 
-        if($roleId){
+        if ($roleId) {
             $data ['roles'] = [['id' => $roleId]];
         }
 
         $user = $this->repo->save($data);
 
-        if (! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
+        if ( ! $skipConfirmEmail && ! config('user.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -240,7 +240,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->repo->first(['email' => $email])) {
+        if ( ! $user = $this->repo->first(['email' => $email])) {
             \Errors::notFound('email');
         }
 
@@ -264,7 +264,7 @@ 
             'password'              => $password,
             'password_confirmation' => $passwordConfirmation,
             'token'                 => $token
-        ], function ($user, $password) {
+        ], function($user, $password) {
             $this->repo->save(['id' => $user->id, 'password' => $password]);
         });
 
@@ -297,7 +297,7 @@ 
     public function changePassword($password, $oldPassword)
     {
         $user = \Auth::user();
-        if (! \Hash::check($oldPassword, $user->password)) {
+        if ( ! \Hash::check($oldPassword, $user->password)) {
             \Errors::invalidOldPassword();
         }
 
@@ -312,7 +312,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->repo->first(['confirmation_code' => $confirmationCode])) {
             \Errors::invalidConfirmationCode();
         }