mno-enterprise-core 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6186245d5ffafcbdde4aebcb976b5ec4e841b2
-  data.tar.gz: d5ecb24f9f5be4a58bbd39b1ee0f1210c971d544
+  metadata.gz: 65ad5fd0badd5b1b262d37cec7072456038fb961
+  data.tar.gz: 5c4a566cd957070e836af6a3d7ada961f80242f2
 SHA512:
-  metadata.gz: f0ed824978bc6d391744c66a0045e634bd4364c289796e4138bf2818955eac35f2957c27d9183c3e17d5e138b5c29fc7ddb91d765053606e4adda06d53b15a99
-  data.tar.gz: 665975695947ba02bae356968e139128006e258730e949bcd5e14709a39bf264e01f265e4a22d024c9f5ff5bb696606c238bfc22a0a39425da29d1f90e0f1c74
+  metadata.gz: 17d9bd4a3783ad23a7882ebac470cda39b8879df49050a17cee7a612afd1acf60b47f3d089d4335ada1900fecfed572ff4747139e7a19be6c650a2c562ff47e6
+  data.tar.gz: f42a459f8bd6e7f5b22d330e3d7fd2fbfa4de1b58ac5e05d716371ec9281dfa095fbbc3a2c60527d3ea5b9137f784924ced36b44e73d86125e6aa911ae3e4293

data/app/controllers/mno_enterprise/application_controller.rb

@@ -98,8 +98,12 @@ module MnoEnterprise
     # Redirect to previous url and reset it
     def after_sign_in_path_for(resource)
       previous_url = session.delete(:previous_url)
-      url = MnoEnterprise.router.dashboard_path || main_app.root_url
-      return (return_to_url(resource) || previous_url || url)
+      default_url = if resource.respond_to?(:admin_role) && resource.admin_role.present?
+        MnoEnterprise.router.admin_path
+      else
+        MnoEnterprise.router.dashboard_path || main_app.root_url
+      end
+      return (return_to_url(resource) || previous_url || default_url)
     end
 
     # Some controllers needs to redirect to 'MySpace' which breaks if you dont use mnoe-frontend

data/lib/her_extension/middleware/mnoe_raise_error.rb

@@ -0,0 +1,21 @@
+module Her
+  module Middleware
+    # This middleware will raise errors based on the response status
+    # Same as Faraday::Response::RaiseError, except it will catch specific
+    # errors codes rather than everything in 400..600
+    class MnoeRaiseError < Faraday::Response::RaiseError
+      def on_complete(env)
+        case env[:status]
+        when 407
+          # mimic the behavior that we get with proxy requests with HTTPS
+          raise Faraday::Error::ConnectionFailed,
+                %(407 "Proxy Authentication Required ")
+        when 502..504
+          raise Faraday::Error::ConnectionFailed, response_values(env)
+        when 401, 500
+          raise Faraday::Error::ClientError, response_values(env)
+        end
+      end
+    end
+  end
+end

data/lib/her_extension/model/relation.rb

@@ -26,6 +26,9 @@ module Her
       # Use filter instead of raw parameters
       def where(params = {})
         return self if !params || params.empty?
+        # If a value is an empty array, it'll be excluded when calling params.to_query, so convert it to nil instead
+        params.each { |k, v| params[k] = v.presence if v.is_a?(Array) }
+
         self.params[:filter] ||= {}
         self.params[:filter].merge!(params)
         self

data/lib/mno_enterprise/core.rb

@@ -18,6 +18,7 @@ require "her_extension/model/associations/association"
 require "her_extension/model/associations/association_proxy"
 require "her_extension/model/associations/has_many_association"
 require "her_extension/middleware/mnoe_api_v1_parse_json"
+require "her_extension/middleware/mnoe_raise_error"
 require "faraday_middleware"
 require "mno_enterprise/engine"
 
@@ -53,6 +54,10 @@ module MnoEnterprise
       @terms_url || '#'
     end
 
+    def admin_path
+      @admin_path || '/admin/'
+    end
+
     def launch_url(id,opts = {})
       host_url("/launch/#{id}",opts)
     end
@@ -310,6 +315,9 @@ module MnoEnterprise
 
         # Adapter
         c.use Faraday::Adapter::NetHttpNoProxy
+
+        # Error Handling
+        c.use Her::Middleware::MnoeRaiseError
       end
     end
 end

data/lib/mno_enterprise/testing_support/factories/users.rb

@@ -4,7 +4,7 @@
 # Use as such: build(:api_user)
 # See http://stackoverflow.com/questions/10032760/how-to-define-an-array-hash-in-factory-girl
 FactoryGirl.define do
-  
+
   factory :user, class: MnoEnterprise::User do
     sequence(:id)
     sequence(:uid) { |n| "usr-fda9#{n}" }
@@ -20,28 +20,32 @@ FactoryGirl.define do
     created_at 2.days.ago
     updated_at 2.days.ago
     sso_session "1fdd5sf5a73D7sd1as2a4sd541"
-    admin_role false
+    admin_role nil
 
     confirmation_sent_at 2.days.ago
     confirmation_token "wky763pGjtzWR7dP44PD"
     confirmed_at 1.days.ago
-    
+
     trait :unconfirmed do
       confirmed_at nil
     end
 
     trait :admin do
-      admin_role true
+      admin_role 'admin'
+    end
+
+    trait :staff do
+      admin_role 'staff'
     end
 
     trait :with_deletion_request do
       deletion_request { build(:deletion_request).attributes }
     end
-    
+
     trait :with_organizations do
       organizations { [build(:organization).attributes] }
     end
-    
+
     # Properly build the resource with Her
     initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }
   end

data/lib/mno_enterprise/testing_support/mno_enterprise_api_test_helper.rb

@@ -124,7 +124,8 @@ module MnoEnterpriseApiTestHelper
 
         # Response
         c.use Her::Middleware::MnoeApiV1ParseJson
-      
+        c.use Her::Middleware::MnoeRaiseError
+
         # Add stubs on the test adapter
         c.use MnoeFaradayTestAdapter do |receiver|
           @_stub_list.each do |key,stub|

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/spec/controllers/mno_enterprise/application_controller_spec.rb

@@ -2,14 +2,30 @@ require 'rails_helper'
 
 module MnoEnterprise
   describe ApplicationController, type: :controller do
+    # create an anonymous subclass of ApplicationController to expose protected methods
+    controller(MnoEnterprise::ApplicationController) do
+      def after_sign_in_path_for(resource)
+        super
+      end
+      def add_param_to_fragment(url, param_name, param_value)
+        super
+      end
+    end
+
     describe '#add_param_to_fragment' do
-      let(:controller) { MnoEnterprise::ApplicationController.new }
+      it { expect(controller.add_param_to_fragment('/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/', 'foo', 'bar')).to eq('/#?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
+    end
 
-      it { expect(subject.send(:add_param_to_fragment, '/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
-      it { expect(subject.send(:add_param_to_fragment, '/', 'foo', 'bar')).to eq('/#?foo=bar') }
-      it { expect(subject.send(:add_param_to_fragment, '/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
-      it { expect(subject.send(:add_param_to_fragment, '/#/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
+    describe '#after_sign_in_path_for' do
+      before { @request.env["devise.mapping"] = Devise.mappings[:user] }
+
+      it { expect(controller.after_sign_in_path_for(User.new())).to eq('/dashboard/') }
+      it { expect(controller.after_sign_in_path_for(User.new(admin_role: "staff"))).to eq('/admin/') }
+      it { expect(controller.after_sign_in_path_for(User.new(admin_role: ""))).to eq('/dashboard/') }
+      it { expect(controller.after_sign_in_path_for(User.new(admin_role: "admin"))).to eq('/admin/') }
     end
   end
-
 end

data/spec/controllers/mno_enterprise/i18n_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module MnoEnterprise
-  describe ApplicationController, type: :controller do
+  describe 'ApplicationController I18n', type: :controller do
     # Anonymous controller
     controller do
       include MnoEnterprise::Concerns::Controllers::I18n

data/spec/lib/her_extension/model/relation_spec.rb

@@ -3,5 +3,19 @@ require 'rails_helper'
 module MnoEnterprise
   RSpec.describe Her::Model::Relation do
     pending "add specs for Her::Model::Relation monkey patch: #{__FILE__}"
+
+    let(:dummy_class) { Class.new { include Her::Model } }
+
+    describe '.where' do
+      it 'adds the filter to params[:filter]' do
+        rel = Her::Model::Relation.new(dummy_class).where('uid.in' => [1, 2], 'foo' => 'bar')
+        expect(rel.params[:filter]).to eq('uid.in' => [1, 2], 'foo' => 'bar')
+      end
+
+      it 'replaces empty array values with nil' do
+        rel = Her::Model::Relation.new(dummy_class).where('id.in' => [])
+        expect(rel.params[:filter]).to eq('id.in' => nil)
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/base_resource_spec.rb

@@ -2,6 +2,28 @@ require 'rails_helper'
 
 module MnoEnterprise
   RSpec.describe BaseResource, type: :model do
+    describe 'Error Handling' do
+      class Test < BaseResource; end
+
+      context 'Connection Errors' do
+        ((502..504).to_a<<407).each do |code|
+          it "handles #{code} error" do
+            api_stub_for(get: "/tests/1", code: code)
+            expect { Test.find(1) }.to raise_error(Faraday::ConnectionFailed)
+          end
+        end
+      end
+
+      context 'Server Errors' do
+        [401, 500].each do |code|
+          it "handles #{code} error" do
+            api_stub_for(get: "/tests/1", code: code)
+            expect { Test.find(1) }.to raise_error(Faraday::Error::ClientError)
+          end
+        end
+      end
+    end
+
     describe '#cache_key' do
       context 'for existing record' do
         let(:user) { build(:user) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -478,6 +478,7 @@ files:
 - lib/generators/mno_enterprise/templates/scripts/upstart/app.conf
 - lib/her_extension/her_orm_adapter.rb
 - lib/her_extension/middleware/mnoe_api_v1_parse_json.rb
+- lib/her_extension/middleware/mnoe_raise_error.rb
 - lib/her_extension/model/associations/association.rb
 - lib/her_extension/model/associations/association_proxy.rb
 - lib/her_extension/model/associations/has_many_association.rb