From 345ec83b3637bd59d0cb80aac9ff07c6e0e5413a Mon Sep 17 00:00:00 2001 From: "szabolcs.gyuris" Date: Fri, 11 Oct 2024 09:26:06 +0000 Subject: [PATCH] Revert NC change to be able to authenticate with email address - webdav clients (cherry picked from commit 437ad79ba190d126db701a6628977f333689749a) (cherry picked from commit fa536abf43c2da39860cc27dfa79d5c0fb905199) --- lib/private/User/Session.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 72a9621355efe..d111e48b718dd 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -439,15 +439,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);