Merge pull request #53 from GDGAlgiers/dev

Added Email verification
GDGAlgiers · Oct 21, 2023 · ff98ac9 · ff98ac9
2 parents fc2c81f + ad48fee
commit ff98ac9
Show file tree

Hide file tree

Showing 16 changed files with 276 additions and 101 deletions.
diff --git a/app/Http/Controllers/API/AuthController.php b/app/Http/Controllers/API/AuthController.php
@@ -11,12 +11,14 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Auth\Events\Registered;
 
 class AuthController extends BaseController
 {
     public function register(Request $request){
         $validator = Validator::make($request->all(), [
             'full_name' => 'required|string|unique:users,full_name',
+            'email' => 'required|email|unique:users,email',
             'track' => 'required|string|exists:tracks,type',
             'password' => 'required|string|min:6',
         ]);
@@ -33,13 +35,15 @@ public function register(Request $request){
 
         $user = User::create([
             'full_name' => $request->full_name,
+            'email' => $request->email,
             'track_id' => $trackID,
             'password' => Hash::make($request->password),
             'role' => 'participant',
             'points' => 0,
             'ip' => $request->ip()
         ]);
 
+        event(new Registered($user));
         $token = $user->createToken('arizona-platform')->plainTextToken;
         $result = [
             'user' => new ParticipantResource($user),

diff --git a/app/Http/Controllers/VerifyEmailController.php b/app/Http/Controllers/VerifyEmailController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\User;
+use Illuminate\Auth\Events\Verified;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class VerifyEmailController extends Controller
+{
+
+    public function sendVerificationEmail(Request $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return response()->json([
+                'success' => false,
+                'message' => 'email already verified'
+            ], 400);
+        }
+
+        $request->user()->sendEmailVerificationNotification();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'email verification link has been sent'
+        ]);
+    }
+
+    public function verify(EmailVerificationRequest $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return response()->json([
+                'success' => false,
+                'message' => 'email already verified'
+            ], 400);
+        }
+
+        if ($request->user()->markEmailAsVerified()) {
+            event(new Verified($request->user()));
+        }
+
+        return response()->json([
+            'success' => true,
+            'message' => 'email has been verified'
+        ]);
+    }
+}
diff --git a/app/Http/Repositories/UserRepository.php b/app/Http/Repositories/UserRepository.php
@@ -8,9 +8,6 @@
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Mail;
-use App\Mail\ParticipantAccountCreated;
-use App\Mail\JudgeAccountCreated;
 
 Class UserRepository {
 
@@ -26,6 +23,7 @@ public function create_participant($request) {
         $response = [];
         $validator = Validator::make($request->all(), [
             'full_name' => 'required|unique:users,full_name',
+            'email' => 'required|unique:users,email',
             'password' => 'required|min:6',
             'track' => 'required|exists:tracks,type'
         ]);
@@ -39,6 +37,7 @@ public function create_participant($request) {
         $trackID = Track::where('type', $request->track)->pluck('id')->first();
         $user = User::create([
             'full_name' => $request->full_name,
+            'email' => $request->email,
             'track_id' => $trackID,
             'password' => Hash::make($request->password),
             'role' => 'participant',
@@ -55,6 +54,7 @@ public function create_judge($request)
         $response = [];
         $validator = Validator::make($request->all(), [
             'full_name' => 'required|string|unique:users,full_name',
+            'email' => 'required|unique:users,email',
             'password' => 'required|string|min:6',
             'track' => 'required|exists:tracks,type'
         ]);
@@ -67,6 +67,7 @@ public function create_judge($request)
         $trackID = Track::where('type', $request->track)->pluck('id')->first();
         $user = User::create([
             'full_name' => $request->full_name,
+            'email' => $request->email,
             'password' => Hash::make($request->password),
             'role' => 'judge',
             'track_id' => $trackID

diff --git a/app/Http/Resources/User/AdministratorResource.php b/app/Http/Resources/User/AdministratorResource.php
@@ -17,6 +17,7 @@ public function toArray($request)
         return [
             'id' => $this->id,
             'full_name' => $this->full_name,
+            'email' => $this->email,
             'role' => 'administrator'
         ];
     }

diff --git a/app/Http/Resources/User/JudgeResource.php b/app/Http/Resources/User/JudgeResource.php
@@ -17,6 +17,7 @@ public function toArray($request)
         return [
             'id' => $this->id,
             'full_name' => $this->full_name,
+            'email' => $this->email,
             'role' => 'judge',
             'track' => $this->track->type
         ];

diff --git a/app/Http/Resources/User/ParticipantResource.php b/app/Http/Resources/User/ParticipantResource.php
@@ -18,6 +18,7 @@ public function toArray($request)
         return [
             'id' => $this->id,
             'full_name' => $this->full_name,
+            'email' => $this->email,
             'points' => $this->points,
             'role' => 'participant',
             'email_verified' => $this->email_verified_at ? true: false,

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -20,6 +20,7 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     protected $fillable = [
         'full_name',
+        'email',
         'password',
         'points',
         'role',

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -3,7 +3,10 @@
 namespace App\Providers;
 
 // use Illuminate\Support\Facades\Gate;
+
+use Illuminate\Auth\Notifications\VerifyEmail;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Notifications\Messages\MailMessage;
 
 class AuthServiceProvider extends ServiceProvider
 {
@@ -25,6 +28,12 @@ public function boot()
     {
         $this->registerPolicies();
 
-        //
+        VerifyEmail::toMailUsing(function ($notifiable, $url) {
+            $spaUrl = env('FRONT_URL').'/email_verification/verify?url='.$url;
+            return (new MailMessage)
+                ->subject('Verify Your Email Address')
+                ->line('Are you real? If so, please click the button below to verify your email address')
+                ->action('Verify Email Address', $spaUrl);
+        });
     }
 }