Merge pull request #44 from EscolaLMS/dev

Repair bug
EscolaLMS · May 5, 2022 · d5ec426 · d5ec426
2 parents 3cc0783 + c94da64
commit d5ec426
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Http/Middleware/SetTimezoneForUserMiddleware.php b/src/Http/Middleware/SetTimezoneForUserMiddleware.php
@@ -3,6 +3,7 @@
 namespace EscolaLms\Core\Http\Middleware;
 
 use Closure;
+use EscolaLms\Core\Models\User;
 use Illuminate\Http\Request;
 
 class SetTimezoneForUserMiddleware
@@ -17,9 +18,11 @@ class SetTimezoneForUserMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
-        $user = auth()->user();
-        $user->current_timezone = $request->header('CURRENT_TIMEZONE', 'UTC');
-        $user->save();
+        $user = User::whereId(auth()->user()->getKey())->first();
+        if ($user) {
+            $user->current_timezone = $request->header('CURRENT_TIMEZONE', 'UTC');
+            $user->save();
+        }
         return $next($request);
     }
 }
diff --git a/tests/Api/CoreControllerTest.php b/tests/Api/CoreControllerTest.php
@@ -35,12 +35,14 @@ public function testSetTimezoneForUsers(): void
             'CURRENT_TIMEZONE' => $timezone
         ]);
         $response->assertOk();
+        $admin->refresh();
         $this->assertTrue($admin->current_timezone === $timezone);
         $timezone = 'America/New_York';
         $response = $this->actingAs($admin, 'api')->json('GET', 'api/core/packages', [], [
             'CURRENT_TIMEZONE' => $timezone
         ]);
         $response->assertOk();
+        $admin->refresh();
         $this->assertTrue($admin->current_timezone === $timezone);
     }
 }