mno-enterprise-api 3.1.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17e731fc6479dd2463a9a081eec77d50cbfaf5d
-  data.tar.gz: f791a962650c45dc5c310f4b1a660ab48d2b8bba
+  metadata.gz: 98313610cc252efb1e91c0187d397ba299476e9d
+  data.tar.gz: 7046190053c32c805db818b9b36d2aad461ffb94
 SHA512:
-  metadata.gz: 9590fe9cc0bc61c996216277404caa50b83a6d228ae23c5acab7c06687797a553a57e63e84baaf24d06430d7fdebe86e392e3c8540eff3c83458ace45bdc110d
-  data.tar.gz: f56f3fef5b4a6447111df480dec04757b6975474ec2cae343d75d449b28c000bbc50870bfcec38d182b4e3ce8e888af996f7cd29caff0c9c00af7cca8b3d06f8
+  metadata.gz: f04f1a99e1922cc754a2ec0d3bad296efb151cb40c55f4a3e0ae88baf5a496246cca95697e19025e198d3597cc3761eeab5c4e9ccd19d89c011bb7958e6e5b94
+  data.tar.gz: 41c1785557185b19e3dc80d526313e60b7652a9b7147779c0a53892da2148351b05586f557a78fb67b71f24215885be9bb13f262959a3eba3ef846ae12b9cc57

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

@@ -8,5 +8,11 @@ angular.module('mnoEnterprise.configuration', [])
     enabled: <%= MnoEnterprise.i18n_enabled %>,
     available_locales: <%= I18n.available_locales.to_json %>
   })
-  .constant('PRICING_CONFIG', <%= Settings.pricing.to_json %>)
+  .constant('PRICING_CONFIG', <%= Hash(Settings.pricing).to_json %>)
+  .constant('DOCK_CONFIG', <%= Hash(Settings.dock).to_json %>)
+  .constant('DEVELOPER_SECTION_CONFIG', <%= Hash(Settings.developer).to_json %>)
+  .constant('REVIEWS_CONFIG', <%= Hash(Settings.reviews).to_json %>)
+  .constant('MARKETPLACE_CONFIG', <%= Hash(Settings.marketplace).to_json %>)
   .constant('GOOGLE_TAG_CONTAINER_ID', <%= MnoEnterprise.google_tag_container.to_json %>)
+  .constant('INTERCOM_ID', <%= MnoEnterprise.intercom_app_id.to_json %>)
+  .constant('APP_NAME', <%= MnoEnterprise.app_name.to_json %>)

data/app/controllers/mno_enterprise/auth/omniauth_callbacks_controller.rb

@@ -1,30 +1,6 @@
 module MnoEnterprise
   class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-    # You should configure your model like this:
-    # devise :omniauthable, omniauth_providers: [:twitter]
-
-    # You should also create an action method in this controller like this:
-    # def twitter
-    # end
-
-    # More info at:
-    # https://github.com/plataformatec/devise#omniauth
-
-    # GET|POST /resource/auth/twitter
-    # def passthru
-    #   super
-    # end
-
-    # GET|POST /users/auth/twitter/callback
-    # def failure
-    #   super
-    # end
-
-    # protected
-
-    # The path used when omniauth fails
-    # def after_omniauth_failure_path_for(scope)
-    #   super(scope)
-    # end
+    include MnoEnterprise::Concerns::Controllers::Auth::OmniauthCallbacksController
   end
-end
+end
+

data/app/controllers/mno_enterprise/auth/sessions_controller.rb

@@ -1,7 +1,5 @@
 module MnoEnterprise
   class Auth::SessionsController < Devise::SessionsController
     include MnoEnterprise::Concerns::Controllers::Auth::SessionsController
-
-    
   end
-end
+end

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

@@ -0,0 +1,26 @@
+module MnoEnterprise
+  class Jpi::V1::Admin::AppAnswersController < Jpi::V1::Admin::BaseResourceController
+
+    # POST /mnoe/jpi/v1/admin/app_answers
+    def create
+      @app_review = MnoEnterprise::AppAnswer.new(app_answer_params)
+
+      if @app_review.save
+        render :show
+      else
+        render json: @app_review.errors, status: :bad_request
+      end
+    end
+
+    def app_answer_params
+      # for an admin, the organization does not matter
+      organization_id = current_user.organizations.first.id
+      params.require(:app_answer).permit(:description)
+        .merge(user_id: current_user.id, question_id: parent.id, organization_id: organization_id, app_id: parent.app_id)
+    end
+
+    def parent
+      @parent ||= MnoEnterprise::AppQuestion.find(params[:question_id])
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module MnoEnterprise
+  class Jpi::V1::Admin::AppCommentsController < Jpi::V1::Admin::BaseResourceController
+
+    # POST /mnoe/jpi/v1/admin/app_comments
+    def create
+      @app_review = MnoEnterprise::AppComment.new(app_comment_params)
+
+      if @app_review.save
+        render :show
+      else
+        render json: @app_review.errors, status: :bad_request
+      end
+    end
+
+    private
+
+    def app_comment_params
+      # for an admin, the organization does not matter
+      organization_id = current_user.organizations.first.id
+      params.require(:app_comment).permit(:description)
+        .merge(user_id: current_user.id, feedback_id: parent.id, organization_id: organization_id, app_id: parent.app_id)
+    end
+
+    def parent
+      @parent ||= MnoEnterprise::AppFeedback.find(params[:feedback_id])
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module MnoEnterprise
+  class Jpi::V1::Admin::AppInstancesController < Jpi::V1::Admin::BaseResourceController
+
+    # DELETE /mnoe/jpi/v1/app_instances/1
+    def destroy
+      app_instance = MnoEnterprise::AppInstance.find(params[:id])
+
+      if app_instance
+        MnoEnterprise::EventLogger.info('app_destroy', current_user.id, 'App destroyed', app_instance)
+        app_instance.terminate
+      end
+
+      head :accepted
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module MnoEnterprise
+  class Jpi::V1::Admin::AppReviewsController < Jpi::V1::Admin::BaseResourceController
+    # GET /mnoe/jpi/v1/admin/app_reviews
+    def index
+      @app_reviews = MnoEnterprise::AppReview
+      @app_reviews = @app_reviews.limit(params[:limit]) if params[:limit]
+      @app_reviews = @app_reviews.skip(params[:offset]) if params[:offset]
+      @app_reviews = @app_reviews.order_by(params[:order_by]) if params[:order_by]
+      @app_reviews = @app_reviews.where(params[:where]) if params[:where]
+      @app_reviews = @app_reviews.all.fetch
+      response.headers['X-Total-Count'] = @app_reviews.metadata[:pagination][:count]
+    end
+
+    # GET /mnoe/jpi/v1/admin/app_reviews/1
+    def show
+      @app_review = MnoEnterprise::AppReview.find(params[:id])
+    end
+
+    # PATCH /mnoe/jpi/v1/admin/app_reviews/1
+    def update
+      @app_review = MnoEnterprise::AppReview.find(params[:id])
+      @app_review.update(app_review_params)
+      render :show
+    end
+
+    def app_review_params
+      params.require(:app_review).permit(:status, :description).merge(user_id: current_user.id)
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module MnoEnterprise::Jpi::V1::Admin
         send_org_invite(invite)
       end
 
-      MnoEnterprise::EventLogger.info('user_invite', current_user.id, 'User invited', {user_email: user.email, account_name: @organization.name}, user)
+      MnoEnterprise::EventLogger.info('user_invite', current_user.id, 'User invited', user, {user_email: user.email, account_name: @organization.name})
 
       @user = user.confirmed? ? invite : user.reload
 

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

@@ -50,6 +50,18 @@ module MnoEnterprise
       render 'show'
     end
 
+    # PATCH /mnoe/jpi/v1/admin/organizations/1
+    def update
+      # get organization
+      @organization = MnoEnterprise::Organization.find(params[:id])
+
+      update_app_list
+
+      @organization_active_apps = @organization.app_instances.active
+
+      render 'show'
+    end
+
     # POST /mnoe/jpi/v1/admin/organizations/1/users
     # Invite a user to the organization (and create it if needed)
     # This does not send any emails (emails are manually triggered later)
@@ -62,60 +74,66 @@ module MnoEnterprise
 
       # Create the invitation
       invite = @organization.org_invites.create(
-          user_email: user.email,
-          user_role: params[:user][:role],
-          referrer_id: current_user.id,
-          status: 'staged' # Will be updated to 'accepted' for unconfirmed users
+        user_email: user.email,
+        user_role: params[:user][:role],
+        referrer_id: current_user.id,
+        status: 'staged' # Will be updated to 'accepted' for unconfirmed users
       )
 
       @user = user.confirmed? ? invite : user.reload
     end
 
     protected
-      def organization_permitted_update_params
-        [:name]
-      end
 
-      def organization_update_params
-        params.fetch(:organization, {}).permit(*organization_permitted_update_params)
-      end
+    def organization_permitted_update_params
+      [:name]
+    end
 
-      def user_params
-        params.require(:user).permit(:email, :name, :surname, :phone)
-      end
+    def organization_update_params
+      params.fetch(:organization, {}).permit(*organization_permitted_update_params)
+    end
 
-      # Create an unconfirmed user and skip the confirmation notification
-      # TODO: monkey patch User#confirmation_required? to simplify this? Use refinements?
-      def create_unconfirmed_user(user_params)
-        user = MnoEnterprise::User.new(user_params)
-        user.skip_confirmation_notification!
-        user.save
-
-        # Reset the confirmation field so we can track when the invite is send - #confirmation_sent_at is when the confirmation_token was generated (not sent)
-        # Not ideal as we do 2 saves, and the previous save trigger a call to the backend to validate the token uniqueness
-        user.assign_attributes(confirmation_sent_at: nil, confirmation_token: nil)
-        user.save
-        user
-      end
+    def user_params
+      params.require(:user).permit(:email, :name, :surname, :phone)
+    end
+
+    # Create an unconfirmed user and skip the confirmation notification
+    # TODO: monkey patch User#confirmation_required? to simplify this? Use refinements?
+    def create_unconfirmed_user(user_params)
+      user = MnoEnterprise::User.new(user_params)
+      user.skip_confirmation_notification!
+      user.save
+
+      # Reset the confirmation field so we can track when the invite is send - #confirmation_sent_at is when the confirmation_token was generated (not sent)
+      # Not ideal as we do 2 saves, and the previous save trigger a call to the backend to validate the token uniqueness
+      user.assign_attributes(confirmation_sent_at: nil, confirmation_token: nil)
+      user.save
+      user
+    end
 
-      # Update App List to match the list passed in params
-      def update_app_list
-        # Differentiate between a null app_nids params and no app_nids params
-        if params[:organization].key?(:app_nids) && (desired_nids = Array(params[:organization][:app_nids]))
+    # Update App List to match the list passed in params
+    def update_app_list
+      # Differentiate between a null app_nids params and no app_nids params
+      if params[:organization].key?(:app_nids) && (desired_nids = Array(params[:organization][:app_nids]))
 
-          existing_apps = @organization.app_instances.active
+        existing_apps = @organization.app_instances.active
 
-          existing_apps.each do |app_instance|
-            desired_nids.delete(app_instance.app.nid) || app_instance.terminate
-          end
+        existing_apps.each do |app_instance|
+          desired_nids.delete(app_instance.app.nid) || app_instance.terminate
+        end
 
-          desired_nids.each do |nid|
+        desired_nids.each do |nid|
+          begin
             @organization.app_instances.create(product: nid)
+          rescue => e
+            Rails.logger.error { "#{e.message} #{e.backtrace.join("\n")}" }
           end
 
-          # Force reload
-          existing_apps.reload
         end
+
+        # Force reload
+        existing_apps.reload
       end
+    end
   end
 end

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

@@ -0,0 +1,22 @@
+module MnoEnterprise
+  class Jpi::V1::AppAnswersController < Jpi::V1::AppReviewsController
+
+    private
+
+    def scope_app_reviews
+      @app_reviews.where(question_id: params[:question_id])
+    end
+
+    def after_save
+      #do nothing because answers doesn't affect on app rating
+    end
+
+    def review_klass
+      MnoEnterprise::AppAnswer
+    end
+
+    def permitted_params
+      params.require(:app_answer).permit(:rating, :description, :organization_id, :question_id)
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module MnoEnterprise
+  class Jpi::V1::AppCommentsController < Jpi::V1::AppReviewsController
+
+    private
+
+    def scope_app_reviews
+      @app_reviews.where(feedback_id: params[:feedback_id])
+    end
+
+    def after_save
+      #do nothing because comments doesn't affect on app rating
+    end
+
+    def review_klass
+      MnoEnterprise::AppComment
+    end
+
+    def permitted_params
+      params.require(:app_comment).permit(:description, :organization_id, :feedback_id)
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module MnoEnterprise
+  class Jpi::V1::AppFeedbacksController < Jpi::V1::AppReviewsController
+
+    private
+
+    def permitted_params
+      params.require(:app_feedback).permit(:rating, :description, :organization_id)
+    end
+
+    def review_klass
+      MnoEnterprise::AppFeedback
+    end
+  end
+end

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

@@ -1,24 +1,5 @@
 module MnoEnterprise
   class Jpi::V1::AppInstancesController < Jpi::V1::BaseResourceController
-
-    # GET /mnoe/jpi/v1/organization/1/apps.json?timestamp=151452452345
-    def index
-      @app_instances = parent_organization.app_instances.select do |i| 
-        i.active? && i.updated_at > Time.at(timestamp) && can?(:access,i)
-      end
-    end
-    
-    # DELETE /mnoe/jpi/v1/app_instances/1
-    def destroy
-      app_instance = MnoEnterprise::AppInstance.find(params[:id])
-
-      if app_instance
-        authorize! :manage_app_instances, app_instance.owner
-        MnoEnterprise::EventLogger.info('app_destroy', current_user.id, "App destroyed", app_instance.name,app_instance)
-        app_instance.terminate
-      end
-      
-      head :accepted
-    end
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::AppInstancesController
   end
 end

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

@@ -0,0 +1,25 @@
+module MnoEnterprise
+  class Jpi::V1::AppQuestionsController < Jpi::V1::AppReviewsController
+
+    private
+
+    def scope_app_reviews
+      collection = @app_reviews.where(reviewable_id: current_app.id)
+      collection = collection.search(params[:search]) if params[:search].present?
+
+      collection
+    end
+
+    def after_save
+      #do nothing because questions doesn't affect on app rating
+    end
+
+    def permitted_params
+      params.require(:app_question).permit(:description, :organization_id)
+    end
+
+    def review_klass
+      MnoEnterprise::AppQuestion
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+module MnoEnterprise
+  class Jpi::V1::AppReviewsController < Jpi::V1::BaseResourceController
+    before_action :ensure_app_exists
+    before_action :find_review, only: [:update, :destroy]
+
+    # GET /mnoe/jpi/v1/marketplace/:id/app_reviews
+    def index
+      @app_reviews = review_klass.approved
+      @app_reviews = @app_reviews.limit(params[:limit]) if params[:limit]
+      @app_reviews = @app_reviews.skip(params[:offset]) if params[:offset]
+      @app_reviews = @app_reviews.order_by(params[:order_by]) if params[:order_by]
+      @app_reviews = @app_reviews.where(params[:where]) if params[:where]
+
+      @app_reviews = scope_app_reviews
+
+      @app_reviews = @app_reviews.all.fetch
+      response.headers['X-Total-Count'] = @app_reviews.metadata[:pagination][:count]
+    end
+
+    # POST /mnoe/jpi/v1/marketplace/:id/app_reviews/:id
+    def show
+      @app_review = review_klass.find(params[:review_id])
+    end
+
+    # POST /mnoe/jpi/v1/marketplace/:id/app_reviews
+    def create
+      # TODO: use the has_many associations -> @app.reviews.build
+      @app_review = review_klass.new(review_params)
+      if @app_review.save
+        after_save
+        render :show
+      else
+        render json: @app_review.errors, status: :bad_request
+      end
+    end
+
+    def update
+      if @app_review.update(permitted_params)
+        after_save
+        render :show
+      else
+        render json: @app_review.errors, status: :bad_request
+      end
+    end
+
+    def destroy
+      @app_review.destroy
+      after_save
+
+      render :show
+    end
+
+    private
+
+    # scope the app_reviews for the children controller
+    # may be overriden
+    def scope_app_reviews
+      @app_reviews.where(reviewable_id: current_app.id)
+    end
+
+    # perform some additional actions if new review was created
+    # may be overriden
+    def after_save
+      @average_rating = current_app.reload.average_rating
+    end
+
+    def current_app
+      @app ||= MnoEnterprise::App.find(params[:id])
+    end
+
+    def ensure_app_exists
+      render_not_found('App') unless current_app.present?
+    end
+
+    def find_review
+      @app_review = review_klass.find(params[:review_id])
+      unless @app_review.user_id == current_user.id
+        return render json:{ errors: {message: "Review not found (id=#{params[:review_id]})", code: 404} }, status: :not_found
+      end
+    end
+
+    def review_klass
+      MnoEnterprise::AppReview
+    end
+
+    def permitted_params
+      params.require(:app_review).permit(:rating, :description, :organization_id)
+    end
+
+    def review_params
+      permitted_params.merge(app_id: current_app.id, user_id: current_user.id)
+    end
+  end
+end