strongmind-auth 1.1.72 → 1.1.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e3fd18ae6d5878a6429567c72e2d50553b364b31924b9f8788049c0d58a186
-  data.tar.gz: b30f49a52fe570523ebcf7d9a432240e35de4d98e30dd22d17ce0102621bf06f
+  metadata.gz: 5045731638769140a75bf68a154d0974ec973384233c100fdef35222440b414a
+  data.tar.gz: 166214edf8924600b71b37f32a475775e7117a3231db37ffb4cebd083d60eb7e
 SHA512:
-  metadata.gz: 28079c7c3ab3a185bfaa113417ef3f6ca08bb5c37b2c4f88496e948161f4a5826d89675e9b18babb161b9cdf16e9d9e3930f691578d3c11c27cfbeb1607bfc07
-  data.tar.gz: c15fd8c8a595ef35c308d103801015621f4c341e1725c3f90e99a4e42aaba3360a3ffdff85d006e8d63293a2c1651f4195bd8101f891b91c2c8680cf00d26573
+  metadata.gz: 2e1e56c92fd97a41be2a5d7d40bbfabf75cf4fb18338a1e0f846cf840f8a5a536dd788ad569e8e3cdcd7d484f9908d573ea574d6e0ed1f9453e2e78d98a3477d
+  data.tar.gz: 02b89568977e51d1f516c0ed3ba29ae8dd05b2ef03573ccbd29e34173e7e66c6505e99614a74601c391fd383e0692af751d598d615802b3187694e5e65e3ebaa

data/app/controllers/concerns/jwt_utilities.rb

@@ -69,16 +69,15 @@ module JwtUtilities
   end
 
   def user_jwt(session_data)
-    tokens = current_user.nil? ? nil : Rails.cache.read(current_user&.uid)
+    tokens = current_user.nil? ? nil : Rails.cache.read(current_user.uid)
     validate_tokens(tokens) unless tokens.nil?
 
     if tokens.nil?
-      tokens = generate_tokens(session_data)
+      tokens = generate_tokens(session_data[:refresh_token])
       validate_tokens(tokens)
 
       unless current_user.nil?
-        tokens[:expires_in] = 1.hour.to_i if tokens[:expires_in].nil?
-        Rails.cache.write(current_user&.uid, tokens, expires_in: tokens[:expires_in].seconds - 10.minutes.in_seconds)
+        Rails.cache.write(current_user.uid, tokens)
       end
     end
     session_data[:refresh_token] = tokens[:refresh_token]
@@ -92,14 +91,14 @@ module JwtUtilities
     raise Strongmind::Exceptions::RefreshTokenExpiredError, tokens[:error]
   end
 
-  def generate_tokens(session_data)
+  def generate_tokens(refresh_token)
     identity_base_url = ENV['IDENTITY_BASE_URL']
     identity_client_id = ENV['IDENTITY_CLIENT_ID']
     response = Faraday.post("#{identity_base_url}/connect/token", {
       client_id: identity_client_id,
       client_secret: ENV['IDENTITY_CLIENT_SECRET'],
       grant_type: 'refresh_token',
-      refresh_token: session_data[:refresh_token]
+      refresh_token: refresh_token
     })
 
     JSON.parse(response.body, symbolize_names: true)

data/app/controllers/concerns/strong_mind_nav.rb

@@ -11,7 +11,7 @@ module StrongMindNav
       @top_navbar_html = navbar[:top_navbar_html]
       @bottom_navbar_html = navbar[:bottom_navbar_html]
       @theme_css = navbar[:theme_css]
-    rescue Strongmind::Exceptions::NilSessionError, Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError, Strongmind::Exceptions::RefreshTokenExpiredError => 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?

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -12,7 +12,7 @@ module Users
 
       render plain: "You do not have permission to access this application.", status: :unauthorized and return if @user.nil?
 
-      session[:refresh_token] = request.env['omniauth.auth'].credentials['refresh_token']
+      session[:refresh_token] = auth.credentials['refresh_token']
       flash.delete(:notice)
 
       if @user.persisted?

data/app/controllers/users/sessions_controller.rb

@@ -34,13 +34,9 @@ module Users
       user_token_info = fetch_user_token_info
 
       id_token_hint = user_token_info[:id_token]
-      token = user_token_info[:access_token]
       current_user&.invalidate_all_sessions!
       identity_base_url = ENV['IDENTITY_BASE_URL']
-      redirect_to "#{identity_base_url}/connect/endsession?id_token_hint=#{id_token_hint}", headers: {
-        'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{token}"
-      }, allow_other_host: true
+      redirect_to "#{identity_base_url}/connect/endsession?id_token_hint=#{id_token_hint}", allow_other_host: true
     end
 
   end

data/app/models/user_base.rb

@@ -12,9 +12,8 @@ class UserBase < ApplicationRecord
                       {
                         id_token: auth.credentials.id_token,
                         access_token: auth.credentials.token,
-                        refresh_token: auth.credentials.refresh_token
-                      },
-                      expires_in: auth.credentials.expires_in.seconds - 10.minutes
+                        refresh_token: auth.credentials.refresh_token,
+                      }
     )
   end
 

data/config/initializers/devise.rb

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-# 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')
-  `rails g strongmind:install`
-  `rails db:migrate`
-
-  raise "StrongMind Auth and Navigation installed. Please restart your server."
-end
-
 # Assuming you have not yet modified this file, each configuration option below
 # is set to its default value. Note that some are commented out while others
 # are not: uncommented lines are intended to protect your configuration from

data/lib/generators/strongmind/install_generator.rb

@@ -54,16 +54,6 @@ devise_scope :user do
       (Time.now.utc.strftime("%Y%m%d%H%M%S").to_i + 1).to_s
     end
 
-    def add_devise_gems
-      gem 'devise'
-      gem 'omniauth'
-      gem 'omniauth_openid_connect'
-      gem 'omniauth-rails_csrf_protection'
-      gem 'dotenv-rails'
-      gem 'sentry-rails'
-
-    end
-
     def add_dotenv_file
       copy_file "env", ".env"
     end

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.72"
+    VERSION = "1.1.74"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -48,8 +48,8 @@ module Strongmind
     end
 
     def fetch_navbar_data(nav_items)
-      refresh_session
-      access_token = token
+      session = refresh_session
+      access_token = session[:access_token]
 
       connection.post(navbar_endpoint, nav_items.to_json, 'Authorization' => "Bearer #{access_token}")
     end
@@ -63,24 +63,16 @@ module Strongmind
       end
     end
 
-    def token
-      cache_data = Rails.cache.fetch(user.uid)
-      cache_missing_message = " - check your caching settings (switch to file or redis)" if Rails.env.development?
-      unless cache_data&.key?(:access_token)
-        raise Strongmind::Exceptions::TokenNotFoundError, "Token not found for user #{user.uid}#{cache_missing_message}"
-      end
-
-      cache_data[:access_token]
-    end
-
     def refresh_session
       session = Rails.cache.fetch(user.uid)
+      cache_missing_message = " - check your caching settings (switch to file or redis)" if Rails.env.development?
       unless session&.key?(:access_token)
-        raise Strongmind::Exceptions::NilSessionError, "Session not found for user #{user.uid}"
+        raise Strongmind::Exceptions::TokenNotFoundError, "Token not found for user #{user.uid}#{cache_missing_message}"
       end
 
       auth_client.refresh_session(session:)
-      Rails.cache.write(user.uid, session, expires_in: session[:expires_in].to_i.seconds - 10.minutes)
+      Rails.cache.write(user.uid, session)
+      session
     rescue PlatformSdk::Identity::ClientError => e
       handle_refresh_error(e)
     end

data/lib/strongmind/exceptions.rb

@@ -6,6 +6,5 @@ module Strongmind
 
     class RefreshTokenExpiredError < StandardError; end
 
-    class NilSessionError < StandardError; end
   end
 end

metadata

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