zuora_connect 2.0.5m → 2.0.5n

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7aaf21ffc4ce6c8191902f11d033184441e28776d26d6d584c1cb7779e41ee
-  data.tar.gz: 46c45ce14414834608d1b406652295e0d5414411c06ed5c1d68a64466e5972d7
+  metadata.gz: 4fbd8460fb918735b2137693cfbd429c23bda6feb0da4f95282260dc096a2b7e
+  data.tar.gz: 78d63c2593390b1e74113f51d634506a6a52df4a327d410a4930d77cc3d0f0d9
 SHA512:
-  metadata.gz: ebb686cc5ac165695facfe6da598765a0fc5e5ba06f529c51b3811faa74d8f38eb740c3682746ecf46e86089f9bf7e983762adb551420ee545b7ee93b07b4ca1
-  data.tar.gz: 77409aaa4fdc0260405997dbd34ffe7aec6b2e643aa7723bd4625b4a9fc415ffb61153bd225bcbe0a557d8fa3a296e641c4044ddb3f1e1cdef6e2f6393454713
+  metadata.gz: e5a0b78587de5d76cfa05e9a76ec6a4227d1881148dde1d78890b17428b53d17b2f03da49b5c21956ba4fc9bce96b0d45894fcb5ce35f594a3bfce4f07c5f60d
+  data.tar.gz: 74d83f48ec8d18f65601dd63a9dc4514e074b5a6efb16fea26453b1cf45eabf686c3ece124c3259ae0e8c4a822ebb61442db1e7b4844da43dc4a784484bb797d

data/app/models/zuora_connect/app_instance_base.rb

@@ -196,10 +196,10 @@ module ZuoraConnect
       self.logitem(item: {tenant_ids: tenants, organization: organizations})
       params = {
         :name => self.task_data.dig('name'), 
-        :zuora_domain => self.target_login.client.rest_domain,
         :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
         :zuora_tenant_ids => self.task_data.fetch('tenant_ids', []).map(&:to_s),
       } 
+      params.merge!({:zuora_domain => self.send(LOGIN_TENANT_DESTINATION).client.rest_domain }))
       params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
       self.update_columns(params) if params.present?
     end

data/lib/zuora_connect/controllers/helpers.rb

@@ -196,58 +196,68 @@ module ZuoraConnect
                   }
                   return
                 end
-
-                user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
                 
-                body = {
-                  'userId' => zuora_user_id, 
-                  'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')], 
-                  'customAuthorities' => [], 
-                  'additionalInformation' => {
-                    'description' => "This user is for #{user} application.", 
-                    'name' => "#{user} API User"
+                ActiveRecord::Base.transaction do
+                  ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
+
+                  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'")
+                    redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{CGI.escape(request.fullpath)}"
+                    return
+                  end
+
+                  user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
+                  body = {
+                    'userId' => zuora_user_id, 
+                    'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')], 
+                    'customAuthorities' => [], 
+                    'additionalInformation' => {
+                      'description' => "This user is for #{user} application.", 
+                      'name' => "#{user} API User"
+                    }
                   }
-                }
-
-                oauth_response, response = zuora_client.rest_call(method: :post, body: body.to_json, url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''), session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, headers: zuora_client.class == ZuoraAPI::Oauth ? {} : {'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
 
-                new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
-                if session["ZuoraCurrentUserInfo"].blank?
-                  client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
-                else
-                  client_describe = session["ZuoraCurrentUserInfo"]
-                end
+                  oauth_response, response = zuora_client.rest_call(method: :post, body: body.to_json, url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''), session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, headers: zuora_client.class == ZuoraAPI::Oauth ? {} : {'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
+
+                  new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
+                  if session["ZuoraCurrentUserInfo"].blank?
+                    client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
+                  else
+                    client_describe = session["ZuoraCurrentUserInfo"]
+                  end
+
+                  Apartment::Tenant.switch!("public")
+                  next_id = (ZuoraConnect::AppInstance.all.where(:access_token => nil).order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
+                  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,
+                    "name": client_describe["tenantName"],
+                    "mode": "Collections",
+                    "status": "Running",
+                    ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
+                      "tenant_type": "Zuora",
+                      "username": session["ZuoraCurrentIdentity"]["username"],
+                      "url": new_zuora_client.url,
+                      "status": "Active",
+                      "oauth_client_id": oauth_response['clientId'],
+                      "oauth_secret": oauth_response['clientSecret'],
+                      "authentication_type": "OAUTH",
+                      "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
+                    },
+                    "tenant_ids": available_entities.map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
+                  }
 
-                Apartment::Tenant.switch!("public")
-                next_id = (ZuoraConnect::AppInstance.all.where(:access_token => nil).order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
-                begin
-                  Apartment::Tenant.create(next_id.to_s)
-                rescue Apartment::TenantExists => ex
-                  ZuoraConnect.logger.debug("Tenant Already Exists")
+                  @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
                 end
-                available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == client_describe['defaultEntityId']}
-                task_data = {
-                  "id": next_id,
-                  "name": client_describe["tenantName"],
-                  "mode": "Collections",
-                  "status": "Running",
-                  ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
-                    "tenant_type": "Zuora",
-                    "username": session["ZuoraCurrentIdentity"]["username"],
-                    "url": new_zuora_client.url,
-                    "status": "Active",
-                    "oauth_client_id": oauth_response['clientId'],
-                    "oauth_secret": oauth_response['clientSecret'],
-                    "authentication_type": "OAUTH",
-                    "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
-                  },
-                  "tenant_ids": available_entities.map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
-                }
-
-                @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
               rescue => ex
                 ZuoraConnect.logger.error(ex)
                 render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5m"
+  VERSION = "2.0.5n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5m
+  version: 2.0.5n
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment