RubyGems - mno-enterprise-core - Versions diffs - 3.0.7 → 3.1.0 - Mend

mno-enterprise-core 3.0.7 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

data/app/views/system_notifications/organization-invite-new-user.text.erb ADDED Viewed

@@ -0,0 +1,14 @@
+Hi there
+=================================================================
+You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!. You can automatically create your account on our platform and join <%= @info[:organization] %> by clicking on the link below:
+<%= @info[:confirmation_link] %>
+<% if @info[:team]? %>
+By accepting this invite you will automatically join the <%= @info[:team] %> team.
+<% end %>
+Regards,
+The Marketplace team

data/app/views/system_notifications/reconfirmation-instructions.html.erb ADDED Viewed

@@ -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>You have asked to change your email address in the platform. Please confirm this new email address by clicking on the following link</p>
+    <a href="<%= @info[:confirmation_link] %>">Confirm my new email address</a>
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

data/app/views/system_notifications/reconfirmation-instructions.text.erb ADDED Viewed

@@ -0,0 +1,10 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+You have asked to change your email address in the platform. Please confirm this new email address by clicking on the following link
+<%= @info[:confirmation_link] %>
+Regards,
+The Marketplace team

data/app/views/system_notifications/registration-instructions.html.erb ADDED Viewed

@@ -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 there,</p>
+    <p>You have been invited to create an account on our platform! You can do so by clicking on the link below:</p>
+    <a href="<%= @info[:registration_link] %>">Create my account</a>
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

data/app/views/system_notifications/registration-instructions.text.erb ADDED Viewed

@@ -0,0 +1,9 @@
+Hi there,
+=================================================================
+You have been invited to create an account on our platform! You can do so by clicking on the link below:
+<%= @info[:registration_link] %>
+Regards,
+The Marketplace team

data/app/views/system_notifications/reset-password-instructions.html.erb ADDED Viewed

@@ -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>You can reset your password by clicking on the following link</p>
+    <a href="<%= @info[:reset_password_link] %>">Reset my password</a>
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

data/app/views/system_notifications/reset-password-instructions.text.erb ADDED Viewed

@@ -0,0 +1,11 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+You can reset your password by clicking on the following link
+To reset password, please follow this link : <%= @info[:reset_password_link] %>
+Regards,
+The Marketplace team

data/app/views/system_notifications/unlock-instructions.html.erb ADDED Viewed

@@ -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>You can unlock your account by clicking on the following link</p>
+    <a href="<%= @info[:unlock_link] %>">Unlock my account</a>
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

data/app/views/system_notifications/unlock-instructions.text.erb ADDED Viewed

@@ -0,0 +1,10 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+You can unlock your account by clicking on the following link
+<%= @info[:unlock_link] %>
+Regards,
+The Marketplace team

data/config/initializers/audit_log.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Somehow the whole config/ folder is loaded twice
+# To investigate
 unless defined? AUDIT_LOG_CONFIG
   AUDIT_LOG_CONFIG = Rails.application.config_for('audit_log') rescue {}
 end

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

@@ -77,6 +77,8 @@ en:
             edit: Edit
             remove: Remove
             invite_modal:
+              title_name: "Edit Member: {{name}} {{surname}}"
+              title_email: "Edit Member: {{email}}"
               description: Enter the email addresses of the people you want to invite in your company
               example: "One address per line, e.g.:"
               disclaimer: Please note that for security reasons unaccepted invites will automatically expire after 3 days.

data/config/locales/views/auth/registrations/en.yml CHANGED Viewed

@@ -6,4 +6,4 @@ en:
           title: Sign Up
           create: Create my account!
           user_accept: I accept
-          tos: the Terms of Use
+          tos: the Terms of Use

data/lib/devise/hooks/impersonatable.rb ADDED Viewed

@@ -0,0 +1,14 @@
+# Allow unconfirmed user to be impersonated
+# We override User#confirmation_required? when impersonating
+Warden::Manager.prepend_after_set_user do |record, warden, options|
+  impersonator_id =  warden.env['rack.session'][:impersonator_user_id]
+  if impersonator_id
+    class <<record
+      # Callback to overwrite if confirmation is required or not.
+      def confirmation_required?
+        false
+      end
+    end
+  end
+end

data/lib/devise_extension.rb CHANGED Viewed

@@ -2,6 +2,9 @@ require 'devise'
 require 'devise/models/password_expirable'
 require 'devise/extension_routes'
+# Hook for impersonation
+require 'devise/hooks/impersonatable'
 module Devise
   # Should the password expire (e.g 3.months)
   mattr_accessor :expire_password_after
@@ -27,6 +30,10 @@ end
 # modules
 Devise.add_module :password_expirable, controller: :password_expirable, model: 'devise/models/password_expirable', route: :password_expired
-ActiveSupport.on_load(:action_controller) do
-  include DeviseExtension::Controllers::Helpers
+module DeviseExtension
+  class Engine < ::Rails::Engine
+    ActiveSupport.on_load(:action_controller) do
+      include DeviseExtension::Controllers::Helpers
+    end
+  end
 end

data/lib/generators/mno_enterprise/install/templates/config/application.yml CHANGED Viewed

@@ -4,8 +4,12 @@
 tenant_id: my_tenant_id
 tenant_key: my_tenant_access_key
-# Emailing platform - Mandrill (default mandrill)
-# mandrill_key: changeme
+# Emailing platform
+# MANDRILL_API_KEY: changeme
+# SPARKPOST_API_KEY: changeme
 # Rails secret key
 SECRET_KEY_BASE: <%= SecureRandom.hex(64) %>
+# Google Tag Manager
+google_tag_container: GTM-TH3MLB

data/lib/generators/mno_enterprise/install/templates/config/initializers/mno_enterprise.rb CHANGED Viewed

@@ -28,6 +28,11 @@ MnoEnterprise.configure do |config|
   # Defaulted to Maestrano Enterprise demo account
   # config.mandrill_key = 'some-mandrill-api-key'
+  # Adapter used to send emails
+  # Default to :mandrill
+  # config.mail_adapter = :mandrill
+  # config.mail_adapter = :sparkpost
   # Support email address
   config.support_email = 'support@example.com'
@@ -64,7 +69,7 @@ MnoEnterprise.configure do |config|
   # Third Party Plugins
   #===============================================
   # Google Tag Manager
-  # config.google_tag_container = nil
+  config.google_tag_container = ENV['google_tag_container']
   #===============================================
   # API Configuration

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

@@ -5,3 +5,5 @@ mno:
   paths:
     root: /api/mnoe/v1
 frontend_host:
+pricing:
+  enabled: false

data/lib/generators/mno_enterprise/install/templates/config/settings/uat.yml CHANGED Viewed

@@ -1,6 +1,6 @@
 impac:
   protocol: https
-  host: api-impac-uat.maestrano.io
+  host: api-impac.maestrano.com
 mno:
   protocol: https
-  host: uat.maestrano.io
+  host: maestrano.com

data/lib/generators/mno_enterprise/install/templates/stylesheets/main.less CHANGED Viewed

@@ -19,6 +19,10 @@
 //--------------------------------------------
 @import "../../../frontend/src/app/stylesheets/variables";
+// Import custom fonts
+//--------------------------------------------
+@import "../../../frontend/src/fonts/font-faces";
 // Import published theme previewer style
 //--------------------------------------------
 // Comment this line if you do not plan to use

data/lib/her_extension/model/relation.rb CHANGED Viewed

@@ -26,25 +26,12 @@ module Her
       # Use filter instead of raw parameters
       def where(params = {})
         return self if !params || params.empty?
-        # If a value is an empty array, it'll be excluded when calling params.to_query, so convert it to nil instead
-        params.each { |k, v| params[k] = v.presence if v.is_a?(Array) }
         self.params[:filter] ||= {}
         self.params[:filter].merge!(params)
         self
       end
       alias all where
-      # Patch to unwrap filter when creating
-      def first_or_create(attributes = {})
-        fetch.first || create((@params.delete(:filter) || {}).merge(attributes))
-      end
-      # Patch to unwrap filter when creating
-      def first_or_initialize(attributes = {})
-        fetch.first || build((@params.delete(:filter) || {}).merge(attributes))
-      end
       # E.g:
       # Product.order_by('created_at.desc','name.asc')
       def order_by(*args)

data/lib/mandrill_client.rb CHANGED Viewed

@@ -1,58 +1,30 @@
 # An interface to the Mandrill API
-# Example usage:
-# MandrillClient.send_template(template_name(string), template_content(array), message(hash))
+# @example
+#   MandrillClient.send_template(template_name(string), template_content(array), message(hash))
+# @deprecated Please use {MnoEnterprise::MailClient}
 module MandrillClient
   class << self
-    # Store the list of mandrill emails that are pending
-    # to be sent
-    # Only used for testing
-    # E.g: expect { some_action }.to change(MandrillClient.base_deliveries,:count).by(1)
-    def base_deliveries
-      @base_deliveries ||= []
-    end
-    # Check whether mailers are in test mode or not
-    # Emails should not be sent in test mode
-    def test?
-      (Rails.configuration.action_mailer.delivery_method || '').to_sym == :test
-    end
     # Return a mandrill client configured with the right API key
+    # @deprecated Use MnoEnterprise::MailClient
     def client
       @client ||= Mandrill::API.new(MnoEnterprise.mandrill_key)
     end
     # Send the provided template with options
-    # MandrillClient.send_template(template_name(string), template_content(array), message(hash))
+    #
+    # @example MandrillClient.send_template(template_name(string), template_content(array), message(hash))
+    # @deprecated Use MnoEnterprise::MailClient
     def send_template(*args)
-      if self.test?
-        self.base_deliveries.push(args)
-      else
-        self.client.messages.send_template(*args)
-      end
+      warn '[DEPRECATION] `MandrillClient` is deprecated. Please use `MnoEnterprise::MailClient` instead.'
+      MnoEnterprise::MailClient.adapter.send_template(*args)
     end
     # A simpler version of send_template
     #
-    # Take in argument:
-    #   template: name of a mandrill template
-    #   from: hash describing the sender. E.g.: { name: "John", email: "john.doe@maestrano.com" }
-    #   to: Array or hash describing the recipient. E.g.: { name: "Jack", email: "jack.doe@maestrano.com" }
-    #   vars: Mandrill email variables. E.g.: { link: "https://mywebsite.com/confirm_account" }
-    #   opts: additional parameters to pass to mandrill. See: https://mandrillapp.com/api/docs/messages.ruby.html
-    #
+    # @deprecated Use MnoEnterprise::MailClient
     def deliver(template,from,to,vars = {},opts = {})
-      # Prepare message from args
-      message = { from_name: from[:name], from_email: from[:email]}
-      message[:to] = [to].flatten.map { |t| {name: t[:name], email: t[:email], type: (t[:type] || :to) } }
-      message[:global_merge_vars] = vars.map { |k,v| {name: k.to_s, content: v} }
-      # Merge additional mandrill options
-      message.merge!(opts)
-      self.send_template(template,[],message)
+      warn '[DEPRECATION] `MandrillClient` is deprecated. Please use `MnoEnterprise::MailClient` instead.'
+      MnoEnterprise::MailClient.deliver(template,from,to,vars,opts)
     end
   end
-end
+end

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

@@ -70,6 +70,11 @@ module MnoEnterprise::Concerns::Models::Ability
     #===================================================
     impac_abilities(user)
+    #===================================================
+    # Admin abilities
+    #===================================================
+    admin_abilities(user)
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)
@@ -105,4 +110,11 @@ module MnoEnterprise::Concerns::Models::Ability
       end
     end
   end
+  # Abilities for admin user
+  def admin_abilities(user)
+    if user.admin_role == 'admin'
+      can :manage_app_instances, MnoEnterprise::Organization
+    end
+  end
 end

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

@@ -69,8 +69,11 @@ module MnoEnterprise::Concerns::Models::Organization
   #==================================================================
   # Return the list of users + active invites
   # TODO: specs
-  def members
-    [self.users,self.org_invites.active].flatten
+  #
+  # @params [Boolean] show_staged Also displayed staged invites (ie: not sent)
+  def members(show_staged=false)
+    invites = show_staged ? self.org_invites.active_or_staged : self.org_invites.active
+    [self.users, invites].flatten
   end
   # Add a user to the organization with the provided role