SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Notifications/Database/Migrations/2017_11_22_162811_create_failed_jobs_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,30 +6,30 @@
 
 class CreateFailedJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('failed_jobs', function (Blueprint $table) {
-            $table->increments('id');
-            $table->text('connection');
-            $table->text('queue');
-            $table->longText('payload');
-            $table->longText('exception');
-            $table->timestamp('failed_at')->useCurrent();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('failed_jobs', function (Blueprint $table) {
+			$table->increments('id');
+			$table->text('connection');
+			$table->text('queue');
+			$table->longText('payload');
+			$table->longText('exception');
+			$table->timestamp('failed_at')->useCurrent();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('failed_jobs');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('failed_jobs');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('failed_jobs', function (Blueprint $table) {
+        Schema::create('failed_jobs', function(Blueprint $table) {
             $table->increments('id');
             $table->text('connection');
             $table->text('queue');

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

Indentation +78 added lines, -78 removed lines

@@ -8,82 +8,82 @@
 
 class UsersTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to users table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Users model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignRoles',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'block',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unblock',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to users table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignRoles',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'block',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unblock',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/Users/Config/user.php

Indentation +13 added lines, -13 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Disable Confirm Email
     |--------------------------------------------------------------------------
@@ -11,9 +11,9 @@ 
     |
     */
 
-    'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', true),
+	'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', true),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Confirm Email URL
     |--------------------------------------------------------------------------
@@ -22,9 +22,9 @@ 
     |
     */
    
-    'confrim_email_url' => env('CONFIRM_EMAIL_URL'),
+	'confrim_email_url' => env('CONFIRM_EMAIL_URL'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Reset Password URL
     |--------------------------------------------------------------------------
@@ -33,9 +33,9 @@ 
     |
     */
    
-    'reset_password_url' => env('RESET_PASSWORD_URL'),
+	'reset_password_url' => env('RESET_PASSWORD_URL'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Passport Client Id
     |--------------------------------------------------------------------------
@@ -44,9 +44,9 @@ 
     |
     */
    
-    'passport_client_id' => env('PASSWORD_CLIENT_ID'),
+	'passport_client_id' => env('PASSWORD_CLIENT_ID'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Passport Client Secret
     |--------------------------------------------------------------------------
@@ -55,9 +55,9 @@ 
     |
     */
    
-    'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),
+	'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Token Expire In
     |--------------------------------------------------------------------------
@@ -66,7 +66,7 @@ 
     |
     */
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Social Pass
     |--------------------------------------------------------------------------
@@ -75,5 +75,5 @@ 
     |
     */
 
-    'social_pass' => env('SOCIAL_PASS', false),
+	'social_pass' => env('SOCIAL_PASS', false),
 ];

src/Modules/Roles/ModelObservers/RoleObserver.php

Indentation +56 added lines, -56 removed lines

@@ -7,69 +7,69 @@
  */
 class RoleObserver
 {
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the admin role.
-     *
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal('name') == RoleEnum::ADMIN) {
-            \Errors::noPermissions();
-        }
-    }
+	/**
+	 * Prevent updating of the admin role.
+	 *
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal('name') == RoleEnum::ADMIN) {
+			\Errors::noPermissions();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent deleting the admin role.
-     *
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        if ($model->getOriginal('name') == RoleEnum::ADMIN) {
-            \Errors::noPermissions();
-        }
-    }
+	/**
+	 * Prevent deleting the admin role.
+	 *
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		if ($model->getOriginal('name') == RoleEnum::ADMIN) {
+			\Errors::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

src/Modules/Roles/Enums/RoleEnum.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 class RoleEnum
 {
-    const ADMIN = 'Admin';
+	const ADMIN = 'Admin';
 }

files/HttpKernel.php

Indentation +74 added lines, -74 removed lines

@@ -6,82 +6,82 @@
 

 class Kernel extends HttpKernel

 {

-    /**

-     * The application's global HTTP middleware stack.

-     *

-     * These middleware are run during every request to your application.

-     *

-     * @var array

-     */

-    protected $middleware = [

-        \Fruitcake\Cors\HandleCors::class,

-        \App\Http\Middleware\TrustProxies::class,

-        \App\Http\Middleware\CheckForMaintenanceMode::class,

-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

-        \App\Http\Middleware\TrimStrings::class,

-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

-    ];

+	/**

+	 * The application's global HTTP middleware stack.

+	 *

+	 * These middleware are run during every request to your application.

+	 *

+	 * @var array

+	 */

+	protected $middleware = [

+		\Fruitcake\Cors\HandleCors::class,

+		\App\Http\Middleware\TrustProxies::class,

+		\App\Http\Middleware\CheckForMaintenanceMode::class,

+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

+		\App\Http\Middleware\TrimStrings::class,

+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

+	];

 

-    /**

-     * The application's route middleware groups.

-     *

-     * @var array

-     */

-    protected $middlewareGroups = [

-        'web' => [

-            \App\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

-            \Illuminate\Session\Middleware\StartSession::class,

-            // \Illuminate\Session\Middleware\AuthenticateSession::class,

-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \App\Http\Middleware\VerifyCsrfToken::class,

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        ],

+	/**

+	 * The application's route middleware groups.

+	 *

+	 * @var array

+	 */

+	protected $middlewareGroups = [

+		'web' => [

+			\App\Http\Middleware\EncryptCookies::class,

+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

+			\Illuminate\Session\Middleware\StartSession::class,

+			// \Illuminate\Session\Middleware\AuthenticateSession::class,

+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+			\App\Http\Middleware\VerifyCsrfToken::class,

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		],

 

-        'api' => [

-            'throttle:60,1',

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            \App\Modules\Core\Http\Middleware\SetSessions::class,

-            \App\Modules\Core\Http\Middleware\CheckPermissions::class,

-            \App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

-            \App\Modules\Core\Http\Middleware\SetRelations::class,

-        ],

-    ];

+		'api' => [

+			'throttle:60,1',

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			\App\Modules\Core\Http\Middleware\SetSessions::class,

+			\App\Modules\Core\Http\Middleware\CheckPermissions::class,

+			\App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

+			\App\Modules\Core\Http\Middleware\SetRelations::class,

+		],

+	];

 

-    /**

-     * The application's route middleware.

-     *

-     * These middleware may be assigned to groups or used individually.

-     *

-     * @var array

-     */

-    protected $routeMiddleware = [

-        'auth' => \App\Http\Middleware\Authenticate::class,

-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

-        'can' => \Illuminate\Auth\Middleware\Authorize::class,

-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

-    ];

+	/**

+	 * The application's route middleware.

+	 *

+	 * These middleware may be assigned to groups or used individually.

+	 *

+	 * @var array

+	 */

+	protected $routeMiddleware = [

+		'auth' => \App\Http\Middleware\Authenticate::class,

+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

+		'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

+		'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

+		'can' => \Illuminate\Auth\Middleware\Authorize::class,

+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

+		'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

+		'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

+		'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

+	];

 

-    /**

-     * The priority-sorted list of middleware.

-     *

-     * This forces non-global middleware to always be in the given order.

-     *

-     * @var array

-     */

-    protected $middlewarePriority = [

-        \Illuminate\Session\Middleware\StartSession::class,

-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-        \App\Http\Middleware\Authenticate::class,

-        \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        \Illuminate\Session\Middleware\AuthenticateSession::class,

-        \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        \Illuminate\Auth\Middleware\Authorize::class,

-    ];

+	/**

+	 * The priority-sorted list of middleware.

+	 *

+	 * This forces non-global middleware to always be in the given order.

+	 *

+	 * @var array

+	 */

+	protected $middlewarePriority = [

+		\Illuminate\Session\Middleware\StartSession::class,

+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+		\App\Http\Middleware\Authenticate::class,

+		\Illuminate\Routing\Middleware\ThrottleRequests::class,

+		\Illuminate\Session\Middleware\AuthenticateSession::class,

+		\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		\Illuminate\Auth\Middleware\Authorize::class,

+	];

 }

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

Indentation +207 added lines, -207 removed lines

@@ -20,211 +20,211 @@
 
 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')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param ChangePassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(ChangePassword $request)
-    {
-        return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param ConfirmEmail $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(ConfirmEmail $request)
-    {
-        return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param ResendEmailConfirmation $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
-    {
-        return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param RefreshToken $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshToken(RefreshToken $request)
-    {
-        return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param SaveProfile $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(SaveProfile $request)
-    {
-        return new $this->modelResource($this->service->saveProfile($request->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')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param ChangePassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(ChangePassword $request)
+	{
+		return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param ConfirmEmail $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(ConfirmEmail $request)
+	{
+		return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param ResendEmailConfirmation $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
+	{
+		return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param RefreshToken $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshToken(RefreshToken $request)
+	{
+		return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param SaveProfile $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(SaveProfile $request)
+	{
+		return new $this->modelResource($this->service->saveProfile($request->validated()));
+	}
 }

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

Indentation +21 added lines, -21 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -23,9 +23,9 @@
      */
     public function rules()
     {
-        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
+        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required'.'';
         return [
-            'name' => $requiredOrNullable . '|string|max:100|unique:roles,name,' . $this->route('id')
+            'name' => $requiredOrNullable.'|string|max:100|unique:roles,name,'.$this->route('id')
         ];
     }
 }

src/Modules/OauthClients/Http/Requests/StoreOauthClient.php

Indentation +24 added lines, -24 removed lines

@@ -6,29 +6,29 @@
 
 class StoreOauthClient 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()
-    {
-        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
-        return [
-            'name'     => $requiredOrNullable . '|max:255',
-            'redirect' => $requiredOrNullable . '|url',
-            'user_id'  => $requiredOrNullable . '|exists:users,id',
-            'revoked'  => 'boolean'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		$requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
+		return [
+			'name'     => $requiredOrNullable . '|max:255',
+			'redirect' => $requiredOrNullable . '|url',
+			'user_id'  => $requiredOrNullable . '|exists:users,id',
+			'revoked'  => 'boolean'
+		];
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@
      */
     public function rules()
     {
-        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required' . '';
+        $requiredOrNullable = request()->isMethod('PATCH') ? 'nullable' : 'required'.'';
         return [
-            'name'     => $requiredOrNullable . '|max:255',
-            'redirect' => $requiredOrNullable . '|url',
-            'user_id'  => $requiredOrNullable . '|exists:users,id',
+            'name'     => $requiredOrNullable.'|max:255',
+            'redirect' => $requiredOrNullable.'|url',
+            'user_id'  => $requiredOrNullable.'|exists:users,id',
             'revoked'  => 'boolean'
         ];
     }