zuora_connect 3.1.5.pre.d → 3.1.5.pre.e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b6d724306897543a323fd69229a7f76cbc53ab37c6a7d4afc67fed8a32ff742
-  data.tar.gz: cdadbbfc0923a51176218dafb946b72e2e60e5575a495b0670565c48bdad1ede
+  metadata.gz: 51ba32eace85675c3714ca6cfd35ad8f838e786f694e5fcb326ac4ca54eed611
+  data.tar.gz: bf4eb3dfabc738c02c38e97a6785016be2f5922b79d78530ff01c497ad5ec19b
 SHA512:
-  metadata.gz: 35d5ff782e1043a831efdd21ff37f725d8056b65ad56f1203cb53a46adcdabb2fe6a31f002b2c6f41a179735b361e6217b193782f80f7d67e5071524d10f0712
-  data.tar.gz: 8af12b1602bb355c5585c87df11869072cff69137bbe3258f1d6318a0377e6341b4c205bde5492ee9a430c2b3295c6fdbe2977e4daf9cd01be38293053a4f7a3
+  metadata.gz: 0113d1a1344d26b70ee9224edb77c70eb298f1b95319e33359ff5c9d1e60db6b9f794f863f63799bd92b5cc29fae6d040dd61b41441fc44c5ce7a8c7714ba69a
+  data.tar.gz: 34b0700883c0032b828f9451bb179f3c658f1f66b8cc3167d1217682648bda8ab84c9ec56b82a33896616c0229929b0bf6ccaf5256aa35459b38f3caa6392057

data/app/models/zuora_connect/zuora_user.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
     self.table_name = "zuora_users"
     attr_accessor :session
 
-    cattr_accessor :current_user_id
+    cattr_accessor :current_user_id, :current_org_id
 
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session

data/lib/zuora_connect/controllers/helpers.rb

@@ -21,6 +21,7 @@ module ZuoraConnect
           end
 
           ZuoraConnect::ZuoraUser.current_user_id = request.headers["Zuora-User-Id"]
+          ZuoraConnect::ZuoraUser.current_org_id = request.headers["Zuora-Org-Id"]
 
           if request.headers["API-Token"].present?
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
@@ -415,8 +416,11 @@ module ZuoraConnect
               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)
             end
 
+            zuora_org_id = cookies['Zuora-Org-Id'] || request.headers['Zuora-User-Id']
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId'] || request.headers["Zuora-User-Id"]
 
+            ZuoraConnect::ZuoraUser.current_org_id = zuora_org_id
+
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)

data/lib/zuora_connect/exceptions.rb

@@ -65,5 +65,18 @@ module ZuoraConnect
         @message || @default_message
       end
     end
+
+    class OrganizationAccessForbidden < Error
+      attr_writer :default_message
+
+      def initialize(message = nil)
+        @message = message
+        @default_message = "You are not authorized to access this page with the current organization."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.5-d"
+  VERSION = "3.1.5-e"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.5.pre.d
+  version: 3.1.5.pre.e
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment