handle filament email verification override. Fix long urls in email

visualbuilder · Sep 15, 2023 · 8976a22 · 8976a22
1 parent e0749c1
commit 8976a22
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ The following email templates are included to get you started and show different
 
  - **User Registered**  - Welcome them to the platform
  - **User Verify Email** - Check they are human
- - **User Verified Email** - Yes they are
+ - **User Verification Success** - Yes they are
  - **User Request Password Reset** - Let them change the password
  - **User Password Reset Success** - Yay, you changed your password
  - **User Locked Out** - Oops - What to do now?

diff --git a/resources/views/email/parts/_head.blade.php b/resources/views/email/parts/_head.blade.php
@@ -69,7 +69,10 @@
 
         /* ANDROID CENTER FIX */
         div[style*="margin: 16px 0;"] { margin: 0 !important; }
+
+        /* Long URL Fix */
+        a {word-break: break-all;}
     </style>
 </head>
-<body style="background-color: {{$data['theme']["header_bg_color"]}}; margin: 0 !important; padding: 0 !important;">
+<body style="background-color: {{$data['theme']["body_bg_color"]}}; margin: 0 !important; padding: 0 !important;">
 
diff --git a/src/EmailTemplatesAuthServiceProvider.php b/src/EmailTemplatesAuthServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace Visualbuilder\EmailTemplates;
 
-use App\Models\User;
+
 use Illuminate\Auth\Notifications\VerifyEmail;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Visualbuilder\EmailTemplates\Mail\UserVerifyEmail;
@@ -20,7 +20,7 @@ public function boot()
 
         if(config('filament-email-templates.send_emails.verification')) {
             //Override default Laravel VerifyEmail notification toMail function
-            VerifyEmail::toMailUsing(function (User $user, string $verificationUrl) {
+            VerifyEmail::toMailUsing(function ($user, string $verificationUrl) {
                 return (new UserVerifyEmail($user, $verificationUrl));
             });
         }

diff --git a/src/EmailTemplatesFacade.php b/src/EmailTemplatesFacade.php
@@ -4,9 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-/**
- * @see \Visualbuilder\EmailTemplates\Skeleton\SkeletonClass
- */
+
 class EmailTemplatesFacade extends Facade
 {
     /**

diff --git a/src/EmailTemplatesServiceProvider.php b/src/EmailTemplatesServiceProvider.php
@@ -13,6 +13,7 @@
 use Visualbuilder\EmailTemplates\Helpers\CreateMailableHelper;
 use Visualbuilder\EmailTemplates\Helpers\FormHelper;
 
+
 class EmailTemplatesServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
@@ -35,6 +36,21 @@ public function packageRegistered(): void
         $this->app->singleton(CreateMailableInterface::class, CreateMailableHelper::class);
         $this->app->singleton(FormHelperInterface::class, FormHelper::class);
         $this->app->register(EmailTemplatesEventServiceProvider::class);
+
+        //Override Filament send email verification Listener
+        if(config('filament-email-templates.send_emails.verification')) {
+            $this->app->bind(
+                    \Filament\Listeners\Auth\SendEmailVerificationNotification::class,
+                    \Visualbuilder\EmailTemplates\Listeners\SendEmailVerificationListener::class,
+
+            );
+            $this->app->bind(
+                    \Filament\Notifications\Auth\VerifyEmail::class,
+                    \Visualbuilder\EmailTemplates\Listeners\SendEmailVerificationListener::class,
+
+            );
+        }
+
     }
 
     public function packageBooted(): void

diff --git a/src/Listeners/SendEmailVerificationListener.php b/src/Listeners/SendEmailVerificationListener.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Visualbuilder\EmailTemplates\Listeners;
+
+use Exception;
+use Filament\Facades\Filament;
+use Visualbuilder\EmailTemplates\Notifications\UserVerifyEmailNotification;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification as BaseListener;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+
+class SendEmailVerificationListener extends BaseListener
+{
+    public function handle(Registered $event): void
+    {
+        if (! $event->user instanceof MustVerifyEmail) {
+            return;
+        }
+
+        if ($event->user->hasVerifiedEmail()) {
+            return;
+        }
+
+        if (! method_exists($event->user, 'notify')) {
+            $userClass = $event->user::class;
+
+            throw new Exception("Model [{$userClass}] does not have a [notify()] method.");
+        }
+
+        $notification = new UserVerifyEmailNotification(Filament::getVerifyEmailUrl($event->user));
+
+        $event->user->notify($notification);
+    }
+}
diff --git a/src/Mail/UserVerifyEmail.php b/src/Mail/UserVerifyEmail.php
@@ -23,10 +23,10 @@ class UserVerifyEmail extends Mailable
      *
      * @return void
      */
-    public function __construct($user, $token)
+    public function __construct($user, $url)
     {
         $this->user = $user;
-        $this->verificationUrl = $token;
+        $this->verificationUrl = $url;
         $this->sendTo = $user->email;
     }
 }
diff --git a/src/Notifications/UserVerifyEmailNotification.php b/src/Notifications/UserVerifyEmailNotification.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Visualbuilder\EmailTemplates\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Notification;
+use Visualbuilder\EmailTemplates\Mail\UserVerifiedEmail;
+use Visualbuilder\EmailTemplates\Mail\UserVerifyEmail;
+
+class UserVerifyEmailNotification extends Notification
+{
+    use Queueable;
+
+    public string $url;
+
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct($url)
+    {
+        $this->url = $url;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        if(config('filament-email-templates.send_emails.verification')) {
+            return app(UserVerifyEmail::class, ['user' => $notifiable,'url'=>$this->url]);
+        }
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+
+            ];
+    }
+}