g5_authenticatable 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cad812409d3b2240214bf1984fc0ac285011072
-  data.tar.gz: 7116d3828bcc927ffc1aa7cef4e0e79ec52da2e8
+  metadata.gz: 93238b9dd28980b2722ffc334c98c7c29aed9952
+  data.tar.gz: cd9eaa8d01343dd9463a0a6a2cc082331ec89f49
 SHA512:
-  metadata.gz: c1ea849772f6d6bfb1948c172f6c5e991a0e6160e924a0b0e843024aa80b308329478c8ef10494482c35d68a4c1377527df244d49549cc290e9ca4c389f7b5ac
-  data.tar.gz: 50fbcc29a23cbb1673f6eb3baed96ff36dbbc3926e65e7c3f379f1e2d19b5ffff027b65b328394e57588e024546d5abb6d5fb85098771f1843f4ce9edc2aa788
+  metadata.gz: 39a183780b26fb0bb1c730797504f549bd7510d10e76bf6946b52d818de6b5215649eebb48717150cffa551e337e0cea7c85e3891c9ee3a1196b6437aa4c080f
+  data.tar.gz: 036629738e9fd3c4f1888f9bd53b82a1bf61485bf01305cc97da8ebb32c9a342d792ec2e3b68abc5db9eb91ecf6202f8f03079d5f7dcaf66d981ca1423eed60d

data/.gitignore

@@ -23,3 +23,4 @@ spec/dummy/tmp/
 spec/dummy/.sass-cache
 spec/dummy/config/database.yml
 .env.*
+.idea

data/Gemfile

@@ -27,6 +27,7 @@ group :test do
   gem 'shoulda-matchers', '~> 2.6'
   gem 'generator_spec'
   gem 'rspec-http', require: 'rspec/http'
+  gem 'rspec-activemodel-mocks'
 end
 
 # Declare any dependencies that are still in development here instead of in

data/app/models/g5_authenticatable/user.rb

@@ -32,7 +32,19 @@ module G5Authenticatable
 
     def update_roles_from_auth(auth_data)
       roles.clear
-      auth_data.extra.roles.each { |role| add_role(role.name) }
+      auth_data.extra.roles.each do |role|
+        if(role.type == 'GLOBAL')
+          add_role(role.name)
+        else
+          begin
+            the_class = Object.const_get(role.type)
+            resource = the_class.where(urn: role.urn).first
+            add_role(role.name, resource)
+          rescue => e
+            Rails.logger.error(e)
+          end
+        end
+      end
     end
 
     private
@@ -45,5 +57,7 @@ module G5Authenticatable
         organization_name: auth_data.extra.organization_name
       }
     end
+
+
   end
 end

data/g5_authenticatable.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'devise_g5_authenticatable', '~> 0.2', '>= 0.2.1'
-  spec.add_dependency 'omniauth-g5', '~> 0.2'
-  spec.add_dependency 'g5_authenticatable_api', '~> 0.3.1'
+  spec.add_dependency 'devise_g5_authenticatable', '~> 0.2.2'
+  spec.add_dependency 'omniauth-g5', '~> 0.3'
+  spec.add_dependency 'g5_authenticatable_api', '~> 0.4.1'
   spec.add_dependency 'rolify', '~> 4.0'
   spec.add_dependency 'pundit', '~> 1.0'
 end

data/lib/g5_authenticatable/test/feature_helpers.rb

@@ -16,7 +16,7 @@ module G5Authenticatable
             title: user.title,
             organization_name: user.organization_name,
             roles: user.roles.collect do |role|
-              {name: role.name}
+              {name: role.name, type: 'GLOBAL', urn: nil}
             end,
             raw_info: {}
           }

data/lib/g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module G5Authenticatable
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/spec/features/sign_in_spec.rb

@@ -28,7 +28,7 @@ describe 'Signing in' do
           extra: {
             title: updated_title,
             organization_name: updated_organization_name,
-            roles: [{name: updated_role.name}],
+            roles: [{name: updated_role.name, type: 'GLOBAL', urn: nil}],
             raw_info: {}
           }
         })
@@ -123,7 +123,7 @@ describe 'Signing in' do
           extra: {
             title: user_attributes[:title],
             organization_name: user_attributes[:organization_name],
-            roles: [{name: role_attributes[:name]}],
+            roles: [{name: role_attributes[:name], type: 'GLOBAL', urn: nil}],
             raw_info: {}
           }
         })

data/spec/models/g5_authenticatable/user_spec.rb

@@ -64,30 +64,31 @@ describe G5Authenticatable::User do
 
     let(:params) { Hash.new }
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        'provider' => new_user_attributes[:provider],
-        'uid' => new_user_attributes[:uid],
-        '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]}
-          ],
-          'raw_info' => {}
-        }
-      })
+      OmniAuth::AuthHash.new(
+        {
+          'provider' => new_user_attributes[:provider],
+          'uid' => new_user_attributes[:uid],
+          '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
 
     let(:new_user_attributes) { FactoryGirl.attributes_for(:g5_authenticatable_user) }
@@ -180,7 +181,7 @@ describe G5Authenticatable::User do
                                  phone_number: nil,
                                  title: nil,
                                  organization_name: nil
-                                )
+      )
     end
     let(:role_name) { :my_role }
 
@@ -190,29 +191,30 @@ describe G5Authenticatable::User do
     end
 
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        'provider' => user_attributes[:provider],
-        'uid' => user_attributes[:uid],
-        'info' => {
-          'email' => updated_attributes[:email],
-          'first_name' => updated_attributes[:first_name],
-          'last_name' => updated_attributes[:last_name],
-          'phone' => updated_attributes[:phone_number]
-        },
-        'credentials' => {
-          'token' => updated_attributes[:g5_access_token],
-          'expires' => true,
-          'expires_at' => Time.now + 1000
-        },
-        'extra' => {
-          'title' => updated_attributes[:title],
-          'organization_name' => updated_attributes[:organization_name],
-          'roles' => [
-            {name: updated_role_name}
-          ],
-          'raw_info' => {}
-        }
-      })
+      OmniAuth::AuthHash.new(
+        {
+          'provider' => user_attributes[:provider],
+          'uid' => user_attributes[:uid],
+          'info' => {
+            'email' => updated_attributes[:email],
+            'first_name' => updated_attributes[:first_name],
+            'last_name' => updated_attributes[:last_name],
+            'phone' => updated_attributes[:phone_number]
+          },
+          'credentials' => {
+            'token' => updated_attributes[:g5_access_token],
+            'expires' => true,
+            'expires_at' => Time.now + 1000
+          },
+          'extra' => {
+            'title' => updated_attributes[:title],
+            'organization_name' => updated_attributes[:organization_name],
+            'roles' => [
+              {name: updated_role_name, type: 'GLOBAL', urn: nil}
+            ],
+            'raw_info' => {}
+          }
+        })
     end
 
     context 'when user info is the same' do
@@ -373,4 +375,106 @@ describe G5Authenticatable::User do
       end
     end
   end
+
+  describe '#update_roles_from_auth' do
+    before do
+      user.roles = []
+      user.save!
+    end
+
+    let(:user2) { G5Authenticatable::User.create(user_attributes) }
+    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) }
+
+    let(:mock_resource) { stub_model(mock_resource_class, urn: mock_urn) }
+    before do
+      allow(mock_resource_class).to receive(:where).with(urn: mock_urn).and_return([mock_resource])
+    end
+
+    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' => {}
+          }
+        })
+    end
+
+    context 'with global role' do
+      let(:roles) { [
+        {name: 'admin', type: 'GLOBAL', urn: nil}
+      ] }
+
+      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.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}
+      ] }
+
+      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.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')
+      end
+    end
+
+    context 'with a more than 1 role' do
+      let(:roles) { [
+        {name: 'viewer', type: 'MockResource', urn: mock_urn},
+        {name: 'admin', type: 'GLOBAL', urn: nil}
+      ] }
+
+      it 'will add a scoped role' do
+        expect{ user.update_roles_from_auth(auth_data) }.to change{ user.roles.length }.from(0).to(2)
+      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)
+      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}
+      ] }
+
+      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.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')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: omniauth-g5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: g5_authenticatable_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement