summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-12-03 15:50:47 +0100
committerGitHub <noreply@github.com>2022-12-03 15:50:47 +0100
commit299f979d94d32ca9305a19aa641c79b50577a738 (patch)
tree77cd631fc58bd927346b8b626d7b040529765742
parent515dbfa351fd4a5a3bb4ec25a446e1a0592abc32 (diff)
parent6c76443e89dead3a4590d7abfbfbb8cb6254c8b9 (diff)
downloadnextcloud-server-299f979d94d32ca9305a19aa641c79b50577a738.tar.gz
nextcloud-server-299f979d94d32ca9305a19aa641c79b50577a738.zip
Merge pull request #35556 from nextcloud/revert/unrelated-change
Revert unrelated change from #34940
-rw-r--r--core/Controller/ClientFlowLoginV2Controller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php
index 90dbac2ca27..3c57b190593 100644
--- a/core/Controller/ClientFlowLoginV2Controller.php
+++ b/core/Controller/ClientFlowLoginV2Controller.php
@@ -216,7 +216,7 @@ class ClientFlowLoginV2Controller extends Controller {
return $response;
}
- $result = $this->loginFlowV2Service->flowDoneWithAppPassword($loginToken, $this->getServerPath(), $user, $password);
+ $result = $this->loginFlowV2Service->flowDoneWithAppPassword($loginToken, $this->getServerPath(), $this->userId, $password);
return $this->handleFlowDone($result);
}