Add return_url to email verification (#24)

* Add return_url to email verification * Set flag to run email verification event
EscolaLMS · Feb 1, 2022 · 6dd45fa · 6dd45fa
1 parent 4740f7b
commit 6dd45fa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/Auth/VerifyEmailVariables.php b/src/Auth/VerifyEmailVariables.php
@@ -13,6 +13,18 @@ public static function getActionLink(EventWrapper $event): string
     {
         $notifiable = $event->getUser();
 
+        try {
+            $url = $event->getReturnUrl();
+        } catch (\Throwable $th) {
+            $url = null;
+        }
+
+        if (!empty($url)) {
+            return $url .
+                '?id=' . $notifiable->getKey() .
+                '&hash=' . sha1($notifiable->getEmailForVerification());
+        }
+
         return URL::temporarySignedRoute(
             'verification.verify',
             Carbon::now()->addMinutes(config('auth.verification.expire', 60)),

diff --git a/src/EscolaLmsTemplatesEmailServiceProvider.php b/src/EscolaLmsTemplatesEmailServiceProvider.php
@@ -3,8 +3,10 @@
 namespace EscolaLms\TemplatesEmail;
 
 use EscolaLms\Auth\EscolaLmsAuthServiceProvider;
+use EscolaLms\Auth\Events\AccountRegistered;
 use EscolaLms\Auth\Events\ForgotPassword;
 use EscolaLms\Auth\Listeners\CreatePasswordResetToken;
+use EscolaLms\Auth\Listeners\SendEmailVerificationNotification;
 use EscolaLms\Settings\Facades\AdministrableConfig;
 use EscolaLms\Templates\EscolaLmsTemplatesServiceProvider;
 use EscolaLms\Templates\Repository\Contracts\TemplateRepositoryContract;
@@ -78,6 +80,16 @@ function () {
                 ));
             }
         );
+
+        SendEmailVerificationNotification::setRunEventEmailVerification(
+            function () {
+                $templateRepository = app(TemplateRepositoryContract::class);
+                return empty($templateRepository->findTemplateDefault(
+                    AccountRegistered::class,
+                    EmailChannel::class
+                ));
+            }
+        );
     }
 
     public function bootForConsole()

diff --git a/tests/Api/AuthTest.php b/tests/Api/AuthTest.php
@@ -47,6 +47,7 @@ public function testVerifyEmail()
             'last_name' => 'tester',
             'password' => 'testtest',
             'password_confirmation' => 'testtest',
+            'return_url' => 'https://escolalms.com/email/verify',
         ]);
 
         $this->assertApiSuccess();
@@ -62,7 +63,7 @@ public function testVerifyEmail()
         Notification::assertNotSentTo($user, VerifyEmail::class);
 
         $listener = app(TemplateEventListener::class);
-        $listener->handle(new AccountRegistered($user));
+        $listener->handle(new AccountRegistered($user, 'https://escolalms.com/email/verify'));
 
         Mail::assertSent(EmailMailable::class, function (EmailMailable $mailable) use ($user) {
             $this->assertEquals('Verify Email Address', $mailable->subject);