diff options
| author | Julius Härtl <jus@bitgrid.net> | 2024-07-15 15:49:32 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2024-08-05 12:13:52 +0200 |
| commit | 1aa29441e33d9dbe00e3bd57cba7908c6ffed277 (patch) | |
| tree | c3796f8f819af0f3bf53a09e48873e36877c8973 /core/Controller | |
| parent | 8511b89579b761798ea4f6ecf9257cad8d0bc462 (diff) | |
| download | nextcloud-server-1aa29441e33d9dbe00e3bd57cba7908c6ffed277.tar.gz nextcloud-server-1aa29441e33d9dbe00e3bd57cba7908c6ffed277.zip | |
fix: Add direct parameter to flow auth v2
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/ClientFlowLoginV2Controller.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php index 76c8ed2921a..e6e1c282d2b 100644 --- a/core/Controller/ClientFlowLoginV2Controller.php +++ b/core/Controller/ClientFlowLoginV2Controller.php @@ -84,7 +84,7 @@ class ClientFlowLoginV2Controller extends Controller { #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] #[FrontpageRoute(verb: 'GET', url: '/login/v2/flow/{token}')] - public function landing(string $token, $user = ''): Response { + public function landing(string $token, $user = '', int $direct = 0): Response { if (!$this->loginFlowV2Service->startLoginFlow($token)) { return $this->loginTokenForbiddenResponse(); } @@ -92,7 +92,7 @@ class ClientFlowLoginV2Controller extends Controller { $this->session->set(self::TOKEN_NAME, $token); return new RedirectResponse( - $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.showAuthPickerPage', ['user' => $user]) + $this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.showAuthPickerPage', ['user' => $user, 'direct' => $direct]) ); } @@ -101,7 +101,7 @@ class ClientFlowLoginV2Controller extends Controller { #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] #[FrontpageRoute(verb: 'GET', url: '/login/v2/flow')] - public function showAuthPickerPage($user = ''): StandaloneTemplateResponse { + public function showAuthPickerPage(string $user = '', int $direct = 0): StandaloneTemplateResponse { try { $flow = $this->getFlowByLoginToken(); } catch (LoginFlowV2NotFoundException $e) { @@ -123,6 +123,7 @@ class ClientFlowLoginV2Controller extends Controller { 'urlGenerator' => $this->urlGenerator, 'stateToken' => $stateToken, 'user' => $user, + 'direct' => $direct, ], 'guest' ); @@ -136,7 +137,7 @@ class ClientFlowLoginV2Controller extends Controller { #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] #[FrontpageRoute(verb: 'GET', url: '/login/v2/grant')] - public function grantPage(?string $stateToken): StandaloneTemplateResponse { + public function grantPage(?string $stateToken, int $direct = 0): StandaloneTemplateResponse { if ($stateToken === null) { return $this->stateTokenMissingResponse(); } @@ -163,6 +164,7 @@ class ClientFlowLoginV2Controller extends Controller { 'instanceName' => $this->defaults->getName(), 'urlGenerator' => $this->urlGenerator, 'stateToken' => $stateToken, + 'direct' => $direct, ], 'guest' ); |