Merge pull request #18 from thedevdojo/updateUerModel

adding updates to the verify and register functionality
thedevdojo · May 22, 2024 · 14d884d · 14d884d
2 parents e50eb7d + adaafc0
commit 14d884d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/resources/views/pages/auth/register.blade.php b/resources/views/pages/auth/register.blade.php
@@ -88,7 +88,11 @@ public function register()
 
         Auth::login($user, true);
 
-        return redirect()->intended('/');
+        if(config('devdojo.auth.settings.registration_require_email_verification')){
+            return redirect()->route('verification.notice');
+        }
+
+        return redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
     }
 };
 

diff --git a/src/Http/Controllers/VerifyEmailController.php b/src/Http/Controllers/VerifyEmailController.php
@@ -14,13 +14,13 @@ class VerifyEmailController
     public function __invoke(EmailVerificationRequest $request): RedirectResponse
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
+            return redirect()->intended(config('devdojo.auth.settings.redirect_after_auth').'?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
             event(new Verified($request->user()));
         }
 
-        return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
+        return redirect()->intended(config('devdojo.auth.settings.redirect_after_auth').'?verified=1');
     }
 }
diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php
@@ -27,7 +27,7 @@
         ->set('name', 'John Doe')
         ->call('register')
         ->assertHasNoErrors()
-        ->assertRedirect('/');
+        ->assertRedirect('/dashboard');
 
     $this->assertTrue(Auth::check());
     $this->assertEquals('user@example.com', Auth::user()->email);