fixes bug with global fed caps cache

bcgov · Jan 31, 2025 · 96aaa90 · 96aaa90
1 parent 5286bae
commit 96aaa90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Modules/Ministry/App/Http/Controllers/FedCapController.php b/Modules/Ministry/App/Http/Controllers/FedCapController.php
@@ -78,8 +78,10 @@ public function setDefault(Request $request)
         $fedCap = FedCap::where('guid', $request->input('fed_cap_guid'))->first();
 
         Cache::forget('global_fed_caps_' . Auth::id());
+
+        // Sometimes Auth::id() is null and we need to enforce attaching the id to the cache
         if(!is_null(Auth::id())){
-            \Log::info('updating global fed caps for: ' . Auth::id());
+//            \Log::info('updating global fed caps for: ' . Auth::id());
             Cache::remember('global_fed_caps_' . Auth::id(), now()->addHours(10), function () use ($fedCap) {
                 $fedCaps = FedCap::select('id', 'guid', 'start_date', 'end_date', 'status')
                     ->without(['caps'])

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -246,6 +246,9 @@ public function login(Request $request)
      */
     public function logout(Request $request)
     {
+        if(Auth::check()){
+            Cache::forget('global_fed_caps_' . Auth::id());
+        }
         Auth::logout();
         $request->session()->invalidate();
         $request->session()->regenerateToken();

diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -48,8 +48,9 @@ public function share(Request $request): array
         if (Auth::check()) {
             $user = User::find(Auth::id());
 
+            // Sometimes Auth::id() is null and we need to enforce attaching the id to the cache
             if(!is_null(Auth::id())){
-                \Log::info('Updating Global Fed Caps for: ' . Auth::id());
+//                \Log::info('Updating Global Fed Caps for: ' . Auth::id());
 
                 $globalFedCaps = Cache::remember('global_fed_caps_' . Auth::id(), now()->addHours(10), function () {
                     $fedCaps = FedCap::select('id', 'guid', 'start_date', 'end_date', 'status')