strongmind-auth 1.1.100 → 1.1.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557c4edfda589ee28700958fd64124446c9baa854f8e64d938ef84ebf4349c27
-  data.tar.gz: 7a4fda48941151d352c683c774c267fab93fd21133798e70443c2dca848c75d3
+  metadata.gz: e28c44ee15358c2cd005c765701a0bae728a8f731a26bd983cc89b98f22f93a0
+  data.tar.gz: f9002365819bfc3cb943d6b432406d4aaf8c0874bf661abff9f86ffda05727a7
 SHA512:
-  metadata.gz: 4bb2fb0f665c02d3e2108bb9f5c9bd5b895ca5d1b92821357d5d37de67aa8271d5c8bca8f94e8d8c7d348dc8a9d5795793ecb21f5ae78f78fedbf46563620792
-  data.tar.gz: cc8b758f4b1144b203d16ab61e469c4d165e1a7c3e1e89109dcf3372715084bfb1ca9149a6612118fa0df65d163658872975f2ae4af16e9c104fba9273624fd0
+  metadata.gz: 4105b0026dab50a2394d3bdbd788bb4bb921fe268670b2a4020688568dbb34d02a47c4fc32ddea6c7aea8600226a3dc6fd1c7090d3e11f9b80730caf4f6c1036
+  data.tar.gz: 0dbc0726df726ff5ae0baf5e1c6e3548d55b239f9da13ef48a248f4ffc16e24b267656a973a2572954d92bc982b09ae452a3ae8b9cde0ce5afe2370f33e02a8d

data/app/controllers/concerns/strong_mind_nav.rb

@@ -6,7 +6,12 @@ module StrongMindNav
 
   def fetch_common_nav
     begin
-      navbar = Strongmind::CommonNavFetcher.new(current_user, request).retrieve(common_nav_options)
+      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
+        Strongmind::CommonNavFetcher.new(current_user).retrieve(nav_items, common_nav_options)
+      end
 
       @top_navbar_html = navbar[:top_navbar_html]
       @bottom_navbar_html = navbar[:bottom_navbar_html]
@@ -33,9 +38,55 @@ module StrongMindNav
 
   def common_nav_options
     {
-      menu_items: menu_items,
       authenticity_token: form_authenticity_token,
       show_role_switcher: false
     }
   end
+
+  def build_nav_items
+    items = { nav_items: menu_items.map { |item| nav_item_data(item) } }
+    items[:nav_items].first[:is_active] = true unless items[:nav_items].any? { |item| item[:is_active] }
+    items
+  end
+
+  def nav_item_data(item)
+    url = item[:url]
+    {
+      name: item[:name],
+      icon: item[:icon],
+      url: url,
+      is_active: current_page?(url)
+    }
+  end
+
+  private
+
+  def current_page?(url)
+    request.fullpath == URI.parse(url).path || path_in_request?(url)
+  end
+
+  def path_in_request?(path)
+    sanitized_path = path.gsub('/', '')
+
+    path_to_compare = request.fullpath.split('?').first
+
+    return path_to_compare == '/' if sanitized_path.empty?
+    path_to_compare.include?(sanitized_path) || path_to_compare.include?(sanitized_path.pluralize)
+  end
+
+  def generate_user_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('_')
+                     else
+                       [session_token, user, navbar_options_cache_key, 'navbar'].join('_')
+                     end
+
+    Digest::SHA256.hexdigest(user_cache_key)
+  end
 end

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.100"
+    VERSION = "1.1.104"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -5,7 +5,7 @@ require 'platform_sdk'
 module Strongmind
   # This class is responsible for fetching the common navbar data from SM Central
   class CommonNavFetcher
-    attr_reader :user, :request, :auth_client
+    attr_reader :user, :auth_client
 
     include Rails.application.routes.url_helpers
 
@@ -13,40 +13,25 @@ module Strongmind
 
     class UserNotFoundError < StandardError; end
 
-    def initialize(user, request)
+    def initialize(user)
       raise Strongmind::Exceptions::UserNotFoundError, 'User not found' unless user.present?
-      raise ArgumentError, 'Request not found' unless request.present?
       raise ArgumentError, 'Identity base URL not found at IDENTITY_BASE_URL in environment' unless ENV['IDENTITY_BASE_URL'].present?
       raise ArgumentError, 'Identity client ID not found at IDENTITY_CLIENT_ID in environment' unless ENV['IDENTITY_CLIENT_ID'].present?
       raise ArgumentError, 'Identity client secret not found at IDENTITY_CLIENT_SECRET in environment' unless ENV['IDENTITY_CLIENT_SECRET'].present?
 
       @user = user
-      @request = request
       @auth_client = PlatformSdk::Identity::AuthClient.new(
         ENV.fetch('IDENTITY_BASE_URL'), ENV.fetch('IDENTITY_CLIENT_ID'), ENV.fetch('IDENTITY_CLIENT_SECRET')
       )
     end
 
-    def retrieve(nav_options)
-      response = fetch_navbar_data(build_nav_items(nav_options[:menu_items]), nav_options)
+    def retrieve(nav_items, nav_options)
+      response = fetch_navbar_data(nav_items, nav_options)
       parse_navbar(response)
     end
 
     private
 
-    def current_page?(url)
-      request.fullpath == URI.parse(url).path || path_in_request?(url)
-    end
-
-    def path_in_request?(path)
-      sanitized_path = path.gsub('/', '')
-
-      path_to_compare = request.fullpath.split('?').first
-
-      return path_to_compare == '/' if sanitized_path.empty?
-      path_to_compare.include?(sanitized_path) || path_to_compare.include?(sanitized_path.pluralize)
-    end
-
     def fetch_navbar_data(nav_items, nav_options)
       session = refresh_session
       access_token = session[:access_token]
@@ -95,21 +80,5 @@ module Strongmind
     def parse_navbar(response)
       JSON.parse(response.body, symbolize_names: true) if response
     end
-
-    def build_nav_items(menu_items)
-      items = { nav_items: menu_items.map { |item| nav_item_data(item) } }
-      items[:nav_items].first[:is_active] = true unless items[:nav_items].any? { |item| item[:is_active] }
-      items
-    end
-
-    def nav_item_data(item)
-      url = item[:url]
-      {
-        name: item[:name],
-        icon: item[:icon],
-        url: url,
-        is_active: current_page?(url)
-      }
-    end
   end
 end

metadata

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