Merge pull request #351 from datamweb/show-validate-error

fix: show validate errors in `magic-link`

Author: kenjis

src/Controllers/MagicLinkController.php

@@ -60,7 +60,7 @@ public function loginAction()
         // Validate email format
         $rules = $this->getValidationRules();
         if (! $this->validate($rules)) {
-            return redirect()->route('magic-link')->with('error', lang('Auth.invalidEmail'));
+            return redirect()->route('magic-link')->with('errors', $this->validator->getErrors());
         }
 
         // Check if the user exists

src/Views/magic_link_form.php

@@ -9,9 +9,20 @@
         <div class="card-body">
             <h5 class="card-title mb-5"><?= lang('Auth.useMagicLink') ?></h5>
 
-            <?php if (session('error') !== null) : ?>
-            <div class="alert alert-danger" role="alert"><?= session('error') ?></div>
-            <?php endif ?>
+                <?php if (session('error') !== null) : ?>
+                    <div class="alert alert-danger" role="alert"><?= session('error') ?></div>
+                <?php elseif (session('errors') !== null) : ?>
+                    <div class="alert alert-danger" role="alert">
+                        <?php if (is_array(session('errors'))) : ?>
+                            <?php foreach (session('errors') as $error) : ?>
+                                <?= $error ?>
+                                <br>
+                            <?php endforeach ?>
+                        <?php else : ?>
+                            <?= session('errors') ?>
+                        <?php endif ?>
+                    </div>
+                <?php endif ?>
 
             <form action="<?= url_to('magic-link') ?>" method="post">
                 <?= csrf_field() ?>

tests/Authentication/MagicLinkTest.php

@@ -50,7 +50,9 @@ public function testMagicLinkSubmitNoEmail(): void
         ]);
 
         $result->assertRedirectTo(route_to('magic-link'));
-        $result->assertSessionHas('error', lang('Auth.invalidEmail'));
+        $expected = ['email' => 'The Email Address field is required.'];
+
+        $result->assertSessionHas('errors', $expected);
     }
 
     public function testMagicLinkSubmitBadEmail(): void

tests/Controllers/MagicLinkTest.php

@@ -46,4 +46,15 @@ public function testAfterLoggedInNotAllowDisplayMagicLink()
         $result = $this->get('/login/magic-link');
         $result->assertRedirectTo(config('Auth')->loginRedirect());
     }
+
+    public function testShowValidateErrorsInMagicLink()
+    {
+        $result = $this->post('/login/magic-link', [
+            'email' => 'foo@example',
+        ]);
+
+        $expected = ['email' => 'The Email Address field must contain a valid email address.'];
+
+        $result->assertSessionHas('errors', $expected);
+    }
 }