omniauth-multiprovider 0.1.1 → 0.2.0

data/lib/omniauth/multiprovider/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MultiProvider
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/omniauth/provider/abstract.rb

@@ -1,46 +1,14 @@
 module OmniAuth
   module Provider
-    class Abstract
+    class Abstract < SimpleDelegator
 
-      def self.init
+      def initialize(controller)
+        super
+        @controller = controller
       end
 
-      OmniAuth::MultiProvider::resource_klass.send(:include, OmniAuth::MultiProvider::EmailMockups)
-
-      def self.find_from_oauth(provider_name, omniauth_data, signed_in_resource=nil)
-        auth = MultiProvider::authentication_klass.normalize(omniauth_data)
-        access_token = auth.credentials.token
-        authentication = MultiProvider.authentication_klass.find_by(provider: provider_name, uid: auth.uid)
-
-        resource = nil
-
-        if authentication
-          if signed_in_resource
-            if authentication.resource == signed_in_resource
-              raise MultiProvider::Error.new 'already connected'
-            else
-              raise MultiProvider::Error.new 'already connected with other user'
-            end
-          end
-          resource = authentication.resource
-        end
-        unless resource
-          if auth.info[:email].blank?
-            auth.info[:email] = MultiProvider::resource_klass.mock_email(provider_name, auth.uid)
-          end
-          email = auth.info[:email]
-
-          raise MultiProvider::Error.new 'email_already_registered' if MultiProvider::resource_klass.find_by(email: email)
-
-          resource = signed_in_resource || MultiProvider::resource_klass.new(
-                                         email: email,
-                                         password: Devise.friendly_token[0,20]
-                                         )
-
-          MultiProvider.authentication_klass.from(auth, resource)
-
-        end
-        resource
+      def handle_request(controller)
+        raise "Should be defined by subclasses"
       end
 
       def self.authenticate_from_oauth(provider_name, omniauth_data)

data/lib/omniauth/provider/generic.rb

@@ -2,21 +2,18 @@ module OmniAuth
   module Provider
     class Generic < Abstract
 
-      def self.init(provider_name)
-        klass = self
-        OmniAuth::MultiProvider::CallbacksController.add_callback(provider_name) do
-          auth = request.env['omniauth.auth']
-          resource = klass.find_from_oauth(provider_name, auth, send(OmniAuth::MultiProvider::current_resource))
-          if resource.persisted?
-            sign_in_and_redirect resource, event: :authentication #this will throw if resource is not activated
-            set_flash_message(:notice, :success, kind: provider_name.to_s.camelize) if is_navigational_format?
-          else
-            session["devise.#{provider_name}_data"] = auth.except('extra')
-            redirect_to send("new_#{OmniAuth::MultiProvider::resource_mapping}_registration_url")
-          end
+      def handle_request
+        auth = request.env['omniauth.auth']
+        provider_name = auth['provider_name']
+        resource = resource_class.from_oauth auth, signed_in_resource
+        if resource.persisted?
+          sign_in_and_redirect resource, event: :authentication #this will throw if resource is not activated
+          @controller.send(:set_flash_message, :notice, :success, kind: provider_name.to_s.camelize) if is_navigational_format?
+        else
+          session["devise.#{provider_name}_data"] = auth.except('extra')
+          redirect_to send("new_#{OmniAuth::MultiProvider::resource_mapping}_registration_url")
         end
       end
-
     end
   end
 end

data/omniauth-multiprovider.gemspec

@@ -1,4 +1,7 @@
-$:.push File.expand_path('../lib', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'omniauth/multiprovider/version'
 
 Gem::Specification.new do |s|
@@ -8,12 +11,22 @@ Gem::Specification.new do |s|
   s.description = "Provides a simple approach to support many oauth providers to devise"
   s.authors     = ["German Del Zotto"]
   s.email       = 'germ@ndz.com.ar'
-  s.files       = `git ls-files`.split("\n")
+  s.files       = `git ls-files -z`.split("\x0")
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
   s.homepage    = 'https://github.com/1uptalent/omniauth-multiprovider'
   s.license     = 'MIT'
 
   s.add_dependency('devise', '~> 3.2')
+  s.add_dependency('activesupport', ">= 3.2.6", "< 5")
+  s.add_dependency('activerecord', ">= 3.2.6", "< 5")
   s.add_dependency('omniauth-oauth2', '~> 1.1')
   s.add_dependency('hashugar', '~> 0.0', '>= 0.0.6')
+
+  s.add_development_dependency "bundler", "~> 1.7"
+  s.add_development_dependency "rake", "~> 10.0"
+
+  s.add_development_dependency "rspec", "~> 3.1"
+  s.add_development_dependency "rspec-rails", "~> 3.1"
+  s.add_development_dependency "sqlite3"
 end

data/spec/omniauth/error_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe OmniAuth::MultiProvider::Error do
+  it 'is a runtime error' do
+    expect { raise OmniAuth::MultiProvider::Error }.to raise_error RuntimeError
+  end
+end
+
+describe OmniAuth::MultiProvider::AlreadyBoundError do
+  let(:current_resource) { double('current_resource') }
+  let(:bound_resource) { double("bound_resource") }
+
+  it 'provides the current and bound resources' do
+    error = OmniAuth::MultiProvider::AlreadyBoundError.new(current_resource, bound_resource)
+    expect(error.bound_to).to be bound_resource
+    expect(error.current).to be current_resource
+  end
+
+  describe '#message' do
+    it 'is "bound_to_same" for the same current and bound resource' do
+      error = OmniAuth::MultiProvider::AlreadyBoundError.new(current_resource, current_resource)
+      expect(error.message).to eq 'bound_to_same'
+    end
+
+    it 'is "bound_to_other" for different current and bound resources' do
+      error = OmniAuth::MultiProvider::AlreadyBoundError.new(current_resource, bound_resource)
+      expect(error.message).to eq 'bound_to_other'
+    end
+  end
+end

data/spec/omniauth/multiprovider/controllers/callbacks_controller_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe 'OmniAuth::MultiProvider::CallbacksController' do
+  let(:klass) { OmniAuth::MultiProvider::CallbacksController }
+
+  it 'defines methods for omniauth providers' do
+    Devise.omniauth :foo
+    Devise.omniauth :bar
+    methods = klass.action_methods
+    expect(methods).to include 'foo'
+    expect(methods).to include 'bar'
+  end
+
+  describe '#create_handler' do
+    it 'creates a method with the handler name' do
+      klass.send :create_handler, 'whatever'
+      expect(klass.action_methods).to include 'whatever'
+    end
+
+    it 'creates a generic handler for unknown providers' do
+      expect_any_instance_of(OmniAuth::Provider::Generic).to receive :handle_request
+      klass.send :create_handler, 'whatever'
+      klass.new.whatever
+    end
+
+    it 'creates a custom handler for Facebook' do
+      expect_any_instance_of(OmniAuth::Provider::Facebook).to receive :handle_request
+      klass.send :create_handler, 'facebook'
+      klass.new.facebook
+    end
+  end
+
+  describe '#handle_request' do
+    subject { klass.new }
+    let(:request) { ActionDispatch::TestRequest.new }
+    let(:response) { ActionDispatch::TestResponse.new }
+    before { klass.send :public, :handle_request }
+    before { allow(subject).to receive(:devise_mapping) { Devise.mappings[:user]} }
+    before do
+      subject.instance_variable_set '@_request', request
+      subject.instance_variable_set '@_response', response
+    end
+
+    context 'when it raises' do
+      let(:provider) { double('a provider') }
+
+      context 'MultiProvider errors' do
+        let(:error) { OmniAuth::MultiProvider::Error.new 'message_key' }
+        before { expect(provider).to receive(:handle_request).and_raise(error) }
+
+        context 'default behavior' do
+          it 'does not raise' do
+            expect { subject.handle_request provider }.not_to raise_error
+          end
+
+          it 'sets the flash[:alert] with an I18N error message' do
+            subject.handle_request provider
+            expect(subject.flash[:alert]).to match %r{en.devise.callbacks.user.#{error.message}}
+          end
+
+          it 'redirects to the remembered url' do
+            location = '/foo/bar/baz'
+            subject.store_location_for :user, location
+            subject.handle_request provider
+            expect(response.location).to eq "http://test.host#{location}"
+          end
+        end
+
+        it 'does raise if the error is not handled' do
+          allow(subject).to receive(:handle_provider_error) { false }
+          expect { subject.handle_request provider }.to raise_error error
+        end
+      end
+
+      context 'unexpected errors' do
+        let(:unexpected_error) { Class.new(RuntimeError).new("some message") }
+        before { expect(provider).to receive(:handle_request).and_raise(unexpected_error) }
+        it 're-raises the error by default' do
+          expect { subject.handle_request provider }.to raise_error unexpected_error
+        end
+        it 'does not raise if the error is handled' do
+          allow(subject).to receive(:handle_unexpected_error) { true }
+          expect { subject.handle_request provider }.not_to raise_error
+        end
+      end
+    end
+  end
+
+
+end

data/spec/omniauth/multiprovider/models/active_record_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe OmniAuth::MultiProvider::ActiveRecord do
+  before do
+    ActiveRecord::Base.connection.create_table :cs, temporary: true
+  end
+  after do
+    ActiveRecord::Base.connection.drop_table :cs
+  end
+  let!(:klass) do
+    class C < ActiveRecord::Base
+      omniauthenticable
+    end
+  end
+
+  it 'can create instances' do
+    klass.new
+  end
+
+
+end

data/spec/omniauth/multiprovider/models/concerns/omni_authenticable_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe OmniAuth::MultiProvider::OmniAuthenticable do
+  describe '#from_oauth' do
+    context 'already authenticated' do
+      let(:user) do
+        u = User.new
+        u.save validate: false
+        u
+      end
+      let(:authentication) do
+        Authentication.create(resource: user, provider: 'test', uid: '123')
+      end
+      let(:omniauth_data) do
+        #https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
+        {
+          provider: authentication.provider,
+          uid: authentication.uid,
+          credentials: { token: 'foo' }
+        }
+      end
+
+      it 'returns the existing user' do
+        expected = user
+        actual = User.from_oauth omniauth_data
+        expect(expected).to eq actual
+      end
+
+      it 'fails if the current user is different' do
+        another_user = User.new
+        expect do
+          User.from_oauth omniauth_data, another_user
+        end.to raise_error OmniAuth::MultiProvider::AlreadyBoundError
+      end
+
+      it 'succeeds if already bound to current user' do
+        expect do
+          User.from_oauth omniauth_data, user
+        end.not_to raise_error
+      end
+    end
+  end
+
+  describe '#oauth_to_attributes' do
+    it 'returns email, password and password_confirmation' do
+      oauth = {provider: 'foo', info: { email: 'some_email' } }.to_hashugar
+      attrs = User.oauth_to_attributes oauth
+      expect(attrs.keys).to match [:email, :password, :password_confirmation]
+    end
+
+    it 'returns a mock email when oauth data does not have it' do
+      oauth = {provider: 'foo', info: {} }.to_hashugar
+      email = User.oauth_to_attributes(oauth)[:email]
+      expect(email).to match /@from-foo\.example$/
+    end
+
+    it 'returns the oauth email if present' do
+      oauth = {provider: 'foo', info: {email: 'smith@example.com'} }.to_hashugar
+      email = User.oauth_to_attributes(oauth)[:email]
+      expect(email).to eq 'smith@example.com'
+    end
+  end
+
+  describe '#update_from_oauth' do
+
+  end
+end

data/spec/omniauth/provider/abstract_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'support/shared_examples_for_providers'
+
+describe OmniAuth::Provider::Abstract do
+  let(:controller) { double('a controller') }
+  subject { described_class.new controller }
+
+  it_behaves_like 'a provider'
+
+  describe '#handle_request' do
+    it 'raises since it is a template method' do
+      expect{subject.handle_request double('controller')}.to raise_error "Should be defined by subclasses"
+    end
+  end
+end

data/spec/omniauth/provider/facebook_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'support/shared_examples_for_providers'
+
+describe OmniAuth::Provider::Facebook do
+  let(:controller) { double('a controller') }
+  subject { described_class.new controller }
+
+  it_behaves_like 'a provider'
+
+  describe '#handle_request' do
+  end
+
+end

data/spec/omniauth/provider/generic_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'support/shared_examples_for_providers'
+
+describe OmniAuth::Provider::Generic do
+  let(:controller) { double('a controller') }
+  subject { described_class.new controller }
+
+  it_behaves_like 'a provider'
+
+  describe '#handle_request' do
+  end
+
+end

data/spec/rails_app/.gitignore

@@ -0,0 +1,17 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp

data/spec/rails_app/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/rails_app/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

data/spec/rails_app/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */