Merge branch 'master' of github.com:appwrite/appwrite
This commit is contained in:
commit
157ef49125
1 changed files with 5 additions and 4 deletions
|
@ -29,8 +29,8 @@ use DeviceDetector\DeviceDetector;
|
||||||
use GeoIp2\Database\Reader;
|
use GeoIp2\Database\Reader;
|
||||||
use Utopia\Validator\ArrayList;
|
use Utopia\Validator\ArrayList;
|
||||||
|
|
||||||
$oauthDefaultSuccess = $request->getServer('_APP_HOME').'/auth/oauth2/success';
|
$oauthDefaultSuccess = '/auth/oauth2/success';
|
||||||
$oauthDefaultFailure = $request->getServer('_APP_HOME').'/auth/oauth2/failure';
|
$oauthDefaultFailure = '/auth/oauth2/failure';
|
||||||
|
|
||||||
$oauth2Keys = [];
|
$oauth2Keys = [];
|
||||||
|
|
||||||
|
@ -508,8 +508,9 @@ $utopia->get('/v1/account/sessions/oauth2/:provider/redirect')
|
||||||
->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
|
->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($state['success'] === $oauthDefaultSuccess) { // Add keys for non-web platforms
|
// Add keys for non-web platforms - TODO - add verification phase to aviod session sniffing
|
||||||
|
if (parse_url($state['success'], PHP_URL_PATH) === $oauthDefaultSuccess) {
|
||||||
$state['success'] = URLParser::parse($state['success']);
|
$state['success'] = URLParser::parse($state['success']);
|
||||||
$query = URLParser::parseQuery($state['success']['query']);
|
$query = URLParser::parseQuery($state['success']['query']);
|
||||||
$query['project'] = $project->getId();
|
$query['project'] = $project->getId();
|
||||||
|
|
Loading…
Reference in a new issue