Merge branch 'develop' of https://github.com/viralsolani/laravel-adminpanel into develop

Author: viralsolani

app/Http/Controllers/Api/V1/AuthController.php

@@ -20,7 +20,7 @@ class AuthController extends APIController
     public function login(Request $request)
     {
         $validation = Validator::make($request->all(), [
-            'email' => 'required|email',
+            'email'    => 'required|email',
             'password' => 'required|min:4',
         ]);
 

app/Http/Kernel.php

@@ -63,18 +63,18 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth'       => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'timeout' => \App\Http\Middleware\SessionTimeout::class,
+        'bindings'   => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'can'        => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest'      => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'timeout'    => \App\Http\Middleware\SessionTimeout::class,
 
         /*
          * Access Middleware
          */
-        'access.routeNeedsRole' => \App\Http\Middleware\RouteNeedsRole::class,
+        'access.routeNeedsRole'       => \App\Http\Middleware\RouteNeedsRole::class,
         'access.routeNeedsPermission' => \App\Http\Middleware\RouteNeedsPermission::class,
         'jwt.auth' => GetUserFromToken::class,
         'jwt.refresh' => RefreshToken::class,

app/Models/Access/User/User.php

@@ -98,17 +98,17 @@ public function setPasswordAttribute($password)
     public function getJWTCustomClaims()
     {
         return [
-            'id' => $this->id,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'email' => $this->email,
-            'picture' => $this->getPicture(),
-            'confirmed' => $this->confirmed,
-            'role' => optional($this->roles()->first())->name,
+            'id'          => $this->id,
+            'first_name'  => $this->first_name,
+            'last_name'   => $this->last_name,
+            'email'       => $this->email,
+            'picture'     => $this->getPicture(),
+            'confirmed'   => $this->confirmed,
+            'role'        => optional($this->roles()->first())->name,
             'permissions' => $this->permissions()->get(),
-            'status' => $this->status,
-            'created_at' => $this->created_at->toIso8601String(),
-            'updated_at' => $this->updated_at->toIso8601String(),
+            'status'      => $this->status,
+            'created_at'  => $this->created_at->toIso8601String(),
+            'updated_at'  => $this->updated_at->toIso8601String(),
         ];
     }
 }

tests/Feature/Api/V1/LoginTest.php

@@ -10,7 +10,7 @@ class LoginTest extends TestCase
     public function users_can_login_through_api()
     {
         $res = $this->json('POST', '/api/v1/auth/login', [
-            'email' => $this->user->email,
+            'email'    => $this->user->email,
             'password' => '1234',
         ])
             ->assertStatus(200)