Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: workaround backwards compat

Browse Source
This commit is contained in:
loks0n
2023-12-04 15:38:12 +01:00
parent 0df3ff9e8b
commit 63b2363556
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+15 -6
View File
@@ -769,6 +769,10 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
->setPayload($response->output($session, Response::MODEL_SESSION))
;
if (!Config::getParam('domainVerification')) {
$response->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $sessionSecret)]));
}
// Add token for server platforms
$tokenSecret = Auth::tokenGenerator();
@@ -796,16 +800,21 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$state['success'] = URLParser::parse($state['success']);
$query = URLParser::parseQuery($state['success']['query']);
$query['secret'] = $tokenSecret;
$query['userId'] = $user->getId();
if (parse_url($state['success'], PHP_URL_PATH) == $oauthDefaultSuccess) {
$query['project'] = $project->getId();
$query['domain'] = Config::getParam('cookieDomain');
$query['key'] = Auth::$cookieName;
$query['secret'] = $sessionSecret;
} else {
$query['secret'] = $tokenSecret;
$query['userId'] = $user->getId();
}
$state['success']['query'] = URLParser::unparseQuery($query);
$state['success'] = URLParser::unparse($state['success']);
if (!Config::getParam('domainVerification')) {
$response->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $sessionSecret)]));
}
$response
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
->addHeader('Pragma', 'no-cache')