cul_omniauth 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d79b0f43eeca5c75a633f01fe939ddcc798e5a
-  data.tar.gz: a09213d0e00ca9642955507fba71d1e940fbcc30
+  metadata.gz: b8ba38b1d154bb45319aa7a7b320feebbd782d98
+  data.tar.gz: 3ff2f174925240d120e8787ce5b3074662b8e7f0
 SHA512:
-  metadata.gz: 977bed10ff96bfcc48668b99313076c2267bf8023071709be49d8d51a2de37317e1dc3bfe2ed00d065b8bd6f84658be2c7ff63623a50c50d3db18f9ff651ccbd
-  data.tar.gz: bc39d14929e69cbd30e50aeab065f069c8c14cdf935d484dd48ab1341291468ce97d7e65c35a8396e67e8f86800cec0d058c51d1b1a28d3103b23468d0ef50ef
+  metadata.gz: b93f0f9c6c8ba0ea242716e8fbe6d87086bb85a562f29b88eedabdeb16f6fabbabcc8a4b37696d29b07dbb031aac976543d0bf00b9b7ac4f052a347e6baa1c80
+  data.tar.gz: e1cb942dbfb5c8dd68e22d82a433dc0f355df74b5708d079668d920efed3c5088a7543848ea41cbc379fa260f332565aa53599d437140d0ed048b05576a5b4fa

data/app/controllers/concerns/cul/omniauth/callbacks.rb

@@ -28,7 +28,8 @@ module Cul::Omniauth::Callbacks
     affiliations(@current_user,affils)
     session["devise.roles"] = affils
     if @current_user && @current_user.persisted?
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", kind: auth_type
+      message = I18n.t "devise.omniauth_callbacks.success", kind: auth_type
+      flash[:notice] = message unless message.blank?
       sign_in_and_redirect @current_user, :event => :authentication
     else
       reason = @current_user ? 'no persisted user for id' : 'no uid in token'

data/app/models/concerns/cul/omniauth/users/configured_roles.rb

@@ -0,0 +1,12 @@
+module Cul::Omniauth::Users::ConfiguredRoles
+  extend ActiveSupport::Concern
+  def role? role_sym
+    super || begin
+      found = false
+      found = role_members(role_sym).detect {|member| self.role?(member.to_sym)}
+    end
+  end
+  def role_members(role_sym)
+    Ability.config.fetch(role_sym.to_sym,{}).fetch(:members,[])
+  end
+end

data/lib/cul/omniauth/version.rb

@@ -1,5 +1,5 @@
 module Cul
   module Omniauth
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

data/spec/dummy/log/test.log

@@ -122,3 +122,102 @@ no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
 no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}
+no persisted user for id {"uid"=>"foo", "extra"=>{}}

data/spec/lib/cul/omniauth/callbacks_spec.rb

@@ -59,6 +59,21 @@ describe Cul::Omniauth::Callbacks do
             subject.send method.downcase.to_sym
             expect(rig.flash[:notice]).to be
           end
+          context "and success translation is empty" do
+            before do
+              I18n.load_path.unshift fixture_path(File.join('test', 'locales', 'translation.en.yml'))
+              I18n.backend.reload!
+            end
+            after do
+              I18n.load_path.shift
+              I18n.backend.reload!
+            end
+            it do
+              is_expected.to receive(:sign_in_and_redirect)
+              subject.send method.downcase.to_sym
+              expect(rig.flash[:notice]).not_to be
+            end
+          end
           context "no current_user" do
             before do
               rig.instance_variable_set :@current_user, nil

data/spec/lib/cul/omniauth/users/configured_roles_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Cul::Omniauth::Users::ConfiguredRoles do
+
+  it do
+    is_expected.to be_a Module
+  end
+  context "is included" do
+    let(:uid) { 'foo' }
+    let(:rules) do
+      YAML.load(fixture('test/role_config/members.yml').read)['_all_environments']
+    end
+    let(:test_class) {
+    	c = Class.new(User)
+      c.class_eval do
+        attr_accessor :request, :flash, :session
+        include Cul::Omniauth::Users::ConfiguredRoles
+      end
+      c
+    }
+
+    before do
+      Ability.instance_variable_set :@role_proxy_config, symbolize_hash_keys(rules)
+    end
+
+    after do
+      Ability.instance_variable_set :@role_proxy_config, nil
+    end
+
+    subject { test_class.new }
+
+    context "a role as ad-hoc members" do
+      it 'should find memberships one level removed' do
+        expect(subject.role? 'one_level').to be
+      end
+      it 'should find memberships several levels removed' do
+        expect(subject.role? 'three_level').to be
+      end
+      it 'should still return false for other roles' do
+        expect(subject.role? 'none_level').not_to be
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -28,6 +28,10 @@ if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
+def fixture_path(filename)
+  path = File.join(File.dirname(__FILE__),'..','fixtures',filename)
+end
+
 def fixture(filename, mode="r")
   path = File.join(File.dirname(__FILE__),'..','fixtures',filename)
   if block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_omniauth
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - barmintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,6 +113,7 @@ files:
 - app/helpers/cul/omniauth/application_helper.rb
 - app/models/concerns/cul/omniauth/abilities.rb
 - app/models/concerns/cul/omniauth/users.rb
+- app/models/concerns/cul/omniauth/users/configured_roles.rb
 - app/views/layouts/cul/omniauth/application.html.erb
 - config/locales/cul_omniauth.en.yml
 - config/routes.rb
@@ -170,6 +171,7 @@ files:
 - spec/lib/cul/omniauth/abilities_spec.rb
 - spec/lib/cul/omniauth/callbacks_spec.rb
 - spec/lib/cul/omniauth/remote_ip_ability_spec.rb
+- spec/lib/cul/omniauth/users/configured_roles_spec.rb
 - spec/lib/cul/omniauth/users_spec.rb
 - spec/lib/omni_auth/strategies/saml/service_ticket_validator_spec.rb
 - spec/lib/omni_auth/strategies/wind/service_ticket_validator_spec.rb
@@ -240,6 +242,7 @@ test_files:
 - spec/lib/cul/omniauth/abilities_spec.rb
 - spec/lib/cul/omniauth/callbacks_spec.rb
 - spec/lib/cul/omniauth/remote_ip_ability_spec.rb
+- spec/lib/cul/omniauth/users/configured_roles_spec.rb
 - spec/lib/cul/omniauth/users_spec.rb
 - spec/lib/omni_auth/strategies/saml/service_ticket_validator_spec.rb
 - spec/lib/omni_auth/strategies/wind/service_ticket_validator_spec.rb