Merge branch 'main' of https://github.com/blumilksoftware/interns2024b …

…into 12-dashboard
blumilksoftware · Sep 6, 2024 · 2e8076b · 2e8076b
2 parents 80b327f + a7bf744
commit 2e8076b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/app/Http/Controllers/EmailVerifyController.php b/app/Http/Controllers/EmailVerifyController.php
@@ -27,9 +27,11 @@ public function create(): Response
 
     public function send(Request $request): RedirectResponse
     {
-        $request->user()->sendEmailVerificationNotification();
+        if (auth()->check()) {
+            $request->user()->sendEmailVerificationNotification();
+        }
 
         return back()
-            ->with("message", "Wiadomość z linkiem aktywacyjnym została wysłana na Twój adres e-mail!");
+            ->with("status", "Wiadomość z linkiem aktywacyjnym została wysłana na Twój adres e-mail!");
     }
 }
diff --git a/app/Http/Controllers/RegisterUserController.php b/app/Http/Controllers/RegisterUserController.php
@@ -26,6 +26,6 @@ public function store(RegisterUserRequest $request): RedirectResponse
             Auth::login($user);
         }
 
-        return Redirect::route("home");
+        return Redirect::route("verification.notice");
     }
 }
diff --git a/routes/web.php b/routes/web.php
@@ -22,9 +22,9 @@
 use App\Models\Question;
 use Illuminate\Support\Facades\Route;
 
-Route::get("/email/verify", [EmailVerifyController::class, "create"])->middleware("auth")->name("verification.notice");
+Route::get("/email/verify", [EmailVerifyController::class, "create"])->name("verification.notice");
 Route::get("/email/{id}/{hash}", EmailVerifyController::class)->middleware(["auth", "throttle:6,1"])->name("verification.verify");
-Route::post("/email/verification-notification", [EmailVerifyController::class, "send"])->middleware("auth", "throttle:3,60")->name("verification.send");
+Route::post("/email/verification-notification", [EmailVerifyController::class, "send"])->middleware("throttle:3,60")->name("verification.send");
 Route::post("/auth/logout", [AuthenticateSessionController::class, "logout"])->middleware("auth")->name("logout");
 
 Route::middleware(["guest"])->group(function (): void {

diff --git a/tests/Feature/RegisterUserTest.php b/tests/Feature/RegisterUserTest.php
@@ -25,7 +25,7 @@ public function testUserCanRegister(): void
             "password" => "123456890",
             "school_id" => $school->id,
         ])
-            ->assertRedirect("/");
+            ->assertRedirect("/email/verify");
 
         $this->assertDatabaseHas("users", [
             "name" => "Test",
@@ -39,7 +39,7 @@ public function testUserCanRegister(): void
         ]);
     }
 
-    public function testUserCanNotCheckIfEmailIsAlreadyTakenViaRegisterForm(): void
+    public function testUserIsRedirectedToEmailVerifyIfEmailIsAlreadyTakenViaRegisterForm(): void
     {
         $school = School::factory()->create();
         User::factory()->create([
@@ -53,7 +53,9 @@ public function testUserCanNotCheckIfEmailIsAlreadyTakenViaRegisterForm(): void
             "password" => "123456890",
             "school_id" => $school->id,
         ])
-            ->assertRedirect("/");
+            ->assertRedirect("/email/verify");
+
+        $this->assertGuest();
     }
 
     public function testUserCanNotRegisterWithWrongSchoolIndex(): void