dock_health_api 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d06240d8efd2c2ac6c4b49cb3d6525379498665991a0c873efdb72707bd489d
-  data.tar.gz: c082a4f60607579cc01a7e4f10655e0b954c6b4bb1641f981c663b7bc569b920
+  metadata.gz: 744bfe703e4f755b8a9b1e17713dc55e65d1a03f1e11de51fd0d684c3f031afb
+  data.tar.gz: 89dcf95b0ad77852e57e7ebe60b8c542f45758f986a702f2e72285f869a92fbd
 SHA512:
-  metadata.gz: b4ed56ce48bd425eb26d9e96daa60f37ca13fdcc16f95340662d0a62db14e1f5d535a033f4bfcc57561d5c9eb4bd5d5c8cc7df2701a044c92a0084e62d92f955
-  data.tar.gz: 77b3bbd488d916dec0ac6f77364cd5d2949e24112d53ba16a7ca1768f680d1c711a7cf91ee9358c2b1c24d10f9000b8f4206348af0245dad2573b54ef5a17437
+  metadata.gz: 6f2bc2e66d7adee6e4984d7a21e05c91c7a24b5cd5d37fa850111ecdf004fc306e11812f4d4db48862ef9424457b2ee0495fc39b70ac4711e128439735bacac3
+  data.tar.gz: 3a986259f4154205e21a4b935bd981276b4ecd5139ced86486cfe18657c5107e177124ee1acc9733389d134b0e4ccdb621d73920a2fe1ff47bbd3b95f72135a1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dock_health_api (0.5.6)
+    dock_health_api (0.5.8)
       oauth2 (~> 1.4)
       ostruct
       rspec (~> 3.0)

data/lib/dock_health_api/client.rb

@@ -6,17 +6,13 @@ module DockHealthApi
     BUFFER = 120
 
     include Singleton
-    
+
     attr_reader :config
 
     def initialize
       @config = DockHealthApi.config
     end
 
-    def active_client
-      instance
-    end
-
     def connection
       @connection ||= OAuth2::Client.new(config.api_key, config.api_secret, token_url: config.token_url, raise_errors: false)
     end
@@ -35,10 +31,18 @@ module DockHealthApi
     end
 
     def iframe_token_connection
-      get_iframe_token
+      get_iframe_token if @iframe_token_connection.nil? || iframe_token_about_to_expire?
       @iframe_token_connection
     end
 
+    def iframe_token_expiration_time
+      @iframe_token_expiration_time ||= Time.now + @iframe_token_connection.expires_in
+    end
+
+    def iframe_token_about_to_expire?
+      Time.now + BUFFER > iframe_token_expiration_time
+    end
+
     def token
       @token ||= token_connection.token
     end
@@ -56,8 +60,8 @@ module DockHealthApi
     def get_iframe_token
       @iframe_token_connection = connection.client_credentials.get_token(scope:"dockhealth/system.embedded.launch")
       return @iframe_token_connection if @iframe_token_connection.nil?
-      DockHealthApi.iframe_token = @iframe_token_connection.token
-      DockHealthApi.iframe_token_expires_at = Time.now + @iframe_token_connection.expires_in
+      @iframe_token_expiration_time = Time.now + @iframe_token_connection.expires_in
+      @iframe_token_connection
     end
   end
 end

data/lib/dock_health_api/config.rb

@@ -8,10 +8,6 @@ module DockHealthApi
       :org_id,
       :user_id,
       :api,
-      :iframe_token,
-      :token,
-      :iframe_token_expires_at,
-      :token_expires_at,
       :debug,
       :iframe_base_url
   end

data/lib/dock_health_api/version.rb

@@ -1,3 +1,3 @@
 module DockHealthApi
-  VERSION = "0.5.6"
+  VERSION = "0.5.8"
 end

data/lib/dock_health_api.rb

@@ -45,24 +45,19 @@ module DockHealthApi
     def_delegators :@config, :org_id, :org_id=
     def_delegators :@config, :user_id, :user_id=
     def_delegators :@config, :api, :api=
-    def_delegators :@config, :iframe_token, :iframe_token=
-    def_delegators :@config, :iframe_token_expires_at, :iframe_token_expires_at=
-    def_delegators :@config, :token, :token=
-    def_delegators :@config, :token_expires_at, :token_expires_at=
     def_delegators :@config, :debug, :debug=
     def_delegators :@config, :iframe_base_url, :iframe_base_url=
 
     def receive_iframe_token
-      Client.active_client.iframe_token_connection if iframe_token_expired?
+      @receive_iframe_token ||= Client.instance.iframe_token_connection
     end
 
-    def iframe_token_expired?
-      return Time.now > self.iframe_token_expires_at if self.iframe_token_expires_at
-      true
+    def iframe_token
+      receive_iframe_token.token
     end
 
     def iframe_url(arg={})
-      DockHealthApi.receive_iframe_token
+      receive_iframe_token
       dock_user_id = arg[:user_id]
       view_type = arg[:view_type]
       target_type = arg[:target_type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dock_health_api
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.8
 platform: ruby
 authors:
 - Robert Magomero
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2