Skip to content

Commit 2ef04bf

Browse files
authored
Merge pull request #47686 from nextcloud/fix/move-email-logic-local-user-backend
fix: Move login via email logic to local backend
2 parents a1a35c0 + 3c4feff commit 2ef04bf

File tree

6 files changed

+140
-328
lines changed

6 files changed

+140
-328
lines changed

lib/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,6 @@
10781078
'OC\\Authentication\\Login\\ClearLostPasswordTokensCommand' => $baseDir . '/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php',
10791079
'OC\\Authentication\\Login\\CompleteLoginCommand' => $baseDir . '/lib/private/Authentication/Login/CompleteLoginCommand.php',
10801080
'OC\\Authentication\\Login\\CreateSessionTokenCommand' => $baseDir . '/lib/private/Authentication/Login/CreateSessionTokenCommand.php',
1081-
'OC\\Authentication\\Login\\EmailLoginCommand' => $baseDir . '/lib/private/Authentication/Login/EmailLoginCommand.php',
10821081
'OC\\Authentication\\Login\\FinishRememberedLoginCommand' => $baseDir . '/lib/private/Authentication/Login/FinishRememberedLoginCommand.php',
10831082
'OC\\Authentication\\Login\\FlowV2EphemeralSessionsCommand' => $baseDir . '/lib/private/Authentication/Login/FlowV2EphemeralSessionsCommand.php',
10841083
'OC\\Authentication\\Login\\LoggedInCheckCommand' => $baseDir . '/lib/private/Authentication/Login/LoggedInCheckCommand.php',

lib/composer/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
11271127
'OC\\Authentication\\Login\\ClearLostPasswordTokensCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php',
11281128
'OC\\Authentication\\Login\\CompleteLoginCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/CompleteLoginCommand.php',
11291129
'OC\\Authentication\\Login\\CreateSessionTokenCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/CreateSessionTokenCommand.php',
1130-
'OC\\Authentication\\Login\\EmailLoginCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/EmailLoginCommand.php',
11311130
'OC\\Authentication\\Login\\FinishRememberedLoginCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/FinishRememberedLoginCommand.php',
11321131
'OC\\Authentication\\Login\\FlowV2EphemeralSessionsCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/FlowV2EphemeralSessionsCommand.php',
11331132
'OC\\Authentication\\Login\\LoggedInCheckCommand' => __DIR__ . '/../../..' . '/lib/private/Authentication/Login/LoggedInCheckCommand.php',

lib/private/Authentication/Login/Chain.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public function __construct(
1313
private PreLoginHookCommand $preLoginHookCommand,
1414
private UserDisabledCheckCommand $userDisabledCheckCommand,
1515
private UidLoginCommand $uidLoginCommand,
16-
private EmailLoginCommand $emailLoginCommand,
1716
private LoggedInCheckCommand $loggedInCheckCommand,
1817
private CompleteLoginCommand $completeLoginCommand,
1918
private CreateSessionTokenCommand $createSessionTokenCommand,
@@ -31,7 +30,6 @@ public function process(LoginData $loginData): LoginResult {
3130
$chain
3231
->setNext($this->userDisabledCheckCommand)
3332
->setNext($this->uidLoginCommand)
34-
->setNext($this->emailLoginCommand)
3533
->setNext($this->loggedInCheckCommand)
3634
->setNext($this->completeLoginCommand)
3735
->setNext($this->flowV2EphemeralSessionsCommand)

lib/private/Authentication/Login/EmailLoginCommand.php

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)