mno-enterprise-core 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b2136652697969f675be8a746722177281d2ddd
-  data.tar.gz: 364a904419110a78129648cbe3c96a550dfa2593
+  metadata.gz: 04d03f902dba4992c2dcf7dfc79bcde79328f734
+  data.tar.gz: 7abe37f46afd67baf9b2c01aa6e71f915887e91e
 SHA512:
-  metadata.gz: 7fbcaa5cc80fa061845fe612054fab9b203664a34ef781b154b127b17c93ecedbfad105d78c7c354f7593e4dbd3491fa243ed7c4151d5d4395c28844fc352bb6
-  data.tar.gz: 64e9c84dbf5b379182ea162b808a89b377a8f04d8052c48687c65b2b2981625eda367cc0d5f836ca9ec79d783a4fc494161a10f4ddd135ac5344f32512b3e1b4
+  metadata.gz: f102931d14d82727074363e7492e5212005693ec5124cbf13cbaf4f6366a2bbac9b661f5f48661ec4a20b4f893a4aa7e03e2bca728738f9e728b31a4991c87fb
+  data.tar.gz: 504de1f76c89a3a3b8f77c4948b6a5bc47b32b16437ff02e95746584e90c5a3bbff26e2989b5ee2efa70e858b8332513f6c74388a0046ed9305e4935f2b1a5a4

data/app/assets/stylesheets/mno_enterprise/mail.css

@@ -8,11 +8,8 @@
 }
 .header img{
   display: block;
-  width: 40%;
-  min-width: 200px;
-  max-width: 400px;
-  
   margin: 0 auto;
+  max-height: 120px;
 }
 
 .footer {

data/app/controllers/mno_enterprise/application_controller.rb

@@ -36,7 +36,7 @@ module MnoEnterprise
 
     def set_default_meta
       @meta = {}
-      @meta[:title] = "Application"
+      @meta[:title] = MnoEnterprise.app_name
       @meta[:description] = "Enterprise Applications"
     end
 

data/app/helpers/mno_enterprise/application_helper.rb

@@ -1,18 +1,18 @@
 module MnoEnterprise
   module ApplicationHelper
-    
+
     def support_email
       MnoEnterprise.support_email
     end
-    
+
     # Re-implement Devise filter
     # For some reasons the original Devise filter seems to ignore the
     # mnoe prefix when using custom devise controllers
-    def authenticate_user!
+    def authenticate_user!(_favourite=nil, opts={})
       redirect_to(new_user_session_path) unless current_user
       true
     end
-    
+
     # Redirect a signed in user to the confirmation
     # lounge if unconfirmed
     def redirect_to_lounge_if_unconfirmed
@@ -21,17 +21,17 @@ module MnoEnterprise
       end
       return true
     end
-    
+
     # Redirect to signup page if user not authenticated
     def authenticate_user_or_signup!
       unless current_user
         redirect_to new_user_registration_path
         false
       end
-    
+
       true
     end
-    
+
     def notice_hash(notice)
       return {} unless notice
       # TODO: refactor

data/app/models/mno_enterprise/app.rb

@@ -31,8 +31,17 @@ module MnoEnterprise
     scope :cloud, -> { where(stack: 'cloud') }
 
     attributes :id, :uid, :nid, :name, :description, :tiny_description, :created_at, :updated_at, :logo, :website, :slug,
-    :categories, :key_benefits, :key_features, :testimonials, :worldwide_usage, :tiny_description,
-    :popup_description, :stack, :terms_url, :pictures, :tags, :api_key, :metadata_url, :metadata, :details, :rank
+               :categories, :key_benefits, :key_features, :testimonials, :worldwide_usage, :tiny_description,
+               :popup_description, :stack, :terms_url, :pictures, :tags, :api_key, :metadata_url, :metadata, :details, :rank,
+               :multi_instantiable, :subcategories, :reviews, :average_rating, :running_instances_count
+
+
+    #================================
+    # Associations
+    #================================
+    has_many :reviews,   class_name: 'AppReview'
+    has_many :feedbacks, class_name: 'AppFeedback'
+    has_many :questions, class_name: 'AppQuestion'
 
     # Return the list of available categories
     def self.categories(list = nil)
@@ -55,7 +64,7 @@ module MnoEnterprise
     end
 
     # Methods for appinfo flags
-    %w(coming_soon single_billing).each do |method|
+    %w(coming_soon single_billing add_on).each do |method|
       define_method "#{method}?" do
         appinfo.presence && appinfo[method]
       end

data/app/models/mno_enterprise/app_answer.rb

@@ -0,0 +1,13 @@
+module MnoEnterprise
+  # List All Answers
+  # MnoEnterprise::AppAnswer.all
+  # Create an AppAnswer
+  # MnoEnterprise::AppAnswer.create(description: "This is my answer", organization_id: 3, user_id: 9, app_id: 43, question_id: 1)
+
+  # An AppAnswer belong to an AppQuestion
+  class AppAnswer < AppReview
+    attributes :question_id
+
+    belongs_to :question, class_name: 'AppQuestion', foreign_key: :question_id
+  end
+end

data/app/models/mno_enterprise/app_comment.rb

@@ -0,0 +1,10 @@
+module MnoEnterprise
+
+  # Create an AppComment
+  # MnoEnterprise::AppComment.create(description: "description", organization_id: 3, user_id: 9, app_id: 43, feedback_id: 1)
+  class AppComment < AppReview
+    attributes :feeback_id
+
+    belongs_to :feedback, class_name: 'AppFeedback', foreign_key: :feedback_id
+  end
+end

data/app/models/mno_enterprise/app_feedback.rb

@@ -0,0 +1,7 @@
+module MnoEnterprise
+  # Create an AppFeedback
+  # MnoEnterprise::AppFeedback.create(description: "description", organization_id: 3, user_id: 9, app_id: 43, rating: 5)
+  class AppFeedback < AppReview
+    belongs_to :app
+  end
+end

data/app/models/mno_enterprise/app_question.rb

@@ -0,0 +1,9 @@
+module MnoEnterprise
+  # Create an AppQuestion
+  # MnoEnterprise::AppQuestion.create(description: "This is my question", organization_id: 3, user_id: 9, app_id: 43)
+  class AppQuestion < AppReview
+    belongs_to :app
+
+    scope :search, ->(search) { where("description.like" => "%#{search}%") }
+  end
+end

data/app/models/mno_enterprise/app_review.rb

@@ -0,0 +1,7 @@
+module MnoEnterprise
+  class AppReview < BaseResource
+    attributes :id, :rating, :description, :created_at, :updated_at, :app_id, :user_id, :organization_id, :status, :parent_id, :type, :edited, :edited_by_name, :edited_by_admin_role, :edited_by_id
+
+    scope :approved, -> { where(status: 'approved') }
+  end
+end

data/app/models/mno_enterprise/base_resource.rb

@@ -49,6 +49,11 @@ module MnoEnterprise
         self.where(hash).limit(1).first
       end
 
+      # ActiveRecord Compatibility for Her
+      def exists?(hash)
+        find_by(hash).present?
+      end
+
       # ActiveRecord Compatibility for Her
       # Returns the class descending directly from MnoEnterprise::BaseResource, or
       # an abstract class, if any, in the inheritance hierarchy.
@@ -146,7 +151,7 @@ module MnoEnterprise
         raise_record_invalid if self.errors.any?
         ret
       else
-        false
+        raise_record_invalid
       end
     end
 

data/app/models/mno_enterprise/identity.rb

@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Endpoint: /v1/identities
+#
+#  id         :integer         not null, primary key
+#  user_id    :integer
+#  provider   :string(255)
+#  uid        :string(255)
+#  created_at :datetime        not null
+#  updated_at :datetime        not null
+#
+
+module MnoEnterprise
+  class Identity < BaseResource
+
+    attributes :id, :user_id, :provider, :uid, :created_at, :updated_at
+
+    belongs_to :user, class_name: 'MnoEnterprise::User'
+
+    def self.find_for_oauth(auth)
+      where(uid: auth.uid, provider: auth.provider).first_or_create
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module MnoEnterprise
+  class Impac::Alert < BaseResource
+
+    attributes :title, :webhook, :service, :settings, :sent
+
+    belongs_to :kpi, class_name: 'MnoEnterprise::Impac::Kpi', foreign_key: 'impac_kpi_id'
+    has_many :recipients, class_name: 'MnoEnterprise::User'
+
+  end
+end

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

@@ -1,10 +1,10 @@
 module MnoEnterprise
   class Impac::Dashboard < BaseResource
 
-    attributes :name, :widgets_order, :organization_ids, :widgets_templates, :currency
+    attributes :full_name, :widgets_order, :settings, :organization_ids, :widgets_templates, :currency
 
-    has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget', dependent: :destroy
-    has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi', dependent: :destroy
+    has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget'
+    has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi'
     belongs_to :owner, polymorphic: true
 
     #============================================
@@ -18,13 +18,12 @@ module MnoEnterprise
 
     # Return all the organizations linked to this dashboard and to which
     # the user has access
-    def organizations
-      MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
-    end
-
-    def sorted_widgets
-      order = self.widgets_order.map(&:to_i) | self.widgets.map{|w| w.id }
-      order.map { |id| self.widgets.to_a.find{ |w| w.id == id} }.compact
+    def organizations(org_list = nil)
+      if org_list
+        org_list.to_a.select { |e| self.organization_ids.include?(e.uid) }
+      else
+        MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
+      end
     end
 
     # Filter widgets list based on config
@@ -39,7 +38,7 @@ module MnoEnterprise
     end
 
     def to_audit_event
-      name
+      {name: name}
     end
   end
 end

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

@@ -1,9 +1,11 @@
 module MnoEnterprise
   class Impac::Kpi < BaseResource
 
-    attributes :settings, :targets, :extra_params, :endpoint, :source, :element_watched
+    attributes :settings, :targets, :extra_params, :endpoint, :source, :element_watched, :extra_watchables
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
-    
+    belongs_to :widget, class_name: 'MnoEnterprise::Impac::Widget'
+    has_many :alerts, class_name: 'MnoEnterprise::Impac::Alert'
+
   end
 end

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

@@ -3,10 +3,13 @@ module MnoEnterprise
 
     attributes :name, :width, :widget_category, :settings
 
+    alias_attribute :endpoint, :widget_category
+
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
+    has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi'
 
     def to_audit_event
-      name
+      {name: name}
     end
 
   end

data/app/models/mno_enterprise/team.rb

@@ -13,38 +13,6 @@
 
 module MnoEnterprise
   class Team < BaseResource
-    
-    attributes :id, :name, :organization_id
-    
-    #=====================================
-    # Associations
-    #=====================================
-    belongs_to :organization, class_name: 'MnoEnterprise::Organization'
-    has_many :users, class_name: 'MnoEnterprise::User'
-    has_many :app_instances, class_name: 'MnoEnterprise::AppInstance'
-    
-    
-    # Add a user to the team
-    # TODO: specs
-    def add_user(user)
-      self.users.create(id: user.id)
-    end
-    
-    # Remove a user from the team
-    # TODO: specs
-    def remove_user(user)
-      self.users.destroy(id: user.id)
-    end
-    
-    # Set the app_instance permissions of this team
-    # Accept a collection of hashes or an array of ids
-    # TODO: specs
-    def set_access_to(collection_or_array)
-      # Empty arrays do not seem to be passed in the request. Force value in this case
-      list = collection_or_array.empty? ? [""] : collection_or_array
-      self.put(data: { set_access_to: list })
-      self.reload
-      self
-    end
+    include MnoEnterprise::Concerns::Models::Team
   end
 end

data/app/models/mno_enterprise/user.rb

@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Endpoint: 
+# Endpoint:
 #   - /v1/users
 #   - /v1/organizations/:organization_id/users
 #
@@ -27,31 +27,36 @@
 #  created_at                     :datetime        not null
 #  updated_at                     :datetime        not null
 #  name                           :string(255)
-#  surname                        :string(255)            
-#  company                        :string(255)   
+#  surname                        :string(255)
+#  company                        :string(255)
 #  phone                          :string(255)
 #  phone_country_code             :string(255)
 #  geo_country_code               :string(255)
 #  geo_state_code                 :string(255)
-#  geo_city                       :string(255)  
-#  website                        :string(255)  
+#  geo_city                       :string(255)
+#  website                        :string(255)
+#  api_key                        :string(255)
+#  api_secret                     :string(255)
 #
 
 module MnoEnterprise
   class User < BaseResource
+    include MnoEnterprise::Concerns::Models::IntercomUser if MnoEnterprise.intercom_enabled?
     extend Devise::Models
-    
+
     # Note: password and encrypted_password are write-only attributes and are never returned by
     # the remote API. If you are looking for a session token, use authenticatable_salt
-    attributes :uid, :email, :password, :current_password, :password_confirmation, :authenticatable_salt, :encrypted_password, :reset_password_token, :reset_password_sent_at, 
-      :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, 
-      :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
-    
+    attributes :uid, :email, :password, :current_password, :password_confirmation, :authenticatable_salt, :encrypted_password, :reset_password_token, :reset_password_sent_at,
+      :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip,
+      :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
+
     define_model_callbacks :validation #required by Devise
     devise :remote_authenticatable, :registerable, :recoverable, :rememberable,
-      :trackable, :validatable, :lockable, :confirmable, :timeoutable, :password_expirable
+      :trackable, :validatable, :lockable, :confirmable, :timeoutable, :password_expirable,
+      :omniauthable, omniauth_providers: Devise.omniauth_providers
 
     #================================
     # Validation
@@ -67,9 +72,12 @@ module MnoEnterprise
     has_many :organizations, class_name: 'MnoEnterprise::Organization'
     has_many :org_invites, class_name: 'MnoEnterprise::OrgInvite'
     has_one :deletion_request, class_name: 'MnoEnterprise::DeletionRequest'
-    has_many :dashboards, class_name: 'MnoEnterprise::Impac::Dashboard'
     has_many :teams, class_name: 'MnoEnterprise::Team'
 
+    # Impac
+    has_many :dashboards, class_name: 'MnoEnterprise::Impac::Dashboard'
+    has_many :alerts, class_name: 'MnoEnterprise::Impac::Alert'
+
     #================================
     # Callbacks
     #================================
@@ -82,25 +90,26 @@ module MnoEnterprise
     # Return nil in case of failure
     def self.authenticate(auth_hash)
       u = self.post("user_sessions", auth_hash)
-      
+
       if u && u.id
         u.clear_attribute_changes!
         return u
       end
-      
+
       nil
     end
-    
+
+
     #================================
     # Devise Confirmation
     # TODO: should go in a module
     #================================
-    
-    
+
+
     # Override Devise to allow confirmation via original token
     # Less secure but useful if user has been created by Maestrano Enterprise
     # (happens when an orga_invite is sent to a new user)
-    #  
+    #
     # Find a user by its confirmation token and try to confirm it.
     # If no user is found, returns a new user with an error.
     # If the user is already confirmed, create an error for the user
@@ -110,23 +119,23 @@ module MnoEnterprise
       confirmable.perform_confirmation(confirmation_token)
       confirmable
     end
-    
+
     # Find a user using a confirmation token
     def self.find_for_confirmation(confirmation_token)
       original_token     = confirmation_token
       confirmation_token = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
-      
+
       confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
       confirmable = find_or_initialize_with_error_by(:confirmation_token, original_token) if confirmable.errors.any?
       confirmable
     end
-    
+
     # Confirm the user and store confirmation_token
     def perform_confirmation(confirmation_token)
       self.confirm if self.persisted?
       self.confirmation_token = confirmation_token
     end
-    
+
     # It may happen that that the errors attribute become nil, which breaks the controller logic (rails responder)
     # This getter ensures that 'errors' is always initialized
     def errors
@@ -158,19 +167,28 @@ module MnoEnterprise
     def failed_attempts
       read_attribute(:failed_attempts) || 0
     end
-    
+
     # Override Devise default method
     def authenticatable_salt
       read_attribute(:authenticatable_salt)
     end
-    
+
     # Return the role of this user for the provided
     # organization
     def role(organization = nil)
       # Return cached version if available
       return self.read_attribute(:role) if !organization
-      
-      org = self.organizations.to_a.find { |o| o.id.to_s == organization.id.to_s }
+
+      # Find in arrays if organizations have been fetched
+      # already. Perform remote query otherwise
+      org = begin
+        if self.organizations.loaded?
+          self.organizations.to_a.find { |e| e.id == organization.id }
+        else
+          self.organizations.where(id: organization.id).first
+        end
+      end
+
       org ? org.role : nil
     end
 
@@ -182,6 +200,69 @@ module MnoEnterprise
     def refresh_user_cache
       self.reload
       Rails.cache.write(['user', self.to_key], self)
+    # singleton can't be dumped / undefined method `marshal_dump' for nil
+    rescue TypeError, NoMethodError
+      expire_user_cache
+    end
+
+    # Used by omniauth providers to find or create users
+    # on maestrano
+    # See Auth::OmniauthCallbacksController
+    def self.find_for_oauth(auth, opts = {}, signed_in_resource = nil)
+      # Get the identity and user if they exist
+      identity = Identity.find_for_oauth(auth)
+
+      # If a signed_in_resource is provided it always overrides the existing user
+      # to prevent the identity being locked with accidentally created accounts.
+      # Note that this may leave zombie accounts (with no associated identity) which
+      # can be cleaned up at a later date.
+      user = signed_in_resource ? signed_in_resource : identity.user
+
+      # Create the user if needed
+      if user.blank? # WTF is wrong with user.nil?
+        # Get the existing user by email.
+        email = auth.info.email
+        user = self.where(email: email).first if email
+
+        # Create the user if it's a new registration
+        if user.nil?
+          user = create_from_omniauth(auth, opts.except(:authorized_link_to_email))
+        elsif auth.provider == 'intuit'
+          unless opts[:authorized_link_to_email] == user.email
+            # Intuit email is NOT a confirmed email. Therefore we need to ask the user to
+            # login the old fashion to make sure it is the right user!
+            fail(SecurityError, 'reconfirm credentials')
+          end
+        end
+      end
+
+      # Associate the identity with the user if needed
+      if identity.user != user
+        identity.user_id = user.id
+        identity.save!
+      end
+      user
+    end
+
+    # Create a new user from omniauth hash
+    def self.create_from_omniauth(auth, opts = {})
+      user = User.new(
+        name: auth.info.first_name.presence || auth.info.email[/(\S*)@/, 1],
+        surname: auth.info.last_name.presence || '',
+        email: auth.info.email,
+        password: Devise.friendly_token[0, 20],
+        avatar_url: auth.info.image.presence
+      )
+
+      # opts hash is expected to contain additional attributes
+      # to set on the model
+      user.assign_attributes(opts)
+
+      # Skip email confirmation if not from Intuit (Intuit email is NOT a confirmed email)
+      user.skip_confirmation! unless auth.provider == 'intuit'
+      user.save!
+
+      user
     end
   end
 end

data/app/views/system_notifications/email-change.html.erb

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+  <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+</head>
+<body>
+<p class="header">
+  <%= image_tag('mno_enterprise/main-logo.png') %>
+</p>
+
+<p>Hi <%= @info[:first_name] %></p>
+
+<p>We received a request to change your email address in the platform to <%= @info[:unconfirmed_email] %>.</p>
+
+<p>If you did not request an email change, contact us.</p>
+
+<p>
+  Regards,<br/>
+  The Marketplace team
+</p>
+
+<p class="footer">
+  <%= @info[:company] %>
+</p>
+</body>
+</html>

data/app/views/system_notifications/email-change.text.erb

@@ -0,0 +1,10 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+
+We received a request to change your email address in the platform to <%= @info[:unconfirmed_email] %>.
+
+If you did not request an email change, contact us.
+
+
+Regards,
+The Marketplace team

data/app/views/system_notifications/password-change.html.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+  <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+</head>
+<body>
+<p class="header">
+  <%= image_tag('mno_enterprise/main-logo.png') %>
+</p>
+
+<p>Hi <%= @info[:first_name] %></p>
+
+<p>We're contacting you to notify you that your password has been changed.</p>
+
+<p>
+  Regards,<br/>
+  The Marketplace team
+</p>
+
+<p class="footer">
+  <%= @info[:company] %>
+</p>
+</body>
+</html>

data/app/views/system_notifications/password-change.text.erb

@@ -0,0 +1,7 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+
+We're contacting you to notify you that your password has been changed.
+
+Regards,
+The Marketplace team