Merge branch '1.5.x' into fix-templates-copy-hidden-files

This commit is contained in:
Luke B. Silver 2024-02-29 14:51:59 +00:00 committed by GitHub
commit ab36448731
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -934,12 +934,12 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
->setPayload($response->output($session, Response::MODEL_SESSION))
;
// TODO: Remove this deprecated, undocumented workaround
// TODO: Remove this deprecated workaround - support only token
if ($state['success']['path'] == $oauthDefaultSuccess) {
$query['project'] = $project->getId();
$query['domain'] = Config::getParam('cookieDomain');
$query['key'] = Auth::$cookieName;
$query['secret'] = $secret;
$query['secret'] = Auth::encodeSession($user->getId(), $secret);
}
$response