mno-enterprise-core 3.2.1 → 3.3.0

data/lib/html_processor.rb

@@ -8,13 +8,13 @@ require 'sanitize'
 # You can initialize it with html or markdown text
 class HtmlProcessor
   attr_reader :html, :original
-  
+
   #======================================
   # Constants
   #======================================
   DESCRIPTION_PROCESSING_ORDER = %w( p h1 h2 h3 h4 h5 h6 )
-  
-  
+
+
   # Define Youtube transformer for Sanitize
   YOUTUBE_TRANSFORMER = lambda do |env|
     node      = env[:node]
@@ -45,7 +45,7 @@ class HtmlProcessor
     # to whitelist the current node.
     {:node_whitelist => [node]}
   end
-  
+
   # Default options for Sanitize
   SANITIZER_OPTS = Sanitize::Config::RELAXED.merge(
     attributes: Sanitize::Config::RELAXED[:attributes].merge(
@@ -53,18 +53,18 @@ class HtmlProcessor
     ),
     transformers: YOUTUBE_TRANSFORMER
   )
-  
+
   #======================================
   # Methods
   #======================================
   def initialize(text, options = { })
     @original = text
-    
+
     # Process markdown or leave original
     if options[:format].to_s == 'markdown' && text
       html_options = { :safe_links_only => true, :hard_wrap => true, :filter_html => false }
       renderer_options = { :autolink => true, :no_intraemphasis => true, :fenced_code_blocks => true, :superscript => true }
-      
+
       renderer = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(html_options), renderer_options)
       raw_html = renderer.render(text)
       @html = Sanitize.fragment(raw_html, SANITIZER_OPTS)
@@ -72,27 +72,27 @@ class HtmlProcessor
       @html = text
     end
   end
-  
+
   # Return a Nokogiri document based
   # on processor html
   def document
     @document ||= Nokogiri::HTML(@html)
   end
-  
+
   # Return a description of the document
   # by returning the first sentence of the
   # first DESCRIPTION_PROCESSING_ORDER found
   def description
     # Return cached value if one
     return @description if @description
-    
+
     # Parse the html document to try to find
     # a description
     @description = ''
     DESCRIPTION_PROCESSING_ORDER.each do |selector|
-      elem = self.document.css(selector).select { |e| e && !e.content.blank? }.first
+      elem = self.document.css(selector).detect { |e| e && !e.content.blank? }
       next if elem.blank? #skip if nil or empty
-      
+
       # Try to get the first two sentences
       match = elem.content.match(/([^.!?]+[.!?]?)([^.!?]+[.!?]?)?/)
       if match && match.captures.any?
@@ -100,7 +100,7 @@ class HtmlProcessor
       end
       break if !@description.empty?
     end
-    
+
     return @description
   end
-end
+end

data/lib/mno_enterprise/concerns/controllers/auth/registrations_controller.rb

@@ -1,6 +1,6 @@
 module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
   extend ActiveSupport::Concern
-  
+
   #==================================================================
   # Included methods
   #==================================================================
@@ -9,22 +9,22 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
   included do
     before_filter :configure_sign_up_params, only: [:create]
     # before_filter :configure_account_update_params, only: [:update]
-    
+
     protected
       def configure_sign_up_params
         devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(
-          :email, 
-          :password, 
-          :password_confirmation, 
-          :name, 
+          :email,
+          :password,
+          :password_confirmation,
+          :name,
           :surname,
           :company,
           :phone,
           :phone_country_code
-        )} 
+        )}
       end
   end
-  
+
   #==================================================================
   # Class methods
   #==================================================================
@@ -33,7 +33,7 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
     #   'some text'
     # end
   end
-  
+
   #==================================================================
   # Instance methods
   #==================================================================
@@ -46,10 +46,13 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
   def create
     build_resource(sign_up_params)
     resource.password ||= Devise.friendly_token
-    
+
     resource_saved = resource.save
-    
+
     if resource_saved
+
+      MnoEnterprise::EventLogger.info('user_add', resource_saved.id, 'User Signup', resource_saved)
+
       if resource.active_for_authentication?
         set_flash_message :notice, :signed_up if is_flashing_format?
         sign_up(resource_name, resource)
@@ -97,7 +100,7 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
   # end
 
   protected
-  
+
     # You can put the params you want to permit in the empty array.
     # def configure_account_update_params
     #   devise_parameter_sanitizer.for(:account_update) << :attribute
@@ -112,12 +115,12 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
     # def after_inactive_sign_up_path_for(resource)
     #   super(resource)
     # end
-  
+
     def sign_up_params
       attrs = super
       attrs.merge(orga_on_create: create_orga_on_user_creation(attrs))
     end
-  
+
     # Check whether we should create an organization for the user
     def create_orga_on_user_creation(user_attrs)
       return false unless user_attrs['email']
@@ -133,4 +136,4 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
       # Get remaining invites via email address
       return MnoEnterprise::OrgInvite.where(user_email: user_attrs['email']).empty?
     end
-end
+end

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

@@ -129,8 +129,11 @@ module MnoEnterprise::Concerns::Models::Ability
     end
 
     can :manage_kpi, MnoEnterprise::Impac::Kpi do |kpi|
-      dashboard = kpi.dashboard
-      authorize! :manage_dashboard, dashboard
+      if kpi.widget.present?
+        authorize! :manage_widget, MnoEnterprise::Impac::Widget.find(kpi.widget.id)
+      else
+        authorize! :manage_dashboard, kpi.dashboard
+      end
     end
 
     can :manage_alert, MnoEnterprise::Impac::Alert do |alert|
@@ -141,7 +144,7 @@ module MnoEnterprise::Concerns::Models::Ability
 
   # Abilities for admin user
   def admin_abilities(user)
-    if user.admin_role == 'admin'
+    if user.admin_role.to_s.casecmp('admin').zero?
       can :manage_app_instances, MnoEnterprise::Organization
     end
   end

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

@@ -106,9 +106,8 @@ module MnoEnterprise::Concerns::Models::AppInstance
       id: id,
       uid: uid,
       name: name,
-      app_nid: app ? app.nid : nil
+      app_nid: app ? app.nid : nil,
+      organization_id: owner_id || owner.id
     }
   end
-
-
 end

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

@@ -25,4 +25,26 @@ module MnoEnterprise::Concerns::Models::IntercomUser
   def intercom_user_hash
     OpenSSL::HMAC.hexdigest('sha256', MnoEnterprise.intercom_api_secret, (self.id || self.email).to_s) if MnoEnterprise.intercom_api_secret
   end
+
+  # Return Intercom user data hash
+  def intercom_data(update_last_request_at = true)
+    data = {
+      user_id: self.id,
+      name: [self.name, self.surname].join(' '),
+      email: self.email,
+      created_at: self.created_at.to_i,
+      last_seen_ip: self.last_sign_in_ip,
+      custom_attributes: {
+        first_name: self.name,
+        surname: self.surname,
+        confirmed_at: self.confirmed_at,
+        admin_role: self.admin_role
+      },
+      update_last_request_at: update_last_request_at
+    }
+    data[:custom_attributes][:phone]= self.phone if self.phone
+    data[:custom_attributes][:external_id]= self.external_id if self.external_id
+
+    data
+  end
 end

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

@@ -41,6 +41,10 @@ module MnoEnterprise::Concerns::Models::Organization
 
     scope :in_arrears, -> { where(in_arrears?: true) }
 
+    scope :active, -> { where(account_frozen: false) }
+
+    default_scope lambda { where(account_frozen: false) }
+
     #================================
     # Associations
     #================================
@@ -115,4 +119,8 @@ module MnoEnterprise::Concerns::Models::Organization
   def payment_restriction
     meta_data && meta_data['payment_restriction']
   end
+
+  def has_credit_card_details?
+    credit_card.persisted?
+  end
 end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Endpoint:
+#  - /v1/app/:app_id/shared_entities
+#
+#  id                :integer         not null, primary key
+#  nid               :string
+#  name              :string
+#  created_at        :datetime        not null
+#  updated_at        :datetime        not null
+
+module MnoEnterprise::Concerns::Models::SharedEntity
+  extend ActiveSupport::Concern
+
+  #==================================================================
+  # Included methods
+  #==================================================================
+  included do
+    # == Relationships ==============================================
+    belongs_to :app
+  end
+
+  #==================================================================
+  # Class methods
+  #==================================================================
+  module ClassMethods
+    # def some_class_method
+    #   'some text'
+    # end
+  end
+
+  #==================================================================
+  # Instance methods
+  #==================================================================
+end

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

@@ -64,4 +64,11 @@ module MnoEnterprise::Concerns::Models::Team
     self.reload
     self
   end
+
+  def to_audit_event
+    {
+      name: name,
+      organization_id: self.organization.id
+    }
+  end
 end

data/lib/mno_enterprise/testing_support/common_rake.rb

@@ -13,7 +13,7 @@ namespace :mno_enterprise do
       ENV["RAILS_ENV"] = 'test'
 
       MnoEnterprise::DummyGenerator.start %W[--quiet --lib_name=#{ENV['LIB_NAME']} --database=#{ENV['DB'].presence || 'sqlite3'}]
-      MnoEnterprise::Generators::InstallGenerator.start %w[--quiet --skip-rspec --skip-sprite --skip-factory-girl --skip-frontend --skip-admin]
+      MnoEnterprise::Generators::InstallGenerator.start %w[--quiet --skip-rspec --skip-sprite --skip-factory-girl --skip-application-config --skip-frontend --skip-admin]
     end
   end
 end

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

@@ -16,11 +16,15 @@ FactoryGirl.define do
     tags ['Foo', 'Bar']
     key_benefits ['Super', 'Hyper', 'Good']
     key_features ['Super', 'Hyper', 'Good']
+    key_workflows ['1st workflow', '2nd workflow']
+    known_limitations "No limitations"
     testimonials [{text: 'Bla', company: 'Doe Pty Ltd', author: 'John'}]
     worldwide_usage 120000
     tiny_description "A great app"
     stack 'cube'
     terms_url "http://opensource.org/licenses/MIT"
+    support_url "http://example.com/su  pport"
+    getting_started "Let's get started"
     appinfo { {} }
     average_rating { rand(1..5) }
     sequence(:rank) { |n| n }
@@ -29,6 +33,8 @@ FactoryGirl.define do
       'default' => [{name: 'Monthly Plan', price: '20.0', currency: 'AUD', factor: '/month'}]
     } }
 
+    shared_entities { [] }
+
     trait :cloud do
       stack 'cloud'
     end

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

@@ -6,6 +6,8 @@ FactoryGirl.define do
       user_id 1
       description 'Blabla'
       details 'Details'
+      organization_id 1
+      organization { {name: 'Org'} }
       user { {name: 'John', surname: 'Doe'} }
 
       # Properly build the resource with Her

data/lib/mno_enterprise/testing_support/mno_enterprise_api_test_helper.rb

@@ -1,12 +1,12 @@
 module MnoEnterpriseApiTestHelper
-  
+
   # Take a resource and transform it into a Hash describing
   # the resource as if it had been returned by the MnoEnterprise
   # API server
   def from_api(res)
     { data: serialize_type(res), metadata: {pagination: {count: entity_count(res)}} }
   end
-  
+
   def serialize_type(res)
     case
     when res.kind_of?(Array)
@@ -42,7 +42,7 @@ module MnoEnterpriseApiTestHelper
       return 1
     end
   end
-  
+
   # Reset all API stubs.
   # Called before each test (see spec_helper)
   def api_stub_reset
@@ -74,12 +74,27 @@ module MnoEnterpriseApiTestHelper
       warn("DEPRECATION WARNING: api_stub_for(MyClass,{ some: 'opts'}) is deprecated. Please use api_stub_for({ some: 'opts' }) from now on")
       real_opts = opts
     end
-    
+
     set_api_stub
     api_stub_add(real_opts)
     api_stub_configure(@_api_stub)
   end
-  
+
+  # Remove an API stub added with `api_stub_for`
+  # This needs to be called with the same options
+  def remove_api_stub(opts = {})
+    set_api_stub
+    api_stub_remove(opts)
+    api_stub_configure(@_api_stub)
+  end
+
+  # Remove all api stubs
+  def clear_api_stubs
+    set_api_stub
+    @_stub_list = {}
+    api_stub_configure(@_api_stub)
+  end
+
   private
     # Set a stub api on the provider class
     def set_api_stub
@@ -99,21 +114,37 @@ module MnoEnterpriseApiTestHelper
     def api_stub_add(orig_opts)
       @_stub_list ||= {}
       opts = orig_opts.dup
-      
-      # Expand options so that: { put: '/path' } becomes { path: '/path', method: :put }
+
+      expand_options(opts)
+
+      key = opts.to_param
+      @_stub_list[key] = opts
+    end
+
+    # Remove an API
+    # This need to be called with the exact same options as `api_stub_add` was called with
+    def api_stub_remove(orig_opts)
+      @_stub_list ||= {}
+      opts = orig_opts.dup
+
+      expand_options(opts)
+
+      key = opts.to_param
+      @_stub_list.delete(key)
+    end
+
+    # Expand options so that: { put: '/path' } becomes { path: '/path', method: :put }
+    def expand_options(opts)
       unless opts[:method] && opts[:path]
-        [:get,:put,:post,:delete].each do |verb|
+        [:get, :put, :post, :delete].each do |verb|
           if path = opts.delete(verb)
             opts[:path] = path
             opts[:method] = verb
           end
         end
       end
-      
-      key = opts.to_param
-      @_stub_list[key] = opts
     end
-  
+
     # Configure the api and apply a list of stubs
     def api_stub_configure(api)
       # This block should match the her.rb initializer
@@ -157,12 +188,12 @@ module MnoEnterpriseApiTestHelper
               else
                 resp_code = stub[:code] || 200
               end
-                 
-              
-              [resp_code, {}, resp.to_json] 
+
+
+              [resp_code, {}, resp.to_json]
             }
           end
         end
       end
     end
-end
+end