zuora_connect 1.2.7 → 1.3.0a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60076f8557db8763947a9be6ec98d7af4300e1c
-  data.tar.gz: cea2ea57e8a89521b16fbe3879427f1f5cfb63b6
+  metadata.gz: f25a399af6352d06552aba98817240a79e1b5c49
+  data.tar.gz: 1a115d1dd8140490cc6de864f4202892d98c48c5
 SHA512:
-  metadata.gz: 36a85e6b8dae507e6f7e457873769d46fdfcdbda6c1a616c755cb6a2724fb268159b78132b24a19126842f08acc82fad0566d78176773485e88d7ed5e54d8d94
-  data.tar.gz: f2f909e1b20bcbe74c6d2044f3732ecb6e95ed9a590d6c725fb17c1d75febd092ff028201cb2f518a91ad8393419515df7853eca32717bdc9fe10f938165bbbe
+  metadata.gz: 7cc8e57eda57052393bfb4a29c2d180f394ebde390208d90e2456b6aa29fb735e77ce6cff54033754974d669b8ba4ebc3c951d71680c5f9571d2963446b9f127
+  data.tar.gz: 4badfd2eb9cd1414c143f63f7defcecfbda360a30fc7eeb7dccc60bac284289b1f06cc9880f145a65f4cbbc58313afe9115b4cf3b725fd24e1765da3c3f1c65e

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,11 +1,11 @@
 module ZuoraConnect
   class AppInstanceBase < ActiveRecord::Base
     after_initialize :init
-     self.table_name = "zuora_connect_app_instances"
-    before_create :generate_access_token
-    attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password, :s3_client
+    self.table_name = "zuora_connect_app_instances"
+    attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password, :s3_client, :api_version
 
     def init
+      @api_version = self.access_token.include? ("@") ? "v1" : "v2"
       @options = Hash.new
       @logins = Hash.new
       if ZuoraConnect.configuration.use_s3
@@ -77,20 +77,33 @@ module ZuoraConnect
 
     def updateOption(optionId, value)
       if self.access_token && self.refresh_token
-        return HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
+        if self.api_version == "v1"
+          return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
+        else
+          return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
+        end
       else
         return false
       end
     end
 
     def refresh(session = nil)
-      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
+      count ||= 0
+      if self.api_version == "v1"
+        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
+      else
+        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.username})
+      end
       if response.code == 200
         @last_refresh = Time.now.to_i
         build_task(JSON.parse(response.body), session)
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
+    rescue
+      self.refresh_oauth
+      count = count + 1
+      retry if count < 2
     end
 
     def build_task(task_data, session)
@@ -141,16 +154,34 @@ module ZuoraConnect
       OpenSSL::PKey::RSA.new(ZuoraConnect.configuration.private_key).private_decrypt(resp)
     end
 
-    def attr_builder(field,val)
-      singleton_class.class_eval { attr_accessor "#{field}" }
-      send("#{field}=", val)
+    def refresh_oauth
+      Rails.logger.debug("REFRESHING - OAuth")
+      params = {
+                :grant_type => "refresh_token",
+                :client_id => ZuoraConnect.configuration.oauth_client_id,
+                :client_secret => ZuoraConnect.configuration.oauth_client_secret,
+                :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
+                :refresh_token => self.refresh_token
+              }
+      response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
+      response_body = JSON.parse(response.body)
+      if response.code == 200
+        self.refresh_token = response_body["refresh_token"]
+        self.access_token = response_body["access_token"]
+        self.expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds.from_now
+        self.save
+      else
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
+      end
     end
 
-    def generate_access_token
-      begin
-        self.token = SecureRandom.hex
-      end while self.class.exists?(token: token)
+    def oauth_expired?
+      (expires_at < Time.now)
     end
 
+    def attr_builder(field,val)
+      singleton_class.class_eval { attr_accessor "#{field}" }
+      send("#{field}=", val)
+    end
   end
 end

data/db/migrate/20170411200303_add_expiration_to_app_instance.rb

@@ -0,0 +1,5 @@
+class AddExpirationToAppInstance < ActiveRecord::Migration[5.0]
+  def change
+    add_column :zuora_connect_app_instances, :oauth_expires_at, :datetime  unless column_exists? :zuora_connect_app_instances, :oauth_expires_at
+  end
+end

data/lib/zuora_connect/configuration.rb

@@ -1,6 +1,6 @@
 module ZuoraConnect
   class Configuration
-    attr_accessor :use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name
+    attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name
 
     def initialize
       @timeout = 5.minutes
@@ -12,6 +12,11 @@ module ZuoraConnect
       @use_s3 = false
       @private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpgIBAAKCAQEA3PlAZWUbyvBSVU9GZxQM+brbwDfecsrFXJIbEvV76LVfFuTO\nDbyMPyuM0SBEAskb79wqNsn5JD0edCwmvZ+/Kn83b8SFkFW3f1tUxA0zFdVuqKP2\nJk1vms97yvOUveDjv22gYVMJYcSAFEzg9D9fUvTRocuBWQdbTq1cyJL+LYs9bUpl\nMB4oIUZuQ5nYz66y2gLlF0yUFNAfLpaCyaJvAmN93bPWTPfaKf+PMtkWCMQJQ3w+\nGvsudynLyE0ZgLx5mfM18h08iTMl61sUawyUEYNPm71Q6er9TB7oiOt3RT7ncw9P\nN+jzdklEphPp+1RaK35joPLQZjZl3Nh/XZg5eQIDAQABAoIBAQCJB+SgPDgk/C0C\njDurdmqpfvABXmQLKaWER3KUqjjh0X+bUd5Z9F/AWMBley3R0GcLsqtW+J8QkvpM\nroiDtQm2T9fP7r2pCQ7W4otJXKoeUxHhcHQXwpOAHES3UaAes9RoBJKdaAH8Z//J\nFve1X4s8hWdufyXCUOaVfrp4A3euQ3BYkb1n6yCnaEclG/evX6VM5jYMuHSDH0AS\nRUAMotuNvoLEIweNjWIolrKBEe+ZA6Rz6UaSoOxoNl8qWWOMsQvKzWfzHOA/YMnn\n9TN3AR10XYhWVjzNWL2dN1Jh4aD3d0byzImuhnCdIsIkTmS5aogl3/iFDce+9+kF\nLnkH5PuRAoGBAPiXQZdXHu7HwuQvZdb+2kII4kVLyLRM6v81rmXZr7pBUWrdpezy\nnFDj8OumSml4cKOLDUTAj/2/Hjs1o3JVGZqD0EbVrfIF0LZ3LzHb0rAae0uoyG7S\ny+2Y8wjLP53RogdZMA+6uoozEPM7yAp04d+rVPQY8i6JwGQmRYh7xSSlAoGBAOOP\nRssUBabZX13gQQ3BsO28g4HTEiFuqgAvGG/44Xbf74IRQiOT6ZaNYELvgaZT+RW2\nbp5E+T15Qe+SHHdxJhv3wtsnAw7yno1BmHpkAs1mEjjGFbNMF84YcRWSRU09g9Pm\nORhAc4lCFxHh7LnGsI1bgcPOYuFDRSHjYEy6y6VFAoGBAOiE8kEQqEpIZy7wdp1m\nu9fQX3TZsd2TpKsaFwoFV60rs2/16mF7fGLdElgYrrmAgjs2sS6Bvy1lOm2/eiZT\nGyO/72ySKaWbcuF5EZfdOXCnFHRsZy3h1gVjbs/m7JY9owSkk6Pi0OC7aztXy4Cc\nWznPFCNNwhltl5sVgSxsOLZRAoGBAJcPOI581xegevdFc8nfB0V5+86FwCZjYQTI\nPq+uBnW0SDkOndoiSVEAvqMQfP9eBR7NwPbdkJqnUQbo9m6vtP2h5j820YfttSTO\nI5szosyY8oWvsR4Z6D+O6BrKw6h3qnhS/xnDRy8ZqVjcohnc9LyRvz2tVuR0lILf\nfsDQy3kFAoGBAOm3N39RR7BwOMWIbe0Pk/ohJJdKwzsd1t1WyuXjAHJGdhMXkjl5\n9T1UsrouUr6qr545FNwEXktjmJ0IuqwypBC7B9kezKJlNTsZxmtcl7HfIFFOade7\nvrPHAAHPHSvCRcUPcFG1PDnFno66dXFOZwMo7W2lN+xTXuO0EvBAlW9P\n-----END RSA PRIVATE KEY-----\n"
 
+      # OAuth Settings
+      @oauth_client_id = ""
+      @oauth_client_secret = ""
+      @oauth_client_redirect_uri = "https://connect.zuora.com/"
+
       # DEV MODE OPTIONS
       @dev_mode_logins = { "target_login" => {"tenant_type" => "Zuora", "username" => "user", "password" => "pass", "url" => "url"} }
       @dev_mode_options = {"name" => {"config_name" => "name", "datatype" => "type", "value" => "value"}}

data/lib/zuora_connect/controllers/helpers.rb

@@ -76,10 +76,10 @@ module ZuoraConnect
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           Apartment::Tenant.create(values["appInstance"].to_s)
-          @appinstance = ZuoraConnect::AppInstance.create!(:id => values["appInstance"].to_i, :access_token => values["user"], :refresh_token => values["key"])
+          @appinstance = ZuoraConnect::AppInstance.create!(:id => values["appInstance"].to_i, :access_token => values["access_token"], :refresh_token => values["refresh_token"], :oauth_expires_at => values["expires"])
         end
         if @appinstance.access_token.blank? || @appinstance.refresh_token.blank?
-          @appinstance.update_attributes(:access_token =>  values["user"], :refresh_token =>  values["key"])
+          @appinstance.update_attributes(:access_token =>  values["access_token"], :refresh_token =>  values["refresh_token"])
         end
       end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.2.7"
+  VERSION = "1.3.0a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - db/migrate/20161024162319_add_tokens_to_app_instance.rb
 - db/migrate/20161024220705_add_token_to_app_instance.rb
 - db/migrate/20170131211919_add_sessions_table.rb
+- db/migrate/20170411200303_add_expiration_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb
@@ -222,9 +223,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1