Merge #263 [backport27] Revert NC change to be able to authenticate w…

…ith email address
nextmcloud · Apr 8, 2024 · 5ff1998 · 5ff1998
2 parents d866fc9 + 437ad79
commit 5ff1998
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -456,15 +456,8 @@ public function logClientIn($user,
 				return false;
 			}
 
-			if ($isTokenPassword) {
-				$dbToken = $this->tokenProvider->getToken($password);
-				$userFromToken = $this->manager->get($dbToken->getUID());
-				$isValidEmailLogin = $userFromToken->getEMailAddress() === $user
-					&& $this->validateTokenLoginName($userFromToken->getEMailAddress(), $dbToken);
-			} else {
 				$users = $this->manager->getByEmail($user);
 				$isValidEmailLogin = (\count($users) === 1 && $this->login($users[0]->getUID(), $password));
-			}
 
 			if (!$isValidEmailLogin) {
 				$this->handleLoginFailed($throttler, $currentDelay, $remoteAddress, $user, $password);