g5_authenticatable 1.1.1 → 1.1.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fd8bc7d1075d2b74f63cf58fe57f0280b2e96b04f8627c63af207e1cdb9a8c
-  data.tar.gz: a9b0ce4501c3dcbe101aa5430dc8209afe1ed60fc919a2f893cabe39deff9286
+  metadata.gz: '081f7ecf2032384e90e2496d589a4b1f4ec09136d05acec75ac2e05b747e336d'
+  data.tar.gz: db926d3359f6e8fa3eb2e88d6bf48ad519743721da0928db845b89fcdcb19ee0
 SHA512:
-  metadata.gz: c8af1bdf2cf861593ef2176c2b11d8bba5fe14b297dd1b01af91ba8645f4fb65b2a80f8796428a438a710db3dbe792c54871ec04ec784ecc9d181184aaefc949
-  data.tar.gz: 8e8ba6bceb7b22c1d20c8e91295ba4c3b8a599cd6b14f520f5cca7ff0a18c52bcbecad8a989a010f39883a4c68c397c7b93a08a4559d9ba50210b5f41c4def51
+  metadata.gz: a3db25d8018a283bda4d8d3aa34c2ab34dc3ec9b60065cdd86c0e87e4fb5cf155108d60c96711e097749c8f47d163383b75a5af34e8063a5d43109b2d0e47ccf
+  data.tar.gz: 25db85aa0014338a5cd1a13932543ef8fbe6df0106e19eed1702b141c3d4815ebd6127e51a8207398f46ffe579b9d2deb9a2b399ba01015b2a6e7685d0e3953a

data/.travis.yml

@@ -23,11 +23,15 @@ cache:
 before_install:
   - gem install bundler
 before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
   - cp spec/dummy/config/database.yml.ci spec/dummy/config/database.yml
   - RAILS_ENV=test bundle exec rake app:db:create app:db:migrate
 script:
   - bundle exec rspec spec
 after_script:
+  - ./cc-test-reporter after-build --exit-code $EXIT_CODE
   - RAILS_ENV=test bundle exec rake app:db:drop
 env:
   global:

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 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/Gemfile

@@ -23,7 +23,6 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'codeclimate-test-reporter'
   gem 'generator_spec'
   gem 'rspec-activemodel-mocks'
   gem 'shoulda-matchers', '~> 3.1'

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://dev-auth.g5search.com/admin
+  * For development, visit https://auth-staging.g5devops.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://dev-auth.g5search.com` or
+  Generally, this will be set to either `https://auth-staging.g5devops.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,6 +9,7 @@ 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/gemfiles/rails_4.1.gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "capybara"
-  gem "codeclimate-test-reporter"
   gem "generator_spec"
   gem "rspec-activemodel-mocks"
   gem "shoulda-matchers", "~> 3.1"

data/gemfiles/rails_4.2.gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "capybara"
-  gem "codeclimate-test-reporter"
   gem "generator_spec"
   gem "rspec-activemodel-mocks"
   gem "shoulda-matchers", "~> 3.1"

data/gemfiles/rails_5.0.gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "capybara"
-  gem "codeclimate-test-reporter"
   gem "generator_spec"
   gem "rspec-activemodel-mocks"
   gem "shoulda-matchers", "~> 3.1"

data/gemfiles/rails_5.1.gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "capybara"
-  gem "codeclimate-test-reporter"
   gem "generator_spec"
   gem "rspec-activemodel-mocks"
   gem "shoulda-matchers", "~> 3.1"

data/gemfiles/rails_5.2.gemfile

@@ -17,7 +17,6 @@ end
 
 group :test do
   gem "capybara"
-  gem "codeclimate-test-reporter"
   gem "generator_spec"
   gem "rspec-activemodel-mocks"
   gem "shoulda-matchers", "~> 3.1"

data/lib/g5_authenticatable/version.rb

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

data/spec/models/g5_authenticatable/user_spec.rb

@@ -9,6 +9,11 @@ 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
@@ -68,30 +73,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
 
@@ -108,17 +113,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
@@ -127,7 +132,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
@@ -136,7 +141,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
 
@@ -150,29 +155,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
 
@@ -237,7 +242,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
@@ -281,11 +286,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 }
 
@@ -296,27 +301,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
 
@@ -328,7 +333,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
@@ -360,22 +365,22 @@ RSpec.describe G5Authenticatable::User do
       end
 
       it 'should not change the user roles' do
-        expect { updated_user }.to_not change { user.reload.roles }
+        expect { updated_user }.to_not change { user.roles.reload.to_a }
       end
     end
 
     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
 
@@ -383,7 +388,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
@@ -400,32 +405,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
@@ -503,25 +508,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
 
@@ -532,7 +537,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
@@ -545,7 +550,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)
@@ -555,14 +560,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
 
@@ -575,7 +580,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
 
@@ -584,21 +589,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.1
+  version: 1.1.2.pre.1
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -303,9 +303,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.7.6