mno-enterprise-core 3.1.4 → 3.2.0

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

@@ -10,16 +10,18 @@
     </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>    
-     
+
+    <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>If you did not ask for a modification just ignore this email.</p>
+
     <p>
       Regards,<br/>
       The Marketplace team
     </p>
-    
+
     <p class="footer">
       <%= @info[:company] %>
     </p>

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

@@ -2,9 +2,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] %>
- 
+
+If you did not ask for a modification just ignore this email.
 
 Regards,
 The Marketplace team

data/config/initializers/config.rb

@@ -1,3 +1,8 @@
 Config.setup do |config|
   config.const_name = "Settings"
 end
+
+# Use the template as default settings
+default = File.expand_path("../../../lib/generators/mno_enterprise/install/templates/config/settings.yml", __FILE__)
+Settings.prepend_source!(default)
+Settings.reload!

data/config/locales/models/user/en.yml

@@ -41,5 +41,10 @@ en:
         updated_at: Updated at
         website: Website
     errors:
+      models:
+        mno_enterprise/user:
+          attributes:
+            email:
+              taken: "has already been taken"
       mno_enterprise/user:
         password_weak: "Password is not strong enough. Try mixing letters, numbers and cases"

data/config/locales/templates/components/en.yml

@@ -19,3 +19,12 @@ en:
           app_not_found: Application not found
           app_not_managed_by_us: The app you requested does not seem to be managed by us.
           did_you_type_the_right_url: Are you sure you typed the right url?
+
+        app_install_btn:
+          conflicting_app: "You cannot install this App as it is incompatible with:"
+          start_app: "Start Now!"
+          launch_app: "Launch App"
+          connect_app: "Connect App"
+          success_notification_title: "{{name}} has been added to your account"
+          success_launch_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Launch\"."
+          success_connect_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Connect\"."

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

@@ -19,6 +19,20 @@ en:
           passwd_form_cancel: Cancel
           settings: Settings
 
+          developer: Developer
+          are_you_developer: Are you a Developer looking to contribute to the Maestrano platform?
+          register: Register!
+          api_key: API Key
+          secret_key: Secret Key
+          show: Show
+          hide: Hide
+          name: Name
+          uid: UID
+          view_developer_docs: View our developer documentation
+          here: here
+          conceal: Conceal
+          organizations: Organizations
+
         app_deletion:
           title: Confirm app deletion
           instructions: In order to delete your app, please enter the following statement in the box below.

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

@@ -4,13 +4,116 @@ en:
       dashboard:
         marketplace:
           index:
-            title: Marketplace
-            select_all: All
-            search: Search
+            title: "Marketplace"
+            select_all: "All"
+            search: "Search"
+            compare: "Compare application"
+            select_apps: "Compare up to 4 applications"
+            toastr:
+              error: "You can only compare up to 4 applications."
+            cancel: "Cancel"
+            compare_apps: "Compare"
 
           show:
-            back: Back
-            start_app: Start Now!
-            tag_responsive: Responsive
-            tag_star: Star!™ Tutorials
-            tag_connec: Connec!™ Ready
+            back: "Back"
+            start_app: "Start Now!"
+            launch_app: "Launch app"
+            connect_app: "Connect App"
+            tag_responsive: "Responsive"
+            tag_star: "Star!™ Tutorials"
+            tag_connec: "Connec!™ Ready"
+            conflicting_app: "You cannot install this app as it is incompatible with:"
+            success_notification_title: "{{name}} has been added to your account"
+            success_launch_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Launch\"."
+            success_connect_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Connect\"."
+            no_reviews: "No reviews on"
+            write_review: "Write a review"
+            number_of_reviews: "Reviews per page:"
+            success_toastr: "Your review has been taken into account!"
+            error_toastr: "An error occurred while saving your review."
+            from: "from"
+            "on": "on"
+            platform_admin: "Platform moderator"
+            edited_by_user: "Edited by User"
+            edited_by_user_tooltip: "Show edit history"
+            edited_by_admin: "Edited by Admin"
+            just_now: "Just Now"
+            company_feedback: "Company feedback"
+            review_title: "Review"
+            no_app_no_review: "You need to have the app running in order to give your feedback."
+            tell_others: "Tell others what you think about this application (optional)"
+            cancel: "Cancel"
+            submit: "Submit"
+            comment_title: "Comment this feedback:"
+            comment_placeholder: "Enter your comment here..."
+            question_title: "Question"
+            question_search: "Search..."
+            question_ask: "Ask a question"
+            question_ask_placeholder: "Enter your question here..."
+            no_review: "There are no reviews of {{name}}."
+            answers: "Answers"
+            answer_q: "Answer this Question"
+            answer_placeholder: "Enter your answer to this question here..."
+            delete: "Delete"
+            delete_q: "Delete this Question"
+            edit: "Edit"
+            edit_review: "Edit your review"
+            edit_answer: "Edit your answer"
+            edit_question: "Edit your question"
+            edit_comment: "Edit your comment"
+            edit_q: "Edit this Question"
+            filter: "Filter by:"
+            filter_rating_desc: "rating high to low"
+            filter_rating_ask: "rating low to high"
+            filter_date_desc: "date high to low"
+            filter_date_ask: "date low to high"
+            success_toastr_2: "Success."
+            success_toastr_answer: "Thank you for answering this question!"
+            success_toastr_question: "Your question has been successfully posted!"
+            error_toastr_answer: "An error occurred while saving your answer"
+            error_toastr_question: "An error occurred while saving your question"
+            review:
+              delete_modal_header: "Delete a review"
+              delete_modal_body: "Do you really want to delete your review?"
+              delete_modal_cancel: "Cancel"
+              delete_modal_delete: "Delete"
+            question:
+              delete_modal_header: "Delete a question"
+              delete_modal_body: "Do you really want to delete your question?"
+              delete_modal_cancel: "Cancel"
+              delete_modal_delete: "Delete"
+              no_question: "There are no questions on {{name}}."
+            comment:
+              delete_modal_header: "Delete a comment"
+              delete_modal_body: "Do you really want to delete your comment?"
+              delete_modal_cancel: "Cancel"
+              delete_modal_delete: "Delete"
+            answer:
+              delete_modal_header: "Delete an answer"
+              delete_modal_body: "Do you really want to delete your answer?"
+              delete_modal_cancel: "Cancel"
+              delete_modal_delete: "Delete"
+            edited: "Edited"
+            edited_tooltip: "Show edit history"
+            modals:
+              history:
+                title: "Edit History"
+                close: "Close"
+
+          app_selection:
+            next: "Next"
+            cancel: "Cancel"
+            select_orga: "Select an organization"
+            no_orga_authorized: "Invalid purchase"
+            unauthorized_to_add_app: "Unfortunately you do not have permission to purchase products for this organization. Please select another organization:"
+
+          compare:
+            title: "Comparison"
+            application_provider: "Application Provider"
+            category: "Category"
+            key_benefits: "Key benefits"
+            short_description: "Short description"
+            rating: "Rating"
+            companies_number: "Number of companies using the application"
+            pricing: "Pricing"
+            pricing_not_available: "pricing information not available"

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

@@ -29,6 +29,7 @@ en:
               placeholder_name: Name
               placeholder_surname: Surname
               number: Card Number
+              unaccepted_type: This card type is not accepted
               cvv: CVV
               country: Country
               country_select: "-- SELECT --"

data/config/locales/templates/impac/dock/en.yml

@@ -0,0 +1,28 @@
+en:
+  mno_enterprise:
+    templates:
+      impac:
+        dock:
+          launch: Launch
+          connect: Connect
+          settings: Settings
+          add_more_apps: Add more apps
+          cancel: Cancel
+          settings:
+            settings: Settings
+            status: Status
+            app_name: Name
+            access_add-on_settings: Access add-on Settings
+            manual_data_sharing: Data sharing
+            manual_data_sync: Manual Data Sync
+            disconnect_link: Disconnect Link
+            delete: Delete
+            confirm_app_deletion: Confirm app deletion
+            please_note_this_app: Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.
+            delete_instructions: In order to delete your app, please enter the following statement in the box below.
+            cancel: Cancel
+            developer_details: developer details
+            linked_to: Linked to
+            organization_id: Organization id
+            group_id: Group id (uid) 
+

data/config/locales/views/auth/shared/en.yml

@@ -8,5 +8,4 @@ en:
           recover_password: Forgot your password?
           resend_confirmation: Didn't receive confirmation instructions?
           unlock: Didn't receive unlock instructions?
-          omni_login: "Sign in with %{provider}"
-          
+          or_sign_in_using: Or sign in using

data/config/locales/views/webhook/o_auth/providers/en.yml

@@ -3,13 +3,18 @@ en:
     webhook:
       o_auth:
         providers:
+          cancel: "Cancel"
+
           myob:
-            which_version_used: Which version of MYOB do you use?
+            which_version_used: "Which version of MYOB do you use?"
             my_version_is: "My version of MYOB is:"
-            connect: Connect
+            connect: "Connect"
+            connect_to: "Connect to {{appname}}"
 
           xero:
-            how_do_you_want_to_connect: How do you want us to connect your Xero account?
-            which_extra_modules: Do you want to connect any of the following extra modules?
-            which_country_for_the_account: What is the country associated with your Xero account?
-            connect: Connect
+            how_do_you_want_to_connect: "How do you want us to connect your Xero account?"
+            which_extra_modules: "Do you want to connect any of the following extra modules?"
+            payroll: "Payroll"
+            which_country_for_the_account: "What is the country associated with your Xero account?"
+            connect: "Connect"
+            connect_to: "Connect to {{appname}}"

data/lib/devise/hooks/lockable.rb

@@ -0,0 +1,13 @@
+# using current version https://github.com/plataformatec/devise/blob/e841c4c5ef826b6838b269d259170bb4fbca82f1/lib/devise/hooks/lockable.rb
+# as 3-stable version https://github.com/plataformatec/devise/blob/3-stable/lib/devise/hooks/lockable.rb
+# is using update_attribute which is not supported by Her
+# After each sign in, if resource responds to failed_attempts, sets it to 0
+# This is only triggered when the user is explicitly set (with set_user)
+Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+  if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
+    unless record.failed_attempts.to_i.zero?
+      record.failed_attempts = 0
+      record.save(validate: false)
+    end
+  end
+end

data/lib/devise/models/remote_authenticatable.rb

@@ -2,7 +2,7 @@ module Devise
   module Models
     module RemoteAuthenticatable
       extend ActiveSupport::Concern
- 
+
       #
       # Here you do the request to the external webservice
       #
@@ -14,12 +14,23 @@ module Devise
       def remote_authentication(authentication_hash)
         self.class.authenticate(authentication_hash) # call MnoEnterprise::User.authenticate
       end
-      
+
+      included do
+        before_update :track_password_changed
+        after_update :send_password_change_notification, if: :send_password_change_notification?
+      end
+
+      def send_password_change_notification
+        send_devise_notification(:password_change)
+      end
+
       ####################################
       # Overriden methods from Devise::Models::Authenticatable
       ####################################
       module ClassMethods
-        
+        # Flag to enable password change notification
+        Devise::Models.config(self, :send_password_change_notification)
+
         # This method is called from:
         # Warden::SessionSerializer in devise
         #
@@ -33,7 +44,7 @@ module Devise
           end.tap {|r| r && r.clear_association_cache}
           record if record && record.authenticatable_salt == salt
         end
-        
+
         # Here you have to return and array with the data of your resource
         # that you want to serialize into the session
         #
@@ -41,8 +52,23 @@ module Devise
         def serialize_into_session(record)
           [record.to_key, record.authenticatable_salt]
         end
- 
+
       end
+
+      protected
+
+        # We want to send the notification once the password has changed but
+        # we won't have access to dirty attributes.
+        # Flag change before the model is saved.
+        # Do not send a notification at confirmation
+        def track_password_changed
+          @password_changed = password_changed? && confirmed_at_was.present?
+          true # before callback needs to return true to continue
+        end
+
+        def send_password_change_notification?
+          self.class.send_password_change_notification && @password_changed
+        end
     end
   end
 end

data/lib/generators/mno_enterprise/install/install_generator.rb

@@ -12,10 +12,15 @@ module MnoEnterprise
       class_option :skip_admin, type: :boolean, default: false, desc: 'Skip admin installation'
 
       def copy_initializer
+        # Foreman config
         template "Procfile"
         template "Procfile.dev"
+        template ".foreman"
+        template ".healthcheck"
+
         template "config/initializers/mno_enterprise.rb"
         template "config/mno_enterprise_styleguide.yml"
+        template "config/puma.rb", skip: true # Copied from Rails 5 - skip if already existing
 
         # Settings
         template "config/settings.yml", "config/settings.yml"
@@ -24,6 +29,8 @@ module MnoEnterprise
 
         template "config/application.yml", "config/application.yml"
         template "config/application.yml", "config/application.sample.yml"
+
+        template "config/newrelic.yml", "config/newrelic.yml"
       end
 
       def setup_assets

data/lib/generators/mno_enterprise/install/templates/Procfile

@@ -1 +1 @@
-web: bundle exec puma -p 7000
+web: bundle exec puma

data/lib/generators/mno_enterprise/install/templates/Procfile.dev

@@ -1,2 +1,2 @@
-web: bundle exec puma -p 7000
+web: bundle exec puma
 gulp: cd ./tmp/build/frontend && node_modules/.bin/gulp serve

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

@@ -13,3 +13,20 @@ SECRET_KEY_BASE: <%= SecureRandom.hex(64) %>
 
 # Google Tag Manager
 google_tag_container: GTM-TH3MLB
+
+# Intercom - uncomment and add a valid intercom_id to enable
+# INTERCOM_APP_ID: intercom_app_id
+# INTERCOM_API_SECRET: intercom_api_secret
+# INTERCOM_API_KEY: intercom_api_key
+
+# OmniAuth - uncomment and add a valid values to enable
+
+# OAUTH_LINKEDIN_KEY: changeme
+# OAUTH_LINKEDIN_SECRET: changeme
+
+# OAUTH_GOOGLE_KEY: changeme
+# OAUTH_GOOGLE_SECRET: changeme
+
+# OAUTH_FACEBOOK_KEY: changeme
+# OAUTH_FACEBOOK_SECRET: changeme
+

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

@@ -3,7 +3,7 @@ MnoEnterprise.configure do |config|
   # General Configuration
   #===============================================
   # Name of your company/application
-  config.app_name = "My Company"
+  config.app_name = 'My Company'
 
   # Fallback default country.
   # Used as default in geolocalised fields (e.g.: country, phone number)
@@ -63,7 +63,7 @@ MnoEnterprise.configure do |config|
   # I18n - Controls:
   #   - Routing in development
   #   - Filter and locale management in controllers
-  config.i18n_enabled = true
+  config.i18n_enabled = false
 
   #===============================================
   # Third Party Plugins
@@ -71,6 +71,12 @@ MnoEnterprise.configure do |config|
   # Google Tag Manager
   config.google_tag_container = ENV['google_tag_container']
 
+  # Intercom (both API Keys and Personal token are supported)
+  config.intercom_token = ENV['INTERCOM_TOKEN']
+  config.intercom_app_id = ENV['INTERCOM_APP_ID']
+  config.intercom_api_key = ENV['INTERCOM_API_KEY']
+  config.intercom_api_secret = ENV['INTERCOM_API_SECRET']
+
   #===============================================
   # API Configuration
   #===============================================
@@ -189,5 +195,4 @@ MnoEnterprise.configure do |config|
   #   'sales/forecast',
   #   'sales/performance'
   # ]
-
 end

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

@@ -0,0 +1,46 @@
+#
+# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+# .NET, PHP, Python and Node applications with deep visibility and low
+# overhead.  For more information, visit www.newrelic.com.
+#
+# For full documentation of agent configuration options, please refer to
+# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
+
+common: &default_settings
+  # Required license key associated with your New Relic account.
+  license_key: <%%= ENV['NEWRELIC_LICENSE_KEY'] %>
+
+  # Your application name. Renaming here affects where data displays in New
+  # Relic.  For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
+  app_name: <%= Rails.application.class.parent_name %>
+
+  # Logging level for log/newrelic_agent.log
+  log_level: info
+
+  # Ignore ping logging
+  rules:
+    ignore_url_regexes: ["^/mnoe/ping", "^/mnoe/health_check", "^/mnoe/version"]
+
+# Environment-specific settings are in this section.
+# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.
+# If your application has other named environments, configure them here.
+development:
+  <<: *default_settings
+  app_name: <%= Rails.application.class.parent_name %> (Development)
+
+  # NOTE: There is substantial overhead when running in developer mode.
+  # Do not use for production or load testing.
+  developer_mode: false
+  monitor_mode: false
+
+test:
+  <<: *default_settings
+  # It doesn't make sense to report to New Relic from automated test runs.
+  monitor_mode: false
+
+uat:
+  <<: *default_settings
+  app_name: <%= Rails.application.class.parent_name %> (UAT)
+
+production:
+  <<: *default_settings

data/lib/generators/mno_enterprise/install/templates/config/puma.rb

@@ -0,0 +1,56 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# If you are preloading your application and using Active Record, it's
+# recommended that you close any connections to the database before workers
+# are forked to prevent connection leakage.
+#
+# before_fork do
+#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
+# end
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end
+#
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart

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

@@ -3,4 +3,4 @@ impac:
   host: api-impac.maestrano.com
 mno:
   protocol: https
-  host: maestrano.com
+  host: api-hub.maestrano.com

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

@@ -3,4 +3,4 @@ impac:
   host: api-impac.maestrano.com
 mno:
   protocol: https
-  host: maestrano.com
+  host: api-hub.maestrano.com

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

@@ -1,9 +1,30 @@
 impac:
   paths:
     mnohub_api: /mnoe/jpi/v1
+  pusher:
+    key: <%= ENV['impac_pusher_key'] %>
 mno:
   paths:
     root: /api/mnoe/v1
 frontend_host:
+
+#===============================================
+# Feature Flags
+#===============================================
+
+# Display App Pricing on Marketplace
 pricing:
   enabled: false
+# Enable the App Dock
+dock:
+  enabled: true
+# Display the Developer section on "My Account"
+developer:
+  enabled: false
+# Enable Reviews in the marketplace
+reviews:
+  enabled: false
+
+marketplace:
+  comparison:
+    enabled: false

data/lib/generators/mno_enterprise/install/templates/stylesheets/variables.less

@@ -29,6 +29,7 @@
 /*                              Login Page                               */
 /*-----------------------------------------------------------------------*/
 @login-bg-color:                     @bg-main-color;
+@login-bg-img:                       "";
 @login-box-grid-position:            { margin-top: 80px; .make-sm-column(4); .make-sm-column-offset(4); };
 
 @login-box-title-color:               @decorator-main-color;
@@ -41,6 +42,8 @@
 @login-box-brand-logo:                { min-height: 61px; max-width: 160px; max-height: 130px; margin: 17px auto 5px auto; };
 @login-box-btn-login:                 { width: 100%; };
 
+@login-box-sso-intuit-logo:           "mno_enterprise/logo-intuit.png";
+
 /*-----------------------------------------------------------------------*/
 /*                           Dashboard Layout                            */
 /*-----------------------------------------------------------------------*/