zuora_connect 1.6.06 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aab6b6790b92249ea03f26bf79222ec77720566
-  data.tar.gz: 5f09e4567ab8a4bdac1defe735a5b43809295dd9
+  metadata.gz: 5aeb9466de005d8eff32c27e0ecd08694aa351ad
+  data.tar.gz: cf8deeee4650bd0fd595fba68758d1e3e1c831a4
 SHA512:
-  metadata.gz: 9b20a0da49a4ee3ff62950fb04419a5d3a98fe1d381ed9b9bcc04c7564c8e9d053db136740a82ff74ad950ce47e094aa63b66739dc35ba1a7d4924c95ab4541b
-  data.tar.gz: fe902be31ee9eb458cc92204cc4addb4ea50a973973247b6a1d44fb1b670a0d0dc35b1644ac5ff8248741b1926dd589e8d17372b1199975530fb98ddbc65a2b9
+  metadata.gz: 8c0a73ea96d302e9643b7277940c5618a0cc1a79f911e6bf0ab44d04235e6bb76ea054c7b6247b477af4378633636a01aa48ee9296931cebc6a3b5993ba012b5
+  data.tar.gz: 2f1d5a979d8f1a81e3e3eac212bf27f5162d42dcfdab26ab3acd2ca97a3eeac983e42891b17d7c7ad3eb9f53dc50e91fbc5da0f6f76d0e84e237d4cd19179f4e

data/app/models/zuora_connect/app_instance_base.rb

@@ -223,7 +223,7 @@ module ZuoraConnect
       Rails.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
       if response.code == 200
         build_task(JSON.parse(response.body), session)
-        @last_refresh = Time.now.to_i
+        self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
       else
@@ -253,21 +253,23 @@ module ZuoraConnect
 
     #### START Task Mathods ####
       def build_task(task_data, session)
-        begin
-          @task_data = task_data
-          @mode = @task_data["mode"]
-          @task_data.each do |k,v|
-            if k.match(/^(.*)_login$/)
-              tmp = ZuoraConnect::Login.new(v)
-              if !session.nil? && v["tenant_type"] == "Zuora"
-                if tmp.entities.size > 0
-                  tmp.entities.each do |value|
-                    entity_id = value["id"]
-                    tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
-                  end
-                else
-                  tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
+        @task_data = task_data
+        @mode = @task_data["mode"]
+        @task_data.each do |k,v|
+          if k.match(/^(.*)_login$/)
+            tmp = ZuoraConnect::Login.new(v)
+            if session.present? && v["tenant_type"] == "Zuora"
+              if tmp.entities.size > 0
+                tmp.entities.each do |value|
+                  entity_id = value["id"]
+                  tmp.client(entity_id).current_session          = session["#{self.id}::#{k}::#{entity_id}:current_session"]               if session["#{self.id}::#{k}::#{entity_id}:current_session"]
+                  tmp.client(entity_id).bearer_token             = session["#{self.id}::#{k}::#{entity_id}:bearer_token"]                  if session["#{self.id}::#{k}::#{entity_id}:bearer_token"]
+                  tmp.client(entity_id).oauth_session_expires_at = session["#{self.id}::#{k}::#{entity_id}:oauth_session_expires_at"]      if session["#{self.id}::#{k}::#{entity_id}:oauth_session_expires_at"]
                 end
+              else
+                tmp.client.current_session                       = session["#{self.id}::#{k}:current_session"]                             if session["#{self.id}::#{k}:current_session"]
+                tmp.client.bearer_token                          = session["#{self.id}::#{k}:bearer_token"]                                if session["#{self.id}::#{k}:bearer_token"] && tmp.client.respond_to?(:bearer_token) ## need incase session id goes from basic to aouth in same redis store
+                tmp.client.oauth_session_expires_at              = session["#{self.id}::#{k}:oauth_session_expires_at"]                    if session["#{self.id}::#{k}:oauth_session_expires_at"]  && tmp.client.respond_to?(:oauth_session_expires_at) 
               end
               @logins[k] = tmp
               self.attr_builder(k, @logins[k])
@@ -443,10 +445,14 @@ module ZuoraConnect
           if login.tenant_type == "Zuora"
             if login.available_entities.size > 1 && Rails.application.config.session_store != ActionDispatch::Session::CookieStore
               login.available_entities.each do |entity_key|
-                session["#{self.id}::#{key}::#{entity_key}:session"] = login.client(entity_key).current_session
+                session["#{self.id}::#{key}::#{entity_key}:current_session"]            = login.client(entity_key).current_session            if login.client.respond_to?(:current_session)
+                session["#{self.id}::#{key}::#{entity_key}:bearer_token"]               = login.client(entity_key).bearer_token               if login.client.respond_to?(:bearer_token)
+                session["#{self.id}::#{key}::#{entity_key}:oauth_session_expires_at"]   = login.client(entity_key).oauth_session_expires_at   if login.client.respond_to?(:oauth_session_expires_at)
               end
             else
-              session["#{self.id}::#{key}:session"] = login.client.current_session
+              session["#{self.id}::#{key}:current_session"]             = login.client.current_session            if login.client.respond_to?(:current_session)
+              session["#{self.id}::#{key}:bearer_token"]                = login.client.bearer_token               if login.client.respond_to?(:bearer_token)
+              session["#{self.id}::#{key}:oauth_session_expires_at"]    = login.client.oauth_session_expires_at   if login.client.respond_to?(:oauth_session_expires_at)
             end
           end
         end
@@ -496,7 +502,7 @@ module ZuoraConnect
       def encrypt_data(data: nil)
         return data if data.blank?
 
-        if Rails.env == 'development'
+        if ['development', 'test'].include?(Rails.env)
           return data.to_json
         else
           return encryptor.encrypt_and_sign(data.to_json)
@@ -745,7 +751,6 @@ module ZuoraConnect
           Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
           Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog))  if cache
         end
-
         return stub_catalog
       end
     ### END Catalog Helping Methods #####
@@ -850,4 +855,4 @@ module ZuoraConnect
     method_hook :refresh, :updateOption, :update_logins, :before => :check_oauth_state
     method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end
-end
+end

data/app/models/zuora_connect/login.rb

@@ -3,20 +3,21 @@ module ZuoraConnect
 
     def initialize (fields)
       @clients = {}
-      if fields["tenant_type"] == "Zuora" && fields["entities"] && fields["entities"].size > 0
-        @clients["Default"] = ::ZuoraAPI::Basic.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
-        @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1
-        fields["entities"].each do |entity|
-          login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
-          login_fields[:entity_id] = entity["id"]
-          @clients[entity["id"]] = ::ZuoraAPI::Basic.new(login_fields)
+      if fields["tenant_type"] == "Zuora"
+        login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
+
+        fields["authentication_type"] = "basic" if fields["authentication_type"].nil? || fields["authentication_type"].blank?
+        
+        @clients["Default"] = "::ZuoraAPI::#{fields["authentication_type"].capitalize}".constantize.new(login_fields)
+        @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1 if fields["entities"] && fields["entities"].size > 0
+        if fields["entities"] && fields["entities"].size > 0
+          fields["entities"].each do |entity|
+            params = {:entity_id => entity["id"]}.merge(login_fields)
+            @clients[entity["id"]] =  "::ZuoraAPI::#{fields["authentication_type"].capitalize}".constantize.new(params)
+          end
         end
-      elsif fields["tenant_type"] == "Zuora"
-        @clients["Default"] = ::ZuoraAPI::Basic.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        self.attr_builder("available_entities", @clients.keys) 
       end
-
-      self.attr_builder("available_entities",@clients.keys) if fields["tenant_type"] == "Zuora"
-
       fields.each do |k,v|
         self.attr_builder(k,v)
       end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-    VERSION = "1.6.06"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.6.06
+  version: 1.7.0
 platform: ruby
 authors:
 - Connect Team
@@ -169,7 +169,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,6 +210,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of Connect.
 email:
 - connect@zuora.com