strongmind-auth 1.1.74 → 1.1.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5045731638769140a75bf68a154d0974ec973384233c100fdef35222440b414a
-  data.tar.gz: 166214edf8924600b71b37f32a475775e7117a3231db37ffb4cebd083d60eb7e
+  metadata.gz: 050c55322ecee87acca90b90fcf0a35568ecbb15b3391ef071b4381e6ae11a6c
+  data.tar.gz: 3d86af83127228831e28687430c922cf5b602fc697d779f5f5e8199fd19dcc9c
 SHA512:
-  metadata.gz: 2e1e56c92fd97a41be2a5d7d40bbfabf75cf4fb18338a1e0f846cf840f8a5a536dd788ad569e8e3cdcd7d484f9908d573ea574d6e0ed1f9453e2e78d98a3477d
-  data.tar.gz: 02b89568977e51d1f516c0ed3ba29ae8dd05b2ef03573ccbd29e34173e7e66c6505e99614a74601c391fd383e0692af751d598d615802b3187694e5e65e3ebaa
+  metadata.gz: dcf96bf27833b844cc169b67cb241a5b264558d60b41d317ee637b87d22bc6b2c3c5eec4784dbf824c892dce00c30ac6a4e1ec331640a198075c5f5827d423df
+  data.tar.gz: 0affb3f22325c53e662f96d29461e49b9fe2ac86deb9c32ce7ce00e8fb3dea38db60e2cebcaba25dac14f3554b0c13752d6d35159595642b6692ec3cef5972d6

data/app/controllers/concerns/jwt_utilities.rb

@@ -69,38 +69,31 @@ module JwtUtilities
   end
 
   def user_jwt(session_data)
-    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[:refresh_token])
-      validate_tokens(tokens)
-
-      unless current_user.nil?
-        Rails.cache.write(current_user.uid, tokens)
+    tokens = current_user&.auth_token_cache
+    auth_client = PlatformSdk::Identity::AuthClient.new(
+      ENV['IDENTITY_BASE_URL'],
+      ENV['IDENTITY_CLIENT_ID'],
+      ENV['IDENTITY_CLIENT_SECRET'])
+    begin
+      if tokens.nil?
+        tokens = auth_client.refresh_token(session_data[:refresh_token])
+      else
+        auth_client.refresh_session(session: tokens)
       end
+      Rails.cache.write(current_user.uid, tokens)
+      tokens
+    rescue PlatformSdk::Identity::ClientError => e
+      handle_refresh_error(e)
     end
-    session_data[:refresh_token] = tokens[:refresh_token]
-
-    tokens
   end
 
-  def validate_tokens(tokens)
-    return unless tokens[:error] == 'invalid_grant' || !tokens[:refresh_token]
+  def handle_refresh_error(error)
+    raise Strongmind::Exceptions::RefreshTokenExpiredError, error.response[:body]['error'] if invalid_grant_error?(error)
 
-    raise Strongmind::Exceptions::RefreshTokenExpiredError, tokens[:error]
+    raise error
   end
 
-  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: refresh_token
-    })
-
-    JSON.parse(response.body, symbolize_names: true)
+  def invalid_grant_error?(error)
+    error.response[:body]['error'] == 'invalid_grant'
   end
 end

data/app/models/user_base.rb

@@ -28,6 +28,6 @@ class UserBase < ApplicationRecord
   end
 
   def invalidate_all_sessions!
-    update_attribute(:session_token, SecureRandom.hex)
+    update_column(:session_token, SecureRandom.hex)
   end
 end

data/lib/strongmind/auth/version.rb

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

metadata

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