From 1bbb4818fa3def35796b8ad3b64416f872beb94e Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 6 Jul 2026 01:14:13 +0000 Subject: [PATCH] refactor(geo): defer locale translation and expose full session geo fields on GeoRecord Restructure GeoRecord + getGeoForIp so the cached record holds raw geo data and locale-translated country/continent names resolve lazily against the current request locale. Extract the full session field set from the geo service response (latitude/longitude/timeZone/weatherCode/postalCode/ autonomousSystem*/connection*/isp) via dedicated getters so account.php callsites stop relying on ad-hoc getAttribute() lookups. Normalize country/continent codes to uppercase before the EU check so the lookup no longer depends on the geo API and locale-eu.php happening to agree on case. Add an isEmpty() override so geo-fencing guards in general.php and Executions/Create.php actually key off "geo data is available" instead of "the ArrayObject has any elements", which was always true. --- app/controllers/api/account.php | 88 +++++++++++------------ app/init/resources/request.php | 40 +++++++---- src/Appwrite/Locale/GeoRecord.php | 114 +++++++++++++++++++++++++++++- 3 files changed, 181 insertions(+), 61 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 9a375b1ae7..b86d62a53d 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -171,17 +171,17 @@ $createSession = function (string $userId, string $secret, Request $request, Res 'factors' => [$factor], 'countryCode' => $geoRecord->getCountryCode(), 'continentCode' => $geoRecord->getContinentCode() === '--' ? null : $geoRecord->getContinentCode(), - 'latitude' => $geoRecord->getAttribute('latitude'), - 'longitude' => $geoRecord->getAttribute('longitude'), - 'timeZone' => $geoRecord->getAttribute('timeZone'), - 'weatherCode' => $geoRecord->getAttribute('weatherCode'), - 'postalCode' => $geoRecord->getAttribute('postalCode'), - 'autonomousSystemNumber' => $geoRecord->getAttribute('autonomousSystemNumber'), - 'autonomousSystemOrganization' => $geoRecord->getAttribute('autonomousSystemOrganization'), - 'connectionType' => $geoRecord->getAttribute('connection'), - 'connectionUsageType' => $geoRecord->getAttribute('user'), - 'connectionOrganization' => $geoRecord->getAttribute('organization'), - 'isp' => $geoRecord->getAttribute('isp'), + 'latitude' => $geoRecord->getLatitude(), + 'longitude' => $geoRecord->getLongitude(), + 'timeZone' => $geoRecord->getTimeZone(), + 'weatherCode' => $geoRecord->getWeatherCode(), + 'postalCode' => $geoRecord->getPostalCode(), + 'autonomousSystemNumber' => $geoRecord->getAutonomousSystemNumber(), + 'autonomousSystemOrganization' => $geoRecord->getAutonomousSystemOrganization(), + 'connectionType' => $geoRecord->getConnectionType(), + 'connectionUsageType' => $geoRecord->getConnectionUsageType(), + 'connectionOrganization' => $geoRecord->getConnectionOrganization(), + 'isp' => $geoRecord->getIsp(), 'expire' => DateTime::addSeconds(new \DateTime(), $duration) ], $providerCredentials, @@ -990,17 +990,17 @@ Http::post('/v1/account/sessions/email') 'factors' => ['password'], 'countryCode' => $geoRecord->getCountryCode(), 'continentCode' => $geoRecord->getContinentCode() === '--' ? null : $geoRecord->getContinentCode(), - 'latitude' => $geoRecord->getAttribute('latitude'), - 'longitude' => $geoRecord->getAttribute('longitude'), - 'timeZone' => $geoRecord->getAttribute('timeZone'), - 'weatherCode' => $geoRecord->getAttribute('weatherCode'), - 'postalCode' => $geoRecord->getAttribute('postalCode'), - 'autonomousSystemNumber' => $geoRecord->getAttribute('autonomousSystemNumber'), - 'autonomousSystemOrganization' => $geoRecord->getAttribute('autonomousSystemOrganization'), - 'connectionType' => $geoRecord->getAttribute('connection'), - 'connectionUsageType' => $geoRecord->getAttribute('user'), - 'connectionOrganization' => $geoRecord->getAttribute('organization'), - 'isp' => $geoRecord->getAttribute('isp'), + 'latitude' => $geoRecord->getLatitude(), + 'longitude' => $geoRecord->getLongitude(), + 'timeZone' => $geoRecord->getTimeZone(), + 'weatherCode' => $geoRecord->getWeatherCode(), + 'postalCode' => $geoRecord->getPostalCode(), + 'autonomousSystemNumber' => $geoRecord->getAutonomousSystemNumber(), + 'autonomousSystemOrganization' => $geoRecord->getAutonomousSystemOrganization(), + 'connectionType' => $geoRecord->getConnectionType(), + 'connectionUsageType' => $geoRecord->getConnectionUsageType(), + 'connectionOrganization' => $geoRecord->getConnectionOrganization(), + 'isp' => $geoRecord->getIsp(), 'expire' => DateTime::addSeconds(new \DateTime(), $duration) ], $detector->getOS(), @@ -1175,17 +1175,17 @@ Http::post('/v1/account/sessions/anonymous') 'factors' => ['anonymous'], 'countryCode' => $geoRecord->getCountryCode(), 'continentCode' => $geoRecord->getContinentCode() === '--' ? null : $geoRecord->getContinentCode(), - 'latitude' => $geoRecord->getAttribute('latitude'), - 'longitude' => $geoRecord->getAttribute('longitude'), - 'timeZone' => $geoRecord->getAttribute('timeZone'), - 'weatherCode' => $geoRecord->getAttribute('weatherCode'), - 'postalCode' => $geoRecord->getAttribute('postalCode'), - 'autonomousSystemNumber' => $geoRecord->getAttribute('autonomousSystemNumber'), - 'autonomousSystemOrganization' => $geoRecord->getAttribute('autonomousSystemOrganization'), - 'connectionType' => $geoRecord->getAttribute('connection'), - 'connectionUsageType' => $geoRecord->getAttribute('user'), - 'connectionOrganization' => $geoRecord->getAttribute('organization'), - 'isp' => $geoRecord->getAttribute('isp'), + 'latitude' => $geoRecord->getLatitude(), + 'longitude' => $geoRecord->getLongitude(), + 'timeZone' => $geoRecord->getTimeZone(), + 'weatherCode' => $geoRecord->getWeatherCode(), + 'postalCode' => $geoRecord->getPostalCode(), + 'autonomousSystemNumber' => $geoRecord->getAutonomousSystemNumber(), + 'autonomousSystemOrganization' => $geoRecord->getAutonomousSystemOrganization(), + 'connectionType' => $geoRecord->getConnectionType(), + 'connectionUsageType' => $geoRecord->getConnectionUsageType(), + 'connectionOrganization' => $geoRecord->getConnectionOrganization(), + 'isp' => $geoRecord->getIsp(), 'expire' => DateTime::addSeconds(new \DateTime(), $duration) ], $detector->getOS(), @@ -1989,17 +1989,17 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') 'factors' => [TYPE::EMAIL, 'oauth2'], // include a special oauth2 factor to bypass MFA checks 'countryCode' => $geoRecord->getCountryCode(), 'continentCode' => $geoRecord->getContinentCode() === '--' ? null : $geoRecord->getContinentCode(), - 'latitude' => $geoRecord->getAttribute('latitude'), - 'longitude' => $geoRecord->getAttribute('longitude'), - 'timeZone' => $geoRecord->getAttribute('timeZone'), - 'weatherCode' => $geoRecord->getAttribute('weatherCode'), - 'postalCode' => $geoRecord->getAttribute('postalCode'), - 'autonomousSystemNumber' => $geoRecord->getAttribute('autonomousSystemNumber'), - 'autonomousSystemOrganization' => $geoRecord->getAttribute('autonomousSystemOrganization'), - 'connectionType' => $geoRecord->getAttribute('connection'), - 'connectionUsageType' => $geoRecord->getAttribute('user'), - 'connectionOrganization' => $geoRecord->getAttribute('organization'), - 'isp' => $geoRecord->getAttribute('isp'), + 'latitude' => $geoRecord->getLatitude(), + 'longitude' => $geoRecord->getLongitude(), + 'timeZone' => $geoRecord->getTimeZone(), + 'weatherCode' => $geoRecord->getWeatherCode(), + 'postalCode' => $geoRecord->getPostalCode(), + 'autonomousSystemNumber' => $geoRecord->getAutonomousSystemNumber(), + 'autonomousSystemOrganization' => $geoRecord->getAutonomousSystemOrganization(), + 'connectionType' => $geoRecord->getConnectionType(), + 'connectionUsageType' => $geoRecord->getConnectionUsageType(), + 'connectionOrganization' => $geoRecord->getConnectionOrganization(), + 'isp' => $geoRecord->getIsp(), 'expire' => DateTime::addSeconds(new \DateTime(), $duration) ], $detector->getOS(), $detector->getClient(), $detector->getDevice())); diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 3c4550ef33..e56e450445 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -1364,30 +1364,42 @@ return function (Container $context): void { } } - $countryCode = $record['countryCode'] ?? '--'; - $continentCode = $record['continentCode'] ?? '--'; - $unknownCountry = $locale->getText('locale.country.unknown'); + $countryCode = \strtoupper($record['countryCode'] ?? '--'); + $continentCode = \strtoupper($record['continentCode'] ?? '--'); - $eu = Config::getParam('locale-eu'); + $eu = \array_map('strtoupper', Config::getParam('locale-eu')); $currencies = Config::getParam('locale-currencies'); $currency = null; - foreach ($currencies as $element) { - if (isset($element['locations'], $element['code']) && \in_array($countryCode, $element['locations'])) { - $currency = $element['code']; - break; + if ($countryCode !== '--') { + foreach ($currencies as $element) { + if (isset($element['locations'], $element['code']) && \in_array($countryCode, $element['locations'], true)) { + $currency = $element['code']; + break; + } } } - $geoRecord = new GeoRecord([ + $autonomousSystemNumber = $record['autonomousSystemNumber'] ?? null; + + $geoRecord = (new GeoRecord([ 'ip' => $ip, - 'countryCode' => $locale->getText('countries.' . strtolower($countryCode), false) ? strtolower($countryCode) : '--', - 'countryName' => $locale->getText('countries.' . strtolower($countryCode), $unknownCountry), - 'continent' => $locale->getText('continents.' . strtolower($continentCode), $unknownCountry), + 'countryCode' => $countryCode, 'continentCode' => $continentCode, - 'eu' => \in_array($countryCode, $eu), + 'eu' => $countryCode !== '--' && \in_array($countryCode, $eu, true), 'currency' => $currency, - ]); + 'latitude' => $record['latitude'] ?? null, + 'longitude' => $record['longitude'] ?? null, + 'timeZone' => $record['timeZone'] ?? null, + 'weatherCode' => $record['weatherCode'] ?? null, + 'postalCode' => $record['postalCode'] ?? null, + 'autonomousSystemNumber' => $autonomousSystemNumber === null ? null : (string) $autonomousSystemNumber, + 'autonomousSystemOrganization' => $record['autonomousSystemOrganization'] ?? null, + 'connectionType' => $record['connection'] ?? null, + 'connectionUsageType' => $record['user'] ?? $record['type'] ?? null, + 'connectionOrganization' => $record['organization'] ?? null, + 'isp' => $record['isp'] ?? null, + ]))->setLocale($locale); $cache[$ip] = $geoRecord; diff --git a/src/Appwrite/Locale/GeoRecord.php b/src/Appwrite/Locale/GeoRecord.php index 99640c72cd..2146eed7c0 100644 --- a/src/Appwrite/Locale/GeoRecord.php +++ b/src/Appwrite/Locale/GeoRecord.php @@ -3,9 +3,24 @@ namespace Appwrite\Locale; use Utopia\Database\Document; +use Utopia\Locale\Locale; class GeoRecord extends Document { + private ?Locale $locale = null; + + public function setLocale(Locale $locale): self + { + $this->locale = $locale; + + return $this; + } + + public function isEmpty(): bool + { + return $this->getAttribute('countryCode', '--') === '--'; + } + public function getIp(): string { return $this->getAttribute('ip', ''); @@ -13,17 +28,51 @@ class GeoRecord extends Document public function getCountryCode(): string { - return $this->getAttribute('countryCode', '--'); + $code = $this->getAttribute('countryCode', '--'); + + if ($code === '--') { + return '--'; + } + + $lower = \strtolower($code); + + if ($this->locale === null) { + return $lower; + } + + return $this->locale->getText('countries.' . $lower, false) ? $lower : '--'; } public function getCountryName(): string { - return $this->getAttribute('countryName', ''); + if ($this->locale === null) { + return ''; + } + + $unknown = $this->locale->getText('locale.country.unknown'); + $code = $this->getAttribute('countryCode', '--'); + + if ($code === '--') { + return $unknown; + } + + return $this->locale->getText('countries.' . \strtolower($code), $unknown); } public function getContinent(): string { - return $this->getAttribute('continent', ''); + if ($this->locale === null) { + return ''; + } + + $unknown = $this->locale->getText('locale.country.unknown'); + $code = $this->getAttribute('continentCode', '--'); + + if ($code === '--') { + return $unknown; + } + + return $this->locale->getText('continents.' . \strtolower($code), $unknown); } public function getContinentCode(): string @@ -40,4 +89,63 @@ class GeoRecord extends Document { return $this->getAttribute('currency'); } + + public function getTimeZone(): ?string + { + return $this->getAttribute('timeZone'); + } + + public function getWeatherCode(): ?string + { + return $this->getAttribute('weatherCode'); + } + + public function getPostalCode(): ?string + { + return $this->getAttribute('postalCode'); + } + + public function getLatitude(): ?float + { + $value = $this->getAttribute('latitude'); + + return $value === null ? null : (float) $value; + } + + public function getLongitude(): ?float + { + $value = $this->getAttribute('longitude'); + + return $value === null ? null : (float) $value; + } + + public function getIsp(): ?string + { + return $this->getAttribute('isp'); + } + + public function getAutonomousSystemNumber(): ?string + { + return $this->getAttribute('autonomousSystemNumber'); + } + + public function getAutonomousSystemOrganization(): ?string + { + return $this->getAttribute('autonomousSystemOrganization'); + } + + public function getConnectionType(): ?string + { + return $this->getAttribute('connectionType'); + } + + public function getConnectionUsageType(): ?string + { + return $this->getAttribute('connectionUsageType'); + } + + public function getConnectionOrganization(): ?string + { + return $this->getAttribute('connectionOrganization'); + } }