zuora_connect 2.0.5f → 2.0.5h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ecdb5a9d063569ac82005b0356326e9c9b063e34865ad91afea19417115f7b2
-  data.tar.gz: 41cab7d528348714fb1d892d61f2bfbafa5af4acf1c47b2f9e1af9a0a433bb6b
+  metadata.gz: f3ac4dedb3c0a45e3e06bdb5f896945c9133f73cc840ea1ee6e69f328a1d5b3d
+  data.tar.gz: adf9a515f860cf94c56b048cc9bde389640e1f6c4a46a9a4a4d599e3be18017f
 SHA512:
-  metadata.gz: 6fccb7ce6ecf1348cd134b0fce2c23c0074b39456dea474271e80dc842494eb88f3cdf2956198771065aaeb921a68d3adec33d22bd7bae97deff3b2c1be32c40
-  data.tar.gz: adf55d461e781b502abe944fab3e88ed5f2629aff2b102c643e5c316362529938172a640c09e396b7942a4eb9a8519fe8546e6a4e1691082af16f800944ba914
+  metadata.gz: 7487348f4ed6b1d59c7ce62ea033fcc6192cac73e6cce67973ddd79340331061b580ef78dad182cebb92af66dd3fbba0ddac35a552c1ca0f58f57c6c04a52d4d
+  data.tar.gz: d41ba2be63158fdc5f12e2f06c3c2b09e44a40779cf9a989c477e75b9e450eb2f4e9e5eeef6ef7e62facf263e599a886e77cc71dee66c356753159c3956b6d98

data/lib/zuora_connect/controllers/helpers.rb

@@ -162,18 +162,18 @@ module ZuoraConnect
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
 
               #Add user/update 
-              @user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
-              if @user.present?
+              @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
+              if @zuora_user.present?
                 ZuoraConnect.logger.debug("Current zuora user #{zuora_user_id}")
-                if @user.updated_at < Time.now - 1.day
-                  @user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
-                  @user.save!
+                if @zuora_user.updated_at < Time.now - 1.day
+                  @zuora_user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
+                  @zuora_user.save!
                 end
               else
                 ZuoraConnect.logger.debug("New zuora user object for #{zuora_user_id}")
-                @user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
+                @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
               end 
-              @user.session = session
+              @zuora_user.session = session
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
@@ -193,14 +193,16 @@ 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 workflow application.', 
-                    'name' => 'Workflow API User'
+                    'description' => "This user is for #{user} application.", 
+                    'name' => "#{user} API User"
                   }
                 }
 
@@ -220,7 +222,7 @@ module ZuoraConnect
                 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"],
@@ -234,9 +236,9 @@ module ZuoraConnect
                     "oauth_client_id": oauth_response['clientId'],
                     "oauth_secret": oauth_response['clientSecret'],
                     "authentication_type": "OAUTH",
-                    "entities": client_describe["accessibleEntities"].map {|e| e.merge({'displayName' => client_describe["tenantName"]})} #needs work
+                    "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
                   },
-                  "tenant_ids": client_describe["accessibleEntities"].map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
+                  "tenant_ids": cavailable_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)
@@ -312,6 +314,10 @@ module ZuoraConnect
         return session["#{@appinstance.id}::admin"]
       end
 
+      def zuora_user
+        return @zuora_user
+      end
+
     private
       def setup_instance_via_data
         session.clear

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5f"
+  VERSION = "2.0.5h"
 end

data/lib/zuora_connect/views/helpers.rb

@@ -4,6 +4,10 @@ module ZuoraConnect
       def is_app_admin?
         return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
       end
+
+      def zuora_user
+        return @zuora_user
+      end
     end
   end
 end

metadata

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