Merge pull request #584 from rheasunshine/bug/799-customer-creation

[MNOE-799] Unable to create new customer from Admin Panel
maestrano · Nov 21, 2017 · 74f2f78 · 74f2f78
2 parents a5d0aa0 + 911267c
commit 74f2f78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/api/app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb b/api/app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb
@@ -210,9 +210,8 @@ def update_app_list
       if params[:organization].key?(:app_nids) && (desired_nids = Array(params[:organization][:app_nids]))
         existing_apps = @organization.app_instances&.select(&:active?) || []
         existing_apps.each { |app_instance| desired_nids.delete(app_instance.app.nid) || app_instance.terminate }
-        desired_nids.each { |nid| @organization.provision_app_instance(nid) }
+        desired_nids.each { |nid| @organization.provision_app_instance!(nid) }
       end
     end
   end
 end
-
diff --git a/api/spec/controllers/mno_enterprise/jpi/v1/admin/organizations_controller_spec.rb b/api/spec/controllers/mno_enterprise/jpi/v1/admin/organizations_controller_spec.rb
@@ -111,7 +111,7 @@ module MnoEnterprise
       describe 'app provisioning' do
         let(:params) { attributes_for(:organization).merge(app_nids: ['xero', app_instance.app.nid]) }
 
-        before { expect_any_instance_of(Organization).to receive(:provision_app_instance) }
+        before { expect_any_instance_of(Organization).to receive(:provision_app_instance!) }
         before { subject }
         it { expect(data['organization']['id']).to eq(organization.id) }
       end

diff --git a/core/lib/mno_enterprise/concerns/controllers/auth/omniauth_callbacks_controller.rb b/core/lib/mno_enterprise/concerns/controllers/auth/omniauth_callbacks_controller.rb
@@ -186,7 +186,7 @@ def setup_apps(user = nil, app_nids = [], opts = {})
           results << app_instance
         else
           # Provision instance and add to results
-          app_instance = org.provision_app_instance(app.nid)
+          app_instance = org.provision_app_instance!(app.nid)
           results << app_instance
           MnoEnterprise::EventLogger.info('app_add', user.id, 'App added', app_instance)
         end