diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-11-03 10:53:05 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2021-12-29 11:52:31 +0100 |
| commit | 61dd1d3d976e811ed504074e3d9fd7d2b149b5b5 (patch) | |
| tree | 44704b27ee1cccda6f6a488996b56e6668f3011a /core/Controller | |
| parent | 8eab1fedfe64e17d1bfadca3f26da913a8bd9347 (diff) | |
| download | nextcloud-server-61dd1d3d976e811ed504074e3d9fd7d2b149b5b5.tar.gz nextcloud-server-61dd1d3d976e811ed504074e3d9fd7d2b149b5b5.zip | |
Pass username prefill through unauthenticated request redirects
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/ClientFlowLoginController.php | 3 | ||||
| -rw-r--r-- | core/Controller/ClientFlowLoginV2Controller.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index 2ba26deb0e7..e067f0ff6b5 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -167,7 +167,7 @@ class ClientFlowLoginController extends Controller { * * @return StandaloneTemplateResponse */ - public function showAuthPickerPage($clientIdentifier = '') { + public function showAuthPickerPage($clientIdentifier = '', $user = '') { $clientName = $this->getClientName(); $client = null; if ($clientIdentifier !== '') { @@ -218,6 +218,7 @@ class ClientFlowLoginController extends Controller { 'stateToken' => $stateToken, 'serverHost' => $this->getServerPath(), 'oauthState' => $this->session->get('oauth.state'), + 'user' => $user, ], 'guest' ); diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php index 205c1ff8a1c..bb15ea3cc5d 100644 --- a/core/Controller/ClientFlowLoginV2Controller.php +++ b/core/Controller/ClientFlowLoginV2Controller.php @@ -117,7 +117,7 @@ class ClientFlowLoginV2Controller extends Controller { * @PublicPage * @UseSession */ - public function showAuthPickerPage(): StandaloneTemplateResponse { + public function showAuthPickerPage($user = ''): StandaloneTemplateResponse { try { $flow = $this->getFlowByLoginToken(); } catch (LoginFlowV2NotFoundException $e) { @@ -138,6 +138,7 @@ class ClientFlowLoginV2Controller extends Controller { 'instanceName' => $this->defaults->getName(), 'urlGenerator' => $this->urlGenerator, 'stateToken' => $stateToken, + 'user' => $user, ], 'guest' ); |