agx 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882bb436fd382a7f3328601c59c6c78d5fbd823a6dd994df56f4e5ffd2ca336b
-  data.tar.gz: 41273c8378e4e2211d228e247fb67e340a10dabc1717f50456b50c375747cdc1
+  metadata.gz: cc30295d8784ea06646dec1957a98f5790267367ff7400cc945ef83075c8a0ae
+  data.tar.gz: fcd11958bd999df6292925fc94235809ae7000bba25a065b373bd53ce60fbfff
 SHA512:
-  metadata.gz: f7573c8f79028550413f1017cef0aad295e0765c1b390cbf29737ea660709ded51cb31cfa8bb47ae1831d02cf44f935fbbcfdfa48f9af1c8278f41359ebe72dd
-  data.tar.gz: 4e0d2dadecf383a00d62b156869aac3993968c37c70e0499079b7cae7f8f32889ac7df1aac1e5f274268b55a8e144d6e0d21e94a3a028e23bbbe50f4031d85a7
+  metadata.gz: 2a2ac37901fcc2911f5bd32d508dab2f75124f3a23d229922a8320228a11cec38f4dcc619de87125b81a9c31d642ec803fcf70d8fe47c6328748e844b6df11b9
+  data.tar.gz: 8c0548b7c39144bc89c6212e4919a5074aff73e599c04168885cc638082c627ce7cf4330bbe4cec985875fded6f4bd6d5114eb5c48fe9a0f81ed77a454617068

data/README.md

@@ -33,6 +33,8 @@ Setup agX Content Client (OAuth 2 Client Credentials Flow)
   client_secret: "your_client_secret",
   version: "v1"  # optional
   prod: true # optional, false for QA
+  access_token: "token_if_stored", # optional
+  expires_at: "token_expires_at_if_stored" # optional
 )
 ```
 

data/lib/agx/content/client.rb

@@ -3,7 +3,7 @@ module Agx
     class Client
       attr_accessor :client_id, :client_secret, :site, :token_url, :version
 
-      def initialize(client_id: nil, client_secret: nil, version: nil, prod: true)
+      def initialize(client_id: nil, client_secret: nil, version: nil, prod: true, access_token: nil, expires_at: nil)
         domain = (prod ? "agxplatform.com" : "qaagxplatform.com")
         @client_id = client_id || ENV['AGX_CONTENT_CLIENT_ID']
         @client_secret = client_secret || ENV['AGX_CONTENT_CLIENT_SECRET']
@@ -12,8 +12,8 @@ module Agx
         @version = version || "v1"
         @client = set_client
         @token = {
-          access_token: nil,
-          expires_at: nil
+          access_token: access_token,
+          expires_at: expires_at
         }
       end
 
@@ -29,6 +29,25 @@ module Agx
         end
       end
 
+      def current_token
+        if @token[:access_token].nil? || @token[:expires_at].nil?
+          new_token = api_token
+        else
+          oauth_token = OAuth2::AccessToken.new(
+            @client,
+            @token[:access_token],
+            {expires_at: @token[:expires_at]}
+          )
+          if Time.now.to_i + 180 >= @token[:expires_at] || oauth_token.expired?
+            new_token = api_token
+          else
+            new_token = oauth_token
+          end
+        end
+
+        new_token
+      end
+
       protected
 
       def validate_credentials
@@ -74,25 +93,6 @@ module Agx
         raise error_to_raise
       end
 
-      def current_token
-        if @token[:access_token].nil? || @token[:expires_at].nil?
-          new_token = api_token
-        else
-          oauth_token = OAuth2::AccessToken.new(
-            @client,
-            @token[:access_token],
-            {expires_at: @token[:expires_at]}
-          )
-          if Time.now.to_i + 180 >= @token[:expires_at] || oauth_token.expired?
-            new_token = api_token
-          else
-            new_token = oauth_token
-          end
-        end
-
-        new_token
-      end
-
       def api_token
         begin
           new_token = @client.client_credentials.get_token(

data/lib/agx/sync/client.rb

@@ -116,6 +116,21 @@ module Agx
         end
       end
 
+      def current_token
+        new_token = OAuth2::AccessToken.new @client, @token[:access_token], {
+          expires_at: @token[:expires_at],
+          refresh_token: @token[:refresh_token]
+        }
+        if Time.now.to_i + 90 >= @token[:expires_at]
+          new_token = new_token.refresh!
+          @token[:access_token] = new_token.token
+          @token[:refresh_token] = new_token.refresh_token
+          @token[:expires_at] = new_token.expires_at
+        end
+
+        new_token
+      end
+
       protected
 
       def validate_credentials
@@ -179,21 +194,6 @@ module Agx
         raise error_to_raise
       end
 
-      def current_token
-        new_token = OAuth2::AccessToken.new @client, @token[:access_token], {
-          expires_at: @token[:expires_at],
-          refresh_token: @token[:refresh_token]
-        }
-        if Time.now.to_i + 90 >= @token[:expires_at]
-          new_token = new_token.refresh!
-          @token[:access_token] = new_token.token
-          @token[:refresh_token] = new_token.refresh_token
-          @token[:expires_at] = new_token.expires_at
-        end
-
-        new_token
-      end
-
       def set_client
         @client = OAuth2::Client.new(
           @client_id,

data/lib/agx/version.rb

@@ -1,3 +1,3 @@
 module Agx
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agx
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Bryce Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj