zuora_connect 1.3.0a → 1.3.0b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25a399af6352d06552aba98817240a79e1b5c49
-  data.tar.gz: 1a115d1dd8140490cc6de864f4202892d98c48c5
+  metadata.gz: 539b14028c8efc7b82b7ce290d961b98f5312dda
+  data.tar.gz: ca9cdeef30c05a7a5466f7fefc5702c78cd92f9c
 SHA512:
-  metadata.gz: 7cc8e57eda57052393bfb4a29c2d180f394ebde390208d90e2456b6aa29fb735e77ce6cff54033754974d669b8ba4ebc3c951d71680c5f9571d2963446b9f127
-  data.tar.gz: 4badfd2eb9cd1414c143f63f7defcecfbda360a30fc7eeb7dccc60bac284289b1f06cc9880f145a65f4cbbc58313afe9115b4cf3b725fd24e1765da3c3f1c65e
+  metadata.gz: ab991527b2acafd51e4073179437cb30aaac6bb1d84cdf0d3978a03ea0583bd1713286e55261fb0795fc89c5ea00d8bb96a979210e96640943680730456d6499
+  data.tar.gz: 3123bf76dd8c2c50f3616ac79ceb9f7083dab16ef26b1f24e6f00d8a2460ae47170196530702607364d0fff55bbbefe00deb119b6de99ac389984339356c912f

data/app/models/zuora_connect/app_instance_base.rb

@@ -5,7 +5,6 @@ module ZuoraConnect
     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
@@ -26,6 +25,7 @@ module ZuoraConnect
     end
 
     def new_session(session: {}, username: self.access_token, password: self.refresh_token)
+      @api_version = (username.include?("@") ? "v1" : "v2")
       @username = username
       @password = password
       @last_refresh = session["#{self.id}::last_refresh"]
@@ -41,14 +41,14 @@ module ZuoraConnect
         self.mode = ZuoraConnect.configuration.dev_mode_mode
       else
         if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
-          Rails.logger.debug("REFRESHING - Session Nil") if session.nil?
-          Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
-          Rails.logger.debug("REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
-          Rails.logger.debug("REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
-          Rails.logger.debug("REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+          Rails.logger.debug("[#{self.id}] REFRESHING - Session Nil") if session.nil?
+          Rails.logger.debug("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})") if  (!session.nil? && self.id != session["appInstance"].to_i)
+          Rails.logger.debug("[#{self.id}] REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
+          Rails.logger.debug("[#{self.id}] REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
+          Rails.logger.debug("[#{self.id}] REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
           self.refresh(session)
         else
-          Rails.logger.debug("REBUILDING")
+          Rails.logger.debug("[#{self.id}] REBUILDING")
           build_task(session["#{self.id}::task_data"], session)
         end
       end
@@ -92,7 +92,7 @@ module ZuoraConnect
       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})
+        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
       end
       if response.code == 200
         @last_refresh = Time.now.to_i
@@ -101,9 +101,13 @@ module ZuoraConnect
         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
+      if self.api_version == "v2" && count < 2 && response.code == 401
+        self.refresh_oauth
+        count += 1
+        retry
+      else
+        raise
+      end
     end
 
     def build_task(task_data, session)
@@ -155,11 +159,9 @@ module ZuoraConnect
     end
 
     def refresh_oauth
-      Rails.logger.debug("REFRESHING - OAuth")
+      Rails.logger.debug("[#{self.id}] 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
               }
@@ -168,7 +170,7 @@ module ZuoraConnect
       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.oauth_expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds
         self.save
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)

data/db/migrate/20170413191512_add_new_api_token.rb

@@ -0,0 +1,5 @@
+class AddNewApiToken < ActiveRecord::Migration[5.0]
+  def change
+    add_column :zuora_connect_app_instances, :api_token, :string  unless column_exists? :zuora_connect_app_instances, :api_token
+  end
+end

data/lib/zuora_connect/controllers/helpers.rb

@@ -10,17 +10,17 @@ module ZuoraConnect
 
       def authenticate_app_api_request
         start_time = Time.now
-        authenticate_or_request_with_http_basic do |username, password|
-          @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
-          if !@appinstance.blank?
-            @appinstance.new_session(:session => instance_data_lookup(@appinstance.id))
-            Thread.current[:appinstance] = @appinstance
-            return  @appinstance.valid
-          else
-            render text: "Access Denied", status: :unauthorized
+        if !params[:access_token].blank?
+          @appinstance = ZuoraConnect::AppInstance.where(:api_token => params[:access_token]).first
+          check_instance
+        else
+          authenticate_or_request_with_http_basic do |username, password|
+            @appinstance = ZuoraConnect::AppInstance.where(:token => password).first
+            @appinstance ||= ZuoraConnect::AppInstance.where(:api_token => password).first
+            check_instance
           end
         end
-        Rails.logger.debug("Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
+        Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
       end
 
       def authenticate_connect_app_request
@@ -37,7 +37,7 @@ module ZuoraConnect
         @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id))
         I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
         Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-        Rails.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+        Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
       end
 
       def persist_connect_app_session
@@ -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["access_token"], :refresh_token => values["refresh_token"], :oauth_expires_at => values["expires"])
+          @appinstance = ZuoraConnect::AppInstance.create!(:api_token =>  values[:api_token],:id => values["appInstance"].to_i, :access_token => values["access_token"], :token => values["refresh_token"]  , :refresh_token => values["refresh_token"].blank?, :oauth_expires_at => values["expires"])
         end
-        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank?
-          @appinstance.update_attributes(:access_token =>  values["access_token"], :refresh_token =>  values["refresh_token"])
+        if (@appinstance.access_token.blank? || @appinstance.access_token != (values["access_token"].blank? ? values["user"] : values["access_token"]) )|| (@appinstance.refresh_token.blank?  || @appinstance.refresh_token != (values["refresh_token"].blank? ? values["key"] : values["refresh_token"])) || @appinstance.api_token.blank?
+          @appinstance.update_attributes(:access_token => values["access_token"], :refresh_token => values["refresh_token"], :oauth_expires_at => values["expires"],:api_token => values["api_token"])
         end
       end
 
@@ -110,5 +110,17 @@ module ZuoraConnect
       end
 
     end
+
+    private
+
+    def check_instance
+      if !@appinstance.blank?
+        @appinstance.new_session(:session => instance_data_lookup(@appinstance.id))
+        Thread.current[:appinstance] = @appinstance
+        return  @appinstance.valid
+      else
+        render text: "Access Denied", status: :unauthorized
+      end
+    end
   end
 end

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.3.0a
+  version: 1.3.0b
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -160,6 +160,7 @@ files:
 - 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
+- db/migrate/20170413191512_add_new_api_token.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb