g5_authenticatable 1.1.2.pre.1 → 1.1.2.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081f7ecf2032384e90e2496d589a4b1f4ec09136d05acec75ac2e05b747e336d'
-  data.tar.gz: db926d3359f6e8fa3eb2e88d6bf48ad519743721da0928db845b89fcdcb19ee0
+  metadata.gz: c2cb34d3b28574111f10bb4db862b8b54276bd825763a7540294d353906e81e8
+  data.tar.gz: fa649cec65a016088cf63073e3503b546a7daeb19d0de5d5393a49480070e1a3
 SHA512:
-  metadata.gz: a3db25d8018a283bda4d8d3aa34c2ab34dc3ec9b60065cdd86c0e87e4fb5cf155108d60c96711e097749c8f47d163383b75a5af34e8063a5d43109b2d0e47ccf
-  data.tar.gz: 25db85aa0014338a5cd1a13932543ef8fbe6df0106e19eed1702b141c3d4815ebd6127e51a8207398f46ffe579b9d2deb9a2b399ba01015b2a6e7685d0e3953a
+  metadata.gz: 744623d894aac98bc79523e84d9aab3c42a1ae59733bce8cb95e1c929685c1746b48dbed9c3fdad09f1c1207af6f66ce7c19c55aabb9352ea9624a3ed0d60303
+  data.tar.gz: 948276bb53c47074e9425cd2f1e9f3d9473b8521936b20d3fe3ab48b93858f5bd18eeb12ea45ea6cdb9da663bafb062d64f748974f1db83350b29410fea638fb

data/CHANGELOG.md

@@ -1,5 +1,3 @@
-## v1.1.2 (2018-12-20)
-* Adding `User.current_client_urn` to better support Pundit authorization
 ## v1.1.1 (2018-06-21)
 
 * Support rails 5.2 green field apps, including fixes for setting the default

data/README.md

@@ -76,7 +76,7 @@ root to: 'home#index'
 ### Registering your OAuth application
 
 1. Visit the auth server admin console and login:
-  * For development, visit https://auth-staging.g5devops.com/admin
+  * For development, visit https://dev-auth.g5search.com/admin
   * For production, visit https://auth.g5search.com/admin
 2. Click "New Application"
 3. Enter a name that recognizably identifies your application.
@@ -106,7 +106,7 @@ environment variables for your client application:
 * `G5_AUTH_CLIENT_SECRET` - the OAuth 2.0 application secret from the auth server
 * `G5_AUTH_REDIRECT_URI` - the OAuth 2.0 redirect URI registered with the auth server
 * `G5_AUTH_ENDPOINT` - the endpoint URL (without any path info) for the G5 auth server.
-  Generally, this will be set to either `https://auth-staging.g5devops.com` or
+  Generally, this will be set to either `https://dev-auth.g5search.com` or
   `https://auth.g5search.com` (the default).
 
 If you need to make server-to-server API calls that are not associated with an

data/app/models/g5_authenticatable/user.rb

@@ -9,7 +9,6 @@ module G5Authenticatable
 
     validates :email, presence: true, uniqueness: true
     validates_uniqueness_of :uid, scope: :provider
-    attr_accessor :current_client_urn # helpful for authorizing in Pudit
 
     GLOBAL_ROLE = 'GLOBAL'
 

data/app/policies/g5_authenticatable/base_policy.rb

@@ -71,16 +71,26 @@ module G5Authenticatable
       user.present? && user.has_role?(:super_admin)
     end
 
-    def admin?
-      user.present? && user.has_role?(:admin)
+    def check_for_role(role_name,global_scope=false)
+      if user.present?
+        query = user.roles.where(name: role_name)
+        query = query.where(resource_type: nil) if global_scope
+        return query.exists?
+      else
+        return false
+      end
+    end
+
+    def admin?(global_scope=false)
+      check_for_role(:admin,global_scope)
     end
 
-    def editor?
-      user.present? && user.has_role?(:editor)
+    def editor?(global_scope=false)
+      check_for_role(:editor,global_scope)
     end
 
-    def viewer?
-      user.present? && user.has_role?(:viewer)
+    def viewer?(global_scope=false)
+      check_for_role(:viewer,global_scope)
     end
 
     def has_global_role?
@@ -92,7 +102,7 @@ module G5Authenticatable
     end
 
     def global_role?
-      super_admin? || admin? || editor? || viewer?
+      super_admin? || admin?(true) || editor?(true) || viewer?(true)
     end
   end
 end

data/lib/g5_authenticatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module G5Authenticatable
-  VERSION = '1.1.2-1'
+  VERSION = '1.1.2.rc.1'
 end

data/spec/models/g5_authenticatable/user_spec.rb

@@ -9,11 +9,6 @@ RSpec.describe G5Authenticatable::User do
 
   it { is_expected.to have_and_belong_to_many(:roles) }
 
-  it 'has an current_client_urn attr_accessor' do
-    subject.current_client_urn = 'foo'
-    expect(subject.current_client_urn).to eq('foo')
-  end
-
   it 'should expose the email' do
     expect(user.email).to eq(user_attributes[:email])
   end
@@ -73,30 +68,30 @@ RSpec.describe G5Authenticatable::User do
       full_name = [new_user_attributes[:first_name],
                    new_user_attributes[:last_name]].join(' ')
       OmniAuth::AuthHash.new(
-          'uid'         => new_user_attributes[:uid],
-          'provider'    => new_user_attributes[:provider],
-          'info'        => {
-              'email'      => new_user_attributes[:email],
-              'name'       => full_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'          => {}
-          }
+        'uid' => new_user_attributes[:uid],
+        'provider' => new_user_attributes[:provider],
+        'info' => {
+          'email' => new_user_attributes[:email],
+          'name' => full_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
 
@@ -113,17 +108,17 @@ RSpec.describe G5Authenticatable::User do
 
     it 'has the correct provider' do
       expect(attributes_from_auth[:provider])
-          .to eq(new_user_attributes[:provider])
+        .to eq(new_user_attributes[:provider])
     end
 
     it 'has the correct first_name' do
       expect(attributes_from_auth[:first_name])
-          .to eq(new_user_attributes[:first_name])
+        .to eq(new_user_attributes[:first_name])
     end
 
     it 'has the correct last_name' do
       expect(attributes_from_auth[:last_name])
-          .to eq(new_user_attributes[:last_name])
+        .to eq(new_user_attributes[:last_name])
     end
 
     it 'has the correct email' do
@@ -132,7 +127,7 @@ RSpec.describe G5Authenticatable::User do
 
     it 'has the correct phone_number' do
       expect(attributes_from_auth[:phone_number])
-          .to eq(new_user_attributes[:phone_number])
+        .to eq(new_user_attributes[:phone_number])
     end
 
     it 'has the correct title' do
@@ -141,7 +136,7 @@ RSpec.describe G5Authenticatable::User do
 
     it 'has the correct organization_name' do
       expect(attributes_from_auth[:organization_name])
-          .to eq(new_user_attributes[:organization_name])
+        .to eq(new_user_attributes[:organization_name])
     end
   end
 
@@ -155,29 +150,29 @@ RSpec.describe G5Authenticatable::User do
       full_name = [new_user_attributes[:first_name],
                    new_user_attributes[:last_name]].join(' ')
       OmniAuth::AuthHash.new(
-          'provider'    => new_user_attributes[:provider],
-          'info'        => {
-              'email'      => new_user_attributes[:email],
-              'name'       => full_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' => full_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
 
@@ -242,7 +237,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'should set the organization_name from the session data' do
         expect(new_user.organization_name)
-            .to eq(new_user_attributes[:organization_name])
+          .to eq(new_user_attributes[:organization_name])
       end
 
       it 'should assign the role from the session data' do
@@ -286,11 +281,11 @@ RSpec.describe G5Authenticatable::User do
 
     let(:user_attributes) do
       FactoryBot.attributes_for(:g5_authenticatable_user,
-                                first_name:        nil,
-                                last_name:         nil,
-                                phone_number:      nil,
-                                title:             nil,
-                                organization_name: nil)
+                                 first_name: nil,
+                                 last_name: nil,
+                                 phone_number: nil,
+                                 title: nil,
+                                 organization_name: nil)
     end
     let(:role_name) { :my_role }
 
@@ -301,27 +296,27 @@ RSpec.describe G5Authenticatable::User do
 
     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, type: 'GLOBAL', urn: nil }
-              ],
-              'raw_info'          => {}
-          }
+        '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
 
@@ -333,7 +328,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'should update the access token' do
         expect { updated_user }.to change { user.reload.g5_access_token }
-                                       .to(updated_attributes[:g5_access_token])
+          .to(updated_attributes[:g5_access_token])
       end
 
       it 'should return the updated user' do
@@ -372,15 +367,15 @@ RSpec.describe G5Authenticatable::User do
     context 'when user info has changed' do
       let(:updated_attributes) do
         {
-            uid:               user.uid,
-            provider:          user.provider,
-            email:             'updated.email@test.host',
-            g5_access_token:   'updatedtoken42',
-            first_name:        'Updated First Name',
-            last_name:         'Updated Last Name',
-            phone_number:      '555.555.5555 x123',
-            title:             'Recently Promoted',
-            organization_name: 'Updated Department'
+          uid: user.uid,
+          provider: user.provider,
+          email: 'updated.email@test.host',
+          g5_access_token: 'updatedtoken42',
+          first_name: 'Updated First Name',
+          last_name: 'Updated Last Name',
+          phone_number: '555.555.5555 x123',
+          title: 'Recently Promoted',
+          organization_name: 'Updated Department'
         }
       end
 
@@ -388,7 +383,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'should update the access token' do
         expect { updated_user }.to change { user.reload.g5_access_token }
-                                       .to(updated_attributes[:g5_access_token])
+          .to(updated_attributes[:g5_access_token])
       end
 
       it 'should return the updated user' do
@@ -405,32 +400,32 @@ RSpec.describe G5Authenticatable::User do
 
       it 'should update the email' do
         expect { updated_user }.to change { user.reload.email }
-                                       .to(updated_attributes[:email])
+          .to(updated_attributes[:email])
       end
 
       it 'should update the first name' do
         expect { updated_user }.to change { user.reload.first_name }
-                                       .to(updated_attributes[:first_name])
+          .to(updated_attributes[:first_name])
       end
 
       it 'should update the last name' do
         expect { updated_user }.to change { user.reload.last_name }
-                                       .to(updated_attributes[:last_name])
+          .to(updated_attributes[:last_name])
       end
 
       it 'should update the phone number' do
         expect { updated_user }.to change { user.reload.phone_number }
-                                       .to(updated_attributes[:phone_number])
+          .to(updated_attributes[:phone_number])
       end
 
       it 'should update the title' do
         expect { updated_user }.to change { user.reload.title }
-                                       .to(updated_attributes[:title])
+          .to(updated_attributes[:title])
       end
 
       it 'should update the organization_name' do
         expect { updated_user }.to change { user.reload.organization_name }
-                                       .to(updated_attributes[:organization_name])
+          .to(updated_attributes[:organization_name])
       end
 
       it 'should unassign the old role' do
@@ -508,25 +503,25 @@ RSpec.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
 
@@ -537,7 +532,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'will add a global role' do
         expect { user.update_roles_from_auth(auth_data) }
-            .to change { user.roles.length }.from(0).to(1)
+          .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
@@ -550,7 +545,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'will add a scoped role' do
         expect { user.update_roles_from_auth(auth_data) }
-            .to change { user.roles.length }.from(0).to(1)
+          .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(resource.id)
         expect(user.roles.first.resource_type).to eq(resource.class.name)
@@ -560,14 +555,14 @@ RSpec.describe G5Authenticatable::User do
     context 'with a more than 1 role' do
       let(:roles) do
         [
-            { name: 'viewer', type: resource.class.name, urn: resource.urn },
-            { name: 'admin', type: 'GLOBAL', urn: nil }
+          { name: 'viewer', type: resource.class.name, urn: resource.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)
+          .to change { user.roles.length }.from(0).to(2)
       end
     end
 
@@ -580,7 +575,7 @@ RSpec.describe G5Authenticatable::User do
 
       it 'will add a scoped role' do
         expect { user.update_roles_from_auth(auth_data) }
-            .to_not change { user.roles.length }
+          .to_not change { user.roles.length }
       end
     end
 
@@ -589,21 +584,21 @@ RSpec.describe G5Authenticatable::User do
 
       it 'will add a scoped role' do
         expect { user.update_roles_from_auth(auth_data) }
-            .to_not change { user.roles.length }.from(0)
+          .to_not change { user.roles.length }.from(0)
       end
     end
 
     context 'with a bad role type' do
       let(:roles) do
         [
-            { name: 'viewer', type: resource.class.name, urn: resource.urn },
-            { name: 'viewer', type: 'BadResource', urn: resource.urn }
+          { name: 'viewer', type: resource.class.name, urn: resource.urn },
+          { name: 'viewer', type: 'BadResource', urn: resource.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)
+          .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(resource.id)
         expect(user.roles.first.resource_type).to eq(resource.class.name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.2.pre.1
+  version: 1.1.2.rc.1
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable