mno-enterprise-api 3.1.4 → 3.2.0

data/app/controllers/mno_enterprise/jpi/v1/base_resource_controller.rb

@@ -28,5 +28,17 @@ module MnoEnterprise
         end
         true
       end
+
+      def render_not_found(resource)
+        render json: { errors: {message: "#{resource.titleize} not found (id=#{params[:id]})", code: 404, params: params} }, status: :not_found
+      end
+
+      def render_bad_request(attempted_action, issue)
+        render json: { errors: {message: "Error while trying to #{attempted_action}: #{issue}", code: 400, params: params} }, status: :bad_request
+      end
+
+      def render_forbidden_request(attempted_action)
+        render json: { errors: {message: "Error while trying to #{attempted_action}: you do not have permission", code: 403} }, status: :forbidden
+      end
   end
 end

data/app/controllers/mno_enterprise/jpi/v1/impac/alerts_controller.rb

@@ -0,0 +1,5 @@
+module MnoEnterprise
+  class Jpi::V1::Impac::AlertsController < Jpi::V1::BaseResourceController
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::AlertsController
+  end
+end

data/app/controllers/mno_enterprise/jpi/v1/impac/kpis_controller.rb

@@ -1,80 +1,5 @@
 module MnoEnterprise
   class Jpi::V1::Impac::KpisController < Jpi::V1::BaseResourceController
-    respond_to :json
-    
-    # POST /jpi/v1/impac/dashboards/:dashboard_id/kpis
-    def create
-      whitelist = %w(name endpoint source element_watched targets metadata extra_params)
-      attrs = (params[:kpi] || {}).select { |k,v| whitelist.include?(k.to_s) } 
-
-      if dashboard
-        authorize! :manage_impac, dashboard
-
-        # TODO: Her will perform a request there which could be avoided
-        @kpi = dashboard.kpis.create(attrs)
-        if @kpi
-          render 'show'
-        else
-          render json: @kpi.errors, status: :bad_request
-        end
-      else
-        render json: { errors: "Dashboard id #{params[:dashboard_id]} doesn't exist" }, status: :not_found
-      end
-    end
-
-    # PUT /jpi/v1/impac/kpis/:id
-    def update
-      whitelist = %w(name element_watched targets extra_params)
-      attrs = (params[:kpi] || {}).select { |k,v| whitelist.include?(k.to_s) }.symbolize_keys 
-      
-      # Find kpi and assign
-      # Will call GET kpi route on Maestrano
-      @kpi = Impac::Kpi.find(params[:id])
-      authorize! :manage_impac, @kpi.dashboard
-      if @kpi
-        # metadata will be merged instead of replaced
-        p = HashWithIndifferentAccess.new(params[:kpi])
-        if p[:metadata] && p[:metadata].is_a?(Hash)
-          attrs[:metadata] = @kpi.settings.merge(p[:metadata])
-        end
-
-        if @kpi.update(attrs)
-          render 'show'
-        else
-          render json: @kpi.errors, status: :bad_request
-        end
-      else
-        render json: { errors: "Kpi id #{params[:id]} doesn't exist" }, status: :not_found
-      end
-    end
-    
-    # DELETE /jpi/v1/impac/kpis/:id
-    def destroy
-      # Will call GET kpi route on Maestrano
-      @kpi = MnoEnterprise::Impac::Kpi.find(params[:id])
-      
-      if @kpi
-        authorize! :manage_impac, @kpi.dashboard
-        if @kpi.destroy
-          head status: :ok
-        else
-          render json: { errors: 'Unable to delete this widget' }, status: :bad_request
-        end
-      else
-        render json: {errors: "Kpi id #{params[:id]} doesn't exist" }, status: :not_found
-      end
-    end
-    
-    
-    #=================================================
-    # Private methods
-    #=================================================
-    private
-
-      def dashboard
-        return false unless params[:dashboard_id]
-        @dashboard ||= MnoEnterprise::Impac::Dashboard.find(params[:dashboard_id])
-      end
-
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::KpisController
   end
 end

data/app/controllers/mno_enterprise/jpi/v1/marketplace_controller.rb

@@ -1,22 +1,5 @@
 module MnoEnterprise
   class Jpi::V1::MarketplaceController < ApplicationController
-    respond_to :json
-
-    # GET /mnoe/mnoe/jpi/v1/marketplace
-    def index
-      @apps = if MnoEnterprise.marketplace_listing
-        MnoEnterprise::App.where('nid.in' => MnoEnterprise.marketplace_listing).to_a
-      else
-        MnoEnterprise::App.all.to_a
-      end
-      @apps.sort_by! { |app| [app.rank ? 0 : 1 , app.rank] } # the nil ranks will appear at the end
-      @categories = MnoEnterprise::App.categories(@apps)
-      @categories.delete('Most Popular')
-    end
-
-    # GET /mnoe/jpi/v1/marketplace/1
-    def show
-      @app = MnoEnterprise::App.find(params[:id])
-    end
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::MarketplaceController
   end
 end

data/app/controllers/mno_enterprise/jpi/v1/teams_controller.rb

@@ -1,88 +1,6 @@
 # This controller uses nesting (under organizations) and shallow routes
 module MnoEnterprise
   class Jpi::V1::TeamsController < Jpi::V1::BaseResourceController
-    respond_to :json
-
-    # GET /mnoe/jpi/v1/organizations/:organization_id/teams
-    def index
-      authorize! :read, parent_organization
-      @teams = parent_organization.teams
-    end
-
-    # GET /mnoe/jpi/v1/teams/:id
-    def show
-      @team = MnoEnterprise::Team.find(params[:id])
-      authorize! :read, @team.organization
-    end
-
-    # POST /mnoe/jpi/v1/organizations/:organization_id/teams
-    def create
-      authorize! :manage_teams, parent_organization
-      @team = parent_organization.teams.create(team_params)
-
-      render 'show'
-    end
-
-    # PUT /mnoe/jpi/v1/teams/:id
-    def update
-      @team = MnoEnterprise::Team.find(params[:id])
-      authorize! :manage_teams, @team.organization
-
-      # Update regular attributes
-      @team.update_attributes(team_params)
-
-      # # Update permissions
-      if params[:team] && params[:team][:app_instances]
-        list = params[:team][:app_instances].select { |e| e != {} }
-        @team.set_access_to(list)
-      end
-
-      render 'show'
-    end
-
-    # PUT /mnoe/jpi/v1/teams/:id/add_users
-    def add_users
-      @team = MnoEnterprise::Team.find(params[:id])
-      authorize! :manage_teams, @team.organization
-
-      # Add users
-      if params[:team] && params[:team][:users]
-        id_list = params[:team][:users].map { |h| h[:id] }.compact
-        users = @team.organization.users.where('id.in' => id_list)
-        users.each { |u| @team.add_user(u) }
-      end
-
-      render 'show'
-    end
-
-    # PUT /mnoe/jpi/v1/teams/:id/remove_users
-    def remove_users
-      @team = MnoEnterprise::Team.find(params[:id])
-      authorize! :manage_teams, @team.organization
-
-      # Add users
-      if params[:team] && params[:team][:users]
-        id_list = params[:team][:users].map { |h| h[:id] }.compact
-        users = @team.organization.users.where('id.in' => id_list)
-        users.each { |u| @team.remove_user(u) }
-      end
-
-      render 'show'
-    end
-
-    # DELETE /mnoe/jpi/v1/teams/:id
-    def destroy
-      @team = MnoEnterprise::Team.find(params[:id])
-      authorize! :manage_teams, @team.organization
-      @team.destroy
-
-      head :no_content
-    end
-
-    private
-
-    def team_params
-      params.require(:team).permit(:name)
-    end
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::TeamsController
   end
 end

data/app/jobs/mno_enterprise/event_logger_job.rb

@@ -0,0 +1,10 @@
+module MnoEnterprise
+  # To perform event logging asynchronously
+  class EventLoggerJob < ActiveJob::Base
+    queue_as :default
+
+    def perform(action, *args)
+      MnoEnterprise::EventLogger.send("send_#{action}", *args)
+    end
+  end
+end

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

@@ -8,24 +8,24 @@
           %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|
-            
+          = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, name: 'form', class: 'form-horizontal autofill-detect' }) do |f|
+
             - unless devise_error_messages!.empty?
               .row
                 .alert.alert-error
                   %button.close ×
                   = devise_error_messages!
-            
+
             .row
               .col-sm-12
                 = f.email_field :email, placeholder: "*Email", autofocus: true, required: true, 'ng-model' => 'user.email', :class => 'form-control'
-            
+
             %br
-            
+
             .row
               .col-sm-12
                 .text-center
                   %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"
+          = render "mno_enterprise/auth/shared/links"

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

@@ -8,27 +8,27 @@
           %h2= t('.title')
         .login-box
           .brand-logo
-          
+
           = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'form-horizontal autofill-detect' }) do |f|
-            
+
             - unless devise_error_messages!.empty?
               .row
                 .alert.alert-error
                   %button.close ×
                   = devise_error_messages!
-            
+
             .row
               .col-sm-12
                 = f.email_field :email, placeholder: "*Email", required: true, 'ng-model' => 'user.email', :class => 'form-control'
-            
+
             %br
-            
+
             .row
               .col-sm-12
                 .text-center
                   %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('.title')
                   %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
-          
+
           %hr
-          
-          = render "devise/shared/links"
+
+          = render "mno_enterprise/auth/shared/links"

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

@@ -7,5 +7,6 @@
         .login-box
           .brand-logo
           = render "mno_enterprise/auth/registrations/form"
+          = render "mno_enterprise/auth/shared/omniauth"
           %hr
           = render "mno_enterprise/auth/shared/links"

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

@@ -7,5 +7,6 @@
         .login-box
           .brand-logo
           = render "mno_enterprise/auth/sessions/form"
+          = render "mno_enterprise/auth/shared/omniauth"
           %hr
           = render "mno_enterprise/auth/shared/links"

data/app/views/mno_enterprise/auth/shared/_links.html.haml

@@ -17,8 +17,3 @@
 - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' && MnoEnterprise.style.devise.unlock_link_shown
   = link_to t('mno_enterprise.auth.shared.links.unlock'), new_unlock_path(resource_name)
   %br/
-
-- if devise_mapping.omniauthable? && MnoEnterprise.style.devise.omniauth_link_shown 
-  - resource_class.omniauth_providers.each do |provider|
-    = link_to t('mno_enterprise.auth.shared.links.omni_login', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)
-    %br/

data/app/views/mno_enterprise/auth/shared/_omniauth.html.haml

@@ -0,0 +1,10 @@
+- if devise_mapping.omniauthable? && MnoEnterprise.style.devise.omniauth_link_shown && resource_class.omniauth_providers.any?
+  .sign-in-using
+    = t('mno_enterprise.auth.shared.links.or_sign_in_using')
+  .oauth-sso
+    - resource_class.omniauth_providers.each do |provider|
+      - if provider.to_s == 'intuit'
+        = link_to "", omniauth_authorize_path(resource_name, provider), class: "omniauth intuit"
+      - else
+        = link_to(omniauth_authorize_path(resource_name, provider), class: "omniauth") do
+          %i{class: "fa fa-#{provider}"}

data/app/views/mno_enterprise/jpi/v1/admin/app_answers/show.json.jbuilder

@@ -0,0 +1,15 @@
+json.app_answer do
+  json.id @app_review[:id]
+  json.description @app_review[:description]
+  json.status @app_review[:status]
+  json.user_id @app_review[:user_id]
+  json.user_name @app_review[:user_name]
+  json.organization_id @app_review[:organization_id]
+  json.organization_name @app_review[:organization_name]
+  json.type @app_review[:type]
+  json.app_id @app_review[:app_id]
+  json.question_id @app_review[:question_id]
+  json.app_name @app_review[:app_name]
+  json.created_at @app_review[:created_at]
+  json.updated_at @app_review[:updated_at]
+end

data/app/views/mno_enterprise/jpi/v1/admin/app_comments/show.json.jbuilder

@@ -0,0 +1,15 @@
+json.app_comment do
+  json.id @app_review[:id]
+  json.description @app_review[:description]
+  json.status @app_review[:status]
+  json.user_id @app_review[:user_id]
+  json.user_name @app_review[:user_name]
+  json.organization_id @app_review[:organization_id]
+  json.organization_name @app_review[:organization_name]
+  json.type @app_review[:type]
+  json.app_id @app_review[:app_id]
+  json.feedback_id @app_review[:feedback_id]
+  json.app_name @app_review[:app_name]
+  json.created_at @app_review[:created_at]
+  json.updated_at @app_review[:updated_at]
+end

data/app/views/mno_enterprise/jpi/v1/admin/app_reviews/_app_review.json.jbuilder

@@ -0,0 +1,13 @@
+json.id app_review.id
+json.rating app_review.rating
+json.description app_review.description
+json.status app_review.status
+json.app_id app_review.app_id
+json.app_name app_review.app_name
+json.user_id app_review.user_id
+json.user_name app_review.user_name
+json.organization_id app_review.organization_id
+json.organization_name app_review.organization_name
+json.type app_review.type
+json.created_at app_review.created_at
+json.updated_at app_review.updated_at

data/app/views/mno_enterprise/jpi/v1/admin/app_reviews/index.json.jbuilder

@@ -0,0 +1 @@
+json.app_reviews @app_reviews, partial: 'app_review', as: :app_review

data/app/views/mno_enterprise/jpi/v1/admin/app_reviews/show.json.jbuilder

@@ -0,0 +1,3 @@
+json.app_review do
+  json.partial! 'app_review', app_review: @app_review
+end

data/app/views/mno_enterprise/jpi/v1/admin/organizations/show.json.jbuilder

@@ -7,5 +7,6 @@ json.organization do
     json.extract! instance, :id, :name, :stack, :uid, :status, :oauth_keys_valid
     json.app_name instance.app.name
     json.app_logo instance.app.logo
+    json.nid instance.app.nid
   end
 end

data/app/views/mno_enterprise/jpi/v1/admin/users/_user.json.jbuilder

@@ -1 +1 @@
-json.extract! user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at
+json.extract! user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at, :sign_in_count

data/app/views/mno_enterprise/jpi/v1/app_answers/_resource.json.jbuilder

@@ -0,0 +1,4 @@
+json.partial! 'app_review', app_review: app_answer, show_rating: false
+
+json.question_id app_answer[:question_id]
+

data/app/views/mno_enterprise/jpi/v1/app_answers/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.app_answers do
+  json.array! @app_reviews do |app_answer|
+    json.partial! 'resource', app_answer: app_answer
+  end
+end

data/app/views/mno_enterprise/jpi/v1/app_answers/show.json.jbuilder

@@ -0,0 +1,3 @@
+json.app_answer do
+  json.partial! 'resource', app_answer: @app_review
+end

data/app/views/mno_enterprise/jpi/v1/app_comments/_resource.json.jbuilder

@@ -0,0 +1,3 @@
+json.partial! 'app_review', app_review: app_comment, show_rating: false
+
+json.feedback_id app_comment[:feedback_id]

data/app/views/mno_enterprise/jpi/v1/app_comments/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.app_comments do
+  json.array! @app_reviews do |app_comment|
+    json.partial! 'resource', app_comment: app_comment
+  end
+end

data/app/views/mno_enterprise/jpi/v1/app_comments/show.json.jbuilder

@@ -0,0 +1,3 @@
+json.app_comment do
+  json.partial! 'resource', app_comment: @app_review
+end