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

Updated record tests

Browse Source
This commit is contained in:
Eldad Fux
2020-10-27 07:48:56 +02:00
parent 1c03fb5f63
commit b4e47246b1
3 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+20 -28
View File
@@ -202,15 +202,13 @@ App::post('/v1/account/sessions')
'deviceModel' => $dd->getModel(),
]);
try {
$record = $geodb->get($request->getIP());
$record = $geodb->get($request->getIP());
if($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
}
} catch (\Exception $e) {
if($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
} else {
$session
->setAttribute('countryCode', '--')
;
@@ -542,15 +540,13 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
'deviceModel' => $dd->getModel(),
]);
try {
$record = $geodb->get($request->getIP());
$record = $geodb->get($request->getIP());
if ($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
}
} catch (\Exception $e) {
if($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
} else {
$session
->setAttribute('countryCode', '--')
;
@@ -761,20 +757,16 @@ App::get('/v1/account/logs')
'deviceModel' => $dd->getModel(),
]);
try {
$record = $geodb->get($log['ip']);
$record = $geodb->get($log['ip']);
if ($record) {
$output[$i]['countryCode'] = \strtolower($record['country']['iso_code']);
$output[$i]['countryCode'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
} else {
$output[$i]['countryCode'] = '--';
$output[$i]['countryCode'] = $locale->getText('locale.country.unknown');
}
} catch (\Exception $e) {
$output[$i]->setAttribute('countryCode', '--');
$output[$i]->setAttribute('countryName', $locale->getText('locale.country.unknown'));
if ($record) {
$output[$i]['countryCode'] = \strtolower($record['country']['iso_code']);
$output[$i]['countryCode'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
} else {
$output[$i]['countryCode'] = '--';
$output[$i]['countryCode'] = $locale->getText('locale.country.unknown');
}
}
$response->dynamic(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
app/controllers/api/teams.php
+6 -8
View File
@@ -569,15 +569,13 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
'deviceModel' => $dd->getModel(),
]);
try {
$record = $geodb->get($request->getIP());
$record = $geodb->get($request->getIP());
if ($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
}
} catch (\Exception $e) {
if($record) {
$session
->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
;
} else {
$session
->setAttribute('countryCode', '--')
;
app/controllers/api/users.php
+7 -12
View File
@@ -284,19 +284,14 @@ App::get('/v1/users/:userId/logs')
'deviceModel' => $dd->getModel(),
]);
try {
$record = $geodb->get($log['ip']);
$record = $geodb->get($log['ip']);
if($record){
$output[$i]['countryCode'] = \strtolower($record['country']['iso_code']);
$output[$i]['countryName'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
} else{
$output[$i]['countryCode'] = '--';
$output[$i]['countryName'] = $locale->getText('locale.country.unknown');
}
} catch (\Exception $e) {
$output[$i]->setAttribute('countryCode', '--');
$output[$i]->setAttribute('countryName', $locale->getText('locale.country.unknown'));
if($record){
$output[$i]['countryCode'] = \strtolower($record['country']['iso_code']);
$output[$i]['countryName'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
} else {
$output[$i]['countryCode'] = '--';
$output[$i]['countryName'] = $locale->getText('locale.country.unknown');
}
}