mno-enterprise-api 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea0c5b9f868b772e58b138f599bf47ff3504999
-  data.tar.gz: fbc019fc11c8c18a5d7f4778f815664156e626a8
+  metadata.gz: a0b34731abb419f0c73fd4df71ebb069e531efe0
+  data.tar.gz: 3e20d7533d0c64aef461de97bb9559d31f894929
 SHA512:
-  metadata.gz: 5a5869e83ffccf97c1fda4f8f409c873dd93252adde7e525aa0d8e17089e101b4139dfcd872ffa8d16ac9a44c38d94d60a817f14c31b67736ede61f75adee614
-  data.tar.gz: d47a98b004477bfed67a5209ebec0857320753c074913d9dfd0b1c693f0dc65e3b92d041b270850587a5b7c97edd82e03cf726306851679a394437d647801cbc
+  metadata.gz: 22b2d455051e5434e13bdef392524ec18b8d576e55ddc325ebde46df41b55858a103b9a8749853281740570e1da42739505f34ffe7becbb302983cca932618f2
+  data.tar.gz: 42f2b1aab4920f54304191e9fad4f39e98128afd74a99a71dd2a2b50acfa0c500fbd93476488ac5a58d9c26d3343f5921b2f65ada23f8cc2d31993ae7293d41f

data/app/assets/javascripts/mno_enterprise/config.js.coffee.erb

@@ -8,3 +8,5 @@ angular.module('mnoEnterprise.configuration', [])
     enabled: <%= MnoEnterprise.i18n_enabled %>,
     available_locales: <%= I18n.available_locales.to_json %>
   })
+  .constant('PRICING_CONFIG', <%= Settings.pricing.to_json %>)
+  .constant('GOOGLE_TAG_CONTAINER_ID', <%= MnoEnterprise.google_tag_container.to_json %>)

data/app/controllers/mno_enterprise/impersonate_controller.rb

@@ -8,7 +8,6 @@ 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)
@@ -25,7 +24,7 @@ module MnoEnterprise
         # user = current_user
         revert_impersonate
       end
-      redirect_to session.delete(:impersonator_redirect_path).presence || '/admin/'
+      redirect_to '/admin/'
     end
 
     private

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

@@ -1,6 +1,6 @@
 module MnoEnterprise
   class Jpi::V1::Admin::AuditEventsController < Jpi::V1::Admin::BaseResourceController
-
+    
     # GET /mnoe/jpi/v1/admin/audit_events
     def index
       @audit_events = MnoEnterprise::AuditEvent
@@ -8,7 +8,7 @@ module MnoEnterprise
       @audit_events = @audit_events.skip(params[:offset]) if params[:offset]
       @audit_events = @audit_events.order_by(params[:order_by]) if params[:order_by]
       @audit_events = @audit_events.where(params[:where]) if params[:where]
-      @audit_events = @audit_events.all.fetch
+      @audit_events = @audit_events.all
 
       response.headers['X-Total-Count'] = @audit_events.metadata[:pagination][:count]
     end

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

@@ -0,0 +1,50 @@
+module MnoEnterprise::Jpi::V1::Admin
+  # Manage invitation sending
+  class InvitesController < BaseResourceController
+    def create
+      @organization = MnoEnterprise::Organization.find(params[:organization_id])
+      user = MnoEnterprise::User.find(params[:user_id])
+      return render json: {error: 'Could not find account or user'}, status: :not_found unless @organization && user
+
+      if user.confirmation_required?
+        user.resend_confirmation_instructions
+      else
+        invite = find_org_invite(@organization, user)
+        return render json: {error: 'No active invitation found'}, status: :not_found unless invite
+        send_org_invite(invite)
+      end
+
+      MnoEnterprise::EventLogger.info('user_invite', current_user.id, 'User invited', {user_email: user.email, account_name: @organization.name}, user)
+
+      @user = user.confirmed? ? invite : user.reload
+
+      render 'mno_enterprise/jpi/v1/admin/organizations/invite_member'
+    end
+
+    private
+
+    # Invite for unconfirmed users are automatically accepted
+    def find_org_invite(organization, user)
+      if user.confirmed?
+        status_scope = { 'status.in' => %w(staged pending) }
+      else
+        status_scope = { status: 'accepted' }
+      end
+      organization.org_invites.where(status_scope.merge(user_id: user.id)).first
+    end
+
+    # Send the org invite and update the status
+    def send_org_invite(invite)
+      user = invite.user
+      # Generate token if not generated
+      user.send(:generate_confirmation_token!) if !user.confirmed? && user.confirmation_token.blank?
+
+      MnoEnterprise::SystemNotificationMailer.organization_invite(invite).deliver_later
+
+      # Update staged invite status
+      return unless invite.status == 'staged'
+      invite.status = 'pending'
+      invite.save
+    end
+  end
+end

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

@@ -13,49 +13,35 @@ module MnoEnterprise
 
     # GET /mnoe/jpi/v1/admin/invoices/current_billing_amount
     def current_billing_amount
-      # 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)}
+      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
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_invoicing_amount
     def last_invoicing_amount
-      tenant_billing = tenant.last_customers_invoicing_amount
-      render json: {last_invoicing_amount: format_money(tenant_billing)}
+      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}}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/outstanding_amount
     def outstanding_amount
-      tenant_billing = tenant.last_customers_outstanding_amount
-      render json: {outstanding_amount: format_money(tenant_billing)}
+      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_customers_outstanding_amount
+      render json: {outstanding_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_portfolio_amount
     def last_portfolio_amount
-      tenant_billing = tenant.last_portfolio_amount
-      render json: {last_portfolio_amount: format_money(tenant_billing)}
+      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_portfolio_amount
+      render json: {last_portfolio_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
     end
 
     # GET /mnoe/jpi/v1/admin/invoices/last_commission_amount
     def last_commission_amount
-      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
+      tenant_billing = MnoEnterprise::Tenant.get('tenant').last_commission_amount
+      render json: {last_commission_amount: {amount: tenant_billing.amount, currency: tenant_billing.currency_as_string}}
     end
   end
 end

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

@@ -15,7 +15,7 @@ module MnoEnterprise
         @organizations = @organizations.skip(params[:offset]) if params[:offset]
         @organizations = @organizations.order_by(params[:order_by]) if params[:order_by]
         @organizations = @organizations.where(params[:where]) if params[:where]
-        @organizations = @organizations.all.fetch
+        @organizations = @organizations.all
         response.headers['X-Total-Count'] = @organizations.metadata[:pagination][:count]
       end
     end
@@ -36,5 +36,86 @@ module MnoEnterprise
       organizations_count = MnoEnterprise::Tenant.get('tenant').organizations_count
       render json: {count: organizations_count }
     end
+
+    # POST /mnoe/jpi/v1/admin/organizations
+    def create
+      # Create new organization
+      @organization = MnoEnterprise::Organization.create(organization_update_params)
+
+      # OPTIMIZE: move this into a delayed job?
+      update_app_list
+
+      @organization_active_apps = @organization.app_instances
+
+      render 'show'
+    end
+
+    # POST /mnoe/jpi/v1/admin/organizations/1/users
+    # Invite a user to the organization (and create it if needed)
+    # This does not send any emails (emails are manually triggered later)
+    def invite_member
+      @organization = MnoEnterprise::Organization.find(params[:id])
+
+      # Find or create a new user - We create it in the frontend as MnoHub will send confirmation instructions for newly
+      # created users
+      user = MnoEnterprise::User.find_by(email: user_params[:email]) || create_unconfirmed_user(user_params)
+
+      # Create the invitation
+      invite = @organization.org_invites.create(
+          user_email: user.email,
+          user_role: params[:user][:role],
+          referrer_id: current_user.id,
+          status: 'staged' # Will be updated to 'accepted' for unconfirmed users
+      )
+
+      @user = user.confirmed? ? invite : user.reload
+    end
+
+    protected
+      def organization_permitted_update_params
+        [:name]
+      end
+
+      def organization_update_params
+        params.fetch(:organization, {}).permit(*organization_permitted_update_params)
+      end
+
+      def user_params
+        params.require(:user).permit(:email, :name, :surname, :phone)
+      end
+
+      # Create an unconfirmed user and skip the confirmation notification
+      # TODO: monkey patch User#confirmation_required? to simplify this? Use refinements?
+      def create_unconfirmed_user(user_params)
+        user = MnoEnterprise::User.new(user_params)
+        user.skip_confirmation_notification!
+        user.save
+
+        # Reset the confirmation field so we can track when the invite is send - #confirmation_sent_at is when the confirmation_token was generated (not sent)
+        # Not ideal as we do 2 saves, and the previous save trigger a call to the backend to validate the token uniqueness
+        user.assign_attributes(confirmation_sent_at: nil, confirmation_token: nil)
+        user.save
+        user
+      end
+
+      # Update App List to match the list passed in params
+      def update_app_list
+        # Differentiate between a null app_nids params and no app_nids params
+        if params[:organization].key?(:app_nids) && (desired_nids = Array(params[:organization][:app_nids]))
+
+          existing_apps = @organization.app_instances.active
+
+          existing_apps.each do |app_instance|
+            desired_nids.delete(app_instance.app.nid) || app_instance.terminate
+          end
+
+          desired_nids.each do |nid|
+            @organization.app_instances.create(product: nid)
+          end
+
+          # Force reload
+          existing_apps.reload
+        end
+      end
   end
 end

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

@@ -15,7 +15,7 @@ module MnoEnterprise
         @users = @users.skip(params[:offset]) if params[:offset]
         @users = @users.order_by(params[:order_by]) if params[:order_by]
         @users = @users.where(params[:where]) if params[:where]
-        @users = @users.all.fetch
+        @users = @users.all
         response.headers['X-Total-Count'] = @users.metadata[:pagination][:count]
       end
     end
@@ -60,6 +60,14 @@ module MnoEnterprise
       render json: {count: users_count }
     end
 
+    # POST /mnoe/jpi/v1/admin/users/signup_email
+    # Send an email to a user with the link to the registration page
+    def signup_email
+      MnoEnterprise::SystemNotificationMailer.registration_instructions(params.require(:user).require(:email)).deliver_later
+
+      head :no_content
+    end
+
     private
 
     def user_params

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

@@ -1,6 +1,5 @@
 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
@@ -29,8 +28,9 @@ module MnoEnterprise
       def results(connectors)
         {
           connectors: connectors,
-          is_syncing: connectors.any? { |c| CONNECTOR_STATUS_RUNNING.include?(c[:status]) }
+          is_syncing: connectors.any?{|c| c[:status]=="RUNNING" }
         }
       end
+
   end
 end

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

@@ -9,7 +9,7 @@ module MnoEnterprise
       else
         MnoEnterprise::App.all.to_a
       end
-
+      @apps.sort_by! { |app| [app.rank ? 0 : 1 , app.rank] } # the nil ranks will appear at the end
       @categories = MnoEnterprise::App.categories(@apps)
       @categories.delete('Most Popular')
     end

data/app/controllers/mno_enterprise/status_controller.rb

@@ -13,15 +13,13 @@ module MnoEnterprise
     #   {
     #     'app-version': '9061048-6811c4a',
     #     'mno-enterprise-version': '0.0.1',
-    #     'env': 'test',
-    #     'mno-api-host': 'https://uat.maestrano.io'
+    #     'env': 'test'
     #   }
     def version
       data = {
           'app-version' => MnoEnterprise::APP_VERSION,
           'mno-enteprise-version' => MnoEnterprise::VERSION,
-          'env' => Rails.env,
-          'mno-api-host' => MnoEnterprise.mno_api_host
+          'env' => Rails.env
       }
       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}', phone: '#{resource.phone}' }" }
+%div{ 'ng-init' => "user = { $pwdScore: {}, name: '#{resource.name}', surname: '#{resource.surname}' }" }
 
 = 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', class: 'form-control'
+          = f.text_field :phone, placeholder: "*Phone", required: true, 'ng-model' => 'user.phone_number', 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('mno_enterprise.auth.registrations.new.tos'), MnoEnterprise.router.terms_url, target: '_blank'
+        = link_to t('.tos'), MnoEnterprise.router.terms_url, target: '_blank'
 
   %br
   .row

data/app/views/mno_enterprise/auth/unlocks/new.html.haml

@@ -1,11 +1,11 @@
-.registration
-  .container
-    .row
-      .login-box-wrapper
-        .login-box-title
-          %h2= t('.title')
-        .login-box
-          .brand-logo
-          = render "mno_enterprise/auth/unlocks/form"
-          %hr
-          = render "mno_enterprise/auth/shared/links"
+%h2= t('.title')
+= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    %br/
+    = f.email_field :email, autofocus: true
+  .actions
+    = f.submit t('.unlock')
+
+= render "devise/shared/links"

data/app/views/mno_enterprise/jpi/v1/admin/base_resource/_member.json.jbuilder

@@ -0,0 +1,28 @@
+if member.is_a?(MnoEnterprise::User)
+  json.uid member.uid
+  json.entity 'User'
+  json.role member.role(organization) if organization
+
+  status = case
+           when member.confirmed? then 'active'
+           when member.confirmation_sent_at.nil? then 'pending'
+           when member.confirmation_sent_at.present? then 'invited'
+           end
+
+  user = member
+
+elsif member.is_a?(MnoEnterprise::OrgInvite)
+  json.entity 'OrgInvite'
+  json.role member.user_role
+
+  status = case member.status
+           when 'staged' then 'pending'
+           when 'pending' then 'invited'
+           when 'accepted' then 'active'
+           end
+
+  user = member.user
+end
+
+json.extract! user, :id, :created_at, :email, :name, :surname
+json.status status

data/app/views/mno_enterprise/jpi/v1/admin/organizations/invite_member.json.jbuilder

@@ -0,0 +1,3 @@
+json.user do
+  json.partial! 'member', member: @user, organization: @organization
+end

data/app/views/mno_enterprise/jpi/v1/admin/organizations/show.json.jbuilder

@@ -1,10 +1,10 @@
 json.organization do
   json.partial! 'organization', organization: @organization
-  json.members @organization.members, partial: 'member', as: :member, organization: @organization
+  json.members @organization.members(true), partial: 'member', as: :member, organization: @organization
   json.partial! 'credit_card', credit_card: @organization.credit_card
   json.partial! 'invoices', organization: @organization
   json.active_apps @organization_active_apps do |instance|
-    json.extract! instance, :id, :name, :stack, :uid
+    json.extract! instance, :id, :name, :stack, :uid, :status, :oauth_keys_valid
     json.app_name instance.app.name
     json.app_logo instance.app.logo
   end

data/app/views/mno_enterprise/jpi/v1/admin/users/_user.json.jbuilder

@@ -1 +1 @@
-json.extract! user, :id, :uid, :email, :name, :surname, :admin_role, :created_at
+json.extract! user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at

data/app/views/mno_enterprise/jpi/v1/admin/users/show.json.jbuilder

@@ -1,5 +1,6 @@
 json.user do
-  json.extract! @user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at
+  json.partial! 'user', user: @user
+
   json.organizations @user_organizations do |org|
     json.id org.id
     json.uid org.uid