From eaff081e442337325add9461d962d8ed9f84de1f Mon Sep 17 00:00:00 2001
From: Ron Rise <ron@siteworxpro.com>
Date: Thu, 29 Jan 2026 23:01:53 -0500
Subject: [PATCH] Refactor password reset handler to use a variable for client
 redirect URI

---
 src/CommandBus/Handlers/SendPasswordResetHandler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CommandBus/Handlers/SendPasswordResetHandler.php b/src/CommandBus/Handlers/SendPasswordResetHandler.php
index 28ae898..5bbc764 100644
--- a/src/CommandBus/Handlers/SendPasswordResetHandler.php
+++ b/src/CommandBus/Handlers/SendPasswordResetHandler.php
@@ -11,6 +11,7 @@ use Siteworxpro\App\CommandBus\Commands\SendPasswordReset;
 use Siteworxpro\App\CommandBus\Exceptions\CommandHandlerException;
 use Siteworxpro\App\Helpers\Rand;
 use Siteworxpro\App\Mailer\Message;
+use Siteworxpro\App\Models\ClientRedirectUri;
 use Siteworxpro\App\Models\User;
 use Siteworxpro\App\Services\Facades\Config;
 use Siteworxpro\App\Services\Facades\Mailer;
@@ -31,6 +32,9 @@ class SendPasswordResetHandler extends CommandHandler
 
         $token = Rand::string(64);
 
+        /** @var ClientRedirectUri $redirectUri */
+        $redirectUri = $command->getClient()->clientRedirectUris->first();
+
         $content = Twig::render('password-reset.twig', [
             'user' => $command->getUser(),
             'resetLink' => sprintf(
@@ -38,7 +42,7 @@ class SendPasswordResetHandler extends CommandHandler
                 Config::get('app.url'),
                 $token,
                 $command->getClient()->client_id,
-                urlencode($command->getClient()->clientRedirectUris->first()->redirect_uri)
+                urlencode($redirectUri->redirect_uri)
             ),
             'client' => $command->getClient()
         ]);