fix: fix user password setup link and user password reset link resolvers

CU-86964fpej
BracketSpace · Oct 21, 2024 · 5265737 · 5265737
1 parent 96f1d5e
commit 5265737
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/Repository/MergeTag/User/UserPasswordResetLink.php b/src/Repository/MergeTag/User/UserPasswordResetLink.php
@@ -57,7 +57,7 @@ public function __construct($params = [])
 						sprintf(
 							'wp-login.php?action=rp&key=%s&login=%s',
 							$trigger->{$this->keyPropertyName},
-							rawurlencode($trigger->{$this->getTriggerProp()}->data->user_login)
+							rawurlencode($trigger->{$this->getTriggerProp()}->user_login)
 						)
 					);
 				},

diff --git a/src/Repository/Trigger/User/UserPasswordResetRequest.php b/src/Repository/Trigger/User/UserPasswordResetRequest.php
@@ -50,10 +50,11 @@ public function __construct()
 	 */
 	public function context($username, $resetKey)
 	{
-		$user = get_user_by(
-			'login',
-			$username
-		);
+		$user = get_user_by('login', $username);
+
+		if (!$user instanceof \WP_User) {
+			return false;
+		}
 
 		/**
 		 * Bail if we are handling the registration.
@@ -71,14 +72,7 @@ public function context($username, $resetKey)
 			return false;
 		}
 
-		$this->userId = $user->data->ID;
-
-		$user = get_userdata($this->userId);
-
-		if (!$user instanceof \WP_User) {
-			return false;
-		}
-
+		$this->userId = $user->ID;
 		$this->userObject = $user;
 		$this->passwordResetKey = $resetKey;
 	}

diff --git a/src/Repository/Trigger/User/UserRegistered.php b/src/Repository/Trigger/User/UserRegistered.php
@@ -82,7 +82,7 @@ public function mergeTags()
 							sprintf(
 								'wp-login.php?action=rp&key=%s&login=%s',
 								$trigger->getPasswordResetKey(),
-								rawurlencode($trigger->userObject->userLogin)
+								rawurlencode($trigger->userObject->user_login)
 							),
 							'login'
 						);