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

chore: fix deprecation warning from passing null into json_decode

Browse Source
This commit is contained in:
Steven Nguyen
2025-07-09 22:10:17 -07:00
parent 990e1b91bb
commit 11332ed1f9
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+5 -7
View File
@@ -1424,13 +1424,13 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$name = '';
$nameOAuth = $oauth2->getUserName($accessToken);
$userParam = \json_decode($request->getParam('user'), true);
$userParam = $request->getParam('user');
if (!empty($nameOAuth)) {
$name = $nameOAuth;
} elseif (is_array($userParam)) {
$nameParam = $userParam['name'];
if (is_array($nameParam) && isset($nameParam['firstName']) && isset($nameParam['lastName'])) {
$name = $nameParam['firstName'] . ' ' . $nameParam['lastName'];
} elseif ($userParam !== null) {
$user = \json_decode($userParam, true);
if (isset($user['name']['firstName']) && isset($user['name']['lastName'])) {
$name = $user['name']['firstName'] . ' ' . $user['name']['lastName'];
}
}
$email = $oauth2->getUserEmail($accessToken);
@@ -1748,8 +1748,6 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$state['success']['query'] = URLParser::unparseQuery($query);
$state['success'] = URLParser::unparse($state['success']);
$expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
$response
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
->addHeader('Pragma', 'no-cache')