mno-enterprise-core 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9bc8575caf93295002d64712d732d5fc882a09a
-  data.tar.gz: e27125cc924ba10ac4f62eecb668a1018a4717ad
+SHA256:
+  metadata.gz: cf176f50a3ce889c72e80a547eb8bcad4edb87467e74c858572c0bd6deece662
+  data.tar.gz: da051544d51089e2d354864e25434184788d0d1dd30c4774c87e79358ad26a12
 SHA512:
-  metadata.gz: '0680225db073172cefab691f5bd89183d9f82858ff5fe3ad51760639109bde0f59563c7b241bdaf2100d89bd3479096e3371385aab09532e299985e6eeb7068f'
-  data.tar.gz: d5d82305dbe6d5c81290d99ce572694009cd7f2176e4edf275bd2deaa5ccb369a185163aeb76d9f61583ea6261c5ae277221b5e6ca52c936829f2ddad639d957
+  metadata.gz: 1be7040ae608b7c404339a89a4098c526ac1e82e7eedbde0849f8857c27f2d928104068bdf649d26667a3bb22fe665d81be887a8ad9b3ef5639181cb7ff2762b
+  data.tar.gz: 1af8e04e29fb60df75c7fcc64803f062c67cb05931b0ae6bf0474920a38ad0ffe81f428b37109ef3181c2cfd92f1e2c7864ffc318c5a4385a9c64bb1b4adc8f7

data/app/controllers/mno_enterprise/application_controller.rb

@@ -32,7 +32,7 @@ module MnoEnterprise
     end
 
     def current_ability
-      MnoEnterprise::Ability.new(current_user)
+      MnoEnterprise::Ability.new(current_user, session)
     end
 
     def set_default_meta

data/app/models/mno_enterprise/impac/dashboard.rb

@@ -22,13 +22,13 @@ module MnoEnterprise
     end
 
     # Return all the organizations linked to this dashboard and to which the user has access
-    # If the dashboard is a template, return all the current user's organization
+    # If the dashboard is a template, return all the current user's organizations
     def organizations(org_list = nil)
       if org_list
         return org_list if dashboard_type == 'template'
-        org_list.to_a.select { |e| self.organization_ids.include?(e.uid) }
+        org_list.to_a.select { |e| organization_ids.include?(e.uid) || organization_ids.include?(e.id) }
       else
-        MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
+        MnoEnterprise::Organization.where('uid.in' => organization_ids).to_a
       end
     end
 
@@ -44,10 +44,7 @@ module MnoEnterprise
     end
 
     def to_audit_event
-      {
-        name: name,
-        organization_id: (owner_type == 'Organization') ? owner_id : nil
-      }
+      { name: name }
     end
 
     def copy(owner, name, organization_ids)

data/app/models/mno_enterprise/impac/kpi.rb

@@ -7,5 +7,18 @@ module MnoEnterprise
     belongs_to :widget, class_name: 'MnoEnterprise::Impac::Widget'
     has_many :alerts, class_name: 'MnoEnterprise::Impac::Alert'
 
+    def organizations(orgs = nil)
+      if orgs.present?
+        orgs.select { |org| organization_ids.include?(org.uid) }.to_a
+      else
+        MnoEnterprise::Organization.where('uid.in' => organization_ids).to_a
+      end
+    end
+
+    private
+
+    def organization_ids
+      @organization_ids ||= (settings.present? && settings['organization_ids']).to_a
+    end
   end
 end

data/app/models/mno_enterprise/impac/widget.rb

@@ -2,21 +2,32 @@ module MnoEnterprise
   class Impac::Widget < BaseResource
 
     # TODO: remove :widget_category when mnohub migrated to new model
-    attributes :name, :width, :widget_category, :settings, :endpoint
+    attributes :name, :width, :widget_category, :settings, :endpoint, :layouts
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
     has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi'
 
     def to_audit_event
-
-      if settings.present? && settings['organization_ids'].present?
-        organization = MnoEnterprise::Organization.find_by(uid: settings['organization_ids'].first)
+      if organization_ids.present?
+        organization = MnoEnterprise::Organization.find_by(uid: organization_ids.first)
         { name: name, organization_id: organization.id }
       else
         { name: name }
       end
+    end
 
+    def organizations(orgs = nil)
+      if orgs.present?
+        orgs.select { |org| organization_ids.include?(org.uid) }.to_a
+      else
+        MnoEnterprise::Organization.where('uid.in' => organization_ids).to_a
+      end
     end
 
+    private
+
+    def organization_ids
+      @organization_ids ||= (settings.present? && settings['organization_ids']).to_a
+    end
   end
 end

data/app/models/mno_enterprise/sub_tenant.rb

@@ -0,0 +1,8 @@
+module MnoEnterprise
+  class SubTenant < BaseResource
+    attributes :name, :account_manager_ids, :client_ids
+
+    has_many :account_managers, class_name: 'MnoEnterprise::User'
+    has_many :clients, class_name: 'MnoEnterprise::Organization'
+  end
+end

data/app/models/mno_enterprise/user.rb

@@ -37,6 +37,7 @@
 #  website                        :string(255)
 #  api_key                        :string(255)
 #  api_secret                     :string(255)
+#  mnoe_sub_tenant_id             :string
 #
 
 module MnoEnterprise
@@ -51,7 +52,7 @@ module MnoEnterprise
       :last_sign_in_ip, :confirmation_token, :confirmed_at, :confirmation_sent_at, :unconfirmed_email,
       :failed_attempts, :unlock_token, :locked_at, :name, :surname, :company, :phone, :phone_country_code,
       :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required, :admin_role,
-      :api_key, :api_secret, :developer, :kpi_enabled, :external_id, :meta_data, :password_valid
+      :api_key, :api_secret, :developer, :kpi_enabled, :external_id, :meta_data, :password_valid, :mnoe_sub_tenant_id, :client_ids
 
     define_model_callbacks :validation #required by Devise
 
@@ -83,6 +84,8 @@ module MnoEnterprise
     has_many :dashboards, class_name: 'MnoEnterprise::Impac::Dashboard'
     has_many :alerts, class_name: 'MnoEnterprise::Impac::Alert'
 
+    has_many :clients, class_name: 'MnoEnterprise::Organization'
+
     #================================
     # Callbacks
     #================================

data/app/pdf/mno_enterprise/invoice_pdf.rb

@@ -39,7 +39,7 @@ module MnoEnterprise
 
       # Financial values
       @data[:invoice_price] = @invoice.price
-      @data[:invoice_currency] = @invoice.price.currency_as_string
+      @data[:invoice_currency] = @invoice.price.currency.to_s
       @data[:invoice_currency_name] = @invoice.price.currency.name
       @data[:invoice_credit_paid] = @invoice.credit_paid
       @data[:invoice_total_payable] = @invoice.total_payable
@@ -119,7 +119,7 @@ module MnoEnterprise
 
     # Format a money object
     def money(m)
-      "#{m.format(symbol: false)} #{m.currency_as_string}"
+      "#{m.format(symbol: false)} #{m.currency.to_s}"
     end
 
     # Add a repeated header to the document

data/config/locales/templates/dashboard/organization/en.yml

@@ -114,6 +114,7 @@ en:
 
           settings:
             company_name: Company name
+            financial_year_end_month: Financial Year End Month,
             connec_data_sharing: Connec!™ Data Sharing
             enable: "On"
             disable: "Off"

data/config/locales/templates/dashboard/organization/id.yml

@@ -96,6 +96,7 @@ id:
 
           settings:
             company_name: Nama perusahaan
+            financial_year_end_month: Bulan Akhir Tahun Keuangan
             connec_data_sharing: Berbagi Data Connec!™
             enable: "On"
             disable: "Off"

data/config/locales/templates/dashboard/organization/zh.yml

@@ -96,6 +96,7 @@ zh:
 
           settings:
             company_name: 公司名称
+            financial_year_end_month: 财政年度结束月份
             connec_data_sharing: Connec!??数据分享
             enable: "On"
             disable: "Off"

data/lib/accountingjs_serializer.rb

@@ -12,7 +12,7 @@ module AccountingjsSerializer
         'subunit_symbol' => subunit_symbol(money.currency),
         'subunit_format' => subunit_symbol_first(money.currency) ? "%s%v" : "%v%s",
         'subunit_to_unit' => money.currency.subunit_to_unit,
-        'iso_code' => money.currency_as_string
+        'iso_code' => money.currency.to_s
       }
     }
   end

data/lib/generators/mno_enterprise/install/templates/config/settings.yml

@@ -60,6 +60,8 @@ devise:
 
 # Admin Panel Config
 admin_panel:
+  account_manager:
+    enabled: false
   apps_management:
     enabled: true
   audit_log:
@@ -71,11 +73,13 @@ admin_panel:
       enabled: true
   finance:
     enabled: true
+  impersonation:
+    disabled: false
   # Ability to enable Intercom on the admin panel
   # Intercom needs to be properly setup for the dashboard
   intercom:
     enabled: false
-  impersonation:
-    disabled: false
   staff:
     enabled: true
+  sub_tenant:
+    enabled: false

data/lib/mno_enterprise/concerns/models/ability.rb

@@ -19,7 +19,7 @@ module MnoEnterprise::Concerns::Models::Ability
   #==================================================================
   # Instance methods
   #==================================================================
-  def initialize(user)
+  def initialize(user, session)
     user ||= MnoEnterprise::User.new
 
     #===================================================
@@ -68,7 +68,8 @@ module MnoEnterprise::Concerns::Models::Ability
     #===================================================
     # Impac
     #===================================================
-    impac_abilities(user)
+    orgs_with_acl = user.organizations.active.include_acl(session[:impersonator_user_id]).to_a
+    impac_abilities(orgs_with_acl)
 
     #===================================================
     # Admin abilities
@@ -103,42 +104,69 @@ module MnoEnterprise::Concerns::Models::Ability
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end
 
-  def impac_abilities(user)
-    can :manage_impac, MnoEnterprise::Impac::Dashboard do |dhb|
-      dhb.organizations.any? && dhb.organizations.all? do |org|
-        !!user.role(org) && ['Super Admin', 'Admin'].include?(user.role(org))
+  # Enables / disables Impac! Angular capabilities
+  def impac_abilities(orgs_with_acl)
+    can :create_impac_dashboards, MnoEnterprise::Impac::Dashboard do |d|
+      orgs = d.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:dashboards] && org.acl[:related][:dashboards][:create]
       end
     end
 
-    can :manage_dashboard, MnoEnterprise::Impac::Dashboard do |dashboard|
-      if dashboard.owner_type == "Organization"
-        # The current user is a member of the organization that owns the dashboard that has the kpi attached to
-        owner = MnoEnterprise::Organization.find(dashboard.owner_id)
-        owner && !!user.role(owner)
-      elsif dashboard.owner_type == "User"
-        # The current user is the owner of the dashboard that has the kpi attached to
-        dashboard.owner_id == user.id
-      else
-        false
+    can :update_impac_dashboards, MnoEnterprise::Impac::Dashboard do |d|
+      orgs = d.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:dashboards] && org.acl[:related][:dashboards][:update]
       end
     end
 
-    can :manage_widget, MnoEnterprise::Impac::Widget do |widget|
-      dashboard = widget.dashboard
-      authorize! :manage_dashboard, dashboard
+    can :destroy_impac_dashboards, MnoEnterprise::Impac::Dashboard do |d|
+      orgs = d.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:dashboards] && org.acl[:related][:dashboards][:destroy]
+      end
+    end
+
+    can :create_impac_widgets, MnoEnterprise::Impac::Widget do |w|
+      orgs = w.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:widgets] && org.acl[:related][:widgets][:create]
+      end
+    end
+
+    can :update_impac_widgets, MnoEnterprise::Impac::Widget do |w|
+      orgs = w.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:widgets] && org.acl[:related][:widgets][:update]
+      end
     end
 
-    can :manage_kpi, MnoEnterprise::Impac::Kpi do |kpi|
-      if kpi.widget.present?
-        authorize! :manage_widget, MnoEnterprise::Impac::Widget.find(kpi.widget.id)
-      else
-        authorize! :manage_dashboard, kpi.dashboard
+    can :destroy_impac_widgets, MnoEnterprise::Impac::Widget do |w|
+      orgs = w.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:widgets] && org.acl[:related][:widgets][:destroy]
       end
     end
 
-    can :manage_alert, MnoEnterprise::Impac::Alert do |alert|
-      kpi = alert.kpi
-      authorize! :manage_kpi, kpi
+    can :create_impac_kpis, MnoEnterprise::Impac::Kpi do |k|
+      orgs = k.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:kpis] && org.acl[:related][:kpis][:create]
+      end
+    end
+
+    can :update_impac_kpis, MnoEnterprise::Impac::Kpi do |k|
+      orgs = k.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:kpis] && org.acl[:related][:kpis][:update]
+      end
+    end
+
+    can :destroy_impac_kpis, MnoEnterprise::Impac::Kpi do |k|
+      orgs = k.organizations(orgs_with_acl)
+      orgs.present? && orgs.all? do |org|
+        org.acl[:related] && org.acl[:related][:kpis] && org.acl[:related][:kpis][:destroy]
+      end
     end
   end
 
@@ -146,6 +174,7 @@ module MnoEnterprise::Concerns::Models::Ability
   def admin_abilities(user)
     if user.admin_role.to_s.casecmp('admin').zero? || user.admin_role.to_s.casecmp('staff').zero?
       can :manage_app_instances, MnoEnterprise::Organization
+      can :manage_sub_tenant, MnoEnterprise::SubTenant
     end
   end
 end

data/lib/mno_enterprise/concerns/models/organization.rb

@@ -37,12 +37,16 @@ module MnoEnterprise::Concerns::Models::Organization
   included do
     attributes :uid, :name, :account_frozen, :free_trial_end_at, :soa_enabled, :mails, :logo,
       :latitude, :longitude, :geo_country_code, :geo_state_code, :geo_city, :geo_tz, :geo_currency,
-      :meta_data, :industry, :size, :financial_year_end_month
+      :meta_data, :industry, :size, :financial_year_end_month, :acl
 
     scope :in_arrears, -> { where(in_arrears?: true) }
-
     scope :active, -> { where(account_frozen: false) }
-
+    scope :include_acl, ->(imp_id) do
+      tap do |x|
+        x.params[:include_acl?] = true
+        x.params[:account_manager_id] = imp_id if Settings.admin_panel.account_manager.enabled?
+      end
+    end
     default_scope lambda { where(account_frozen: false) }
 
     #================================

data/lib/mno_enterprise/testing_support/factories/sub_tenants.rb

@@ -0,0 +1,14 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+# This is an API resource factory generating a Hash to be used in API stubs
+# Use as such: build(:api_user)
+# See http://stackoverflow.com/questions/10032760/how-to-define-an-array-hash-in-factory-girl
+FactoryGirl.define do
+
+  factory :sub_tenant, class: MnoEnterprise::SubTenant do
+    sequence(:id)
+    name 'SubTenant'
+    # Properly build the resource with Her
+    initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }
+  end
+end

data/lib/mno_enterprise/testing_support/factories/users.rb

@@ -51,6 +51,10 @@ FactoryGirl.define do
       kpi_enabled true
     end
 
+    trait :with_clients do
+      clients { [build(:organization).attributes] }
+    end
+
     # Properly build the resource with Her
     initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }
   end

data/lib/mno_enterprise/testing_support/mno_enterprise_api_test_helper.rb

@@ -24,7 +24,7 @@ module MnoEnterpriseApiTestHelper
       end
       return hash
     when res.kind_of?(Money)
-      return { cents: res.cents, currency: res.currency_as_string }
+      return { cents: res.cents, currency: res.currency.to_s }
     when res.respond_to?(:iso8601)
       return res.iso8601
     else

data/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb

@@ -54,7 +54,8 @@ module MnoEnterprise::TestingSupport::OrganizationsSharedHelpers
         'name' => organization.name,
         'soa_enabled' => organization.soa_enabled,
         'account_frozen' => organization.account_frozen,
-        'payment_restriction' => organization.payment_restriction
+        'payment_restriction' => organization.payment_restriction,
+        'financial_year_end_month' => organization.financial_year_end_month
     }
 
     if admin

data/lib/mno_enterprise/testing_support/shared_contexts/jpi_v1_admin_controller.rb

@@ -0,0 +1,13 @@
+RSpec.shared_context MnoEnterprise::Jpi::V1::Admin::BaseResourceController do
+  include MnoEnterprise::TestingSupport::SharedExamples::JpiV1Admin
+
+  render_views
+  routes { MnoEnterprise::Engine.routes }
+  before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+  # user is stubbed in the controller?
+  before do
+    api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+    sign_in(user)
+  end
+end

data/lib/mno_enterprise/testing_support/shared_contexts/jpi_v1_admin_impac_controller.rb

@@ -0,0 +1,73 @@
+module MnoEnterprise::TestingSupport::SharedContexts::JpiV1AdminImpacController
+  def hash_for_kpi(kpi)
+    {
+      "id" => kpi.id,
+      "element_watched" => kpi.element_watched,
+      "endpoint" => kpi.endpoint
+    }
+  end
+
+  shared_context 'MnoEnterprise::Jpi::V1::Admin::Impac' do
+    shared_context "#{described_class}: dashboard dependencies stubs" do
+      before do
+        # Not ideal but this is a nested context
+        if described_class == MnoEnterprise::Jpi::V1::Admin::Impac::DashboardsController
+          api_stub_for(
+            get: "/organizations?filter[uid.in][]=#{org.uid}",
+            response: from_api([org])
+          )
+        end
+        if described_class == MnoEnterprise::Jpi::V1::Admin::Impac::DashboardTemplatesController
+          api_stub_for(
+            get: "/users/#{user.id}/organizations",
+            response: from_api([org])
+          )
+        end
+        api_stub_for(
+          get: "/dashboards/#{dashboard.id}/widgets",
+          response: from_api([widget])
+        )
+        api_stub_for(
+          get: "/dashboards/#{dashboard.id}/kpis",
+          response: from_api([d_kpi])
+        )
+        api_stub_for(
+          get: "/widgets/#{widget.id}/kpis",
+          response: from_api([w_kpi])
+        )
+      end
+    end
+
+    let(:user) { build(:user, :admin, :with_organizations) }
+    let(:org) { build(:organization, users: [user]) }
+    let(:metadata) { { hist_parameters: { from: '2015-01-01', to: '2015-03-31', period: 'MONTHLY' } } }
+    let(:dashboard) { build(:impac_dashboard, dashboard_type: 'dashboard', organization_ids: [org.uid], currency: 'EUR', settings: metadata) }
+    let(:widget) { build(:impac_widget, dashboard: dashboard, owner: user) }
+    let(:d_kpi) { build(:impac_kpi, dashboard: dashboard) }
+    let(:w_kpi) { build(:impac_kpi, widget: widget) }
+
+    let(:hash_for_widget) do
+      {
+        "id" => widget.id,
+        "name" => widget.name,
+        "endpoint" => widget.widget_category,
+        "width" => widget.width,
+        "kpis" => [hash_for_kpi(w_kpi)]
+      }
+    end
+    let(:hash_for_dashboard) do
+      {
+        "id" => dashboard.id,
+        "name" => dashboard.name,
+        "full_name" => dashboard.full_name,
+        "currency" => 'EUR',
+        "metadata" => metadata.deep_stringify_keys,
+        "data_sources" => [{ "id" => org.id, "uid" => org.uid, "label" => org.name}],
+        "kpis" => [hash_for_kpi(d_kpi)],
+        "widgets" => [hash_for_widget]
+      }
+    end
+  end
+end
+
+

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.3.3'
+  VERSION = '3.4.0'
 end

data/spec/models/mno_enterprise/ability_spec.rb

@@ -3,12 +3,35 @@ require 'cancan/matchers'
 
 # TODO: add more ability tests
 RSpec.describe MnoEnterprise::Ability, type: :model do
-  subject(:ability) { described_class.new(user) }
+  subject(:ability) { described_class.new(user, session) }
   let(:user) { FactoryGirl.build(:user, admin_role: admin_role) }
+  let(:user2) { FactoryGirl.build(:user) }
+  let(:session) { { impersonator_user_id: user2.id } }
   let(:admin_role) { nil }
   let(:organization) { FactoryGirl.build(:organization) }
+  
+  let(:org1) { FactoryGirl.build(:organization, acl: acl) }
+  let(:org2) { FactoryGirl.build(:organization, acl: acl) }
+  let(:acl) do
+    {
+      self: { show: false, update: false, destroy: false },
+      related: {
+        impac: { show: false },
+        dashboards: { show: false, create: false, update: false, destroy: false },
+        widgets: { show: false, create: false, update: false, destroy: false },
+        kpis: { show: false, create: false, update: false, destroy: false },
+      }
+    }
+  end
+  let(:orgs_with_acl) { [org1, org2] }
+  let(:orgs_ids) { orgs_with_acl.map(&:uid) }
 
-  before { allow(user).to receive(:role).with(organization) { nil } }
+  before do
+    allow(user).to receive(:role).with(organization) { nil }
+    allow(user).to receive(:organizations).and_return(
+      double(:active, active: double(:include_acl, include_acl: orgs_with_acl))
+    )
+  end
 
   context 'when User#admin_role is admin' do
     let(:admin_role) { 'admin' }
@@ -23,4 +46,39 @@ RSpec.describe MnoEnterprise::Ability, type: :model do
   context 'when no User#admin_role' do
     it { is_expected.not_to be_able_to(:manage_app_instances, organization) }
   end
+
+  describe 'Impac! abilities' do
+    %i(dashboards widgets kpis).each do |component|
+      %i(create update destroy).each do |action|
+        context "when at least one organization cannot #{action} #{component}" do
+          before { org1.acl[:related][component][action] = true }
+
+          it do
+            impac_component = FactoryGirl.build(
+              "impac_#{component}".singularize.to_sym,
+              settings: { organization_ids: orgs_ids },
+              organization_ids: orgs_ids
+            )
+            is_expected.not_to be_able_to("#{action}_impac_#{component}".to_sym, impac_component)
+          end
+        end
+
+        context "when all the organizations can #{action} #{component}" do
+          before do
+            org1.acl[:related][component][action] = true
+            org2.acl[:related][component][action] = true
+          end
+
+          it do
+            impac_component = FactoryGirl.build(
+              "impac_#{component}".singularize.to_sym,
+              settings: { organization_ids: orgs_ids },
+              organization_ids: orgs_ids
+            )
+            is_expected.to be_able_to("#{action}_impac_#{component}".to_sym, impac_component)
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: her
   requirement: !ruby/object:Gem::Requirement
@@ -354,6 +354,7 @@ files:
 - app/models/mno_enterprise/org_invite.rb
 - app/models/mno_enterprise/organization.rb
 - app/models/mno_enterprise/shared_entity.rb
+- app/models/mno_enterprise/sub_tenant.rb
 - app/models/mno_enterprise/team.rb
 - app/models/mno_enterprise/tenant.rb
 - app/models/mno_enterprise/tenant_invoice.rb
@@ -595,6 +596,7 @@ files:
 - lib/mno_enterprise/testing_support/factories/invoices.rb
 - lib/mno_enterprise/testing_support/factories/org_invite.rb
 - lib/mno_enterprise/testing_support/factories/organizations.rb
+- lib/mno_enterprise/testing_support/factories/sub_tenants.rb
 - lib/mno_enterprise/testing_support/factories/team.rb
 - lib/mno_enterprise/testing_support/factories/tenant.rb
 - lib/mno_enterprise/testing_support/factories/tenant_invoice.rb
@@ -604,6 +606,8 @@ files:
 - lib/mno_enterprise/testing_support/mnoe_faraday_test_adapter.rb
 - lib/mno_enterprise/testing_support/organizations_shared_helpers.rb
 - lib/mno_enterprise/testing_support/request_spec_helper.rb
+- lib/mno_enterprise/testing_support/shared_contexts/jpi_v1_admin_controller.rb
+- lib/mno_enterprise/testing_support/shared_contexts/jpi_v1_admin_impac_controller.rb
 - lib/mno_enterprise/testing_support/shared_contexts/rake_task.rb
 - lib/mno_enterprise/testing_support/shared_examples/jpi_v1_admin.rb
 - lib/mno_enterprise/testing_support/user_action_shared.rb
@@ -661,40 +665,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality
 test_files:
-- spec/models/mno_enterprise/app_spec.rb
-- spec/models/mno_enterprise/organization_spec.rb
-- spec/models/mno_enterprise/app_instance_spec.rb
-- spec/models/mno_enterprise/impac/dashboard_spec.rb
-- spec/models/mno_enterprise/credit_card_spec.rb
+- spec/spec_helper.rb
+- spec/config/initializers/audit_log_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
-- spec/models/mno_enterprise/identity_spec.rb
+- spec/models/mno_enterprise/credit_card_spec.rb
 - spec/models/mno_enterprise/ability_spec.rb
-- spec/models/mno_enterprise/invoice_spec.rb
+- spec/models/mno_enterprise/app_instance_spec.rb
+- spec/models/mno_enterprise/organization_spec.rb
 - spec/models/mno_enterprise/shared_entity_spec.rb
-- spec/models/mno_enterprise/user_spec.rb
+- spec/models/mno_enterprise/identity_spec.rb
+- spec/models/mno_enterprise/impac/dashboard_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
-- spec/spec_helper.rb
-- spec/lib/mno_enterprise/smtp_client_spec.rb
+- spec/models/mno_enterprise/invoice_spec.rb
+- spec/models/mno_enterprise/app_spec.rb
+- spec/models/mno_enterprise/user_spec.rb
 - spec/lib/mno_enterprise/mail_adapters/smtp_adapter_spec.rb
-- spec/lib/mno_enterprise/mail_adapters/mandrill_adapter_spec.rb
-- spec/lib/mno_enterprise/mail_adapters/sparkpost_adapter_spec.rb
 - spec/lib/mno_enterprise/mail_adapters/adapter_spec.rb
-- spec/lib/mno_enterprise/mail_client_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/sparkpost_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/mandrill_adapter_spec.rb
 - spec/lib/mno_enterprise/core_engine_spec.rb
+- spec/lib/mno_enterprise/mail_client_spec.rb
+- spec/lib/mno_enterprise/smtp_client_spec.rb
 - spec/lib/mno_enterprise/impac_client_spec.rb
 - spec/lib/devise/model/remote_authenticable_spec.rb
+- spec/lib/mandrill_client_spec.rb
 - spec/lib/her_extension/her_orm_adapter.rb
 - spec/lib/her_extension/model/relation_spec.rb
-- spec/lib/mandrill_client_spec.rb
-- spec/rails_helper.rb
+- spec/mno_enterprise_spec.rb
 - spec/controllers/mno_enterprise/i18n_spec.rb
 - spec/controllers/mno_enterprise/angular_csrf_spec.rb
 - spec/controllers/mno_enterprise/application_controller_spec.rb
-- spec/config/initializers/audit_log_spec.rb
-- spec/mno_enterprise_spec.rb
+- spec/rails_helper.rb
 - spec/helpers/image_helper_spec.rb