zuora_connect 3.0.1.pre.c → 3.0.1.pre.d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad647d03e32b321e138c9adac68f251170483f170801baa94017ba70e920b8e8
-  data.tar.gz: 80fcbbb2144cbb89e2f79a28dc425350337199528e9a47adaa2f677bfd4be7ec
+  metadata.gz: b8b3b4c908df4b86092fd22f150ba750db352f3cb4326872968c75340502d874
+  data.tar.gz: b4c4720d6ea4b42ada745e4a799b2155a801e41b360def0c2b7bef215b6b7a74
 SHA512:
-  metadata.gz: 1d1f9ce5e3958d4c88f0480158c857cf1dcdce12f72af62c8f11c1a7caf03551b5a1be34fd30b404072058b57ef1a6b3c9834fafa7cea40615e5d5ddc992af6e
-  data.tar.gz: e3a4ac9e3994c489fe4c21e3f2ae313d58dad157a8629965c68032f8a77d4578d7076a90f22ba8bc71c195df9e97cb07cb0160452546c5a16eacdce1e96c9a53
+  metadata.gz: d8e1d30cee3f916747c57b0ca1b5710bf34e770ca93421d69ac1d20bf56ff2621583d28c92df0e0523d2f3afcb9f384130ff0f2745334d8dd5d4c96920974aa1
+  data.tar.gz: 8be5213e0ca5e98dd40f4ce7e6bfaf6a89da14817dcacc4727c1508b15f62625d0cf39a0ab8bf831b989d7c6229022b499de37dba9454ff11581ac795c70b956

data/app/controllers/concerns/zuora_connect/authenticate.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  # Methods for authenticating and setting the app instance for the current user
+  module Authenticate
+    extend ActiveSupport::Concern
+
+    def setup_instance_via_dev_mode
+      app_instance_id = ZuoraConnect.configuration.dev_mode_appinstance
+      session['appInstance'] = app_instance_id
+      session["#{app_instance_id}::admin"] = ZuoraConnect.configuration.dev_mode_admin
+
+      values = {
+        id: app_instance_id,
+        access_token: ZuoraConnect.configuration.dev_mode_user,
+        refresh_token: ZuoraConnect.configuration.dev_mode_pass,
+        token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass,
+        api_token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass
+      }
+
+      @appinstance = ZuoraConnect::AppInstance.find_by(id: app_instance_id)
+      ZuoraConnect::ZuoraUser.current_user_id = 0
+      if @appinstance.blank?
+        Apartment::Tenant.switch!('public')
+        begin
+          Apartment::Tenant.create(app_instance_id)
+        rescue Apartment::TenantExists
+          Apartment::Tenant.drop(app_instance_id)
+          retry
+        end
+        @appinstance = ZuoraConnect::AppInstance.new
+      end
+      @appinstance.assign_attributes(values)
+      @appinstance.save(validate: false)
+    end
+  end
+end

data/app/models/zuora_connect/app_instance_base.rb

@@ -1293,8 +1293,8 @@ module ZuoraConnect
     end
 
     def self.read_master_db
-      if self.connection.respond_to?(:stick_to_master!)
-        self.connection.stick_to_master!(false)
+      if self.connection.respond_to?(:stick_to_primary!)
+        self.connection.stick_to_primary!(false)
         yield
         Makara::Context.release_all
       else

data/lib/zuora_connect/controllers/helpers.rb

@@ -663,34 +663,6 @@ module ZuoraConnect
       def generate_token
         rand(36**64).to_s(36)
       end
-
-      def setup_instance_via_dev_mode
-        session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
-
-        values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance,
-          access_token: ZuoraConnect.configuration.dev_mode_user,
-          refresh_token: ZuoraConnect.configuration.dev_mode_pass,
-          token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass,
-          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
-        }
-
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
-        ZuoraConnect::ZuoraUser.current_user_id = 0
-        if @appinstance.blank?
-          Apartment::Tenant.switch!("public")
-          begin
-            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-          rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-            retry
-          end
-          @appinstance = ZuoraConnect::AppInstance.new()
-        end
-        @appinstance.assign_attributes(values)
-        @appinstance.save(:validate => false)
-      end
     end
   end
 end

data/lib/zuora_connect/engine.rb

@@ -31,6 +31,7 @@ module ZuoraConnect
     initializer "connect.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include ZuoraConnect::Controllers::Helpers
+        include ZuoraConnect::Authenticate
         helper ZuoraConnect::ApplicationHelper
       end
     end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.1-c"
+  VERSION = "3.0.1-d"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre.c
+  version: 3.0.1.pre.d
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -346,6 +346,7 @@ files:
 - app/assets/javascripts/zuora_connect/application.js
 - app/assets/stylesheets/zuora_connect/api/v1/app_instance.css
 - app/assets/stylesheets/zuora_connect/application.css
+- app/controllers/concerns/zuora_connect/authenticate.rb
 - app/controllers/zuora_connect/admin/tenant_controller.rb
 - app/controllers/zuora_connect/api/v1/app_instance_controller.rb
 - app/controllers/zuora_connect/application_controller.rb