Email verification (#47)

SebKay · web-flow · commit 95e96e19a160 · 2023-12-05T21:01:31.000Z
* Update User.php

* Implement email verification notice page

* Add route to verify email

* Add ability to resend verification email
diff --git a/app/Http/Controllers/EmailVerificationController.php b/app/Http/Controllers/EmailVerificationController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
+use Illuminate\Http\Request;
+
+class EmailVerificationController extends Controller
+{
+    public function show()
+    {
+        return \inertia('EmailVerification/Show');
+    }
+
+    public function store(EmailVerificationRequest $request)
+    {
+        $request->fulfill();
+
+        return \redirect()->route('home');
+    }
+
+    public function update(Request $request)
+    {
+        $request->user()->sendEmailVerificationNotification();
+
+        \session()->flash('message', \__('account.verification-resent'));
+
+        return \back();
+    }
+}
diff --git a/app/Http/Controllers/RegisterController.php b/app/Http/Controllers/RegisterController.php
@@ -5,6 +5,7 @@
 use App\Enums\Role;
 use App\Http\Requests\Register\RegisterStore;
 use App\Models\User;
+use Illuminate\Auth\Events\Registered;
 
 class RegisterController extends Controller
 {
@@ -36,6 +37,8 @@ public function store(RegisterStore $request)
 
         \auth()->loginUsingId($user->id);
 
+        \event(new Registered($user));
+
         return \redirect()->route('home');
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,12 +2,11 @@
 
 namespace App\Models;
 
-// use Illuminate\Contracts\Auth\MustVerifyEmail;
-
 use App\Enums\Role;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasName;
 use Filament\Panel;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -16,7 +15,7 @@
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Authenticatable implements FilamentUser, HasName
+class User extends Authenticatable implements FilamentUser, HasName, MustVerifyEmail
 {
     use HasApiTokens;
     use HasFactory;
diff --git a/lang/en/account.php b/lang/en/account.php
@@ -2,4 +2,6 @@
 
 return [
     'updated' => 'Your account has been updated.',
+    'verification-success' => 'Your email address has been verified.',
+    'verification-resent' => 'A new verification link has been sent.',
 ];
diff --git a/resources/js/Components/Button.vue b/resources/js/Components/Button.vue
@@ -1,5 +1,5 @@
 <template>
-    <button class="rounded-md w-full bg-slate-800 px-6 py-3 text-sm font-semibold text-white shadow-sm hover:bg-slate-500">
+    <button class="rounded-md bg-slate-800 px-6 py-3 text-sm font-semibold text-white inline-flex shadow-sm hover:bg-slate-500">
         <span v-text="text"></span>
     </button>
 </template>
diff --git a/resources/js/Layouts/App.vue b/resources/js/Layouts/App.vue
@@ -43,7 +43,7 @@
                         label: "Account",
                         route: route("account.edit"),
                         condition: true,
-                        components: ['Account/Edit'],
+                        components: ['Account/Edit', 'EmailVerification/Show'],
                     },
                     {
                         label: "Organisation",
diff --git a/resources/js/Pages/EmailVerification/Show.vue b/resources/js/Pages/EmailVerification/Show.vue
@@ -0,0 +1,35 @@
+<template>
+    <Head :title="title" />
+
+    <div class="mx-auto max-w-2xl bg-white rounded-2xl lg:p-10 p-6 border border-slate-200 text-center">
+        <p>
+            Please verify your email address by clicking on the link we just emailed to you.
+        </p>
+        <Button
+            @click="resend"
+            class="mt-6"
+            text="Resend Verification Email"
+        />
+    </div>
+</template>
+
+<script>
+    import { router } from "@inertiajs/vue3";
+
+    export default {
+        data() {
+            return {
+                title: "Email Verification",
+            };
+        },
+
+        methods: {
+            resend() {
+                router.post(route('verification.send'), {
+                    preserveScroll: true,
+                    preserveState: true,
+                });
+            },
+        },
+    };
+</script>
diff --git a/routes/web.php b/routes/web.php
@@ -21,22 +21,31 @@
     ->name('logout');
 
 Route::controller(App\Http\Controllers\HomeController::class)
-    ->middleware(['auth'])
+    ->middleware(['auth', 'verified'])
     ->group(function () {
         Route::get('/', 'index')->name('home');
     });
 
 Route::controller(App\Http\Controllers\AccountController::class)
     ->prefix('account')
-    ->middleware(['auth'])
+    ->middleware(['auth', 'verified'])
     ->group(function () {
         Route::get('', 'edit')->name('account.edit');
         Route::patch('', 'update')->name('account.update');
     });
 
+Route::controller(App\Http\Controllers\EmailVerificationController::class)
+    ->prefix('account')
+    ->middleware(['auth'])
+    ->group(function () {
+        Route::get('verify', 'show')->name('verification.notice');
+        Route::get('verify/{id}/{hash}', 'store')->middleware(['signed'])->name('verification.verify');
+        Route::post('verify/resend', 'update')->middleware(['auth', 'throttle:6,1'])->name('verification.send');
+    });
+
 Route::controller(App\Http\Controllers\OrganisationController::class)
     ->prefix('organisation')
-    ->middleware(['auth'])
+    ->middleware(['auth', 'verified'])
     ->group(function () {
         Route::get('', 'edit')->name('organisation.edit');
         Route::patch('', 'update')->name('organisation.update');

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use App\Enums\Role;`
`6`	`6`	`use App\Http\Requests\Register\RegisterStore;`
`7`	`7`	`use App\Models\User;`
	`8`	`+use Illuminate\Auth\Events\Registered;`
`8`	`9`
`9`	`10`	`class RegisterController extends Controller`
`10`	`11`	`{`
`@@ -36,6 +37,8 @@ public function store(RegisterStore $request)`
`36`	`37`
`37`	`38`	`\auth()->loginUsingId($user->id);`
`38`	`39`
	`40`	`+ \event(new Registered($user));`
	`41`	`+`
`39`	`42`	`return \redirect()->route('home');`
`40`	`43`	`}`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`label: "Account",`
`44`	`44`	`route: route("account.edit"),`
`45`	`45`	`condition: true,`
`46`		`- components: ['Account/Edit'],`
	`46`	`+ components: ['Account/Edit', 'EmailVerification/Show'],`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`label: "Organisation",`