RubyGems - zuora_connect - Versions diffs - 2.0.3i → 2.0.3j - Mend

zuora_connect 2.0.3i → 2.0.3j

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +4 -4
data/app/models/zuora_connect/app_instance_base.rb +17 -8
data/app/models/zuora_connect/zuora_user.rb +6 -0
data/app/views/zuora_connect/static/invalid_app_instance_error.html.erb +1 -1
data/app/views/zuora_connect/static/invalid_launch_request.html.erb +4 -1
data/app/views/zuora_connect/static/launch.html.erb +6 -3
data/app/views/zuora_connect/static/permission_error.html.erb +80 -0
data/lib/zuora_connect/configuration.rb +2 -1
data/lib/zuora_connect/controllers/helpers.rb +96 -58
data/lib/zuora_connect/version.rb +1 -1
metadata +8 -7
data/app/models/zuora_connect/zuora_login.rb +0 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e725064fb61589a27d7ae6380a45d7f338aa47a7b9b5616ea945bff45984f766
-  data.tar.gz: 9680005274b6bf52e302dc96a99a04e51bc8b818ee8f8477e955d2ea6df543cc
+  metadata.gz: d3dffd068d3d5a57b16bbf1fa5e00eb96e60301cf19ac1153454c89c70934f39
+  data.tar.gz: 22fd7f60c7b3f3f68876d050e70a8d4c55bd8f797b0d0f215dd096c9bb138668
 SHA512:
-  metadata.gz: e389aac6250ea4d1c92d53b76c91e083a42135f8fc2833be12eca519a25c74e301f2aedced9bbcff98178f632c8879af4fd8552154870aa0e4b2074e8fcf9ec3
-  data.tar.gz: f60754ef29451e8b95233a177e1130ce584855c1d7a2caad5f3c1b5e262085d4dce4670d68ac9569d86998468ec1a05110a54599130efbf0a5d6a9e5ab6a6f94
+  metadata.gz: c99a8e9830e1b3ff39a84d7ab7422529d2db2721c2c3b9af23c453bc7b3b5aa5cfbafef33a44a191629d5139f539609e34154c3b845a2da271679f2885af73ca
+  data.tar.gz: 904613ed66f2f1396c926d2983c23fb25b36dec82462746874f1e1e6a59af67d0798a84a1612d6b377dca1078363291d044c1a092fb422ce5892287177cfa541

data/app/models/zuora_connect/app_instance_base.rb CHANGED Viewed

@@ -206,18 +206,26 @@ module ZuoraConnect
     def refresh(session: {}, session_fallback: false)
       refresh_count ||= 0
-      start = Time.now
-      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-      response_time = Time.now - start
+      #Check how app was deployed
+      if self.id < 24999999
+        start = Time.now
+        response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
+        response_time = Time.now - start
-      ZuoraConnect.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
-      if response.code == 200
-        self.build_task(task_data: JSON.parse(response.body), session: session)
+        ZuoraConnect.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+        if response.code == 200
+          self.build_task(task_data: JSON.parse(response.body), session: session)
+          self.last_refresh = Time.now.to_i
+          self.cache_app_instance
+          self.reset_mark_for_refresh
+        else
+          raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
+        end
+      else
+        self.build_task(task_data: JSON.parse(self.zuora_logins), session: session)
         self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
-      else
-        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
@@ -362,6 +370,7 @@ module ZuoraConnect
           end
         end
       rescue => ex
+        ZuoraConnect.logger.error(ex)
         ZuoraConnect.logger.error("Task Data: #{task_data}") if task_data.present?
         if session.present?
           ZuoraConnect.logger.error("Task Session: #{session.to_h}")  if session.methods.include?(:to_h)

data/app/models/zuora_connect/zuora_user.rb ADDED Viewed

@@ -0,0 +1,6 @@
+module ZuoraConnect
+  class ZuoraUser < ActiveRecord::Base
+    self.table_name = "zuora_users"
+  end
+end

data/app/views/zuora_connect/static/invalid_app_instance_error.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <html><head>
-  <title>We're sorry, but something went wrong (500)</title>
+  <title>We're sorry, but something went wrong</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {

data/app/views/zuora_connect/static/invalid_launch_request.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <html><head>
-  <title>We're sorry, but something went wrong (500)</title>
+  <title>We're sorry, but something went wrong</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
@@ -49,6 +49,9 @@
     color: #666;
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
+  div#main{
+    background: white;
+  }
   </style>
 </head>

data/app/views/zuora_connect/static/launch.html.erb CHANGED Viewed

@@ -38,8 +38,11 @@
     line-height: 1.5em;
   }
-  div.button {
+  div.launch_button {
     margin: 1em 0 1em;
+    margin-right: auto;
+    margin-left: auto;
     padding: 1em;
     width: 300px;
     font-size: 12pt;
@@ -67,8 +70,8 @@
       <input type="hidden" id="name_hash" value="<%= @names.to_s %>" />
       <input type="hidden" id="app_instance_list" value="<%= @app_instance_ids.to_s %>" />
-      <% @names.each do |id, name| %>
-        <div class="button">
+      <% names.each do |id, name| %>
+        <div class="launch_button" >
           <% label = name.present? ? "#{id} - #{name}" : id %>
           <%= link_to label, root_path(app_instance_id: id) %>
         </div>

data/app/views/zuora_connect/static/permission_error.html.erb ADDED Viewed

@@ -0,0 +1,80 @@
+<html><head>
+  <title>Select Task ID</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
+    margin: 0 0 1em;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #3D4B5A solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    border-bottom-left-radius: 9px;
+    border-bottom-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  h1 {
+    font-size: 100%;
+    color: #3D4B5A;
+    line-height: 1.5em;
+  }
+  div.launch_button {
+    margin: 1em 0 1em;
+    margin-right: auto;
+    margin-left: auto;
+    padding: 1em;
+    width: 300px;
+    font-size: 12pt;
+    font-weight: bold;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #999;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+<body style='background: white;'>
+  <div class="dialog">
+    <div>
+      <h1>You currently don't have access to the deployed workflow instance.</h1>
+      <p style='text-align:left'>Please contact one of the below system administrators and have them give you access.</p>
+      <ul style='text-align:left'>
+        <% admins.each do |admin| %>
+        <li><%= admin.username %></li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</body></html>

data/lib/zuora_connect/configuration.rb CHANGED Viewed

@@ -3,7 +3,7 @@ module ZuoraConnect
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
+    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue, :app_access_permissions
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
@@ -19,6 +19,7 @@ module ZuoraConnect
       @additional_apartment_models = []
       @silencer_resque_finish = true
       @blpop_queue = false
+      @app_access_permissions = false
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb CHANGED Viewed

@@ -59,65 +59,19 @@ module ZuoraConnect
         end
       end
-      def verify_with_navbar
-        if !session[params[:app_instance_ids]].present?
-          host = request.headers["HTTP_X_FORWARDED_HOST"]
-          zuora_client = ZuoraAPI::Login.new(url: "https://#{host}")
-          menus = zuora_client.get_full_nav(cookies.to_h)["menus"]
-          app = menus.select do |item|
-            matches = /(?<=.com\/services\/)(.*?)(?=\?|$)/.match(item["url"])
-            if !matches.blank?
-              matches[0].split("?").first == ENV["DEIS_APP"]
-            end
-          end
-          session[params[:app_instance_ids]] = app[0]
-          return app[0]
-        else
-          return session[params[:app_instance_ids]]
-        end
-      end
-      def select_instance
-        begin
-          app = verify_with_navbar
-          url_tasks = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(app["url"]).query)["app_instance_ids"][0]))
-          @app_instance_ids = JSON.parse(Base64.urlsafe_decode64(params[:app_instance_ids]))
-          if (url_tasks & @app_instance_ids).size == @app_instance_ids.size
-            sql = "select name,id from zuora_connect_app_instances where id = ANY(ARRAY#{@app_instance_ids})"
-            result = ActiveRecord::Base.connection.execute(sql)
-            @names = {}
-            result.each do |x|
-              @names[x["id"].to_i] = x["name"]
-            end
-            render "zuora_connect/static/launch"
-          else
-            render "zuora_connect/static/invalid_launch_request"
-          end
-        rescue => ex
-          ZuoraConnect.logger.debug("Error parsing Instance ID's: #{ex.message}")
-          render "zuora_connect/static/invalid_launch_request"
-        end
-      end
       def authenticate_connect_app_request
         ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
         Thread.current[:appinstance] = nil
-        if request.headers['Zuora-Auth-Token'].present? && request.headers["NEWZUORA"].present?
-          #Debug
-          headers = request.headers.env.select do |k, _|
-            k.downcase.start_with?('http') ||
-            k.in?(ActionDispatch::Http::Headers::CGI_VARIABLES)
-          end
-          puts headers
+        if request.headers['Zuora-Auth-Token'].present?
           #Do we need to refresh session identity
           zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
-          zuora_client = ZuoraAPI::Login.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
+          if request.headers["Zuora-Auth-Token"].present?
+            zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", bearer_token: request.headers["Zuora-Auth-Token"], oauth_session_expires_at: Time.now + 5.minutes )
+          else
+            zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
+          end
           zuora_entity_id = request.headers['ZuoraCurrentEntity']
           zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
@@ -160,20 +114,104 @@ module ZuoraConnect
             end
           end
+          zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
           #One deployed instance
           if appinstances.size == 1
             ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
-            session["appInstance"] = appinstances.to_h.keys.first
+            #Add user/update
+            user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
+            if 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!
+              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"]})
+            end
+            #Update access if admin in tenant
+            if session["ZuoraCurrentIdentity"]['platformRole'] == 'ADMIN' && !user.app_permissions['access'].to_bool
+              user.app_permissions['access'] = true
+              user.save!
+            end
+            #If user has has access to application
+            if user.app_permissions['access'].to_bool || !ZuoraConnect.configuration.app_access_permissions
+              session["appInstance"] = appinstances.to_h.keys.first
+            else
+              Thread.current[:appinstance] = nil
+              session["appInstance"] = nil
+              admin_users = ZuoraConnect::ZuoraUser.select("zuora_identity_response #>> '{#{zuora_entity_id},username}' as username").where("zuora_identity_response #>> :selector = 'ADMIN' ", :selector => "{#{zuora_entity_id},platformRole}")
+              render "zuora_connect/static/permission_error", :locals => {:admins => admin_users}
+              return
+            end
           #We have multiple, user must pick
           elsif appinstances.size > 1
             ZuoraConnect.logger.debug("User must select instance. #{@names}")
-            @names = appinstances.to_h
-            render "zuora_connect/static/launch"
+            render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}
             return
           else
-            #Create new app instance
-            raise "Do not support new instance creation right now."
+            begin
+              #Ensure user can access oauth creation API
+              if session["ZuoraCurrentIdentity"]['platformRole'] != 'ADMIN'
+                raise ZuoraConnect::Exceptions::Error.new("User is not admin, workflow cannot be deployed.")
+              end
+              body = {
+                'clientId' => SecureRandom.uuid,
+                'clientSecret' => SecureRandom.hex(10),
+                'userId' => zuora_user_id,
+                'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
+                'customAuthorities' => [],
+                'additionalInformation' => {
+                  'description' => 'This user is for workflow application.',
+                  'name' => 'Workflow 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: :bearer)
+              new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
+              client_describe, response = new_zuora_client.rest_call(body: body.to_json, url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
+              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
+              task_data = {
+                "id": next_id,
+                "name": client_describe["tenantName"],
+                "mode": "Collections",
+                "status": "Running",
+                "target_login": {
+                    "tenant_type": "Zuora",
+                    "username": session["ZuoraCurrentIdentity"]["username"],
+                    "url": new_zuora_client.url,
+                    "status": "Active",
+                    "oauth_client_id": body['clientId'],
+                    "oauth_secret": body['clientSecret'],
+                    "authentication_type": "OAUTH",
+                    "entities": client_describe["accessibleEntities"].map {|e| e.merge({'displayName' => client_describe["tenantName"]})} #needs work
+                },
+                "tenant_ids": client_describe["accessibleEntities"].map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
+              }
+              appinstance = ZuoraConnect::AppInstance.new(:id => next_id, :zuora_logins => task_data.to_json, :oauth_expires_at => Time.now + 1000.years)
+              appinstance.save(:validate => false)
+              session["appInstance"] = appinstance.id
+            rescue => ex
+              ZuoraConnect.logger.error(ex)
+              render "zuora_connect/static/invalid_launch_request", :locals => {:exception => ex}
+              return
+            end
           end
         end

data/lib/zuora_connect/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.3i"
+  VERSION = "2.0.3j"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.3i
+  version: 2.0.3j
 platform: ruby
 authors:
 - Connect Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.37
+        version: 1.6.42
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.37
+        version: 1.6.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.37
+        version: 1.6.42
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.37
+        version: 1.6.42
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -305,12 +305,13 @@ files:
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
 - app/models/zuora_connect/telegraf.rb
-- app/models/zuora_connect/zuora_login.rb
+- app/models/zuora_connect/zuora_user.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/sql/refresh_aggregate_table.txt
 - app/views/zuora_connect/static/invalid_app_instance_error.html.erb
 - app/views/zuora_connect/static/invalid_launch_request.html.erb
 - app/views/zuora_connect/static/launch.html.erb
+- app/views/zuora_connect/static/permission_error.html.erb
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/aws.rb

data/app/models/zuora_connect/zuora_login.rb DELETED Viewed

	@@ -1,2 +0,0 @@
1	- class ZuoraLogin
2	- end