treezor_connect 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8521db96d02266f7a596240f39cc17d8741613f004908be4be1e9a13bf3e4b
-  data.tar.gz: 3c6b31cfa4998d21f4d391d4881105e8af007c3856333a18f342bf74ebb5a8d5
+  metadata.gz: 00c1d414338e6f321a46bb09834c8260d96d8bf997a40cbfbb0492cbf4a85f2d
+  data.tar.gz: 57bf5992fdaed77a47a081582547395c7cb3c82b97ea758344c1786a4ee951d2
 SHA512:
-  metadata.gz: 1ea75968193a6c2d07d40b70eab44b2667d07a39a7370d70d798278a215b1a6e36bed58052634387b3d2204419972aef127b3c8f33e63a4caf8fb80f0d722690
-  data.tar.gz: eb4320448da51e60b853d5e4a9ca5d94412933db2ab9d0f39602e63b4867755b654fcce31773ce66cdf5c01baaf6c08e7d9d1d30f7307f3a11a22ea0d695e270
+  metadata.gz: d0a61aaa2f198c71399d338bdd3343ccdd5f9e32817f87cef7eb35df85f5ea81ce2505320dfeca6ed5df504ab2a86f24310a3fada2a29e2613f025843e8c8722
+  data.tar.gz: 440bd90c178e01511020eb541e80252a73d87c08b1de49fbca426e105965c13604189423fbc16c0e7c1b2bcefe211f4ce5d6917439ca1c41878e18a665537a40

data/lib/treezor_connect/client.rb

@@ -2,6 +2,8 @@
 
 module TreezorConnect
   class Client
+    attr_reader :access_token
+
     def initialize(access_token)
       @conn = build_default_conn
       @access_token = access_token.nil? ? default_access_token : access_token
@@ -19,7 +21,7 @@ module TreezorConnect
 
     private
 
-    attr_reader :conn, :access_token
+    attr_reader :conn
 
     def build_default_conn
       http = HTTP.persistent(TreezorConnect.api_base_url)
@@ -48,17 +50,24 @@ module TreezorConnect
       )
     end
 
-    def token_expired?(token)
-      OAuth2::AccessToken.new(conn, token).expired?
+    def current_access_token_expired?
+      return true if current_access_token.nil?
+
+      decoded_token = JWT.decode(current_access_token, nil, false).first
+      decoded_token['exp'] < Time.now.to_i
     end
 
     def default_access_token
-      access_token = Thread.current[:treezor_default_access_token]
-      if access_token.nil? || token_expired?(access_token)
-        Thread.current[:treezor_default_access_token] = fetch_access_token
+      if current_access_token_expired?
+        access_token = fetch_access_token
+        Thread.current[:treezor_default_access_token] = access_token if ENV['SKIP_ACCESS_TOKEN_IN_THREAD'].nil?
       else
-        access_token
+        current_access_token
       end
     end
+
+    def current_access_token
+      @current_access_token ||= Thread.current[:treezor_default_access_token]
+    end
   end
 end

data/lib/treezor_connect/resources/oauth/token.rb

@@ -5,18 +5,28 @@ module TreezorConnect
     class Token
       class << self
         def create(params = {})
+          access_token = fetch_token(params[:username], params[:password], params[:sca])
+
+          {
+            token: access_token.token,
+            expires_in: access_token.expires_in,
+            expires_at: access_token.expires_at
+          }
+        end
+
+        private
+
+        def fetch_token(username, password, sca)
           oauth_client.client_credentials.get_token({
                                                       grant_type: 'delegated_end_user',
                                                       client_id: TreezorConnect.client_id,
                                                       client_secret: TreezorConnect.client_secret,
-                                                      username: params[:username],
-                                                      password: params[:password],
-                                                      sca: params[:sca]
-                                                    }).token
+                                                      username:,
+                                                      password:,
+                                                      sca:
+                                                    })
         end
 
-        private
-
         def oauth_client
           OAuth2::Client.new(
             TreezorConnect.client_id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treezor_connect
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - stefakins
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies: []
 description: A gem for making HTTP calls to Treezor Connect.
 email: stefan.atkinson69@gmail.com