mno-enterprise-api 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35fc216add77173460114179a66177c4691895a6
-  data.tar.gz: 3996b0e5569c9b6cffd7fd8fcf22924fdf34976d
+  metadata.gz: 4634cd921bb1ad61aa2d22d2f87ec8f8f743a6eb
+  data.tar.gz: 5c9e5f8551ad2c50d31a8f97b36a4636b9612076
 SHA512:
-  metadata.gz: 8937e10a9c4baf22b1625d8b9b360a7441a5a42275e92fc2b720abcc06e7d308ceacfe777ec339b933e92f22c864f3e4397680c830f2b3f107af9748676e6c91
-  data.tar.gz: 1c8d427beae96bb414d9750ad19b01b81e4489d82aeca1a384e752b7b4412a680dbb675d0fdee06ceb5e7ed80ca21222e778241844d6a911f5cc265f949f9bd6
+  metadata.gz: 049b8bca7b97ba5ecbdf7f33744bb36a76a50de88c85340123c58b0f7838b8e32d9b01760a9d68f5a8ec4f102fbb609715f99d152abecad462f8fc49a7a7f395
+  data.tar.gz: 9c9487907c76667e0ad38df08a9ac4a51f488f3ce8b06719a2708badde5a0e4866f8e9d44081df083458114413fc5eb5d88536a4bc8e6f27842053f91450da11

data/app/controllers/mno_enterprise/impersonate_controller.rb

@@ -8,6 +8,7 @@ module MnoEnterprise
     # Perform the user impersonate action
     # GET /impersonate/user/123
     def create
+      session[:impersonator_redirect_path] = params[:redirect_path].presence
       @user = MnoEnterprise::User.find(params[:user_id])
       if @user.present?
         impersonate(@user)
@@ -24,7 +25,7 @@ module MnoEnterprise
         # user = current_user
         revert_impersonate
       end
-      redirect_to '/admin/'
+      redirect_to session.delete(:impersonator_redirect_path).presence || '/admin/'
     end
 
     private

data/app/controllers/mno_enterprise/jpi/v1/admin/invoices_controller.rb

@@ -13,35 +13,49 @@ module MnoEnterprise
 
     # GET /mnoe/jpi/v1/admin/invoices/current_billing_amount
     def current_billing_amount
-      data = Rails.cache.fetch('tenant_admin/current_billing_amount', expires_in: ADMIN_CACHE_DURATION) do
-        billing = MnoEnterprise::Organization.all.map(&:current_billing).sum(Money.new(0))
-        {current_billing_amount: {amount: billing.amount, currency: billing.currency_as_string}}
-      end
-      render json: data
+      # Backward compatibility with old MnoHub (<= v1.0.2)
+      # TODO: Remove once all mnohub are migrated to newer versions
+      tenant.respond_to?(:current_billing_amount) && current_billing = tenant.current_billing_amount
+
+      render json: {current_billing_amount: format_money(current_billing)}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_invoicing_amount
     def last_invoicing_amount
-      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_customers_invoicing_amount
-      render json: {last_invoicing_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
+      tenant_billing = tenant.last_customers_invoicing_amount
+      render json: {last_invoicing_amount: format_money(tenant_billing)}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/outstanding_amount
     def outstanding_amount
-      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_customers_outstanding_amount
-      render json: {outstanding_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
+      tenant_billing = tenant.last_customers_outstanding_amount
+      render json: {outstanding_amount: format_money(tenant_billing)}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_portfolio_amount
     def last_portfolio_amount
-      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_portfolio_amount
-      render json: {last_portfolio_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
+      tenant_billing = tenant.last_portfolio_amount
+      render json: {last_portfolio_amount: format_money(tenant_billing)}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_commission_amount
     def last_commission_amount
-      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_commission_amount
-      render json: {last_commission_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
+      tenant_billing = tenant.last_commission_amount
+      render json: {last_commission_amount: format_money(tenant_billing)}
+    end
+
+    private
+
+    def tenant
+      @tenant ||= MnoEnterprise::Tenant.show
+    end
+
+    def format_money(money)
+      if money
+        {amount: money.amount, currency: money.currency_as_string}
+      else
+        {amount: 'N/A', currency: ''}
+      end
     end
   end
 end

data/app/controllers/mno_enterprise/jpi/v1/app_instances_sync_controller.rb

@@ -1,5 +1,6 @@
 module MnoEnterprise
   class Jpi::V1::AppInstancesSyncController < Jpi::V1::BaseResourceController
+    CONNECTOR_STATUS_RUNNING = ['PENDING', 'RUNNING']
 
     # GET /mnoe/jpi/v1/organization/org-fbba/app_instances_sync
     def index
@@ -28,9 +29,8 @@ module MnoEnterprise
       def results(connectors)
         {
           connectors: connectors,
-          is_syncing: connectors.any?{|c| c[:status]=="RUNNING" }
+          is_syncing: connectors.any? { |c| CONNECTOR_STATUS_RUNNING.include?(c[:status]) }
         }
       end
-
   end
 end

data/app/controllers/mno_enterprise/status_controller.rb

@@ -13,13 +13,15 @@ module MnoEnterprise
     #   {
     #     'app-version': '9061048-6811c4a',
     #     'mno-enterprise-version': '0.0.1',
-    #     'env': 'test'
+    #     'env': 'test',
+    #     'mno-api-host': 'https://uat.maestrano.io'
     #   }
     def version
       data = {
           'app-version' => MnoEnterprise::APP_VERSION,
           'mno-enteprise-version' => MnoEnterprise::VERSION,
-          'env' => Rails.env
+          'env' => Rails.env,
+          'mno-api-host' => MnoEnterprise.mno_api_host
       }
       render json: data
     end

data/app/views/mno_enterprise/auth/confirmations/_form.html.haml

@@ -1,4 +1,4 @@
-%div{ 'ng-init' => "user = { $pwdScore: {}, name: '#{resource.name}', surname: '#{resource.surname}' }" }
+%div{ 'ng-init' => "user = { $pwdScore: {}, name: '#{resource.name}', surname: '#{resource.surname}', phone: '#{resource.phone}' }" }
 
 = form_for(resource, as: resource_name, :url => mno_enterprise.user_confirmation_finalize_path, :html => { 'name' => 'loginForm', :class => 'autofill-detect text-center' }) do |f|
 
@@ -18,7 +18,7 @@
       .col-sm-12
         .phone
           = f.select :phone_country_code, options_for_select(Country.all.map { |country,code| c = Country.new(code); ["#{c.alpha2} +#{c.country_code}", code]}, MnoEnterprise.app_country), {}, class: 'form-control unstyled'
-          = f.text_field :phone, placeholder: "*Phone", required: true, 'ng-model' => 'user.phone_number', class: 'form-control'
+          = f.text_field :phone, placeholder: "*Phone", required: true, 'ng-model' => 'user.phone', class: 'form-control'
 
   %br
 

data/app/views/mno_enterprise/auth/registrations/_form.html.haml

@@ -25,7 +25,7 @@
       .checkbox-section.text-center
         = check_box_tag 'tos', 'accept', false, :required => true, :style => "margin-top: -3px;", 'ng-model' => 'acceptTos'
         %label{for: 'tos'}= t('mno_enterprise.auth.registrations.new.user_accept')
-        = link_to t('.tos'), MnoEnterprise.router.terms_url, target: '_blank'
+        = link_to t('mno_enterprise.auth.registrations.new.tos'), MnoEnterprise.router.terms_url, target: '_blank'
 
   %br
   .row

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

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

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 'CVV'
+    json.verification_value credit_card.id ? 'CVV' : nil
   end
-end
+end

data/spec/controllers/mno_enterprise/impersonate_controller_spec.rb

@@ -30,13 +30,23 @@ module MnoEnterprise
 
       describe "#destroy" do
         subject { get :destroy }
-        before { get :create, user_id: user2.id }
 
-        it { expect(controller.current_user.id).to eq(user2.id) }
+        context 'without redirect_path' do
+          before { get :create, user_id: user2.id }
 
-        it { subject; expect(controller.current_user.id).to eq(user.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
       end
     end
   end
-
 end

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

@@ -39,16 +39,13 @@ module MnoEnterprise
     # Stub invoice and invoice call
     let(:invoice) { build(:invoice) }
     let(:user) { build(:user, :admin) }
-    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')) }
+    let(:tenant) { build(:tenant, current_billing_amount: Money.new(11_000,'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
@@ -85,6 +82,19 @@ 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/app_instances_sync_controller_spec.rb

@@ -74,6 +74,14 @@ 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

data/spec/controllers/mno_enterprise/jpi/v1/impac/kpis_controller_spec.rb

@@ -46,7 +46,7 @@ module MnoEnterprise
     end
 
     describe 'PUT #update' do
-      let(:kpi_hash) { from_api(kpi)[:data].except(:dashboard).merge(name: 'New Name') }
+      let(:kpi_hash) { from_api(kpi)[:data].except(:dashboard).merge(element_watched: 'New Watchable') }
 
       subject { put :update, id: kpi.id, kpi: kpi_hash }
 
@@ -59,7 +59,7 @@ module MnoEnterprise
 
       it "updates the kpi" do
         subject
-        expect(assigns(:kpi).name).to eq('New Name')
+        expect(assigns(:kpi).element_watched).to eq('New Watchable')
       end
 
       it { subject; expect(response.code).to eq('200') }

data/spec/controllers/mno_enterprise/pages_controller_spec.rb

@@ -5,6 +5,10 @@ module MnoEnterprise
     render_views
     routes { MnoEnterprise::Engine.routes }
 
+    # Freeze time (JWT are time dependent)
+    before { Timecop.freeze }
+    after { Timecop.return }
+
     let(:user) { build(:user) }
     let(:app_instance) { build(:app_instance) }
 

data/spec/controllers/mno_enterprise/status_controller_spec.rb

@@ -29,6 +29,10 @@ module MnoEnterprise
       it 'returns the environment' do
         expect(data['env']).to eq('test')
       end
+
+      it 'returns the mno-api-host' do
+        expect(data['mno-api-host']).to eq('https://api-enterprise.maestrano.com')
+      end
     end
   end
 end

data/spec/controllers/mno_enterprise/webhook/o_auth_controller_spec.rb

@@ -9,6 +9,10 @@ module MnoEnterprise
     render_views
     routes { MnoEnterprise::Engine.routes }
 
+    # Freeze time (JWT are time dependent)
+    before { Timecop.freeze }
+    after { Timecop.return }
+
     # Stub controller ability
     let!(:ability) { stub_ability }
     let(:extra_params) { {some: 'param'} }
@@ -33,7 +37,7 @@ module MnoEnterprise
       it_behaves_like 'a user protected resource'
 
       it { subject; expect(response).to be_success }
-      it { Timecop.freeze { subject; expect(assigns(:redirect_to)).to eq(redirect_url) } }
+      it { subject; expect(assigns(:redirect_to)).to eq(redirect_url) }
 
       Webhook::OAuthController::PROVIDERS_WITH_OPTIONS.each do |provider|
         describe "#{provider.capitalize} provider" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - API