devise_g5_authenticatable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21c4321163499661d4fd43789dfcff59c38d10a
-  data.tar.gz: 7ae73de16b05661c29a0a092da8191b2242f442b
+  metadata.gz: efb202ccac3050c390f4aee7ef1afdf625437574
+  data.tar.gz: 89c6a1f7f1aaebe7123a321c1ceec726ee17e4b7
 SHA512:
-  metadata.gz: d75544ee10f7e7749c4f7b7a95504b76ff015d9bfc74dd168f7c369135c61d386622738f102843c20ff9c61f6872379688b20a09b187cbcb20f181645dbf2947
-  data.tar.gz: e73c4a027bdbfa89f39078becfe6f15dd1c6931da06222e3f6456114c7eec55391ba23c87fe44215d2593e7b76a2f6eba85777c9c96ae0c2e69edc15367bd161
+  metadata.gz: 4af967f531a3b3e974cdb46d462cf86a25302357af9a46ff62bc864f4253a0c99759e0bd14c7a4394798bb331dfe559b7d072c6fe54aeecd60ee71564e28bf19
+  data.tar.gz: 075ebbe92655bb91e49b35df46341d546a6dc6994f6e482e22ebd74844b07ee234f1c138660edecc8bcd49b1a9c84eaa011a9a8a6a6ea4594f013001dac4c865

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.2 (2014-08-04)
+* Use existing user with updated password on duplicate user creation with
+  duplicate email.
+
 ## v0.1.1 (2014-07-31)
 * Find a user by email when a duplicate email exception is returned from 
   user creation.

data/lib/devise_g5_authenticatable/g5/auth_user_creator.rb

@@ -23,13 +23,21 @@ module Devise
           auth_client.create_user(auth_user_args)
         rescue  StandardError => e
           if e.message =~ /Email has already been taken/
-            auth_client.find_user_by_email(model.email)
+            existing_auth_user
           else
             raise e
           end
         end
       end
 
+      def existing_auth_user
+        user = auth_client.find_user_by_email(model.email)
+        user.password = model.password
+        user.password_confirmation = model.password
+        auth_client.update_user(user.to_hash)
+        user
+      end
+
       def auth_user_exists?
         !model.uid.blank?
       end

data/lib/devise_g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseG5Authenticatable
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/g5/auth_user_creator_spec.rb

@@ -15,9 +15,17 @@ describe Devise::G5::AuthUserCreator do
     let(:updated_by) {}
     let(:password) { 'new password' }
     let(:password_confirmation) { 'new password confirmation' }
+    let(:other_password) { 'blah' }
 
     let(:auth_client) { double(:g5_authentication_client) }
-    let(:auth_user) { double(:auth_user, id: uid, email: model.email, clean_up_passwords: nil) }
+
+    let(:auth_user) { double(:auth_user,
+                             id: uid,
+                             email: model.email,
+                             password: other_password,
+                             clean_up_passwords: nil,
+                             to_hash: {}) }
+
     let(:uid) { 'remote-auth-user-42' }
 
     before do
@@ -29,11 +37,19 @@ describe Devise::G5::AuthUserCreator do
         model.uid = nil
         allow(auth_client).to receive(:create_user).and_raise(StandardError.new('Email has already been taken'))
         allow(auth_client).to receive(:find_user_by_email).and_return(auth_user)
-        create
+        allow(auth_client).to receive(:update_user)
       end
 
       it 'should create the local user with the existing uid' do
-        expect(model.uid).to eq(uid)
+        allow(auth_user).to receive(:password=)
+        allow(auth_user).to receive(:password_confirmation=)
+        expect{ create }.to change(model, :uid).to uid
+      end
+
+      it 'should reset the password' do
+        expect(auth_user).to receive(:password=).with(password)
+        expect(auth_user).to receive(:password_confirmation=).with(password)
+        create
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise