CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-30 17:26:48 +13:00
Code Issues Projects Releases Wiki Activity

Updated GEO DB calls

Browse source
This commit is contained in:
Eldad Fux 2020-10-27 03:03:54 +02:00
parent 75fc72333b
commit 3de7c27571
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/api/account.php
View file

@ -138,7 +138,7 @@ App::post('/v1/account/sessions')
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
/** @var Utopia\Locale\Locale $locale */ /** @var Utopia\Locale\Locale $locale */
/** @var GeoIp2\Database\Reader $geodb */ /** @var MaxMind\Db\Reader $geodb */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
$protocol = $request->getProtocol(); $protocol = $request->getProtocol();
@ -203,10 +203,13 @@ App::post('/v1/account/sessions')
]); ]);
try { try {
$record = $geodb->country($request->getIP()); $record = $geodb->get($request->getIP());
if($record) {
$session $session
->setAttribute('countryCode', \strtolower($record->country->isoCode)) ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
; ;
}
} catch (\Exception $e) { } catch (\Exception $e) {
$session $session
->setAttribute('countryCode', '--') ->setAttribute('countryCode', '--')
@ -375,7 +378,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
/** @var Appwrite\Database\Document $project */ /** @var Appwrite\Database\Document $project */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
/** @var GeoIp2\Database\Reader $geodb */ /** @var MaxMind\Db\Reader $geodb */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
$protocol = $request->getProtocol(); $protocol = $request->getProtocol();
@ -540,10 +543,13 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
]); ]);
try { try {
$record = $geodb->country($request->getIP()); $record = $geodb->get($request->getIP());
if ($record) {
$session $session
->setAttribute('countryCode', \strtolower($record->country->isoCode)) ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
; ;
}
} catch (\Exception $e) { } catch (\Exception $e) {
$session $session
->setAttribute('countryCode', '--') ->setAttribute('countryCode', '--')

9
app/controllers/api/teams.php
View file

@ -468,7 +468,7 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
/** @var GeoIp2\Database\Reader $geodb */ /** @var MaxMind\Db\Reader $geodb */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
$protocol = $request->getProtocol(); $protocol = $request->getProtocol();
@ -570,10 +570,13 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
]); ]);
try { try {
$record = $geodb->country($request->getIP()); $record = $geodb->get($request->getIP());
if ($record) {
$session $session
->setAttribute('countryCode', \strtolower($record->country->isoCode)) ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
; ;
}
} catch (\Exception $e) { } catch (\Exception $e) {
$session $session
->setAttribute('countryCode', '--') ->setAttribute('countryCode', '--')