devise_g5_authenticatable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6178bfffa50bb6940208406f65192bc3fa8e8e
-  data.tar.gz: 36ae13c7b26dfc6af43a26cb6c22f36e0c93e2a9
+  metadata.gz: c21c4321163499661d4fd43789dfcff59c38d10a
+  data.tar.gz: 7ae73de16b05661c29a0a092da8191b2242f442b
 SHA512:
-  metadata.gz: cd3303525818dea3add1c492fd6dc45500240fb308d1f098dae9966601735bb730ddb93f646cef8c9bdcaf35f31b8d878d2a288074fd8a5925a68b52bf772713
-  data.tar.gz: 4656dcac40c6697ab9bc249660848bd207b5a8f948c85b1ba3b9c6f2c8ec89ae312e604eec5f5dd86e15515820fb00d70d131d39f1332019173e7d7cbdb83ae0
+  metadata.gz: d75544ee10f7e7749c4f7b7a95504b76ff015d9bfc74dd168f7c369135c61d386622738f102843c20ff9c61f6872379688b20a09b187cbcb20f181645dbf2947
+  data.tar.gz: e73c4a027bdbfa89f39078becfe6f15dd1c6931da06222e3f6456114c7eec55391ba23c87fe44215d2593e7b76a2f6eba85777c9c96ae0c2e69edc15367bd161

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.1 (2014-07-31)
+* Find a user by email when a duplicate email exception is returned from 
+  user creation.
+
 ## v0.1.0 (2014-03-12)
 
 * Move `rake g5:export_users` from

data/Gemfile

@@ -4,9 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 # Dependencies for the dummy test app
-gem 'rails', '~> 3.2.15'
+gem 'rails', '4.1.4'
 gem 'jquery-rails'
 gem 'pg'
+gem 'protected_attributes'
 
 group :test, :development do
   gem 'rspec-rails', '~> 2.14'
@@ -18,6 +19,6 @@ group :test do
   gem 'simplecov'
   gem 'codeclimate-test-reporter'
   gem 'webmock'
-  gem 'shoulda-matchers'
+  gem 'shoulda-matchers', '~> 2.6'
   gem 'factory_girl_rails', '~> 4.3', require: false
 end

data/circle.yml

@@ -1,4 +1,4 @@
 database:
   override:
     - cp spec/dummy/config/database.yml.ci spec/dummy/config/database.yml
-    - RAILS_ENV=test rake app:db:setup
+    - RAILS_ENV=test bundle exec rake app:db:setup

data/lib/devise_g5_authenticatable/g5/auth_user_creator.rb

@@ -15,9 +15,19 @@ module Devise
 
       private
       def create_auth_user
-        auth_user = auth_client.create_user(auth_user_args)
         set_auth_attributes(auth_user)
-        auth_user
+      end
+
+      def auth_user
+        begin
+          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)
+          else
+            raise e
+          end
+        end
       end
 
       def auth_user_exists?
@@ -42,6 +52,7 @@ module Devise
         model.provider = 'g5'
         model.uid = auth_user.id
         model.clean_up_passwords
+        model
       end
     end
   end

data/lib/devise_g5_authenticatable/version.rb

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

data/spec/dummy/app/models/user.rb

@@ -4,7 +4,4 @@ class User < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :registerable, :trackable, :validatable,
          :g5_authenticatable
-
-  # Setup accessible (or protected) attributes for your model
-  # attr_accessible :title, :body
 end

data/spec/dummy/config/application.rb

@@ -4,7 +4,6 @@ require File.expand_path('../boot', __FILE__)
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
-require 'active_resource/railtie'
 require 'sprockets/railtie'
 
 Bundler.require(*Rails.groups)
@@ -49,12 +48,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/spec/dummy/config/environments/development.rb

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -21,19 +18,15 @@ Dummy::Application.configure do
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
-  config.assets.compress = false
+  config.assets.js_compressor = nil
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  config.eager_load = false
 end

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +26,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/spec/dummy/config/initializers/devise.rb

@@ -21,6 +21,10 @@ Devise.setup do |config|
   # available as additional gems.
   require 'devise/orm/active_record'
 
+  # Require optional support for protected_attributes in devise
+  # models
+  require 'devise_g5_authenticatable/models/protected_attributes'
+
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
   # just :email. You can configure it to use [:username, :subdomain], so for

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = '647a56085c4f52cc5e906029f424ff1fa1d118d66800fb131b28c7ef7467f379f253ec847cc15af0036a8c55a4c547c9ef73d09d17bf00f9ecbd6823e90edbae'
+Dummy::Application.config.secret_key_base = '77ca04658d54f9b0e5ec8d6331964640bb6237e145d03031b88a0186a13cb584b6e5031e6956ba23f37941a216f91387b6f1b9999eae0fb0ba598d798fa58367'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -7,8 +7,3 @@
 ActiveSupport.on_load(:action_controller) do
   wrap_parameters format: [:json]
 end
-
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end

data/spec/features/registration_spec.rb

@@ -76,7 +76,7 @@ describe 'User registration' do
     let(:password_confirmation) { 'something else entirely' }
 
     it_should_behave_like 'a registration validation error' do
-      let(:error_message) { "Password doesn't match confirmation" }
+      let(:error_message) { "Password confirmation doesn't match" }
     end
   end
 

data/spec/g5/auth_user_creator_spec.rb

@@ -16,84 +16,104 @@ describe Devise::G5::AuthUserCreator do
     let(:password) { 'new password' }
     let(:password_confirmation) { 'new password confirmation' }
 
-    let(:auth_client) { double(:g5_authentication_client, create_user: auth_user) }
-    let(:auth_user) { double(:auth_user, id: uid, email: model.email) }
+    let(:auth_client) { double(:g5_authentication_client) }
+    let(:auth_user) { double(:auth_user, id: uid, email: model.email, clean_up_passwords: nil) }
     let(:uid) { 'remote-auth-user-42' }
+
     before do
       allow(G5AuthenticationClient::Client).to receive(:new).and_return(auth_client)
     end
 
-    context 'when the new model has no uid' do
-      before { model.uid = nil }
+    context 'when there is an existing auth user' do
+      before 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
+      end
 
-      context 'when updated by an existing user' do
-        let(:updated_by) { build_stubbed(:user) }
+      it 'should create the local user with the existing uid' do
+        expect(model.uid).to eq(uid)
+      end
+    end
 
-        before { create }
+    context 'when there is no existing auth user' do
+      before do
+        allow(auth_client).to receive(:create_user).and_return(auth_user)
+      end
 
-        it 'should use the token for updated_by user to call g5 auth' do
-          expect(G5AuthenticationClient::Client).to have_received(:new).
-            with(access_token: updated_by.g5_access_token)
-        end
+      context 'when the new model has no uid' do
+        before { model.uid = nil }
 
-        it 'should create a new auth user with the correct email' do
-          expect(auth_client).to have_received(:create_user).
-            with(hash_including(email: model.email))
-        end
+        context 'when updated by an existing user' do
+          let(:updated_by) { build_stubbed(:user) }
 
-        it 'should create a new auth user with the correct password' do
-          expect(auth_client).to have_received(:create_user).
-            with(hash_including(password: password))
-        end
+          before { create }
 
-        it 'should create a new auth user with the correct password confirmation' do
-          expect(auth_client).to have_received(:create_user).
-            with(hash_including(password_confirmation: password_confirmation))
-        end
+          it 'should use the token for updated_by user to call g5 auth' do
+            expect(G5AuthenticationClient::Client).to have_received(:new).
+              with(access_token: updated_by.g5_access_token)
+          end
 
-        it 'should reset the password' do
-          expect(model.password).to be_nil
-        end
+          it 'should create a new auth user with the correct email' do
+            expect(auth_client).to have_received(:create_user).
+              with(hash_including(email: model.email))
+          end
 
-        it 'should reset the password_confirmation' do
-          expect(model.password_confirmation).to be_nil
-        end
-      end
+          it 'should create a new auth user with the correct password' do
+            expect(auth_client).to have_received(:create_user).
+              with(hash_including(password: password))
+          end
 
-      context 'when auth service returns an error' do
-        before do
-          allow(auth_client).to receive(:create_user).and_raise('Error!')
+          it 'should create a new auth user with the correct password confirmation' do
+            expect(auth_client).to have_received(:create_user).
+              with(hash_including(password_confirmation: password_confirmation))
+          end
+
+          it 'should reset the password' do
+            expect(model.password).to be_nil
+          end
+
+          it 'should reset the password_confirmation' do
+            expect(model.password_confirmation).to be_nil
+          end
         end
 
-        it 'should raise an exception' do
-          expect { create }.to raise_error('Error!')
+        context 'when auth service returns an error' do
+          before do
+            allow(auth_client).to receive(:create_user).and_raise('Error!')
+          end
+
+          it 'should raise an exception' do
+            expect { create }.to raise_error('Error!')
+          end
         end
-      end
 
-      context 'when not updated by an existing user' do
-        before { create }
+        context 'when not updated by an existing user' do
+          before { create }
 
-        it 'should use the user token to call g5 auth' do
-          expect(G5AuthenticationClient::Client).to have_received(:new).
-            with(access_token: model.g5_access_token)
+          it 'should use the user token to call g5 auth' do
+            expect(G5AuthenticationClient::Client).to have_received(:new).
+              with(access_token: model.g5_access_token)
+          end
         end
       end
-    end
 
-    context 'when new model already has a uid' do
-      before { model.uid = 'remote-user-42' }
-      before { create }
+      context 'when new model already has a uid' do
+        before { model.uid = 'remote-user-42' }
+        before { create }
 
-      it 'should not create a user' do
-        expect(auth_client).to_not have_received(:create_user)
-      end
+        it 'should not create a user' do
+          expect(auth_client).to_not have_received(:create_user)
+        end
 
-      it 'should not reset the password' do
-        expect(model.password).to_not be_blank
-      end
+        it 'should not reset the password' do
+          expect(model.password).to_not be_blank
+        end
 
-      it 'should not reset the password_confirmation' do
-        expect(model.password_confirmation).to_not be_blank
+        it 'should not reset the password_confirmation' do
+          expect(model.password_confirmation).to_not be_blank
+        end
       end
     end
   end

data/spec/models/protected_attributes_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 describe DeviseG5Authenticatable::Models::ProtectedAttributes do
+  before do
+    Dummy::Application.config.active_record.whitelist_attributes = true
+  end
+
+  after do
+    Dummy::Application.config.active_record.whitelist_attributes = false
+  end
+
   subject { model }
 
   let(:model_class) { User }

data/spec/spec_helper.rb

@@ -41,4 +41,6 @@ RSpec.configure do |config|
   # config.filter_run_excluding type: 'feature'
 
   config.after(:suite) { WebMock.disable! }
+
+  config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -102,7 +102,7 @@ files:
 - spec/dummy/app/assets/stylesheets/custom_sessions.css
 - spec/dummy/app/assets/stylesheets/home.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/custom_registrations_controllers.rb
+- spec/dummy/app/controllers/custom_registrations_controller.rb
 - spec/dummy/app/controllers/custom_sessions_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -121,7 +121,6 @@ files:
 - spec/dummy/config/database.yml.sample
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
@@ -197,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Devise extension for the G5 Auth service
@@ -216,7 +215,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/custom_sessions.css
 - spec/dummy/app/assets/stylesheets/home.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/custom_registrations_controllers.rb
+- spec/dummy/app/controllers/custom_registrations_controller.rb
 - spec/dummy/app/controllers/custom_sessions_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -235,7 +234,6 @@ test_files:
 - spec/dummy/config/database.yml.sample
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb

data/spec/dummy/config/environments/production.rb

@@ -1,67 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # Code is not reloaded between requests
-  config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
-
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
-  # Generate digests for assets URLs
-  config.assets.digest = true
-
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Prepend all log lines with the following tags
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
-end