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

Check null

Browse Source
This commit is contained in:
Damodar Lohani
2025-11-18 07:54:04 +00:00
parent 8d838355d0
commit 0dad571a8d
10 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+3 -3
View File
@@ -1803,7 +1803,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
'userAgent' => $request->getUserAgent('UNKNOWN'),
'ip' => $request->getIP(),
'factors' => [TYPE::EMAIL, 'oauth2'], // include a special oauth2 factor to bypass MFA checks
'countryCode' => $geoRecord['countryCode'],
'countryCode' => $geoRecord['countryCode'] ?? '',
'expire' => DateTime::addSeconds(new \DateTime(), $duration)
], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
@@ -2944,8 +2944,8 @@ App::get('/v1/account/logs')
$detector->getDevice()
));
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
app/controllers/api/messaging.php
+8 -8
View File
@@ -1199,8 +1199,8 @@ App::get('/v1/messaging/providers/:providerId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
@@ -2601,8 +2601,8 @@ App::get('/v1/messaging/topics/:topicId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
@@ -3016,8 +3016,8 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
@@ -3812,8 +3812,8 @@ App::get('/v1/messaging/messages/:messageId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
app/controllers/api/teams.php
+3 -3
View File
@@ -1275,7 +1275,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
'userAgent' => $request->getUserAgent('UNKNOWN'),
'ip' => $request->getIP(),
'factors' => ['email'],
'countryCode' => $geoRecord['countryCode'],
'countryCode' => $geoRecord['countryCode'] ?? '',
'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
@@ -1513,8 +1513,8 @@ App::get('/v1/teams/:teamId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
app/controllers/api/users.php
+3 -3
View File
@@ -969,8 +969,8 @@ App::get('/v1/users/:userId/logs')
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
@@ -2210,7 +2210,7 @@ App::post('/v1/users/:userId/sessions')
'userAgent' => $request->getUserAgent('UNKNOWN'),
'factors' => ['server'],
'ip' => $request->getIP(),
'countryCode' => $geoRecord['countryCode'],
'countryCode' => $geoRecord['countryCode'] ?? '',
'expire' => $expire,
],
$detector->getOS(),
app/controllers/general.php
+1 -1
View File
@@ -383,7 +383,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
$headers['x-appwrite-country-code'] = $geoRecord['countryCode'] ?? '';
$headers['x-appwrite-continent-code'] = $geoRecord['continentCode'] ?? '';
$headers['x-appwrite-continent-eu'] = (\in_array($geoRecord['countryCode'], $eu)) ? 'true' : 'false';
$headers['x-appwrite-continent-eu'] = (\in_array(($geoRecord['countryCode'] ?? ''), $eu)) ? 'true' : 'false';
}
}
src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
+2 -2
View File
@@ -146,8 +146,8 @@ class XList extends Action
'deviceModel' => $device['deviceModel']
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
-1
View File
@@ -22,7 +22,6 @@ use Utopia\Database\Validator\Queries;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\UID;
use Utopia\Locale\Locale;
use Utopia\Swoole\Response as SwooleResponse;
class XList extends Action
src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
+2 -2
View File
@@ -127,8 +127,8 @@ class XList extends Action
'deviceModel' => $device['deviceModel'],
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
+2 -2
View File
@@ -122,8 +122,8 @@ class XList extends Action
'deviceModel' => $device['deviceModel'],
]);
$output[$i]['countryCode'] = $geoRecord['countryCode'];
$output[$i]['countryName'] = $geoRecord['countryName'];
$output[$i]['countryCode'] = $geoRecord['countryCode'] ?? '';
$output[$i]['countryName'] = $geoRecord['countryName'] ?? '';
}
$response->dynamic(new Document([
src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+1 -1
View File
@@ -239,7 +239,7 @@ class Create extends Base
$headers['x-appwrite-country-code'] = $geoRecord['countryCode'] ?? '';
$headers['x-appwrite-continent-code'] = $geoRecord['continentCode'] ?? '';
$headers['x-appwrite-continent-eu'] = (\in_array($geoRecord['countryCode'], $eu)) ? 'true' : 'false';
$headers['x-appwrite-continent-eu'] = (\in_array(($geoRecord['countryCode'] ?? ''), $eu)) ? 'true' : 'false';
}
}