fix: make SendLoginLink work

owhyy · Apr 28, 2024 · f7c4a2f · f7c4a2f
1 parent 3f1175f
commit f7c4a2f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -22,6 +22,8 @@ public function store(StoreRequest $request): RedirectResponse
         if (! $this->user->whereEmail($request->validated()['email'])->exists()) {
             $user = $this->user->create($request->validated());
             $this->token->create(['email' => $user->email]);
+            auth()->login($user);
+
         }
 
         // also generate some sort of notification (later)

diff --git a/app/Listeners/SendLoginLink.php b/app/Listeners/SendLoginLink.php
@@ -21,7 +21,7 @@ public function __construct(private readonly User $user)
      */
     public function handle(RequestedLogin $event): void
     {
-        $user = $this->user->whereEmail($event->token->email);
-        $user->notify(new UserRequestedLogin($user));
+        $user = $this->user->whereEmail($event->token->email)->firstOrFail();
+        $user->notify(new UserRequestedLogin($user, $event->token));
     }
 }
diff --git a/app/Notifications/UserRegistered.php b/app/Notifications/UserRegistered.php
@@ -36,9 +36,7 @@ public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject('Account successfully created!')
-            ->greeting("Hi {$this->user->nickname}, your account has been successfully created! Please use the link below to log in.")
-            // TODO: this should be encoded
-            ->line(url('login.do', ['token' => $this->user->token]))
+            ->greeting("Hi {$this->user->nickname}, your account has been successfully created! A link that you can use to log in will be sent to you shortly.")
             ->line('Thank you for using our application!');
     }
 

diff --git a/app/Notifications/UserRequestedLogin.php b/app/Notifications/UserRequestedLogin.php
@@ -2,6 +2,7 @@
 
 namespace App\Notifications;
 
+use App\Models\LoginToken;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +15,7 @@ class UserRequestedLogin extends Notification
     /**
      * Create a new notification instance.
      */
-    public function __construct(public User $user)
+    public function __construct(public User $user, public LoginToken $token)
     {
         //
     }
@@ -37,7 +38,7 @@ public function toMail(object $notifiable): MailMessage
         return (new MailMessage)
             ->subject('Login link!')
             ->greeting("Hi {$this->user->nickname}, please use the link below to log in.")
-            ->line(route('login.do', ['token' => $this->user->token]))
+            ->line(route('login.do', ['token' => $this->token->value]))
             ->line('Thank you for using our application!');
     }