strongmind-auth 1.1.104 → 1.1.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28c44ee15358c2cd005c765701a0bae728a8f731a26bd983cc89b98f22f93a0
-  data.tar.gz: f9002365819bfc3cb943d6b432406d4aaf8c0874bf661abff9f86ffda05727a7
+  metadata.gz: 146ed93c0c8bf7dbe2e89d40ded7b296b6b9837898e5fa4cb5ff585554b2a952
+  data.tar.gz: fc3c36b3a9068a31d114eed4c12b846e2bbf8b64fd2ed553d2c62fe42f62483a
 SHA512:
-  metadata.gz: 4105b0026dab50a2394d3bdbd788bb4bb921fe268670b2a4020688568dbb34d02a47c4fc32ddea6c7aea8600226a3dc6fd1c7090d3e11f9b80730caf4f6c1036
-  data.tar.gz: 0dbc0726df726ff5ae0baf5e1c6e3548d55b239f9da13ef48a248f4ffc16e24b267656a973a2572954d92bc982b09ae452a3ae8b9cde0ce5afe2370f33e02a8d
+  metadata.gz: c87a80912078481e0ffde87a1ba092b57a88cbb47532c7fd402e57a778dfad4feb91048eb5f831d86d0756374ceed4e32f214991def78d01cc8b08a8aa261ce1
+  data.tar.gz: c7fb97f23269754f91b7ddddbbb128578bc9612572edece18555c864accc68388c9b8938b33780212022d8b7bffaf8d437c606d55b3af9871f758f863e338d24

data/app/controllers/concerns/strong_mind_nav.rb

@@ -4,12 +4,14 @@ 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)
-      navbar = Rails.cache.fetch(user_cache_key_encoded, expires_in: 30.seconds) do
+      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
 
@@ -17,7 +19,7 @@ module StrongMindNav
       @bottom_navbar_html = navbar[:bottom_navbar_html]
       @theme_css = navbar[:theme_css]
     rescue Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError, Strongmind::Exceptions::RefreshTokenExpiredError => e
-      Sentry.capture_exception(e) unless e.is_a? Strongmind::Exceptions::RefreshTokenExpiredError
+      Sentry.capture_exception(e) if e.is_a? Strongmind::Exceptions::UserNotFoundError
       Rails.logger.error(e)
       flash[:alert] = e.inspect if Rails.env.development? || Rails.env.test?
       @stop_redirect = true if Rails.env.development? || Rails.env.test?
@@ -74,19 +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
-    session_token = session[:_csrf_token]
-    user = "user_#{current_user.uid}"
 
     user_cache_key = if current_user.respond_to?(:selected_role_id)
                        role = "role_#{current_user.selected_role_id}"
 
-                       [session_token, user, role, navbar_options_cache_key, 'navbar'].join('_')
+                       [role, navbar_options_cache_key].join('_')
                      else
-                       [session_token, user, navbar_options_cache_key, 'navbar'].join('_')
+                       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.104"
+    VERSION = "1.1.109"
   end
 end

metadata

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