strongmind-auth 1.1.98 → 1.1.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923cb7c2aae5f46d33ca15fcd0e5b35f7153c54a399fd83322c247274001ca7
-  data.tar.gz: 015dcb29507761c53b885f3cb2b6d5bab23aea4102a64cb114c0b6258fb7c8a1
+  metadata.gz: d187d5804082b937eb593a7e6097057531cf701cd5f5d6ca5c5e204e70a74ac6
+  data.tar.gz: 0ea33f4dfe029e0adca678d1a5c0da5a4cacdce1757c0b7a80c7680f6d3bd4a5
 SHA512:
-  metadata.gz: e8c0e869f440f76e180fe00d03c8dfabf9402b6c2b43ce5162ae4fa142496655913ad7ed8c836e6e47b8fbf6a9d48d8e8ad5ebc3998479f35e429de407cb912f
-  data.tar.gz: d9786057f21fdaac11aed09d1952079a5590a5681812dad943294f1353e004fdd3c4d47bd05b141ae6de791cb43bd18719386d8a6e8671d18bfa883136a4b303
+  metadata.gz: 697183d85bc8ef2a0a338b9d553a822972f59bf84bebb2b2da233f8507be0226726ff87e0da2de6ac7a8f33c418297f2b73b7ebdf5d0c1cb5c5457fc281a2d2c
+  data.tar.gz: 1254bc1891abbfe7b4ab360a552d9c5c27bd6564096ac412daa5a3167c8f4a65e0d074e0d8818bc8ec35113bdd302aa738400d6fc68f3a4f9104554185f5fdfc

data/app/controllers/concerns/strong_mind_nav.rb

@@ -6,7 +6,13 @@ 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: 1.day) 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 +39,51 @@ 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
+
+    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"
+                     else
+                       "user_#{current_user.uid}_#{navbar_options_cache_key}_navbar"
+                     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.98"
+    VERSION = "1.1.102"
   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.98
+  version: 1.1.102
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails