Upgrade to Nuxt 2.8 and Laravel 5.8

Author: cretueusebiu

Diff for: .env.example

@@ -2,20 +2,22 @@ APP_NAME="Laravel Nuxt"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
+LOG_CHANNEL=stack
+
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
+SESSION_LIFETIME=120
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
@@ -28,8 +30,14 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
 
 JWT_TTL=1440

Diff for: .gitignore

@@ -3,13 +3,13 @@
 /public/storage
 /storage/*.key
 /vendor
-/.idea
-/.vagrant
+.env
+.env.backup
+.phpunit.result.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-.env
 .nuxt
 /dist
 /public/_nuxt

Diff for: CHANGELOG.md

@@ -2,9 +2,12 @@
 
 ## Unreleased
 
-- Upgrade to Nuxt 2.7
+- Upgrade to Nuxt 2.8
+- Upgrade to Laravel 5.8
+- Added email verification
 - SPA mode by default
 - Update npm dependencies
+- Removed yarn.lock in favor of package-lock.json
 
 ## 1.1.0 - 2018-05-10
 

Diff for: README.md

@@ -12,14 +12,12 @@
 
 ## Features
 
-- Laravel 5.6
-- Nuxt 2.7
-- VueI18n
-- SPA or SSR 
-- Authentication with JWT
+- Nuxt 2.8
+- Laravel 5.8
+- SPA or SSR
 - Socialite integration
-- Bootstrap 4 + Font Awesome 5
-- Login, register, password reset and profile pages
+- VueI18n + ESlint + Bootstrap 4 + Font Awesome 5
+- Login, register, email verification and password reset
 
 ## Installation
 

Diff for: app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use Exception;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -50,4 +51,18 @@ public function render($request, Exception $exception)
     {
         return parent::render($request, $exception);
     }
+
+    /**
+     * Convert an authentication exception into a response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        return $request->expectsJson()
+                    ? response()->json(['message' => $exception->getMessage()], 401)
+                    : redirect()->guest(url('/login'));
+    }
 }

Diff for: app/Exceptions/VerifyEmailException.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Exceptions;
+
+use Illuminate\Validation\ValidationException;
+
+class VerifyEmailException extends ValidationException
+{
+    /**
+     * @param  \App\User $user
+     * @return static
+     */
+    public static function forUser($user)
+    {
+        return static::withMessages([
+            'email' => [__('You must :linkOpen verify :linkClose your email first.', [
+                'linkOpen' => '<a href="/email/resend?email='.urlencode($user->email).'">',
+                'linkClose' => '</a>',
+            ])],
+        ]);
+    }
+}

Diff for: app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -23,10 +23,11 @@ public function __construct()
     /**
      * Get the response for a successful password reset link.
      *
+     * @param  \Illuminate\Http\Request $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetLinkResponse($response)
+    protected function sendResetLinkResponse(Request $request, $response)
     {
         return ['status' => trans($response)];
     }

Diff for: app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,9 @@
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Exceptions\VerifyEmailException;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Validation\ValidationException;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -30,20 +33,25 @@ protected function attemptLogin(Request $request)
     {
         $token = $this->guard()->attempt($this->credentials($request));
 
-        if ($token) {
-            $this->guard()->setToken($token);
+        if (! $token) {
+            return false;
+        }
 
-            return true;
+        $user = $this->guard()->user();
+        if ($user instanceof MustVerifyEmail && ! $user->hasVerifiedEmail()) {
+            return false;
         }
 
-        return false;
+        $this->guard()->setToken($token);
+
+        return true;
     }
 
     /**
      * Send the response after the user was authenticated.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     protected function sendLoginResponse(Request $request)
     {
@@ -52,11 +60,31 @@ protected function sendLoginResponse(Request $request)
         $token = (string) $this->guard()->getToken();
         $expiration = $this->guard()->getPayload()->get('exp');
 
-        return [
+        return response()->json([
             'token' => $token,
             'token_type' => 'bearer',
             'expires_in' => $expiration - time(),
-        ];
+        ]);
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        $user = $this->guard()->user();
+        if ($user instanceof MustVerifyEmail && ! $user->hasVerifiedEmail()) {
+            throw VerifyEmailException::forUser($user);
+        }
+
+        throw ValidationException::withMessages([
+            $this->username() => [trans('auth.failed')],
+        ]);
     }
 
     /**

Diff for: app/Http/Controllers/Auth/OAuthController.php

@@ -97,6 +97,7 @@ protected function createUser($provider, $sUser)
         $user = User::create([
             'name' => $sUser->getName(),
             'email' => $sUser->getEmail(),
+            'email_verified_at' => now(),
         ]);
 
         $user->oauthProviders()->create([

Diff for: app/Http/Controllers/Auth/RegisterController.php

@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
@@ -26,12 +27,18 @@ public function __construct()
      * The user has been registered.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  mixed  $user
-     * @return mixed
+     * @param  \App\User  $user
+     * @return \Illuminate\Http\JsonResponse
      */
-    protected function registered(Request $request, $user)
+    protected function registered(Request $request, User $user)
     {
-        return $user;
+        if ($user instanceof MustVerifyEmail) {
+            $user->sendEmailVerificationNotification();
+
+            return response()->json(['status' => trans('verification.sent')]);
+        }
+
+        return response()->json($user);
     }
 
     /**
@@ -53,7 +60,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return User
+     * @return \App\User
      */
     protected function create(array $data)
     {

Diff for: app/Http/Controllers/Auth/ResetPasswordController.php

@@ -23,10 +23,11 @@ public function __construct()
     /**
      * Get the response for a successful password reset.
      *
+     * @param  \Illuminate\Http\Request $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetResponse($response)
+    protected function sendResetResponse(Request $request, $response)
     {
         return ['status' => trans($response)];
     }

Diff for: app/Http/Controllers/Auth/VerificationController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\URL;
+use App\Http\Controllers\Controller;
+use Illuminate\Auth\Events\Verified;
+use Illuminate\Validation\ValidationException;
+
+class VerificationController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('throttle:6,1')->only('verify', 'resend');
+    }
+
+    /**
+     * Mark the user's email address as verified.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \App\User $user
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function verify(Request $request, User $user)
+    {
+        if (! URL::hasValidSignature($request)) {
+            return response()->json([
+                'status' => trans('verification.invalid'),
+            ], 400);
+        }
+
+        if ($user->hasVerifiedEmail()) {
+            return response()->json([
+                'status' => trans('verification.already_verified'),
+            ], 400);
+        }
+
+        $user->markEmailAsVerified();
+
+        event(new Verified($user));
+
+        return response()->json([
+            'status' => trans('verification.verified'),
+        ]);
+    }
+
+    /**
+     * Resend the email verification notification.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function resend(Request $request)
+    {
+        $this->validate($request, ['email' => 'required|email']);
+
+        $user = User::where('email', $request->email)->first();
+
+        if (is_null($user)) {
+            throw ValidationException::withMessages([
+                'email' => [trans('verification.user')],
+            ]);
+        }
+
+        if ($user->hasVerifiedEmail()) {
+            throw ValidationException::withMessages([
+                'email' => [trans('verification.already_verified')],
+            ]);
+        }
+
+        $user->sendEmailVerificationNotification();
+
+        return response()->json(['status' => trans('verification.sent')]);
+    }
+}

Diff for: app/Http/Controllers/Settings/PasswordController.php

@@ -16,7 +16,7 @@ class PasswordController extends Controller
     public function update(Request $request)
     {
         $this->validate($request, [
-            'password' => 'required|confirmed|min:6',
+            'password' => 'required|confirmed|min:8',
         ]);
 
         $request->user()->update([