Merge pull request #429 from bakaphp/hotfix-forgot-pass-notification

bakaphp · Jul 6, 2023 · b9d6e51 · b9d6e51
2 parents 94fd128 + 037cbcf
commit b9d6e51
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 52 deletions.
diff --git a/app/GraphQL/Ecosystem/Mutations/Auth/AuthManagementMutation.php b/app/GraphQL/Ecosystem/Mutations/Auth/AuthManagementMutation.php
@@ -27,43 +27,6 @@ class AuthManagementMutation
     use TokenTrait;
     use AuthTrait;
 
-    /**
-     * @param array $args
-     *
-     * @throws \Exception
-     */
-    public function forgot(
-        mixed $rootValue,
-        array $request,
-        GraphQLContext $context = null,
-        ResolveInfo $resolveInfo
-    ): bool {
-        $user = new ForgotPasswordService();
-
-        $registeredUser = $user->forgot($request['data']['email']);
-        $tokenResponse = $registeredUser->createToken('kanvas-login')->toArray();
-
-        $request = request();
-
-        return true;
-    }
-
-    /**
-     * Reset user password.
-     */
-    public function reset(
-        mixed $rootValue,
-        array $request,
-        GraphQLContext $context = null,
-        ResolveInfo $resolveInfo
-    ): bool {
-        $user = new ForgotPasswordService();
-
-        $user->reset($request['data']['new_password'], $request['data']['hash_key']);
-
-        return true;
-    }
-
     /**
      * @param array $args
      *
@@ -193,4 +156,41 @@ public function socialLogin(mixed $root, array $req): array
 
         return $tokenResponse;
     }
+
+    /**
+     * @param array $args
+     *
+     * @throws \Exception
+     */
+    public function forgot(
+        mixed $rootValue,
+        array $request,
+        GraphQLContext $context = null,
+        ResolveInfo $resolveInfo
+    ): bool {
+        $user = new ForgotPasswordService();
+
+        $registeredUser = $user->forgot($request['data']['email']);
+        $tokenResponse = $registeredUser->createToken('kanvas-login')->toArray();
+
+        $request = request();
+
+        return true;
+    }
+
+    /**
+     * Reset user password.
+     */
+    public function reset(
+        mixed $rootValue,
+        array $request,
+        GraphQLContext $context = null,
+        ResolveInfo $resolveInfo
+    ): bool {
+        $user = new ForgotPasswordService();
+
+        $user->reset($request['data']['new_password'], $request['data']['hash_key']);
+
+        return true;
+    }
 }
diff --git a/graphql/schemas/Ecosystem/user.graphql b/graphql/schemas/Ecosystem/user.graphql
@@ -108,27 +108,23 @@ input UpdateUserInput {
     address_1: String
     address_2: String
     zip_code: Int
-    city_id: Int
-        @rules(apply: ["exists:Kanvas\\Locations\\Models\\Cities,id"])
-    state_id: Int
-        @rules(apply: ["exists:Kanvas\\Locations\\Models\\States,id"])
+    city_id: Int @rules(apply: ["exists:Kanvas\\Locations\\Models\\Cities,id"])
+    state_id: Int @rules(apply: ["exists:Kanvas\\Locations\\Models\\States,id"])
     country_id: Int
-        @rules(
-            apply: ["exists:Kanvas\\Locations\\Models\\Countries,id"]
-        )
+        @rules(apply: ["exists:Kanvas\\Locations\\Models\\Countries,id"])
 }
 
 extend type Mutation {
     login(data: LoginInput!): TokenResponse!
         @field(
             resolver: "App\\GraphQL\\Ecosystem\\Mutations\\Auth\\AuthManagementMutation@loginMutation"
         )
-    logout: Boolean! 
+    logout: Boolean!
         @guard
         @field(
             resolver: "App\\GraphQL\\Ecosystem\\Mutations\\Auth\\AuthManagementMutation@logout"
         )
-    logoutFromAllDevices: Boolean! 
+    logoutFromAllDevices: Boolean!
         @guard
         @field(
             resolver: "App\\GraphQL\\Ecosystem\\Mutations\\Auth\\AuthManagementMutation@logoutFromAllDevices"

diff --git a/src/Kanvas/Notifications/Notification.php b/src/Kanvas/Notifications/Notification.php
@@ -34,7 +34,7 @@ class Notification extends LaravelNotification implements EmailInterfaces, Shoul
     protected ?UserInterface $toUser = null;
 
     public array $channels = [
-        'mail'
+        'mail',
     ];
 
     public function __construct(Model $entity)
@@ -44,7 +44,6 @@ public function __construct(Model $entity)
         $this->data = [
             'entity' => $this->entity,
             'app' => $this->app,
-            'user' => $this->toUser ? $this->toUser : null,
         ];
     }
 
@@ -72,6 +71,10 @@ public function via(object $notifiable): array
             $channels = array_values($enabledChannels);
         }
 
+        //set the user
+        $this->data['user'] = $notifiable;
+        $this->toUser = $notifiable;
+
         return [
              KanvasDatabaseChannel::class,
              ...$channels,
@@ -87,7 +90,6 @@ public function toMail($notifiable): ?MailMessage
     {
         $fromEmail = $this->app->get('from_email_address') ?? config('mail.from.address');
         $fromName = $this->app->get('from_email_name') ?? config('mail.from.name');
-        $this->toUser = $notifiable;
 
         return (new MailMessage())
                 ->from($fromEmail, $fromName)

diff --git a/src/Kanvas/Notifications/Templates/ResetPassword.php b/src/Kanvas/Notifications/Templates/ResetPassword.php
@@ -12,7 +12,7 @@ public function getData(): array
     {
         return [
            ...parent::getData(),
-            'resetUrl' => $this->app->url . '/users/reset-password/' . $this->toUser->user_activation_forgot,
+            'resetUrl' => $this->app->get('url') . '/reset-password/' . $this->toUser->getAppProfile($this->app)->user_activation_forgot,
         ];
     }
 }
diff --git a/src/Kanvas/Users/Models/Users.php b/src/Kanvas/Users/Models/Users.php
@@ -439,8 +439,6 @@ public function resetPassword(string $newPassword, AppInterface $app): bool
     {
         $user = $this->getAppProfile($app);
         $user->password = Hash::make($newPassword);
-        $user->saveOrFail();
-
         $user->user_activation_forgot = '';
         $user->saveOrFail();