strongmind-platform-sdk 3.10.0 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2255b872c20eeb033920fa418c2bb7986ca2d4857fc920a61f2d8fd64c9053b6
-  data.tar.gz: 884e3636bc8381f7f083a95875a6596e3f24f9b1152abb2c45ce0613b73dd305
+  metadata.gz: fca9cc6c8dcf5d60413ccaade1fe75d0d1c3034984d26f4fbfd2a72ec7eeee6b
+  data.tar.gz: 66c6e120f49d0898618ca43879f09808b3e4042c25e3a57c14b5c65b21935372
 SHA512:
-  metadata.gz: 33b930fd8737f76287c5f781f61f27f766156019bbc9dcc4a0cd596dfe28499cb39cb99cd52c04405c8fa0e7fed068786ef47a847c09310174687ea7e2f35abf
-  data.tar.gz: 65e2ed64748ebe2b6c76fb9fa7262a31611384af3d2a2a0c035d1103936e994e24adefdd4409259bb3ae022a6b640ba37f2c0e029acd4516d2b26d94b320d8b5
+  metadata.gz: 74ca995cf7efa813996ff36cd0d260376a0964d54f30abaeecc90841ef2cd716c9ee58f2f2cf7af4546e65f5a21b0266930657b493c5c7e4556b25335e18402c
+  data.tar.gz: 4355b9b306fd3cbdae3bf12cf956677eb8ed58c4a276afc0abc5e8954c5f335c966518bac240f9fd5956d19651f99fa208108fb3ec7df2c996f921fb5a7961c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strongmind-platform-sdk (3.10.0)
+    strongmind-platform-sdk (3.10.2)
       aws-sdk-secretsmanager (~> 1.66)
       devise
       faraday (~> 2.5, >= 2.5.2)
@@ -19,38 +19,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.5)
-      actionview (= 7.0.5)
-      activesupport (= 7.0.5)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (6.1.7.7)
+      actionview (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.5)
-      activesupport (= 7.0.5)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.5)
-      activesupport (= 7.0.5)
-    activesupport (7.0.5)
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     attr_required (1.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.893.0)
-    aws-sdk-core (3.191.2)
+    aws-partitions (1.894.0)
+    aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
-      base64
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-secretsmanager (1.90.0)
       aws-sdk-core (~> 3, >= 3.191.0)
@@ -62,7 +62,7 @@ GEM
     bigdecimal (3.1.6)
     bindata (2.5.0)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -80,9 +80,9 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factory_bot (6.2.1)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
-    faker (3.2.0)
+    faker (2.22.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.7.7)
       faraday-net_http (>= 2.0, < 3.1)
@@ -95,11 +95,11 @@ GEM
     ffi (1.15.5)
     hashdiff (1.1.0)
     hashie (5.0.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.6.3)
-    json-jwt (1.16.5)
+    json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
       base64
@@ -120,7 +120,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.18.0)
+    minitest (5.22.2)
     multi_json (1.15.0)
     net-imap (0.4.10)
       date
@@ -134,10 +134,6 @@ GEM
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
-      racc (~> 1.4)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -167,7 +163,7 @@ GEM
       ast (~> 2.4.1)
     public_suffix (5.0.4)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-oauth2 (2.2.1)
       activesupport
       attr_required
@@ -187,13 +183,12 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    railties (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.0)

data/lib/platform_sdk/identity/clients.rb

@@ -37,11 +37,23 @@ module PlatformSdk
         end
       end
 
-      def auth_token
-        if expired?
-          response = @conn.post("/connect/token", request_body)
-          @token = response.body.transform_keys(&:to_sym)
+      def with_rescue
+        yield
+      rescue Faraday::ServerError => e
+        raise_error_with_payload(IdentityServerError, e)
+      rescue Faraday::ClientError => e
+        raise_error_with_payload(IdentityClientError, e)
+      end
+
+      def post_payload(path, body)
+        with_rescue do
+          response = @conn.post(path, body)
+          response.body.transform_keys!(&:to_sym)
         end
+      end
+
+      def auth_token
+        @token = post_payload("/connect/token", request_body) if expired?
 
         @token[:access_token]
       end
@@ -65,19 +77,24 @@ module PlatformSdk
         Time.at(JWT.decode(jwt, nil, false)[0]["exp"])
       end
 
-      def refresh_token(jwt:, refresh_token:)
+      def refresh_token_if_expired(jwt:, refresh_token:)
         raise ArgumentError if refresh_token.nil? || jwt.nil?
         return unless token_expired?(jwt)
 
-        response = @conn.post("/connect/token", request_body(
+        refresh_token(refresh_token)
+      end
+
+      def refresh_token(refresh_token)
+        raise ArgumentError if refresh_token.nil?
+
+        post_payload("/connect/token", request_body(
           grant_type: "refresh_token", refresh_token:))
-        response.body.transform_keys!(&:to_sym)
       end
 
       def refresh_session(session: {})
         raise ArgumentError if session[:access_token].nil? || session[:refresh_token].nil?
 
-        refreshed_tokens = refresh_token(jwt: session[:access_token], refresh_token: session[:refresh_token])
+        refreshed_tokens = refresh_token_if_expired(jwt: session[:access_token], refresh_token: session[:refresh_token])
 
         return if refreshed_tokens.nil?
 
@@ -86,6 +103,17 @@ module PlatformSdk
         session[:refresh_token] = refreshed_tokens[:refresh_token]
       end
 
+      def raise_error_with_payload(exception_class, error)
+        json_log = {
+          exception: exception_class.new.class.name.demodulize,
+          payload: error.response.dig(:request, :body),
+          response_body: error.response[:body],
+          status: error.response[:status]
+        }.compact
+        Rails.logger.info json_log.to_json if respond_to?(:Rails)
+        raise exception_class, error.response
+      end
+
       private
 
       def request_body(grant_type: "client_credentials", refresh_token: nil)

data/lib/platform_sdk/identity.rb

@@ -11,5 +11,7 @@ require "platform_sdk/identity/clients"
 module PlatformSdk
   module Identity
     class IdentityNotFoundError < StandardError; end
+    class IdentityServerError < Faraday::ServerError; end
+    class IdentityClientError < Faraday::ClientError; end
   end
 end

data/lib/platform_sdk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlatformSdk
-  VERSION = "3.10.0"
+  VERSION = "3.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-platform-sdk
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.2
 platform: ruby
 authors:
 - Platform Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday