strongmind-auth 1.1.102 → 1.1.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d187d5804082b937eb593a7e6097057531cf701cd5f5d6ca5c5e204e70a74ac6
-  data.tar.gz: 0ea33f4dfe029e0adca678d1a5c0da5a4cacdce1757c0b7a80c7680f6d3bd4a5
+  metadata.gz: 9fb08b31a5fa67f9ea7ea76871e6a7ebacf053bec0301b5dc769187db2cb9e77
+  data.tar.gz: 9c0d495a487895e7abc6a950228eebd7c6def1917cf4e87ba6bd0fde9b5dc4f0
 SHA512:
-  metadata.gz: 697183d85bc8ef2a0a338b9d553a822972f59bf84bebb2b2da233f8507be0226726ff87e0da2de6ac7a8f33c418297f2b73b7ebdf5d0c1cb5c5457fc281a2d2c
-  data.tar.gz: 1254bc1891abbfe7b4ab360a552d9c5c27bd6564096ac412daa5a3167c8f4a65e0d074e0d8818bc8ec35113bdd302aa738400d6fc68f3a4f9104554185f5fdfc
+  metadata.gz: dc4ea71c018cc9e30fdb3d6eec44e4c1f5c0edcf91b6ca9d0b8b167c586b411af87dff2356008c330cfb4d6e313413c58a2dd24a3b49fc705a5ea5ec7becaa22
+  data.tar.gz: 522cbc63024c6f6aa8d8a885a3519bebb3a322dcfbe25fb88e36dded321aa91229a9f5d44b2160e2ac85132b0c5ea8d82ff2ddc4db72a12bcbb4d753d969daf8

data/app/controllers/concerns/strong_mind_nav.rb

@@ -4,12 +4,13 @@ require "strongmind/exceptions"
 module StrongMindNav
   extend ActiveSupport::Concern
 
+  NAVBAR_CACHE_KEY_SUFFIX = 'navbar'
+
   def fetch_common_nav
     begin
       nav_items = build_nav_items
 
-      user_cache_key_encoded = generate_user_cache_key(nav_items)
-
+      user_cache_key_encoded = generate_user_navbar_cache_key(nav_items)
       navbar = Rails.cache.fetch(user_cache_key_encoded, expires_in: 1.day) do
         Strongmind::CommonNavFetcher.new(current_user).retrieve(nav_items, common_nav_options)
       end
@@ -75,15 +76,27 @@ module StrongMindNav
     path_to_compare.include?(sanitized_path) || path_to_compare.include?(sanitized_path.pluralize)
   end
 
-  def generate_user_cache_key(nav_items)
+  def generate_user_navbar_cache_key(nav_items)
     navbar_options_cache_key = nav_items.to_json
 
     user_cache_key = if current_user.respond_to?(:selected_role_id)
-                       "user_#{current_user.uid}_#{current_user.selected_role_id}_#{navbar_options_cache_key}_navbar"
+                       role = "role_#{current_user.selected_role_id}"
+
+                       [role, navbar_options_cache_key].join('_')
                      else
-                       "user_#{current_user.uid}_#{navbar_options_cache_key}_navbar"
+                       navbar_options_cache_key
                      end
 
-    Digest::SHA256.hexdigest(user_cache_key)
+    navbar_cache_key_prefix(current_user) + Digest::SHA256.hexdigest(user_cache_key) + NAVBAR_CACHE_KEY_SUFFIX
+  end
+
+  def invalidate_navbar_cache(user = current_user)
+    cache_key_matcher = navbar_cache_key_prefix(user) + "*" + NAVBAR_CACHE_KEY_SUFFIX
+
+    Rails.cache.delete_matched(cache_key_matcher)
+  end
+
+  def navbar_cache_key_prefix(user)
+    "user_#{user.uid}"
   end
 end

data/app/controllers/users/sessions_controller.rb

@@ -24,6 +24,7 @@ module Users
         user_identity = payload['sub']
         user = User.find_by(uid: user_identity)
         user.invalidate_all_sessions!
+        invalidate_navbar_cache(user)
         render json: {}, status: :ok, headers:
       else
         render json: {}, status: :bad_request, headers:
@@ -36,6 +37,7 @@ module Users
 
       id_token_hint = user_token_info[:id_token]
       current_user&.invalidate_all_sessions!
+      invalidate_navbar_cache
       identity_base_url = ENV['IDENTITY_BASE_URL']
       redirect_to "#{identity_base_url}/connect/endsession?id_token_hint=#{id_token_hint}", allow_other_host: true
     end

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.102"
+    VERSION = "1.1.107"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.102
+  version: 1.1.107
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails