mno-enterprise-api 2.0.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b437d8211aa0d9d834a0572578051d4e5a4802
-  data.tar.gz: 5274bdddb45bdf3c92af8dddb0a478994c7c54f0
+  metadata.gz: ce57f9284f88612e924df7c0cd054f49e73b3966
+  data.tar.gz: 4a017727ef7501242222557b3473ed132cc59a49
 SHA512:
-  metadata.gz: c36b8301e74ea46de788b31a61a3eae0f2b63db9ca76f5984b349d471ae3774694816c2789b884599c5358e2f05b5b9490b36b222f346d66c7ab14064de5d7ac
-  data.tar.gz: fb3a46bfa3ee299b2f33b5827f145d90c59dd852a84fce05559dfd989622a2b145fdda15905c2539169c2fc6753fe80c0764cfc4461b5594875bcf04798eb92e
+  metadata.gz: 79e4618c0754140515cf6146337607ef38be216a379e27235741c6553d7f1ef1dd6ee2659ed107c1e1e4b40859d0b5f8eb8ebf824af45f78e128897750f95aa4
+  data.tar.gz: a970b387a73880e4c33e5bd4df6ece4338f7fec48f6c7e95ce2e3421f482f5a5bf22cf3985a91f33015174a07b49dd06f993f30b1b779337b4623ed83845d6d3

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

@@ -0,0 +1,10 @@
+# Configuration module
+#
+# Recompile if the settings change
+# = depend_on_config
+angular.module('mnoEnterprise.configuration', [])
+  .constant('IMPAC_CONFIG', <%= Settings.impac.to_json %>)
+  .constant('I18N_CONFIG', {
+    enabled: <%= MnoEnterprise.i18n_enabled %>,
+    available_locales: <%= I18n.available_locales.to_json %>
+  })

data/app/controllers/mno_enterprise/impersonate_controller.rb

@@ -2,13 +2,12 @@ module MnoEnterprise
   class ImpersonateController < ApplicationController
     include MnoEnterprise::ImpersonateHelper
 
-    before_filter :authenticate_user!, except: ["destroy"]
-    before_filter :current_user_must_be_admin!, except: ["destroy"]
+    before_filter :authenticate_user!, except: [:destroy]
+    before_filter :current_user_must_be_admin!, except: [:destroy]
 
     # 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)
@@ -19,20 +18,13 @@ module MnoEnterprise
     end
 
     # Revert the user impersonation
-    # DELETE /impersonation/revert
+    # GET /impersonation/revert
     def destroy
       if current_impersonator
-        user = current_user
+        # user = current_user
         revert_impersonate
-        if user
-          flash[:notice] = "No longer impersonating #{user}"
-        else
-          flash[:notice] = "No longer impersonating a user"
-        end
-      else
-        flash[:notice] = "You weren't impersonating anyone"
       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/organizations_controller.rb

@@ -8,7 +8,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

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

@@ -0,0 +1,109 @@
+require 'rake'
+
+Rake::Task.clear # necessary to avoid tasks being loaded several times in dev mode
+Rails.application.load_tasks # load application tasks
+
+module MnoEnterprise
+  class Jpi::V1::Admin::ThemeController < Jpi::V1::Admin::BaseResourceController
+    # No xsrf
+    skip_before_filter :verify_authenticity_token
+
+    # POST /mnoe/jpi/v1/admin/theme/save
+    def save
+      if params[:publish]
+        # Recompile style for production use
+        apply_previewer_style(params[:theme])
+        publish_style
+      else
+        # Save and rebuild previewer style only
+        # (so it is kept across page reloads)
+        save_previewer_style(params[:theme])
+        rebuild_previewer_style
+      end
+
+      render json: {status:  'Ok'},  status: :created
+    end
+
+    # POST /mnoe/jpi/v1/admin/theme/reset
+    def reset
+      reset_previewer_style
+      rebuild_previewer_style
+      render json: {status:  'Ok'}
+    end
+
+    # POST /mnoe/jpi/v1/admin/theme/logo
+    def logo
+      logo_content = params[:logo].read
+      [
+        'frontend/src/images/main-logo.png',
+        'public/dashboard/images/main-logo.png',
+        'app/assets/images/mno_enterprise/main-logo.png'
+      ].each do |filepath|
+        FileUtils.mkdir_p(File.dirname(Rails.root.join(filepath)))
+        File.open(Rails.root.join(filepath),'wb') { |f| f.write(logo_content) }
+      end
+      render json: {status:  'Ok'},  status: :created
+    end
+
+    #=====================================================
+    # Protected
+    #=====================================================
+    protected
+
+      # Save current style to theme-previewer-tmp.less stylesheet
+      # This file overrides theme-previewer-published.less
+      def save_previewer_style(theme)
+        target = Rails.root.join('frontend', 'src','app','stylesheets','theme-previewer-tmp.less')
+        File.open(target, 'w') { |f| f.write(theme_to_less(theme)) }
+      end
+
+      # Save style to theme-previewer-published.less and discard theme-previewer-tmp.less
+      def apply_previewer_style(theme)
+        target = Rails.root.join('frontend', 'src','app','stylesheets','theme-previewer-published.less')
+        File.open(target, 'w') { |f| f.write(theme_to_less(theme)) }
+        reset_previewer_style
+      end
+
+      def reset_previewer_style
+        target = Rails.root.join('frontend', 'src','app','stylesheets','theme-previewer-tmp.less')
+        File.exist?(target) && File.delete(target)
+      end
+
+      def rebuild_previewer_style
+        Rake::Task['mnoe:frontend:rebuild_previewer_style'].reenable
+        Rake::Task['mnoe:frontend:rebuild_previewer_style'].invoke
+      end
+
+      def publish_style
+        Rake::Task['mnoe:frontend:dist'].reenable
+        Rake::Task['mnoe:frontend:dist'].invoke
+      end
+
+      # Convert a theme provided as a hash into a properly
+      # formatted LESS file
+      def theme_to_less(theme)
+        out = "// Generated by the Express Theme Previewer\n"
+
+        if theme[:branding]
+          out += "\n//----------------------------------------\n"
+          out += "// General Branding\n"
+          out += "//----------------------------------------\n"
+          out += theme[:branding].map { |k,v| "#{k}: #{v};" }.join("\n")
+          out += "\n"
+        end
+
+        if theme[:variables]
+          out += "\n//----------------------------------------\n"
+          out += "// Theme Variables\n"
+          out += "//----------------------------------------\n"
+          theme[:variables].each do |section,vars|
+            out += "// #{section}\n"
+            out += vars.map { |k,v| "#{k}: #{v};" }.join("\n")
+            out += "\n\n"
+          end
+        end
+
+        return out
+      end
+  end
+end

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

@@ -8,7 +8,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

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/impac/widgets_controller.rb

@@ -1,5 +1,63 @@
 module MnoEnterprise
   class Jpi::V1::Impac::WidgetsController < Jpi::V1::BaseResourceController
-    include MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::WidgetsController
+    respond_to :json
+    
+    # POST /mnoe/jpi/v1/impac/dashboards/:id/widgets
+    #  -> POST /api/mnoe/v1/dashboards/:id/widgets
+    def create
+      if widgets
+        if @widget = widgets.create(format_attrs(['widget_category','metadata']))
+          MnoEnterprise::EventLogger.info('widget_create', current_user.id, 'Widget Creation', nil, @widget)
+          @nocontent = true # no data fetch from Connec!
+          render 'show'
+        else
+          render json: @widget.errors, status: :bad_request
+        end
+      else
+        render json: { errors: "Dashboard id #{params[:id]} doesn't exist" }, status: :not_found
+      end
+    end
+
+    # PUT /mnoe/jpi/v1/impac/widgets/:id
+    def update
+      if widget.update(format_attrs(['name','metadata']))
+        @nocontent = !params['metadata']
+        render 'show'
+      else
+        render json: @widget.errors, status: :bad_request
+      end
+    end
+    
+    # DELETE /mnoe/jpi/v1/impac/dashboards/1
+    def destroy
+      if widget.destroy
+        MnoEnterprise::EventLogger.info('widget_delete', current_user.id, 'Widget Deletion', nil, widget)
+        head status: :ok
+      else
+        render json: 'Unable to destroy widget', status: :bad_request
+      end
+    end
+    
+    
+    #=================================================
+    # Private methods
+    #=================================================
+    private
+
+      def widget
+        @widget ||= MnoEnterprise::Impac::Widget.find(params[:id])
+      end
+
+      def widgets
+        @widgets ||= MnoEnterprise::Impac::Dashboard.find(params[:dashboard_id]).widgets
+      end
+
+      def format_attrs(whitelist)
+        attrs = (params[:widget] || {}).select { |k,v| whitelist.include?(k.to_s) }
+        attrs['settings'] = widget ? widget.settings || {} : {}
+        attrs['settings'].merge!(attrs['metadata']) if attrs['metadata']
+        attrs.except!('metadata')
+      end
+
   end
 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/{default/_form.html.haml → _form.html.haml}

@@ -1,49 +1,45 @@
-%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|
 
   .row
     .col-sm-12
       = f.text_field :name, placeholder: "*First Name", required: true, 'ng-model' => 'user.name', class:'form-control'
-  
+
   %br
-  
+
   .row
     .col-sm-12
       = f.text_field :surname, placeholder: "*Last Name", required: true, 'ng-model' => 'user.surname', class: 'form-control'
-  
+
   - if @phone_required && MnoEnterprise.style.devise.phone_required
     %br
     .row
       .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
-  
+
   - # Password: two validation styles offered
   .row
     .col-sm-12
       - if !!MnoEnterprise.style.devise.password_complexity_deep_check
         %div{'mno-password' => 'user', form: "loginForm"}
-    
-        .text-center.ng-hide{ 'ng-show' => 'user.$pwdScore.showTip' }
-          %small.text-danger Password is not strong enough. Try mixing letters, numbers and cases
-      
+
       - else
         .input-group
           = f.password_field :password, :placeholder => "*Choose Password", 'ng-model' => 'user.password', class: 'form-control', 'ng-minlength' => 6, 'mno-password-strength' => true, "password-score" => 'user.$pwdScore', :required => true
           %span.input-group-addon.classic.pw-strength-indicator{'ng-class' => 'user.$pwdScore.class' }
             {{ user.$pwdScore.value }}
-          
-        .text-center.ng-hide{ 'ng-show' => 'user.$pwdScore.showTip' }
-          %small.text-danger Password is not strong enough. Try mixing letters, numbers and cases
-      
-  
+
+      .text-center.ng-hide{ 'ng-show' => 'user.$pwdScore.showTip' }
+        %small.text-danger= t('activemodel.errors.mno_enterprise/user.password_weak')
+
   = f.hidden_field :confirmation_token, value: @confirmation_token
-  
+
   %br/
   %div
-    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'loginForm.$invalid', 'ng-hide' => 'hasClicked' } Confirm my account
+    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'loginForm.$invalid', 'ng-hide' => 'hasClicked' }= t('mno_enterprise.auth.confirmations.show.confirm')
     %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }

data/app/views/mno_enterprise/auth/confirmations/lounge.html.haml

@@ -1,4 +1,32 @@
-- if MnoEnterprise.style.design.material
-  = render "mno_enterprise/auth/confirmations/material/lounge"
-- else
-  = render "mno_enterprise/auth/confirmations/default/lounge"
+.banners.promo.dark.darkblue.confirmation-lounge
+  .container
+    .row
+      .col-md-8.col-md-offset-2
+        .row
+          .align-center
+            %i.fa.fa-envelope
+            %h4= t('mno_enterprise.auth.confirmations.lounge.title')
+            %h5= t('mno_enterprise.auth.confirmations.lounge.subtitle')
+
+          %div{ 'ng-init' => "email = '#{@resource.email}'"}
+            = form_for(@resource, :as => resource_name, :url => mno_enterprise.user_confirmation_path, :html => { 'name' => 'form', :class => 'dark form-horizontal', :autocomplete => "off" }) do |f|
+              - unless devise_error_messages!.empty?
+                %div
+                  .alert.alert-error
+                    %button.close{ 'data-dismiss' => "alert" } ×
+                    = devise_error_messages!
+              .spacer2
+              .form-group
+                .col-sm-6.col-sm-offset-2
+                  .input-prepend
+                    = f.email_field :email, :placeholder => "Email", :required => true, 'ng-model' => 'email', :class => 'input-xlarge'
+                .col-sm-2
+                  %button{ :class => "btn btn-lg btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('mno_enterprise.auth.confirmations.lounge.resend')
+                  %img{ class: 'loader-sm', 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-main.gif'), 'ng-show' => 'hasClicked' }
+
+    .spacer2
+    .row
+      .col-md-12
+        .align-center
+          %h5
+            = t('mno_enterprise.auth.confirmations.lounge.support_tip_html', email: mail_to(support_email, t('mno_enterprise.auth.confirmations.lounge.support_team'), subject: t('mno_enterprise.auth.confirmations.lounge.support_email_subject')))

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

@@ -5,7 +5,7 @@
     .row
       .login-box-wrapper
         .login-box-title
-          %h2 Confirmation
+          %h2= t('.title')
         .login-box
           .brand-logo
           = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'form-horizontal autofill-detect' }) do |f|
@@ -25,7 +25,7 @@
             .row
               .col-sm-12
                 .text-center
-                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' } Resend confirmation instructions
+                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('.resend')
                   %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
           %hr
           = render "devise/shared/links"

data/app/views/mno_enterprise/auth/confirmations/show.html.haml

@@ -1,4 +1,10 @@
-- if MnoEnterprise.style.design.material
-  = render "mno_enterprise/auth/confirmations/material/show"
-- else
-  = render "mno_enterprise/auth/confirmations/default/show"
+.registration
+  .container
+    .row
+      //.col-md-6.col-md-offset-3
+      .login-box-wrapper
+        .login-box-title
+          %h2= t('mno_enterprise.auth.confirmations.show.title')
+        .login-box
+          .brand-logo
+          = render "mno_enterprise/auth/confirmations/form"