mno-enterprise-api 3.0.7 → 3.1.0

data/app/views/mno_enterprise/jpi/v1/current_users/show.json.jbuilder

@@ -13,6 +13,7 @@ json.cache! ['v1', @user.cache_key] do
     json.website @user.website
     json.sso_session @user.sso_session
     json.admin_role @user.admin_role
+    json.avatar_url avatar_url(@user)
     if current_impersonator
       json.current_impersonator true
     end

data/app/views/mno_enterprise/jpi/v1/impac/kpis/_kpi.json.jbuilder

@@ -1 +1 @@
-json.extract! kpi, :id, :element_watched, :endpoint, :source, :targets, :settings, :extra_params
+json.extract! kpi, :id, :name, :element_watched, :endpoint, :source, :targets, :settings, :extra_params

data/app/views/mno_enterprise/jpi/v1/marketplace/_app.json.jbuilder

@@ -1,5 +1,5 @@
 json.extract! app, :id, :nid, :name, :stack, :key_benefits, :categories, :tags, :tiny_description,
-              :testimonials, :pictures, :pricing_plans
+              :testimonials, :pictures, :pricing_plans, :rank
 
 json.description markdown(app.sanitized_description)
 

data/app/views/mno_enterprise/jpi/v1/organizations/_credit_card.json.jbuilder

@@ -2,6 +2,6 @@ json.credit_card do
   if credit_card
     json.extract! credit_card, :id, :title,:first_name,:last_name,:month,:year,:country,:billing_address,:billing_city,:billing_postcode, :billing_country
     json.number credit_card.masked_number
-    json.verification_value credit_card.id ? 'CVV' : nil
+    json.verification_value 'CVV'
   end
-end
+end

data/config/initializers/health_check.rb

@@ -1,6 +1,7 @@
-HealthCheck::Engine.routes_explicitly_defined = true
+HealthCheck::Engine.routes_manually_defined = true
 
 HealthCheck.setup do |config|
+
   # Text output upon success
   config.success = 'success'
 
@@ -20,14 +21,15 @@ HealthCheck.setup do |config|
   config.http_status_for_error_object = 500
 
   # You can customize which checks happen on a standard health check
-  config.standard_checks = %w(site cache redis-if-present)
+  config.standard_checks = [ 'database', 'migrations', 'custom' ]
 
   # You can set what tests are run with the 'full' or 'all' parameter
-  config.full_checks = %w(site cache custom redis-if-present sidekiq-redis-if-present)
+  config.full_checks = ['database', 'migrations', 'cache', 'custom']
 
   # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
   config.add_custom_check do
     # any code that returns blank on success and non blank string upon failure
     MnoEnterprise::HealthCheck.perform_mno_hub_check
   end
+
 end

data/config/routes.rb

@@ -127,13 +127,20 @@ MnoEnterprise::Engine.routes.draw do
         resources :users, only: [:index, :show, :destroy, :update, :create] do
           collection do
             get :count
+            post :signup_email
           end
         end
-        resources :organizations, only: [:index, :show] do
+        resources :organizations, only: [:index, :show, :create] do
           collection do
             get :in_arrears
             get :count
           end
+          member do
+            post :users, action: :invite_member
+          end
+          resources :users, only: [] do
+            resource :invites, only: [:create]
+          end
         end
         resources :tenant_invoices, only: [:index, :show]
         resources :invoices, only: [:index, :show] do

data/lib/mno_enterprise/concerns/controllers/jpi/v1/organizations_controller.rb

@@ -176,5 +176,4 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::OrganizationsController
     def organization_update_params
       params.fetch(:organization, {}).permit(*organization_permitted_update_params)
     end
-
 end

data/lib/mno_enterprise/concerns/mailers/system_notification_mailer.rb

@@ -33,7 +33,7 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
   #
   def confirmation_instructions(record, token, opts={})
     template = record.confirmed? && record.unconfirmed_email? ? 'reconfirmation-instructions' : 'confirmation-instructions'
-    MandrillClient.deliver(template,
+    MnoEnterprise::MailClient.deliver(template,
       default_sender,
       recipient(record),
       user_vars(record).merge(confirmation_link: user_confirmation_url(confirmation_token: token))
@@ -51,7 +51,7 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
   #   :reset_password_link
   #
   def reset_password_instructions(record, token, opts={})
-    MandrillClient.deliver('reset-password-instructions',
+    MnoEnterprise::MailClient.deliver('reset-password-instructions',
       default_sender,
       recipient(record),
       user_vars(record).merge(reset_password_link: edit_user_password_url(reset_password_token: token))
@@ -69,7 +69,7 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
   #   :unlock_link
   #
   def unlock_instructions(record, token, opts={})
-    MandrillClient.deliver('unlock-instructions',
+    MnoEnterprise::MailClient.deliver('unlock-instructions',
       default_sender,
       recipient(record),
       user_vars(record).merge(unlock_link: user_unlock_url(unlock_token: token))
@@ -101,7 +101,7 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
     confirmation_link = new_user ? user_confirmation_url(confirmation_token: org_invite.user.confirmation_token) : org_invite_url(org_invite, token: org_invite.token)
     email_template = new_user ? 'organization-invite-new-user' : 'organization-invite-existing-user'
 
-    MandrillClient.deliver(email_template,
+    MnoEnterprise::MailClient.deliver(email_template,
       default_sender,
       recipient(org_invite.user,new_user),
       invite_vars(org_invite,new_user).merge(confirmation_link: confirmation_link)
@@ -118,13 +118,27 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
   #   :full_name
   #   :terminate_account_link
   def deletion_request_instructions(record, deletion_request)
-    MandrillClient.deliver('deletion-request-instructions',
+    MnoEnterprise::MailClient.deliver('deletion-request-instructions',
       default_sender,
       recipient(record),
       user_vars(record).merge(terminate_account_link: deletion_request_url(deletion_request))
     )
   end
 
+  # Description:
+  #   Email providing registration instructions
+  #
+  # Variables:
+  #   :registration_link
+  def registration_instructions(email)
+    MnoEnterprise::MailClient.deliver(
+      'registration-instructions',
+      default_sender,
+      {email: email},
+      {registration_link: new_user_registration_url}
+    )
+  end
+
   protected
 
   def recipient(record, new_user = false)

data/spec/controllers/mno_enterprise/impersonate_controller_spec.rb

@@ -30,23 +30,13 @@ module MnoEnterprise
 
       describe "#destroy" do
         subject { get :destroy }
+        before { get :create, user_id: user2.id }
 
-        context 'without redirect_path' do
-          before { get :create, user_id: user2.id }
+        it { expect(controller.current_user.id).to eq(user2.id) }
 
-          it { expect(controller.current_user.id).to eq(user2.id) }
-
-          it { subject; expect(controller.current_user.id).to eq(user.id) }
-
-          it { is_expected.to redirect_to('/admin/') }
-        end
-
-        context 'with a redirect_path' do
-          before { get :create, user_id: user2.id, redirect_path: '/admin/redirect#path' }
-
-          it { is_expected.to redirect_to('/admin/redirect#path') }
-        end
+        it { subject; expect(controller.current_user.id).to eq(user.id) }
       end
     end
   end
+
 end

data/spec/controllers/mno_enterprise/jpi/v1/admin/invites_controller_spec.rb

@@ -0,0 +1,63 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Admin::InvitesController do
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env['HTTP_ACCEPT'] = 'application/json' }
+
+    #===============================================
+    # Assignments
+    #===============================================
+    # Stub user and user call
+    let(:user) { build(:user, admin_role: 'admin') }
+    before do
+      api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+      sign_in user
+    end
+
+    let(:organization) { FactoryGirl.build(:organization) }
+    let(:invitee) { FactoryGirl.build(:user) }
+    let(:invite) { FactoryGirl.build(:org_invite, user: invitee, organization: organization, status: 'staged') }
+
+    # Stub ActionMailer
+    let(:message_delivery) { instance_double(ActionMailer::MessageDelivery) }
+    before { allow(message_delivery).to receive(:deliver_later).with(no_args) }
+
+    # API stubs
+    before do
+      api_stub_for(get: "/organizations/#{organization.id}", response: from_api(organization))
+      api_stub_for(get: "/organizations/#{organization.id}/org_invites?filter[status.in][]=pending&filter[status.in][]=staged&filter[user_id]=#{invitee.id}", response: from_api([invite]))
+
+      allow(MnoEnterprise::User).to receive(:find) do |user_id|
+        case user_id.to_i
+        when user.id then user
+        when invitee.id then invitee
+        end
+      end
+
+      api_stub_for(put: "/org_invites/#{invite.id}", response: from_api(invite))
+    end
+
+    # unconfirmed
+    describe 'POST #create' do
+      subject { post :create, user_id: invitee.id, organization_id: organization.id }
+
+      context 'existing user' do
+        it 'sends the invitation email' do
+          expect(SystemNotificationMailer).to receive(:organization_invite).with(invite).and_return(message_delivery)
+          subject
+          expect(response).to be_success
+        end
+      end
+
+      context 'new user'  do
+        before { invitee.confirmed_at = nil }
+
+        it 'sends the confirmation instructions' do
+          expect(invitee).to receive(:resend_confirmation_instructions)
+          subject
+        end
+      end
+    end
+  end
+end

data/spec/controllers/mno_enterprise/jpi/v1/admin/invoices_controller_spec.rb

@@ -39,13 +39,16 @@ module MnoEnterprise
     # Stub invoice and invoice call
     let(:invoice) { build(:invoice) }
     let(:user) { build(:user, :admin) }
-    let(:tenant) { build(:tenant, current_billing_amount: Money.new(11_000,'AUD')) }
+    let(:tenant) { build(:tenant) }
+    let(:org1) { build(:organization, current_billing: Money.new(10_000,'AUD')) }
+    let(:org2) { build(:organization, current_billing: Money.new(1000,'AUD')) }
 
     before do
       api_stub_for(get: "/invoices", response: from_api([invoice]))
       api_stub_for(get: "/invoices/#{invoice.id}", response: from_api(invoice))
       api_stub_for(get: "/users", response: from_api([user]))
       api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+      api_stub_for(get: "/organizations", response: from_api([org1, org2]))
       api_stub_for(get: "/tenant", response: from_api(tenant))
       sign_in user
     end
@@ -82,19 +85,6 @@ module MnoEnterprise
     describe 'GET #current_billing_amount' do
       subject { get :current_billing_amount }
 
-      context 'with an old MnoHub' do
-        let(:tenant) { build(:old_tenant) }
-
-        before { subject }
-
-        it { expect(response).to be_success }
-
-        it 'returns the sum of the current_billing' do
-          expected =  {'current_billing_amount' => {"amount"=>"N/A", "currency"=>""}}
-          expect(response.body).to eq(expected.to_json)
-        end
-      end
-
       context 'success' do
         before { subject }
 

data/spec/controllers/mno_enterprise/jpi/v1/admin/organizations_controller_spec.rb

@@ -52,6 +52,7 @@ module MnoEnterprise
       api_stub_for(get: "/organizations/#{organization.id}/app_instances", response: from_api([app_instance]))
       api_stub_for(get: "/organizations/#{organization.id}/credit_card", response: from_api([credit_card]))
       api_stub_for(get: "/arrears_situations", response: from_api([arrears]))
+      api_stub_for(post: "/organizations", response: from_api([organization]))
     end
 
     let(:expected_hash_for_organizations) {
@@ -112,5 +113,69 @@ module MnoEnterprise
         end
       end
     end
+
+    describe 'POST #create' do
+      let(:params) { FactoryGirl.attributes_for(:organization) }
+      before { allow(MnoEnterprise::Organization).to receive(:create) { organization } }
+
+      subject { post :create, organization: params }
+
+      it 'creates the organization' do
+        expect(MnoEnterprise::Organization).to receive(:create).with(params.slice(:name)) { organization }
+        subject
+      end
+
+      it 'provision the app instances' do
+        params.merge!(app_nids: ['xero', app_instance.app.nid])
+
+        # Track the API call
+        create = false
+        stub = -> { create = true; from_api(app_instance) }
+        api_stub_for(post: "/organizations/#{organization.id}/app_instances", response: stub)
+
+        subject
+
+        expect(create).to be true
+      end
+    end
+
+    describe 'POST #invite_member' do
+      before do
+        # Track the api call
+        @api_call = false
+        stub = -> { @api_call = true; from_api(org_invite) }
+        api_stub_for(post: "/organizations/#{organization.id}/org_invites", response: stub)
+      end
+
+      let(:params) { FactoryGirl.attributes_for(:user) }
+      subject { post :invite_member, id: organization.id, user: params }
+
+      context 'with existing user' do
+        before { allow(MnoEnterprise::User).to receive(:find_by) { user } }
+
+        it 'creates an invite' do
+          subject
+          expect(@api_call).to be true
+        end
+      end
+
+      context 'with new user' do
+        before { allow(MnoEnterprise::User).to receive(:find_by) { nil } }
+
+        # Directly stubbing the controller method as user creation is a PITA to stub
+        let(:new_user) { build(:user, params.slice(:email, :name, :surname, :phone)) }
+        before { allow(controller).to receive(:create_unconfirmed_user) { new_user } }
+
+        it 'creates a user' do
+          expect(controller).to receive(:create_unconfirmed_user) { new_user }
+          subject
+        end
+
+        it 'creates an invite' do
+          subject
+          expect(@api_call).to be true
+        end
+      end
+    end
   end
 end

data/spec/controllers/mno_enterprise/jpi/v1/admin/users_controller_spec.rb

@@ -28,33 +28,20 @@ module MnoEnterprise
           'admin_role' => user.admin_role,
           'created_at' => user.created_at,
           'last_sign_in_at' => user.last_sign_in_at,
-          'confirmed_at' => user.confirmed_at,
-          'organizations' => partial_hash_for_organization(user)
-      }
-    end
-
-    def partial_hash_for_users(user)
-      {
-          'id' => user.id,
-          'uid' => user.uid,
-          'email' => user.email,
-          'name' => user.name,
-          'surname' => user.surname,
-          'admin_role' => user.admin_role,
-          'created_at' => user.created_at
+          'confirmed_at' => user.confirmed_at
       }
     end
 
     def hash_for_users(users)
       {
-          'users' => users.map { |o| partial_hash_for_users(o) },
+          'users' => users.map { |o| partial_hash_for_user(o) },
           'metadata' => {'pagination' => {'count' => users.count}}
       }
     end
 
     def hash_for_user(user)
       hash = {
-          'user' => partial_hash_for_user(user)
+          'user' => partial_hash_for_user(user).merge('organizations' => partial_hash_for_organization(user))
       }
 
       return hash
@@ -131,7 +118,20 @@ module MnoEnterprise
 
       # Test that the user is deleted by testing the api endpoint was called
       it { expect(user_to_delete.name).to eq('deleted') }
+    end
+
+    describe 'POST #signup_email' do
+      let(:email) { 'test@test.com' }
+      subject { post :signup_email, user: {email: email}}
 
+      it { expect(response).to be_success }
+
+      it 'sends the signup instructions' do
+        message_delivery = instance_double(ActionMailer::MessageDelivery)
+        expect(SystemNotificationMailer).to receive(:registration_instructions).with(email) { message_delivery }
+        expect(message_delivery).to receive(:deliver_later).with(no_args)
+        subject
+      end
     end
   end
 end

data/spec/controllers/mno_enterprise/jpi/v1/app_instances_sync_controller_spec.rb

@@ -8,7 +8,7 @@ module MnoEnterprise
     render_views
     routes { MnoEnterprise::Engine.routes }
     before { request.env["HTTP_ACCEPT"] = 'application/json' }
-    
+
 
     #===============================================
     # Assignments
@@ -16,7 +16,7 @@ module MnoEnterprise
     # Stub controller ability
     let!(:ability) { stub_ability }
     before { allow(ability).to receive(:can?).with(any_args).and_return(true) }
-    
+
     # Stub user and user call
     let(:user) { build(:user) }
     before do
@@ -24,12 +24,12 @@ module MnoEnterprise
       api_stub_for(put: "/users/#{user.id}", response: from_api(user))
     end
     before { sign_in user }
-    
+
     # Stub organization
     let(:organization) { build(:organization) }
     before { allow_any_instance_of(MnoEnterprise::User).to receive(:organizations).and_return([organization]) }
 
-        
+
     #===============================================
     # Specs
     #===============================================
@@ -49,7 +49,7 @@ module MnoEnterprise
       before { api_stub_for(get: "/organizations/#{organization.id}/app_instances_sync/anything", response: from_api(progress_results)) }
 
       subject { get :index, organization_id: organization.uid }
-      
+
       it_behaves_like "jpi v1 protected action"
 
       it "verifies the user's rights" do
@@ -74,29 +74,21 @@ module MnoEnterprise
         before { subject }
         it { expect(JSON.parse(response.body)['is_syncing']).to be_falsey }
       end
-
-      context "when connector is pending" do
-        let(:progress_results) { { connectors: [
-          HashWithIndifferentAccess.new({name: 'a_name', status: 'PENDING', date: nil})
-        ] } }
-        before { subject }
-        it { expect(JSON.parse(response.body)['is_syncing']).to be_truthy }
-      end
     end
 
     describe "POST #create" do
-      xit "to spec: cannot stub 'post /app_instances_syncs data%5Bmode%5D=a_mode'"
+      it "to spec: cannot stub 'post /app_instances_syncs data%5Bmode%5D=a_mode'"
 
-      # # Apps sync
-      # let(:sync_results) { [] }
-      # before { api_stub_for(post: "/app_instances_sync", response: from_api(sync_results)) }
+      # Apps sync
+      let(:sync_results) { {connectors: []} }
+      before { api_stub_for(post: "/app_instances_syncs", response: from_api(sync_results)) }
 
-      # subject { post :create, organization_id: organization.uid, mode: 'a_mode', return_url: 'a/random/url' }
+      subject { post :create, organization_id: organization.uid, mode: 'a_mode', return_url: 'a/random/url' }
 
-      # it "verifies the user's rights" do
-      #   expect(ability).to receive(:can?).with(:sync_apps, organization)
-      #   subject
-      # end
+      it "verifies the user's rights" do
+        expect(ability).to receive(:can?).with(:sync_apps, organization)
+        subject
+      end
     end
   end
 end