strongmind-auth 1.1.57 → 1.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f5856a21d0d63f1cd1d348ff0b704129da0086bdacfb60cb47bd54a09491f8
-  data.tar.gz: 8d759b62bc2904f148e2f68e81f520367ff6fec544725fc688d974ce4c578358
+  metadata.gz: fbda7597b68d3fc40e7e2e345931da771bd337347bcb400b41f6c25ac9d0af4e
+  data.tar.gz: 9145c6eca8ef8b2f83cc89a40f6acec1505a832b7f1c0c527f7a63b0d31b5e02
 SHA512:
-  metadata.gz: faed6a5513682e5446f3615b1905a89f67359667b6ef4243fcef9c9eafd0932796f842db91c63787a0f6ba8310930f158abebd993326f7f42e1ddd1a3bb4a312
-  data.tar.gz: 1f2ac17b7ec67488165b429c9e70e191057aa19703b6b6e59d5634b269a0a8073a41cb6af56f1022bc83de42131ad2a1c6bf692564b6a1cfe798010e5dd2942f
+  metadata.gz: 847ea8b84ec737bfe71a8ae87101a40d2554e14c62571807e85d21811784d22c68c89dd4e858fb1b6e019bc8dea6151abe73fa72e7a2ec0397fc2dceded19780
+  data.tar.gz: 568f3d402bf0aeed5be2d2751e0ce2649d530547b4289b7b32a57c356230a997fd62a32e24e6083b1737c746154a4b832a2e1a8aba2436086f513e3334fe06ca

data/app/controllers/concerns/strong_mind_nav.rb

@@ -16,7 +16,7 @@ module StrongMindNav
       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?
-      current_user.invalidate_all_sessions!
+      current_user.invalidate_all_sessions! if current_user
       render 'logins/index' and return
     rescue Exception => e
       Sentry.capture_exception(e)

data/config/initializers/devise.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-return if defined? Rails::Generators
+# return if defined? Rails::Generators # This line needs to be commented out to allow tailwindcss watch to run linked ticket: https://strongmind.atlassian.net/browse/BEL-2645
 
 # if Devise is not present in Gemfile
 unless File.read('Gemfile').include?('devise')

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.57"
+    VERSION = "1.1.62"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -35,7 +35,16 @@ module Strongmind
     private
 
     def current_page?(url)
-      request.fullpath == URI.parse(url).path
+      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)
@@ -91,7 +100,9 @@ module Strongmind
     end
 
     def build_nav_items(menu_items)
-      { nav_items: menu_items.map { |item| nav_item_data(item) } }
+      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.57
+  version: 1.1.62
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails