mno-enterprise-api 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a34e4066d4912616b04c98ef5d7a1edeaba36e
-  data.tar.gz: 29516a4df5d0ddf21261b17e78d43d97743f65bc
+  metadata.gz: aca789ccaa3b68b00a79413bbf8e83bcb628036a
+  data.tar.gz: ccf5fa38550cb5e74f7004c1271c2a48a264e860
 SHA512:
-  metadata.gz: 67aaab3ebbdb8ec01c453b96d53f6d4eae2f0e7cddf2bd5998f461c4e904fc6f760ada7d2f257412c7944a347a55ab7b7868f536e9cbb7106a88485854461053
-  data.tar.gz: e9b4d84536aaf56dc637caa9997128f288ef77beab1d3cd8ec710b21eef0976d41833f0c28ac5f406706dcae813566b8d5c7563bc45f18ad844559dbc4370e86
+  metadata.gz: 302386679ffddde2bd791d19cb18d7b64dc4fadda341372f7622a1b81dce5160505bfcf895fecd2a73ec0bfb683e55a6bed46d26805c03a77b6380122634eee1
+  data.tar.gz: deb2aeb804abed9aa8b6fef398cad557224276195885fac6fa5990ebb6eb8810f7997fbb79a4c9e88d8fb20080b62fc9b5521909d8dd70ecc819883dbe3113ac

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

@@ -1,63 +1,5 @@
 module MnoEnterprise
   class Jpi::V1::Impac::WidgetsController < Jpi::V1::BaseResourceController
-    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
-
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::WidgetsController
   end
 end

data/lib/mno_enterprise/concerns/controllers/jpi/v1/impac/widgets_controller.rb

@@ -0,0 +1,72 @@
+module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::WidgetsController
+  extend ActiveSupport::Concern
+
+  #==================================================================
+  # Included methods
+  #==================================================================
+  # 'included do' causes the included code to be evaluated in the
+  # context where it is included rather than being executed in the module's context
+  included do
+    respond_to :json
+  end
+
+  #==================================================================
+  # Instance methods
+  #==================================================================
+  # 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

data/lib/mno_enterprise/concerns/controllers/org_invites_controller.rb

@@ -29,7 +29,7 @@ module MnoEnterprise::Concerns::Controllers::OrgInvitesController
     redirect_path = mnoe_home_path
 
     if @org_invite && !@org_invite.expired? && @org_invite.accept!(current_user)
-      redirect_path += "#/?dhbRefId=#{ @org_invite.organization.id}"
+      redirect_path = add_param_to_fragment(redirect_path.to_s, 'dhbRefId', @org_invite.organization.id)
       message = { notice: "You are now part of #{@org_invite.organization.name}" }
       yield(:success, @org_invite) if block_given?
     elsif @org_invite && @org_invite.expired?

data/lib/mno_enterprise/concerns/mailers/system_notification_mailer.rb

@@ -128,7 +128,8 @@ module MnoEnterprise::Concerns::Mailers::SystemNotificationMailer
   protected
 
   def recipient(record, new_user = false)
-    hash = { email: record.email }
+    # Org Invite for unconfirmed users will have the email in #unconfirmed_email
+    hash = { email: record.email || record.unconfirmed_email }
     hash[:name] = "#{record.name} #{record.surname}".strip unless new_user
     hash
   end

data/spec/controllers/mno_enterprise/org_invites_controller_spec.rb

@@ -8,7 +8,7 @@ module MnoEnterprise
   describe OrgInvitesController, type: :controller do
     render_views
     routes { MnoEnterprise::Engine.routes }
-  
+
     let(:user) { build(:user) }
     let(:invite) { build(:org_invite, user: user) }
     let(:token) { invite.token }
@@ -25,7 +25,7 @@ module MnoEnterprise
     describe "GET #show" do
       subject { get :show, id: invite.id, token: token}
 
-      let(:success_fragment) { "#/?dhbRefId=#{invite.organization.id}&#{URI.encode_www_form([['flash', {msg: "You are now part of #{invite.organization.name}", type: :success}.to_json]])}" }
+      let(:success_fragment) { "#?dhbRefId=#{invite.organization.id}&#{URI.encode_www_form([['flash', {msg: "You are now part of #{invite.organization.name}", type: :success}.to_json]])}" }
       let(:expired_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "It looks like this invite has expired. Please ask your company administrator to resend the invite.", type: :error}.to_json]])}" }
       let(:invalid_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "Unfortunately, this invite does not seem to be valid.", type: :error}.to_json]])}" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/mno_enterprise/concerns/controllers/jpi/v1/current_users_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/deletion_requests_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/impac/dashboards_controller.rb
+- lib/mno_enterprise/concerns/controllers/jpi/v1/impac/widgets_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/organizations_controller.rb
 - lib/mno_enterprise/concerns/controllers/org_invites_controller.rb
 - lib/mno_enterprise/concerns/controllers/pages_controller.rb