strongmind-auth 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1526ec8b78d6caea36cd40f7c943b5e376a4da4fcb0a5f37a4a3222d658e612f
-  data.tar.gz: f8bd96c7bb4d8658961224bf6c5ed9f1b9c2f9afd789d683e95afd3817a93864
+  metadata.gz: 87786b4c0cd6fa8ae92cbf99acb4ed2c189dd0ada276d738448d494fb146949b
+  data.tar.gz: b2020de0c578fe1f1ce781a4086c58b11518efe1338d3b7cba3f7c1a990574d1
 SHA512:
-  metadata.gz: 06353b6d2d5f5d8554af61ba484e97ad6bc2b287a0d44a0e26f447a26df6e6c2de095b991f9b8002aaf676e3b6f080c1e095b1890ec2559f19bbbcb8292cb6d2
-  data.tar.gz: b37c854e2fc115f6a802b5dee2fcc6d45393951a4ad6891f78efa80bb3e24aa7e4e5ab08c86ad7baa4b28c67e12db3eabad4a84d84f15ab312b4a07ecdd9b290
+  metadata.gz: 43cd1f34fb2a6804fef474cc46a65550772e4cb33c9b019b98a66754773ea31228297943d0018d2e7bafebbf1ad51a3cbf003685d80e03df8f18664314143806
+  data.tar.gz: 4b2dc4014ef8fd40bdd1e75041169622c2609977cff7680d65c08ec60107089bfee1c8490bbfddb7a069bf6cbd90dfc4d7b1354094a30cf07f9dd8e5f03fc612

data/app/controllers/concerns/jwt_utilities.rb

@@ -89,7 +89,7 @@ module JwtUtilities
   def validate_tokens(tokens)
     return unless tokens[:error] == 'invalid_grant' || !tokens[:refresh_token]
 
-    raise Strongmind::Exceptions::RefreshTokenExpired, tokens[:error]
+    raise Strongmind::Exceptions::RefreshTokenExpiredError, tokens[:error]
   end
 
   def generate_tokens(session_data)

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/controllers/users/sessions_controller.rb

@@ -18,6 +18,7 @@ module Users
 
     def endsession
       headers = { 'Cache-Control' => 'no-store' }
+      Rails.logger.info("endsession called with params: #{params}")
       if jwt_valid?(params[:logout_token], 'http://schemas.openid.net/event/backchannel-logout')
         payload, _header = JWT.decode(params[:logout_token], nil, false)
         user_identity = payload['sub']

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.0"
+    VERSION = "1.1.2"
   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.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 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