Merge pull request #11857 from nextcloud/backport/10942/longer-passwo…

…rd-reset-time [stable13] Change password expiration time from 12h to 7d
nextcloud · Oct 17, 2018 · e3a2b9e · e3a2b9e
2 parents 329c210 + 7613801
commit e3a2b9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
@@ -187,7 +187,7 @@ protected function checkPasswordResetToken($token, $userId) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 		}
 
-		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*24*7) ||
 			$user->getLastLogin() > $splittedToken[0]) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
 		}

diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php
@@ -584,7 +584,7 @@ public function testSetPasswordExpiredToken() {
 			->with('ValidTokenUser')
 			->willReturn($this->existingUser);
 		$this->timeFactory->method('getTime')
-			->willReturn(55546);
+			->willReturn(617146);
 
 		$this->crypto->method('decrypt')
 			->with(