set-password empty user fix

HesyRa · HesyRa · commit 2e19210cc3e5 · 2017-09-07T18:23:56.000+03:00
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -352,7 +352,7 @@ public function setPasswordAction()
         }
 
         if ($token === null ||
-            !$this->userManager->validatePasswordResetToken($token)
+            !$user = $this->userManager->validatePasswordResetToken($token)
         ) {
             return $this->redirect()->toRoute('user',
                 ['action' => 'message', 'id' => 'failed']);
@@ -389,7 +389,8 @@ public function setPasswordAction()
         }
 
         return new ViewModel([
-            'form' => $form
+            'form' => $form,
+            'user' => $user
         ]);
     }
 
diff --git a/src/Service/UserManager.php b/src/Service/UserManager.php
@@ -257,7 +257,7 @@ public function validatePasswordResetToken($passwordResetToken)
             return false; // expired
         }
         
-        return true;
+        return $user;
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public function setPasswordAction()`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`if ($token === null \|\|`
`355`		`- !$this->userManager->validatePasswordResetToken($token)`
	`355`	`+ !$user = $this->userManager->validatePasswordResetToken($token)`
`356`	`356`	`) {`
`357`	`357`	`return $this->redirect()->toRoute('user',`
`358`	`358`	`['action' => 'message', 'id' => 'failed']);`
`@@ -389,7 +389,8 @@ public function setPasswordAction()`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`return new ViewModel([`
`392`		`- 'form' => $form`
	`392`	`+ 'form' => $form,`
	`393`	`+ 'user' => $user`
`393`	`394`	`]);`
`394`	`395`	`}`
`395`	`396`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public function validatePasswordResetToken($passwordResetToken)`
`257`	`257`	`return false; // expired`
`258`	`258`	`}`
`259`	`259`
`260`		`- return true;`
	`260`	`+ return $user;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`/**`