strongmind-auth 1.1.1 → 1.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0234d7b4cfe4a3a5d738c6ef9af96622f348ca47b39d9b76ff971b6ebc0bfa8f
-  data.tar.gz: 8ca75096b6b9ed3082f03e4e6a48f9e98f43366fdfc4fdfce72fe3d69c8e0463
+  metadata.gz: 6a82e9ae38bf108b49f1cf443aa2ae67c0a14c89c8aed7681e436aaa950ee67b
+  data.tar.gz: e033f56ebe05a573eaa27b1b069fea79e992ac885c54aea70793cb846fe2059c
 SHA512:
-  metadata.gz: b8cf1a51d8ebbb13566a382ede82a001284123efc5544d97e71c487efffea08f81bace84f65742eb19f1dbbd7b312187e754dcead6e9e9a5d7f6ee44437285c9
-  data.tar.gz: 619659baf8e51ffd5daafcea330840ce240c0b072856978b491d5f43d2f4f2d0161f9bfdfdf0e9de356ec8383440d1216666acf17e5a4c34c9a804bd29a9b0e7
+  metadata.gz: bd99910a06be468290a58282c524a9f813c2fc9c629adbf995a16dd4f187606257770e3a0414bcea7550ed9ba358e81340aac54d851e1427803519928e00f458
+  data.tar.gz: f2a8a5da24794639a83f0ba538a59eb9f9c81d9c0946a89d9e2876f25d0caefa225015e6e896395cbd2801b62040db87e59e87b5a2ab65554fbbb6c659c6dd14

data/app/controllers/concerns/strong_mind_nav.rb

@@ -11,12 +11,13 @@ module StrongMindNav
       @top_navbar_html = navbar[:top_navbar_html]
       @bottom_navbar_html = navbar[:bottom_navbar_html]
       @theme_css = navbar[:theme_css]
-    rescue Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError => e
+    rescue Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError, Strongmind::Exceptions::RefreshTokenExpiredError => e
       Sentry.capture_exception(e)
       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?
-      render 'logins/index'
+      current_user.invalidate_all_sessions!
+      render 'logins/index' and return
     rescue Exception => e
       Sentry.capture_exception(e)
       Rails.logger.error(e)

data/app/views/logins/index.html.erb

@@ -17,11 +17,15 @@
 <%= button_to 'Sign in with StrongMind', '/users/auth/strongmind', style: 'display:none' %>
 <script type="text/javascript">
     // Submit the form on load
-    window.addEventListener("load", (event) => {
+    function handleLoadEvent() {
         <% unless @stop_redirect %>
         document.forms[0].submit();
         <% end %>
-    });
+    }
+
+    window.addEventListener("load", handleLoadEvent);
+    window.addEventListener("turbo:load", handleLoadEvent);
+
 
 </script>
 <div id="loading">

data/lib/generators/strongmind/install_generator.rb

@@ -20,13 +20,6 @@ module Strongmind
   before_action :authenticate_user!
   before_action :fetch_common_nav
 
-  rescue_from Strongmind::Exceptions::RefreshTokenExpiredError do
-    current_user&.invalidate_all_sessions!
-    redirect_to \"#{ENV['IDENTITY_BASE_URL']}/connect/endsession\", headers: {
-        'Content-Type' => 'application/json'
-        }, allow_other_host: true
-    end
-
   # Implement the list of menu items for the application
   # def menu_items
   #   [

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.1"
+    VERSION = "1.1.56"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -9,6 +9,10 @@ module Strongmind
 
     include Rails.application.routes.url_helpers
 
+    class TokenNotFoundError < StandardError; end
+
+    class UserNotFoundError < StandardError; end
+
     def initialize(user, request)
       raise Strongmind::Exceptions::UserNotFoundError, 'User not found' unless user.present?
       raise ArgumentError, 'Request not found' unless request.present?
@@ -35,7 +39,7 @@ module Strongmind
     end
 
     def fetch_navbar_data(nav_items)
-      refresh_session if auth_client.token_expired?(token)
+      refresh_session
 
       connection.post(navbar_endpoint, nav_items.to_json, 'Authorization' => "Bearer #{token}")
     end
@@ -60,13 +64,21 @@ module Strongmind
     end
 
     def refresh_session
-      begin
-        session = Rails.cache.fetch(user.uid)
-        auth_client.refresh_session(session:)
-        Rails.cache.write(user.uid, session)
-      rescue Faraday::BadRequestError => e
-        Sentry.capture_exception(e, extra: { session:, request_body: request.body })
-      end
+      session = Rails.cache.fetch(user.uid)
+      auth_client.refresh_session(session:)
+      Rails.cache.write(user.uid, session)
+    rescue PlatformSdk::Identity::ClientError => e
+      handle_refresh_error(e)
+    end
+
+    def handle_refresh_error(error)
+      raise Strongmind::Exceptions::RefreshTokenExpiredError, error.response[:body]['error'] if invalid_grant_error?(error)
+
+      raise error
+    end
+
+    def invalid_grant_error?(error)
+      error.response[:body]['error'] == 'invalid_grant'
     end
 
     def navbar_endpoint

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.56
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
 description: Ruby gem for StrongMind authentication in a strongmind app
 email:
 - teambelding@strongmind.com