devise_g5_authenticatable 0.2.3 → 0.2.4.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e876e0598bb033c7dfd71a0347876195f46d54f4
-  data.tar.gz: 484b9c0ddcdd2a097eccc75b75427c1b3e9b18d5
+  metadata.gz: 8ad97f4949c57fec123b19a0cb9dfd4d562474a4
+  data.tar.gz: 74ed2ef0d3351498bb3b8a3b16e1b7bc88949c25
 SHA512:
-  metadata.gz: 660c04a4ca12614fa1628508d8ab0e53c43fae373919a6b1f7624213fcfee6b428cbe692766b1c4df9a7cc26f1bd9a20559bf53d1d6d09ad13d400354b47faf4
-  data.tar.gz: f88074acc7025e35ec2fafe7fe3ba5a608f898a8a3fc9addb2ebb408536f0ef4e71f18bd809cccc84d85d51a0ed21dd7a36fa2a475c5e4a855ee5ac219f58063
+  metadata.gz: 86fe1453a3d4b41adaae28e90b1debc6a3c5169682ccdf27d8c82de6e2d882b14678d8a98de03edccde482b53e19cefa1de8df919dc35552976ffd36111f3771
+  data.tar.gz: 303fad6ef8fc9f7c01b63152d7c5836ed4b2e8cf1abf262a258935142512416b6be0a53c9d9610906f62448a77432c45ef5cf408ce4699d868635119cc083975

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.4.beta (2015-12-03)
+* Enforces uniqueness of email address in when looking for an email without UID
+
 ## v0.2.3 (2015-11-30)
 * Pins version of devise to 3.5.1 due - https://github.com/plataformatec/devise/issues/3705
 * Pins version of omniauth-g5 to v0.3.1 due - https://github.com/G5/omniauth-g5/pull/10

data/lib/devise_g5_authenticatable/models/g5_authenticatable.rb

@@ -72,7 +72,9 @@ module Devise
 
       module ClassMethods
         def find_for_g5_oauth(oauth_data)
-          find_by_provider_and_uid(oauth_data.provider.to_s, oauth_data.uid.to_s)
+          found_user = find_by_provider_and_uid(oauth_data.provider.to_s, oauth_data.uid.to_s)
+          return found_user if found_user.present?
+          find_by_email_and_provider(oauth_data.info.email, oauth_data.provider.to_s)
         end
 
         def find_and_update_for_g5_oauth(oauth_data)

data/lib/devise_g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseG5Authenticatable
-  VERSION = '0.2.3'
+  VERSION = '0.2.4.beta'
 end

data/spec/models/g5_authenticatable_spec.rb

@@ -7,19 +7,18 @@ describe Devise::Models::G5Authenticatable do
   let(:model) { model_class.new(attributes) }
   let(:attributes) { Hash.new }
 
-
   describe '#save!' do
     subject(:save) { model.save! }
 
     context 'when model is new' do
       let(:attributes) do
-        {email: email,
-         password: password,
-         password_confirmation: password_confirmation,
-         provider: provider,
-         uid: uid,
-         current_password: current_password,
-         updated_by: updated_by}
+        { email: email,
+          password: password,
+          password_confirmation: password_confirmation,
+          provider: provider,
+          uid: uid,
+          current_password: current_password,
+          updated_by: updated_by }
       end
 
       let(:email) { 'test.email@test.host' }
@@ -158,10 +157,10 @@ describe Devise::Models::G5Authenticatable do
     let(:model) { create(:user) }
 
     let(:params) do
-      {current_password: current_password,
-       password: updated_password,
-       password_confirmation: updated_password,
-       email: updated_email}
+      { current_password: current_password,
+        password: updated_password,
+        password_confirmation: updated_password,
+        email: updated_email }
     end
 
     let(:current_password) {}
@@ -173,8 +172,9 @@ describe Devise::Models::G5Authenticatable do
 
     let(:password_validator) { double(:auth_password_validator) }
     before do
-      allow(Devise::G5::AuthPasswordValidator).to receive(:new).
-        and_return(password_validator)
+      allow(Devise::G5::AuthPasswordValidator)
+        .to receive(:new)
+        .and_return(password_validator)
     end
 
     context 'with valid current password' do
@@ -266,13 +266,15 @@ describe Devise::Models::G5Authenticatable do
     let(:password) { 'foobarbaz' }
 
     it 'should change the password to nil' do
-      expect { clean_up_passwords }.to change { model.password }.
-        from(password).to(nil)
+      expect { clean_up_passwords }
+        .to change { model.password }
+        .from(password).to(nil)
     end
 
     it 'should change the password_confirmation to nil' do
-      expect { clean_up_passwords }.to change { model.password_confirmation }.
-        from(password).to(nil)
+      expect { clean_up_passwords }
+        .to change { model.password_confirmation }
+        .from(password).to(nil)
     end
   end
 
@@ -326,13 +328,10 @@ describe Devise::Models::G5Authenticatable do
     subject(:find_and_update) { model_class.find_and_update_for_g5_oauth(auth_data) }
 
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        provider: 'g5',
-        uid: '123999',
-        info: {name: 'Foo Bar',
-               email: 'foo@bar.com'},
-        credentials: {token: 'abc123'}
-      })
+      OmniAuth::AuthHash.new(provider:    'g5',
+                             uid:         '123999',
+                             info:        { name: 'Foo Bar', email: 'foo@bar.com' },
+                             credentials: { token: 'abc123' })
     end
 
     context 'when model exists' do
@@ -364,19 +363,17 @@ describe Devise::Models::G5Authenticatable do
     subject(:find_for_g5_oauth) { model_class.find_for_g5_oauth(auth_data) }
 
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        provider: 'g5',
-        uid: uid,
-        info: {name: 'Foo Bar',
-               email: 'foo@bar.com'},
-        credentials: {token: 'abc123'}
-      })
+      OmniAuth::AuthHash.new(provider:    'g5',
+                             uid:         uid,
+                             info:        { name: 'Foo Bar', email: 'foo@bar.com' },
+                             credentials: { token: 'abc123' })
     end
 
     context 'when model exists' do
       let!(:model) do
-        create(:user, provider: auth_data.provider,
-                      uid: uid.to_s)
+        create(:user, email:    'foo@bar.com',
+                      provider: auth_data.provider,
+                      uid:      uid.to_s)
       end
 
       context 'when auth data uid is an integer' do
@@ -404,6 +401,34 @@ describe Devise::Models::G5Authenticatable do
       end
     end
 
+    context 'given a model with invalid arguments' do
+      let(:uid) { 42 }
+
+      context 'having an un-existing uid' do
+        let!(:model) do
+          create(:user, email:    'foo@bar.com',
+                        provider: auth_data.provider,
+                        uid:      0)
+        end
+
+        it 'finds the record by email address' do
+          expect(find_for_g5_oauth).to eq(model)
+        end
+      end
+
+      context 'having an un-existing uid' do
+        let!(:model) do
+          create(:user, email:    'foo@bar.com',
+                        provider: auth_data.provider,
+                        uid:      0)
+        end
+
+        it 'finds the record by email address' do
+          expect(find_for_g5_oauth).to eq(model)
+        end
+      end
+    end
+
     context 'when model does not exist' do
       let(:uid) { '42' }
 
@@ -421,13 +446,10 @@ describe Devise::Models::G5Authenticatable do
     subject(:update_g5_credentials) { model.update_g5_credentials(auth_data) }
 
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        provider: 'g5',
-        uid: '123999',
-        info: {name: 'Foo Bar',
-               email: 'foo@bar.com'},
-        credentials: {token: 'abc123'}
-      })
+      OmniAuth::AuthHash.new(provider:    'g5',
+                             uid:         '123999',
+                             info:        { name: 'Foo Bar', email: 'foo@bar.com' },
+                             credentials: { token: 'abc123' })
     end
 
     let(:model) do
@@ -483,21 +505,20 @@ describe Devise::Models::G5Authenticatable do
     subject(:new_with_session) { model_class.new_with_session(params, session) }
 
     let(:auth_data) do
-      OmniAuth::AuthHash.new({
-        provider: 'g5',
-        uid: '123999',
-        info: {name: 'Foo Bar',
-               email: 'foo@bar.com'},
-        credentials: {token: 'abc123'}
-      })
+      OmniAuth::AuthHash.new(provider:    'g5',
+                             uid:         '123999',
+                             info:        { name: 'Foo Bar', email: 'foo@bar.com' },
+                             credentials: { token: 'abc123' })
     end
 
     context 'with params' do
-      let(:params) { {'email' => email_param} }
+      let(:params) do
+        { 'email' => email_param }
+      end
       let(:email_param) { 'my.email.param@test.host' }
 
       context 'with session data' do
-        let(:session) { {'omniauth.auth' => auth_data} }
+        let(:session) { { 'omniauth.auth' => auth_data } }
 
         it { is_expected.to be_new_record }
 
@@ -537,7 +558,9 @@ describe Devise::Models::G5Authenticatable do
       let(:params) { Hash.new }
 
       context 'with session data' do
-        let(:session) { {'omniauth.auth' => auth_data} }
+        let(:session) do
+          { 'omniauth.auth' => auth_data }
+        end
 
         it { is_expected.to be_new_record }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.beta
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -194,9 +194,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
@@ -293,4 +293,3 @@ test_files:
 - spec/support/shared_examples/registration_error.rb
 - spec/support/user_feature_methods.rb
 - spec/tasks/export_users_spec.rb
-has_rdoc: