g5_authenticatable 0.7.4 → 0.7.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6226cb2f0aa0c56f0bc9e1e35470b868f4c96ac
-  data.tar.gz: 1e6956f7a93be516354c700d58bfb67afb3cf715
+  metadata.gz: 397be11accbb1a768cab5e7a49357a5c26b4068e
+  data.tar.gz: 9192353fbd88e1aaae7296e9a3b729d064384785
 SHA512:
-  metadata.gz: c6d22c7461167d91b95753482479dd465c1496234b01f60837cf21b6f39c2ead7a1bd7e4bc241dde8eca3c1d585e5022f9df6dc95d4fbcb90b87a434e730bccf
-  data.tar.gz: 4929eb62f866ed92a08b5a1bd29445cdb82c0162ee663fd49982d0d883d3dc84bd06dae6fb3be81133555f42ae67bb0a31a588907a559eb30e472689b525a36e
+  metadata.gz: d689e1b2a13b7940d95c6039b39dd86082d42f55ccd624cf03fa45ba2bad127e32c9cfe9e94cda0874ed97e25f72f57d6230f243b2f90c1cdd6e63548d31a91a
+  data.tar.gz: 6e52489b18d15adc7bbd531d46999747a992bdb931c0dec0a64949f653d14418e39918eb35f27f4abac85b7df397b8beff3d3c34e12f2b648ad17c0e3c9ecfcc

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+before_install:
+  - gem install bundler
 script:
   - RAILS_ENV=test bundle exec rake app:db:setup
   - bundle exec rspec spec
@@ -13,4 +15,4 @@ env:
   global:
     - DEVISE_SECRET_KEY=foo
 addons:
-  postgresql: "9.2"
+  postgresql: "9.2"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.7.5.beta (2016-01-15)
+
+* Fixes bug that granted higher permissions when the resource for a scoped roles didn't exist.
+
+
 ## v0.7.4 (2015-12-09)
 
 * Adds Impersonate (Assume) Devise Strategy and Concern to handle access to session stored values

data/app/models/g5_authenticatable/user.rb

@@ -7,6 +7,8 @@ module G5Authenticatable
     validates :email, presence: true, uniqueness: true
     validates_uniqueness_of :uid, scope: :provider
 
+    GLOBAL_ROLE = 'GLOBAL'
+
     def self.new_with_session(params, session)
       user = super(params, session)
       auth_data = session['omniauth.auth']
@@ -31,7 +33,7 @@ module G5Authenticatable
     def update_roles_from_auth(auth_data)
       roles.clear
       auth_data.extra.roles.each do |role|
-        role.type == 'GLOBAL' ? add_role(role.name) : add_scoped_role(role)
+        role.type == GLOBAL_ROLE ? add_role(role.name) : add_scoped_role(role)
       end
     end
 
@@ -55,7 +57,7 @@ module G5Authenticatable
     def add_scoped_role(role)
       the_class = Object.const_get(role.type)
       resource = the_class.where(urn: role.urn).first
-      add_role(role.name, resource)
+      add_role(role.name, resource) if resource.present?
     rescue => e
       Rails.logger.error(e)
     end

data/lib/g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module G5Authenticatable
-  VERSION = '0.7.4'
+  VERSION = '0.7.5.beta'
 end

data/spec/models/g5_authenticatable/user_spec.rb

@@ -65,28 +65,26 @@ describe G5Authenticatable::User do
     let(:params) { Hash.new }
     let(:auth_data) do
       OmniAuth::AuthHash.new(
-        {
-          'provider' => new_user_attributes[:provider],
-          'info' => {
-            'email' => new_user_attributes[:email],
-            'name' => "#{new_user_attributes[:first_name]} #{new_user_attributes[:last_name]}",
-            'first_name' => new_user_attributes[:first_name],
-            'last_name' => new_user_attributes[:last_name],
-            'phone' => new_user_attributes[:phone_number]
-          },
-          'credentials' => {
-            'token' => new_user_attributes[:g5_access_token],
-            'expires' => true,
-            'expires_at' => Time.now + 1000
-          },
-          'extra' => {
-            'title' => new_user_attributes[:title],
-            'organization_name' => new_user_attributes[:organization_name],
-            'roles' => [
-              { 'name' => new_role_attributes[:name], 'type' => 'GLOBAL', 'urn' => nil }
-            ],
-            'raw_info' => {}
-          }
+        'provider' => new_user_attributes[:provider],
+        'info' => {
+          'email' => new_user_attributes[:email],
+          'name' => "#{new_user_attributes[:first_name]} #{new_user_attributes[:last_name]}",
+          'first_name' => new_user_attributes[:first_name],
+          'last_name' => new_user_attributes[:last_name],
+          'phone' => new_user_attributes[:phone_number]
+        },
+        'credentials' => {
+          'token' => new_user_attributes[:g5_access_token],
+          'expires' => true,
+          'expires_at' => Time.now + 1000
+        },
+        'extra' => {
+          'title' => new_user_attributes[:title],
+          'organization_name' => new_user_attributes[:organization_name],
+          'roles' => [
+            { 'name' => new_role_attributes[:name], 'type' => 'GLOBAL', 'urn' => nil }
+          ],
+          'raw_info' => {}
         })
     end
 
@@ -398,7 +396,6 @@ describe G5Authenticatable::User do
     let(:user_attributes2) { FactoryGirl.attributes_for(:g5_authenticatable_user) }
     let(:mock_urn) { 'mock_urn' }
 
-
     let(:mock_resource_class) { Class.new }
     before { stub_const('MockResource', mock_resource_class) }
 
@@ -409,48 +406,46 @@ describe G5Authenticatable::User do
 
     let(:auth_data) do
       OmniAuth::AuthHash.new(
-        {
-          'provider' => user_attributes[:provider],
-          'uid' => user_attributes[:uid],
-          'info' => {
-            'email' => user_attributes[:email],
-            'first_name' => user_attributes[:first_name],
-            'last_name' => user_attributes[:last_name],
-            'phone' => user_attributes[:phone_number]
-          },
-          'credentials' => {
-            'token' => user_attributes[:g5_access_token],
-            'expires' => true,
-            'expires_at' => Time.now + 1000
-          },
-          'extra' => {
-            'title' => user_attributes[:title],
-            'organization_name' => user_attributes[:organization_name],
-            'roles' => roles,
-            'raw_info' => {}
-          }
-        })
+        'provider' => user_attributes[:provider],
+        'uid' => user_attributes[:uid],
+        'info' => {
+          'email' => user_attributes[:email],
+          'first_name' => user_attributes[:first_name],
+          'last_name' => user_attributes[:last_name],
+          'phone' => user_attributes[:phone_number]
+        },
+        'credentials' => {
+          'token' => user_attributes[:g5_access_token],
+          'expires' => true,
+          'expires_at' => Time.now + 1000
+        },
+        'extra' => {
+          'title' => user_attributes[:title],
+          'organization_name' => user_attributes[:organization_name],
+          'roles' => roles,
+          'raw_info' => {}
+      })
     end
 
     context 'with global role' do
-      let(:roles) { [
-        {name: 'admin', type: 'GLOBAL', urn: nil}
-      ] }
+      let(:roles) do
+        [{ name: 'admin', type: 'GLOBAL', urn: nil }]
+      end
 
       it 'will add a global role' do
-        expect{ user.update_roles_from_auth(auth_data) }.to change{ user.roles.length }.from(0).to(1)
+        expect { user.update_roles_from_auth(auth_data) }.to change { user.roles.length }.from(0).to(1)
         expect(user.roles.first.name).to eq('admin')
         expect(user.roles.first.resource).to be_nil
       end
     end
 
     context 'with a scoped role' do
-      let(:roles) { [
-        {name: 'viewer', type: 'MockResource', urn: mock_urn}
-      ] }
+      let(:roles) do
+        [{ name: 'viewer', type: 'MockResource', urn: mock_urn }]
+      end
 
       it 'will add a scoped role' do
-        expect{ user.update_roles_from_auth(auth_data) }.to change{ user.roles.length }.from(0).to(1)
+        expect { user.update_roles_from_auth(auth_data) }.to change { user.roles.length }.from(0).to(1)
         expect(user.roles.first.name).to eq('viewer')
         expect(user.roles.first.resource_id).to eq(mock_resource.id)
         expect(user.roles.first.resource_type).to eq('MockResource')
@@ -458,31 +453,51 @@ describe G5Authenticatable::User do
     end
 
     context 'with a more than 1 role' do
-      let(:roles) { [
-        {name: 'viewer', type: 'MockResource', urn: mock_urn},
-        {name: 'admin', type: 'GLOBAL', urn: nil}
-      ] }
+      let(:roles) do
+        [
+          { name: 'viewer', type: 'MockResource', urn: mock_urn },
+          { name: 'admin', type: 'GLOBAL', urn: nil }
+        ]
+      end
 
       it 'will add a scoped role' do
-        expect{ user.update_roles_from_auth(auth_data) }.to change{ user.roles.length }.from(0).to(2)
+        expect { user.update_roles_from_auth(auth_data) }.to change { user.roles.length }.from(0).to(2)
       end
     end
+
+    context 'with an un-existing scoped role URL' do
+      let(:non_existing_urn) { 'some-non-existing-urn' }
+      before do
+        allow(mock_resource_class).to receive(:where).with(urn: non_existing_urn).and_return([])
+      end
+
+      let(:roles) do
+        [{ name: 'viewer', type: 'MockResource', urn: non_existing_urn }]
+      end
+
+      it 'will add a scoped role' do
+        expect { user.update_roles_from_auth(auth_data) }.to_not change { user.roles.length }
+      end
+    end
+
     context 'with 0 roles' do
       let(:roles) { [] }
 
       it 'will add a scoped role' do
-        expect{ user.update_roles_from_auth(auth_data) }.to_not change{ user.roles.length }.from(0)
+        expect { user.update_roles_from_auth(auth_data) }.to_not change { user.roles.length }.from(0)
       end
     end
 
     context 'with a bad role type' do
-      let(:roles) { [
-        {name: 'viewer', type: 'MockResource', urn: mock_urn},
-        {name: 'viewer', type: 'BadResource', urn: mock_urn}
-      ] }
+      let(:roles) do
+        [
+          { name: 'viewer', type: 'MockResource', urn: mock_urn },
+          { name: 'viewer', type: 'BadResource', urn: mock_urn }
+        ]
+      end
 
       it 'will skip the bad role' do
-        expect{ user.update_roles_from_auth(auth_data) }.to change{ user.roles.length }.from(0).to(1)
+        expect { user.update_roles_from_auth(auth_data) }.to change { user.roles.length }.from(0).to(1)
         expect(user.roles.first.name).to eq('viewer')
         expect(user.roles.first.resource_id).to eq(mock_resource.id)
         expect(user.roles.first.resource_type).to eq('MockResource')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5.beta
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -266,9 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2