zuora_connect 2.0.5p → 2.0.5q

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fcd3261006fd6d36a06fe1528c53dc1eaeff482589943f82931f660a188bc59
-  data.tar.gz: 877292f064f221c3c779e262050d3c77fcaa64f59d944a247e13aa68ac9218ed
+  metadata.gz: d533bc392f7e7b927a1cbcd99fb2e83efb1d84adf57378e114e62e9f1167d94c
+  data.tar.gz: c7182d8e36035223fe1db8711094772890e8dcb5ad3dbe77a00e2d63018f1e4e
 SHA512:
-  metadata.gz: acc1460b1ff720d381660f4447a6931dfeead161e2b48005732b64b2422dd226926196f72ff226aa1c2d69852f8b2a59ae4df00538b32942893497309d7186f1
-  data.tar.gz: 54b3ee18a7bc3f1f9f2f4fb3c27415a65b51b49c4cf908c98a2f56e85b04fdc03142f9364f8ee3030df50e474aadd8658654613e4d53c24779ab5257da391487
+  metadata.gz: 113fb44242e94367e01f08a0948f1181b254a4418a3da25dfc4a698758eab1dd5dd763a40ed747e580bd50645b36deb08291a0e60c48ef6c37972c59eb61b0f1
+  data.tar.gz: c02a67c7a5fb41c97e17ffbe3444a003d753ae1113678c5abfebdd4b37124f40572cc0744a50f7109fcbfd07da0d4dd2949082dfbbd15fd58beb76fd93190465

data/app/models/zuora_connect/app_instance_base.rb

@@ -16,7 +16,7 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_COMMUNICATION_SLEEP= 5.seconds
-    IGNORED_LOCALS = ['fr', 'ja', 'sp']
+    IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
 

data/db/migrate/20190520232222_add_unique_index.rb

@@ -0,0 +1,6 @@
+class AddUniqueIndex < ActiveRecord::Migration[5.0]
+  def change
+    add_index :zuora_connect_app_instances, :api_token, unique: true
+    add_index :zuora_connect_app_instances, :token, unique: true   
+  end
+end

data/lib/zuora_connect/controllers/helpers.rb

@@ -170,17 +170,18 @@ module ZuoraConnect
                   @zuora_user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
                   @zuora_user.save!
                 end
-
-                session["#{@appinstance.id}::user::email"] = session["username"]
               else
                 ZuoraConnect.logger.debug("New zuora user object for #{zuora_user_id}")
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
               end 
               @zuora_user.session = session
+              session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
+              session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
+              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
-            elsif appinstances.size > 1
+            elsif appinstances.size > 1 
               ZuoraConnect.logger.debug("User must select instance. #{@names}")
               render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}
               return
@@ -199,15 +200,15 @@ module ZuoraConnect
 
                 ActiveRecord::Base.transaction do
                   ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
-                  next_id = (ZuoraConnect::AppInstance.all.where(:access_token => nil).order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
-
+                  sleep(2) #Sleep needed to wait for instance insertion
                   appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
                   if appinstances.size > 0
-                    ZuoraConnect.logger.warn("Double tenant create for '#{zuora_client.rest_domain}' - '#{zuora_entity_id}'")
+                    ZuoraConnect.logger.warn("Double tenant create for '#{zuora_client.rest_domain}' - '#{zuora_entity_id}' - '#{session["ZuoraCurrentIdentity"]["username"]}'")
                     redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{CGI.escape(request.fullpath)}"
                     return
                   end
 
+                  next_id = (ZuoraConnect::AppInstance.all.where('id > 24999999').order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
                   user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
                   body = {
                     'userId' => zuora_user_id, 
@@ -215,7 +216,7 @@ module ZuoraConnect
                     'customAuthorities' => [], 
                     'additionalInformation' => {
                       'description' => "This user is for #{user} application.", 
-                      'name' => "#{user} API User"
+                      'name' => "#{user} API User #{next_id}"
                     }
                   }
 
@@ -228,12 +229,6 @@ module ZuoraConnect
                     client_describe = session["ZuoraCurrentUserInfo"]
                   end
 
-                  Apartment::Tenant.switch!("public")
-                  begin
-                    Apartment::Tenant.create(next_id.to_s)
-                  rescue Apartment::TenantExists => ex
-                    ZuoraConnect.logger.debug("Tenant Already Exists")
-                  end
                   available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == client_describe['defaultEntityId']}
                   task_data = {
                     "id": next_id,
@@ -252,12 +247,36 @@ module ZuoraConnect
                     },
                     "tenant_ids": available_entities.map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
                   }
+                  mapped_values = {:id => next_id, :api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36), :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years}
+                  @appinstance = ZuoraConnect::AppInstance.new(mapped_values)
+                  retry_count = 0
+                  begin
+                    @appinstance.save(:validate => false)
+                  rescue ActiveRecord::RecordNotUnique => ex
+                    if (retry_count += 1) < 3
+                      @appinstance.assign_attributes({:api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36)})
+                      retry
+                    else
+                      Thread.current[:appinstance] = nil
+                      session["appInstance"] = nil
+                      render "zuora_connect/static/error_handled", :locals => {
+                        :title => "Application could not create unique tokens.", 
+                        :message => "Please contact support or retry launching application."
+                      }
+                      return
+                    end
+                  end
+                end
 
-                  @appinstance = ZuoraConnect::AppInstance.new(:id => next_id, :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years)
-                  @appinstance.save(:validate => false)
-                  @appinstance.refresh
-                  session["appInstance"] = @appinstance.id
+                Apartment::Tenant.switch!("public")
+                begin
+                  Apartment::Tenant.create(@appinstance.id.to_s)
+                rescue Apartment::TenantExists => ex
+                  ZuoraConnect.logger.debug("Tenant Already Exists")
                 end
+                @appinstance.refresh
+                session["appInstance"] = @appinstance.id
+
               rescue => ex
                 ZuoraConnect.logger.error(ex)
                 render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
@@ -301,11 +320,17 @@ module ZuoraConnect
           PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
         end
         begin
-          I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
+          locale = session["#{@appinstance.id}::user::locale"]
+          I18n.locale = locale.present? ? locale : @appinstance.locale
         rescue I18n::InvalidLocale => ex
           ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
         end
-        Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
+        begin
+          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
+        rescue 
+          ZuoraConnect.logger.error(ex) 
+        end
+
         ZuoraConnect.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
       end
 
@@ -356,6 +381,8 @@ module ZuoraConnect
         ZuoraConnect.logger.debug({msg: 'Setup values', connect: values}) if Rails.env != "production"
 
         @appinstance = ZuoraConnect::AppInstance.where(:id => values["appInstance"].to_i).first
+
+        mapped_values = {:api_token => values['api_token'], :token => values['api_token'], :access_token => values["access_token"], :refresh_token => values["refresh_token"], :oauth_expires_at => values["expires"]}
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
@@ -363,13 +390,12 @@ module ZuoraConnect
           rescue Apartment::TenantExists => ex
             ZuoraConnect.logger.debug("Tenant Already Exists")
           end
-          @appinstance = ZuoraConnect::AppInstance.new(:api_token =>  values[:api_token],:id => values["appInstance"].to_i, :access_token => values["access_token"].blank? ? values["user"] : values["access_token"], :token => values["refresh_token"]  , :refresh_token => values["refresh_token"].blank? ? values["key"] : values["refresh_token"], :oauth_expires_at => values["expires"])
+          
+          @appinstance = ZuoraConnect::AppInstance.new(mapped_values.merge({:id => values["appInstance"].to_i}))
           @appinstance.save(:validate => false)
         else
-          @appinstance.access_token = values["access_token"] if !values["access_token"].blank? && @appinstance.access_token != values["access_token"]
-          @appinstance.refresh_token = values["refresh_token"] if !values["refresh_token"].blank? && @appinstance.refresh_token != values["refresh_token"]
-          @appinstance.oauth_expires_at = values["expires"] if !values["expires"].blank?
-          @appinstance.api_token = values["api_token"] if !values["api_token"].blank? && @appinstance.api_token != values["api_token"]
+          mapped_values.reject! {|key,value| [:api_token,:token].include?(key) && @appinstance[key].blank? }
+          @appinstance.assign_attributes(mapped_values)
           if @appinstance.access_token_changed? && @appinstance.refresh_token_changed?
             @appinstance.save(:validate => false)
           else

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5p"
+  VERSION = "2.0.5q"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5p
+  version: 2.0.5q
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -333,6 +333,7 @@ files:
 - db/migrate/20180301052853_add_catalog_attempted_at.rb
 - db/migrate/20181206162339_add_fields_to_instance.rb
 - db/migrate/20190520232221_add_zuora_user_table_and_alter_app_instance_id_table.rb
+- db/migrate/20190520232222_add_unique_index.rb
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb