Merge pull request #212 from fleetbase/feature/fix-request-timezone-precedence

Fix request timezone precedence during user enrichment

Author: roncodes

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.45",
+    "version": "1.6.46",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

src/Models/User.php

@@ -7,6 +7,7 @@
 use Fleetbase\Notifications\UserCreated;
 use Fleetbase\Notifications\UserInvited;
 use Fleetbase\Support\NotificationRegistry;
+use Fleetbase\Support\Timezone;
 use Fleetbase\Support\Utils;
 use Fleetbase\Traits\ClearsHttpCache;
 use Fleetbase\Traits\Expandable;
@@ -1220,7 +1221,14 @@ public function isNotVerified(): bool
      */
     public static function applyUserInfoFromRequest($request, array $attributes = []): array
     {
-        $info = null;
+        $info         = null;
+        $timezone     = Timezone::firstValid([
+            $request->input('timezone'),
+            $request->input('whois.timezone'),
+            $request->input('whois.time_zone.name'),
+            data_get($attributes, 'timezone'),
+        ]);
+
         // Lookup user default details
         try {
             $info = \Fleetbase\Support\Http::lookupIp($request);
@@ -1230,10 +1238,16 @@ public static function applyUserInfoFromRequest($request, array $attributes = []
         if ($info) {
             $attributes['country']    = data_get($info, 'country_code');
             $attributes['ip_address'] = data_get($info, 'ip', $request->ip());
-            $tzInfo                   = data_get($info, 'time_zone.name', $request->input('timezone'));
-            if ($tzInfo) {
-                $attributes['timezone'] = $tzInfo;
+            $timezone                 = $timezone ?: Timezone::firstValid([
+                data_get($info, 'time_zone.name'),
+                data_get($info, 'timezone'),
+                data_get($info, 'timezone_name'),
+            ]);
+
+            if ($timezone) {
+                $attributes['timezone'] = $timezone;
             }
+
             $attributes['meta'] = [
                 'areacode'   => data_get($info, 'calling_code'),
                 'currency'   => data_get($info, 'currency.code'),
@@ -1245,6 +1259,10 @@ public static function applyUserInfoFromRequest($request, array $attributes = []
             ];
         }
 
+        if ($timezone) {
+            $attributes['timezone'] = $timezone;
+        }
+
         return $attributes;
     }
 

src/Support/Timezone.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Fleetbase\Support;
+
+class Timezone
+{
+    /**
+     * Return the first valid IANA timezone from a list of candidates.
+     */
+    public static function firstValid(array $candidates): ?string
+    {
+        foreach ($candidates as $candidate) {
+            if (!is_string($candidate) || trim($candidate) === '') {
+                continue;
+            }
+
+            $candidate = trim($candidate);
+            if (in_array($candidate, \DateTimeZone::listIdentifiers(), true)) {
+                return $candidate;
+            }
+        }
+
+        return null;
+    }
+}

tests/Unit/TimezoneTest.php

@@ -0,0 +1,40 @@
+<?php
+
+use Fleetbase\Support\Timezone;
+
+test('first valid timezone preserves request precedence order', function () {
+    $timezone = Timezone::firstValid([
+        'America/New_York',
+        'Asia/Singapore',
+    ]);
+
+    expect($timezone)->toBe('America/New_York');
+});
+
+test('first valid timezone accepts nested whois timezone candidates', function () {
+    $timezone = Timezone::firstValid([
+        null,
+        'Europe/London',
+        'Asia/Singapore',
+    ]);
+
+    expect($timezone)->toBe('Europe/London');
+});
+
+test('first valid timezone ignores invalid values', function () {
+    $timezone = Timezone::firstValid([
+        'Not/A_Timezone',
+        'Also/Invalid',
+    ]);
+
+    expect($timezone)->toBeNull();
+});
+
+test('first valid timezone does not default to application timezone', function () {
+    $timezone = Timezone::firstValid([
+        null,
+        '',
+    ]);
+
+    expect($timezone)->toBeNull();
+});