solidus_social 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a51d0589d5c133e7feade204f1e502a9381ddc
-  data.tar.gz: 3a1c269db431f9221b2db01cf828dec5614981f2
+  metadata.gz: 140e2c41e3d39cdb72559e8eab2d16602332f7e4
+  data.tar.gz: 3f067cd1244a2beb69c29cef84fb24b678fd86c0
 SHA512:
-  metadata.gz: 4bde42eaf3d0cfc966111ab8d0f094827b5d6004b74f37b0cc7d8ee677f20e44c6e579e57ace4a3599bdb23bd460f8b071c14aad6180e2896742d154cddc33c1
-  data.tar.gz: 74e0eac9c4637558d86d4bc1891a80712c921f03b9273e861123d06fcb9eba51b73140b0e7cf92063976b253b40c8c2a04cf3068bc97f93baba530a887053878
+  metadata.gz: 642531bdd1876b9b45bf951f5a1d996885066243f79c16c118f2f3a65fc9a6ea419e6ca653433421e00d0403354ad9f9aa07436b374880cfb08f206fb46dec0d
+  data.tar.gz: 6e5a6858b94fc566ba9685d381b302d8ad7a62940b35ba7deaacd6a7881c4ae4ce24558ac1801cc23a0e91f9d59d39d025a6f8fd50ebe30a3a420c7f0890274e

data/.travis.yml

@@ -1,8 +1,13 @@
-sudo: false
+sudo: required
 cache: bundler
 language: ruby
+dist: trusty
+addons:
+  apt:
+    packages:
+      - google-chrome-beta
 rvm:
-  - 2.3.1
+  - 2.3.5
 env:
   matrix:
     - SOLIDUS_BRANCH=v1.0 DB=postgres
@@ -11,6 +16,9 @@ env:
     - SOLIDUS_BRANCH=v1.3 DB=postgres
     - SOLIDUS_BRANCH=v1.4 DB=postgres
     - SOLIDUS_BRANCH=v2.0 DB=postgres
+    - SOLIDUS_BRANCH=v2.1 DB=postgres
+    - SOLIDUS_BRANCH=v2.2 DB=postgres
+    - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.0 DB=mysql
     - SOLIDUS_BRANCH=v1.1 DB=mysql
@@ -18,4 +26,7 @@ env:
     - SOLIDUS_BRANCH=v1.3 DB=mysql
     - SOLIDUS_BRANCH=v1.4 DB=mysql
     - SOLIDUS_BRANCH=v2.0 DB=mysql
+    - SOLIDUS_BRANCH=v2.1 DB=mysql
+    - SOLIDUS_BRANCH=v2.2 DB=mysql
+    - SOLIDUS_BRANCH=v2.3 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Unreleased
+
+*   The `SolidusSocial::OAUTH_PROVIDERS` constant has been removed in favour
+    of the `Spree::AuthenticationMethod.providers_options` class method. This is populated using
+    the `Spree::SocialConfig#providers` Hash.
+*   Use the install generator to import the solidus social initializer into your app.
+    Please run `bundle exec rails g solidus_social:install` in order to upgrade.
+
 ## Solidus Social 1.0.0
 
 *   Renamed SpreeSocial to SolidusSocial

data/Gemfile

@@ -1,10 +1,22 @@
 source "https://rubygems.org"
 
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
+
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
+group :test do
+  if branch == 'master' || branch >= "v2.0"
+    gem "rails-controller-testing"
+  end
+  gem 'ffaker'
+end
+
+# hack for broken bundler dependency resolution
+if branch == 'master' || branch >= "v2.3"
+  gem 'rails', '~> 5.1.0'
+elsif branch >= "v2.0"
+  gem 'rails', '~> 5.0.0'
 end
 
 gem 'pg'

data/README.md

@@ -22,41 +22,18 @@ $ bundle && bundle exec rails g solidus_social:install
 $ bundle exec rake db:migrate
 ```
 
+This will install a new initializer `config/initializers/solidus_social.rb` into
+your project that allows you to setup the services you want configured for your app.
+
 Optional: By default the login path will be '/users/auth/:provider'. If you
 want something else, configure it in `config/initializers/solidus_social.rb`.
 
-```ruby
-Spree::SocialConfig[:path_prefix] = 'member'  # for /member/auth/:provider
-Spree::SocialConfig[:path_prefix] = 'profile' # for /profile/auth/:provider
-Spree::SocialConfig[:path_prefix] = ''        # for /auth/:provider
-```
 
 ## Using OAuth Sources
 
 Login as an admin user and navigate to Configuration > Social Authentication Methods
 
-Click "New Authentication Method" and enter your API key for the service. (See
-below for instructions on setting up the different providers.)
-
-Multiple key entries can now be entered based on the Rails environment. This
-allows for portability and the lack of need to check in your key to your
-repository. You also have the ability to enable and disable sources. These
-setting will be reflected on the client UI as well.
-
-If you store your configuration/credentials in environment variables, you can
-create Authentication Methods on application boot via an initializer if they
-don't already exist.
-
-```ruby
-# Ensure our environment is bootstrapped with a Facebook Connect app
-if ActiveRecord::Base.connection.table_exists? 'spree_authentication_methods'
-  Spree::AuthenticationMethod.where(environment: Rails.env, provider: 'facebook').first_or_create do |auth_method|
-    auth_method.api_key = ENV['FACEBOOK_APP_ID']
-    auth_method.api_secret = ENV['FACEBOOK_APP_SECRET']
-    auth_method.active = true
-  end
-end
-```
+Click "New Authentication Method" and choose one of your configured providers.
 
 **You MUST restart your application after configuring or updating an authentication method.**
 
@@ -91,7 +68,7 @@ Make sure you specifity the right IP address.
   - Application Website: `http://yourhostname.local:3000` for development and
     `http://your-site.com` for production
   - Application Type: "Browser"
-  - Callback URL: `http://yourhostname.local:3000 for development and
+  - Callback URL: `http://yourhostname.local:3000` for development and
     `http://your-site.com` for production
   - Default Access Type: "Read & Write"
 6. Save the application.
@@ -136,10 +113,16 @@ strategy][12] for them. (If there isn't, you can [write one][13].)
    for SolidusSocial:
 
    ```ruby
-   SolidusSocial::OAUTH_PROVIDERS << ['LinkedIn', 'linkedin']
-   SolidusSocial.init_provider('linkedin')
+
+     config.providers = {
+       # The configuration key has to match your omniauth strategy.
+       linkedin: {
+         api_key: ENV['LINKEDIN_API_KEY'],
+         api_secret: ENV['LINKEDIN_API_SECRET'],
+       },
+       # More providers here
    ```
-3. Activate your provider as usual (via initializer or admin interface).
+3. Activate your provider as usual.
 4. Do **one** of the following:
 
    - Override the `spree/users/social` view to render OAuth links to display

data/app/controllers/spree/admin/authentication_methods_controller.rb

@@ -1,18 +1,6 @@
 module Spree
   module Admin
     class AuthenticationMethodsController < ResourceController
-      create.after :update_oauth_method
-      update.after :update_oauth_method
-
-      private
-
-      def update_oauth_method
-        auth_method = params[:authentication_method]
-        return unless auth_method[:active] == 'true' && auth_method[:environment] == ::Rails.env
-        Devise.setup do |config|
-          config.omniauth auth_method[:provider], auth_method[:api_key], auth_method[:api_secret]
-        end
-      end
     end
   end
 end

data/app/controllers/spree/omniauth_callbacks_controller.rb

@@ -12,8 +12,8 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 
-  SolidusSocial::OAUTH_PROVIDERS.each do |provider|
-    provides_callback_for provider[1].to_sym
+  Spree::SocialConfig.providers.keys.each do |provider|
+    provides_callback_for provider
   end
 
   def omniauth_callback
@@ -34,7 +34,7 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       flash[:notice] = I18n.t('devise.sessions.signed_in')
       redirect_back_or_default(account_url)
     else
-      user = Spree::User.find_by_email(auth_hash['info']['email']) || Spree::User.new
+      user = Spree.user_class.find_by_email(auth_hash['info']['email']) || Spree.user_class.new
       user.apply_omniauth(auth_hash)
       if user.save
         flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])

data/app/models/spree/authentication_method.rb

@@ -1,5 +1,9 @@
 class Spree::AuthenticationMethod < ActiveRecord::Base
-  validates :provider, :api_key, :api_secret, presence: true
+  def self.provider_options
+    SolidusSocial.configured_providers.map { |provider_name| [provider_name.split("_").first.camelize, provider_name] }
+  end
+
+  validates :provider, presence: true
 
   def self.active_authentication_methods?
     where(environment: ::Rails.env, active: true).exists?

data/app/models/spree/social_configuration.rb

@@ -1,5 +1,6 @@
 module Spree
   class SocialConfiguration < Preferences::Configuration
+    attr_accessor :providers
     preference :path_prefix, :string, default: 'users'
   end
 end

data/app/models/spree/user_decorator.rb

@@ -4,7 +4,7 @@ Spree.user_class.class_eval do
   devise :omniauthable
 
   def apply_omniauth(omniauth)
-    if %w(facebook google_oauth2).include? omniauth['provider']
+    if omniauth.fetch('info', {})['email'].present?
       self.email = omniauth['info']['email'] if email.blank?
     end
     user_authentications.build(provider: omniauth['provider'], uid: omniauth['uid'])

data/app/views/spree/admin/authentication_methods/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :environment do %>
-        <%= label_tag nil, Spree.t(:environment) %>
+        <%= label_tag nil, Spree::AuthenticationMethod.human_attribute_name(:environment) %>
         <%= collection_select(:authentication_method, :environment, Rails.configuration.database_configuration.keys, :to_s, :titleize, {}, { class: 'select2 fullwidth' }) %>
       <% end %>
     </div>
@@ -11,23 +11,7 @@
     <div data-hook="environment" class="field">
       <%= f.field_container :provider do %>
         <%= f.label :provider, Spree.t(:social_provider) %>
-        <%= f.select :provider, SolidusSocial::OAUTH_PROVIDERS, {}, { include_blank: false, class: 'select2 fullwidth' } %>
-      <% end %>
-    </div>
-  </div>
-  <div class="alpha five columns">
-    <div data-hook="environment" class="field">
-      <%= f.field_container :api_key do %>
-        <%= f.label :api_key, Spree.t(:social_api_key) %> <span class="required">*</span><br />
-        <%= f.text_field :api_key, class: 'fullwidth' %>
-      <% end %>
-    </div>
-  </div>
-  <div class="alpha five columns">
-    <div data-hook="environment" class="field">
-      <%= f.field_container :api_secret do %>
-        <%= f.label :api_secret, Spree.t(:social_api_secret) %> <span class="required">*</span><br />
-        <%= f.text_field :api_secret, class: 'fullwidth' %>
+        <%= f.select :provider, Spree::AuthenticationMethod.provider_options, {}, { include_blank: false, class: 'select2 fullwidth' } %>
       <% end %>
     </div>
   </div>

data/app/views/spree/admin/authentication_methods/index.html.erb

@@ -34,8 +34,8 @@
       <% @authentication_methods.each do |method|%>
         <tr id="<%= dom_id method %>" data-hook="admin_trackers_index_rows">
           <td class="align-center"><%= method.provider %></td>
-          <td class="align-center"><%= truncate method.api_key, length: 20 %></td>
-          <td class="align-center"><%= truncate method.api_secret, length: 20 %></td>
+          <td class="align-center"><%= truncate method.api_key, length: 10 %></td>
+          <td class="align-center"><%= truncate method.api_secret, length: 10 %></td>
           <td class="align-center"><%= method.environment.to_s.titleize %></td>
           <td class="align-center"><%= method.active ? Spree.t(:yes) : Spree.t(:no) %></td>
           <td class="actions">

data/config/locales/es-MX.yml

@@ -7,11 +7,11 @@ es-MX:
     user_was_not_valid: "El usuario no fue válido."
     add_another_service: 'Añadir otro servicio para inicio de sesión:'
     authentications:
-      destroy: 'Método de autenticación destruido exitosamente.'
+      destroy: 'Método de autenticación eliminado exitosamente.'
     back_to_authentication_methods_list: "Volver a la lista de métodos de autenticación"
     edit_social_method: 'Editando metodo de autenticación'
     new_social_method: 'Nuevo método de autenticación'
-    no_authentication_methods_found: "No se encuentran ni métodos de autenticación"
+    no_authentication_methods_found: "No se encuentran ningún método de autenticación"
     one_more_step: 'Un paso más para completar tu registro desde %{kind}'
     remove_authentication_option_confirmation: '¿Está seguro que quiere eliminar este método de autenticación?'
     sign_into_account: 'Puedes iniciar sesión usando:'
@@ -22,5 +22,5 @@ es-MX:
     social_authentication_methods_description: 'Configurar métodos de autenticación de OAuth'
     social_provider: 'Proveedor social'
     please_confirm_your_email: 'Por favor confirme su email para continuar'
-    sign_in_with: 'Autententicado con %{provider}'
+    sign_in_with: 'Autenticado con %{provider}'
     you_have_signed_in_with_these_services: "Has iniciado sesión con estos servicios"

data/config/locales/it.yml

@@ -0,0 +1,26 @@
+---
+it:
+  devise:
+    omniauth_callbacks:
+      success: "Sei ora loggato con il tuo account di tipo %{kind}."
+  spree:
+    user_was_not_valid: L'utente non è valido
+    add_another_service: "Aggiungi un servizio per il log-in:"
+    authentications:
+      destroy: 'Metodo di autenticazione cancellato con successo.'
+    back_to_authentication_methods_list: "Torna alla lista dei metodi di autenticazione"
+    edit_social_method: "Modifica metodo di autenticazione social"
+    new_social_method: "Nuovo metodo di autenticazione"
+    no_authentication_methods_found: "Nessun metodo di autenticazione trovato"
+    one_more_step: 'Un altro passo per completare il processo di autenticazione  %{kind}'
+    remove_authentication_option_confirmation: "Sei sicuro di voler cancellare questo metodo di autenticazione?"
+    sign_into_account: "Puoi fare log-in utilizzando:"
+    sign_in_through_one_of_these_services: "Entra con uno di questi servizi:"
+    social_api_key: "API Key"
+    social_api_secret: "API Secret"
+    social_authentication_methods: "Metodi di autenticazione social"
+    social_authentication_methods_description: "Setup metodi di autenticazione OAuth"
+    social_provider: "Social Provider"
+    please_confirm_your_email: "Per favore, conferma il tuo indirizzo e-mail per continuare."
+    sign_in_with: "Login con %{provider}"
+    you_have_signed_in_with_these_services: "Hai fatto log-in con questi servizi"

data/config/routes.rb

@@ -1,6 +1,6 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   devise_for :spree_user,
-             class_name: Spree::User,
+             class_name: Spree.user_class,
              only: [:omniauth_callbacks],
              controllers: { omniauth_callbacks: 'spree/omniauth_callbacks' },
              path: Spree::SocialConfig[:path_prefix]

data/db/migrate/20120120163432_create_user_authentications.rb

@@ -1,4 +1,4 @@
-class CreateUserAuthentications < ActiveRecord::Migration
+class CreateUserAuthentications < SolidusSupport::Migration[4.2]
   def change
     create_table :spree_user_authentications do |t|
       t.integer :user_id

data/db/migrate/20120123163222_create_authentication_methods.rb

@@ -1,4 +1,4 @@
-class CreateAuthenticationMethods < ActiveRecord::Migration
+class CreateAuthenticationMethods < SolidusSupport::Migration[4.2]
   def change
     create_table :spree_authentication_methods do |t|
       t.string :environment

data/lib/generators/solidus_social/install/install_generator.rb

@@ -1,6 +1,8 @@
 module SolidusSocial
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      source_root File.dirname(__FILE__) + "/templates"
+
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_stylesheets
@@ -11,6 +13,10 @@ module SolidusSocial
         run 'bundle exec rake railties:install:migrations FROM=solidus_social'
       end
 
+      def copy_initializer
+        template "config/initializers/solidus_social.rb"
+      end
+
       def run_migrations
         run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations

data/lib/generators/solidus_social/install/templates/config/initializers/solidus_social.rb

@@ -0,0 +1,48 @@
+Spree::SocialConfig.configure do |config|
+  config.use_static_preferences!
+
+  # Configure the Path prefix for OAuth paths
+  # The default is /user/auth/:provider
+  #
+  # for /member/auth/:provider
+  # config.path_prefix = 'member'
+  # for /profile/auth/:provider
+  # config.path_prefix = 'profile'
+  # for /auth/:provider
+  # config.path_prefix = ''
+
+  config.providers = {
+    facebook: {
+      api_key: ENV['FACEBOOK_API_KEY'],
+      api_secret: ENV['FACEBOOK_API_SECRET'],
+    },
+    twitter: {
+      api_key: ENV['TWITTER_API_KEY'],
+      api_secret: ENV['TWITTER_API_SECRET'],
+    },
+    github: {
+      api_key: ENV['GITHUB_API_KEY'],
+      api_secret: ENV['GITHUB_API_SECRET'],
+    },
+    google_oauth2: {
+      api_key: ENV['GOOGLE_OAUTH2_API_KEY'],
+      api_secret: ENV['GOOGLE_OAUTH2_API_SECRET'],
+    },
+    amazon: {
+      api_key: ENV['AMAZON_API_KEY'],
+      api_secret: ENV['AMAZON_API_SECRET'],
+    }
+  }
+end
+
+SolidusSocial.init_providers
+
+OmniAuth.config.logger = Logger.new(STDOUT)
+OmniAuth.logger.progname = 'omniauth'
+
+OmniAuth.config.on_failure = proc do |env|
+  env['devise.mapping'] = Devise.mappings[Spree.user_class.table_name.singularize.to_sym]
+  controller_name  = ActiveSupport::Inflector.camelize(env['devise.mapping'].controllers[:omniauth_callbacks])
+  controller_klass = ActiveSupport::Inflector.constantize("#{controller_name}Controller")
+  controller_klass.action(:failure).call(env)
+end

data/lib/solidus_social.rb

@@ -1,4 +1,5 @@
-require 'spree_core'
+require 'solidus_core'
+require 'solidus_support'
 require 'solidus_auth_devise'
 require 'omniauth-twitter'
 require 'omniauth-facebook'

data/lib/solidus_social/engine.rb

@@ -1,12 +1,4 @@
 module SolidusSocial
-  OAUTH_PROVIDERS = [
-    %w(Facebook facebook),
-    %w(Twitter twitter),
-    %w(Github github),
-    %w(Google google_oauth2),
-    %w(Amazon amazon)
-  ]
-
   class Engine < Rails::Engine
     engine_name 'solidus_social'
 
@@ -16,6 +8,16 @@ module SolidusSocial
       Spree::SocialConfig = Spree::SocialConfiguration.new
     end
 
+    initializer 'solidus_social.decorate_spree_user' do
+      next unless Rails.application.respond_to?(:reloader)
+
+      Rails.application.reloader.after_class_unload do
+        # Reload and decorate the spree user class immediately after it is
+        # unloaded so that it is available to devise when loading routes
+        load File.join(__dir__, '../../app/models/spree/user_decorator.rb')
+      end
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
@@ -25,17 +27,14 @@ module SolidusSocial
     config.to_prepare(&method(:activate).to_proc)
   end
 
-  # Setup all OAuth providers
-  def self.init_provider(provider)
-    return unless ActiveRecord::Base.connection.table_exists?('spree_authentication_methods')
-    key, secret = nil
-    Spree::AuthenticationMethod.where(environment: ::Rails.env).each do |auth_method|
-      next unless auth_method.provider == provider
-      key = auth_method.api_key
-      secret = auth_method.api_secret
-      Rails.logger.info("[Spree Social] Loading #{auth_method.provider.capitalize} as authentication source")
+  def self.configured_providers
+    Spree::SocialConfig.providers.keys.map(&:to_s)
+  end
+
+  def self.init_providers
+    Spree::SocialConfig.providers.each do |provider, credentials|
+      setup_key_for(provider, credentials[:api_key], credentials[:api_secret])
     end
-    setup_key_for(provider.to_sym, key, secret)
   end
 
   def self.setup_key_for(provider, key, secret)

data/lib/solidus_social/version.rb

@@ -9,7 +9,7 @@ module SolidusSocial
 
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
     PRE   = nil
 

data/solidus_social.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_runtime_dependency 'solidus_core', [">= 1.0", "< 3"]
+  s.add_runtime_dependency 'solidus_support'
   s.add_runtime_dependency 'solidus_auth_devise'
   s.add_runtime_dependency 'omniauth'
   s.add_runtime_dependency 'oa-core'
@@ -32,10 +33,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'omniauth-amazon'
 
   s.add_development_dependency 'capybara', '~> 2.4'
+  s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'database_cleaner', '1.3'
   s.add_development_dependency 'rspec-rails', '~> 3.1'
   s.add_development_dependency 'factory_girl', '~> 4.4'
   s.add_development_dependency 'selenium-webdriver', '>= 2.41.0'
+  s.add_development_dependency 'chromedriver-helper'
   s.add_development_dependency 'poltergeist', '~> 1.5'
   s.add_development_dependency 'simplecov', '~> 0.9.0'
   s.add_development_dependency 'sqlite3', '~> 1.3.10'

data/spec/controllers/spree/omniauth_callbacks_controller_spec.rb

@@ -141,6 +141,34 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
             expect(controller).to receive(:sign_in_and_redirect)
             expect { controller.twitter }.to change(Spree::User, :count).by(1)
           end
+
+          context 'when `Spree.user_class` has changed' do
+            before do
+              @previous_user_class = Spree.user_class.to_s
+              Spree.user_class = Spree::LegacyUser.to_s
+
+              # the application was initialized with Spree::User, so some
+              # some methods do not exist on LegacyUser. In practice, this will
+              # not happen as Spree.user_class will not change on the fly like
+              # this.
+              # this statement simply stubs the required missing method
+              allow_any_instance_of(Spree::LegacyUser)
+                .to receive(:apply_omniauth)
+            end
+
+            after do
+              # in order to not affect other tests, restore the original class
+              Spree.user_class = @previous_user_class
+            end
+
+            it 'creates a new user' do
+              expect(Spree::User).not_to receive :new
+              expect_any_instance_of(Spree::User).not_to receive :save
+
+              expect { controller.twitter }
+                .to change(Spree::LegacyUser, :count).by(1)
+            end
+          end
         end
 
         context 'email belongs to existing user' do

data/spec/features/spree/admin/authentication_methods_configuration_spec.rb

@@ -21,20 +21,12 @@ RSpec.feature 'Admin Authentication Methods', :js do
 
       click_link 'New Authentication Method'
       expect(page).to have_text /BACK TO AUTHENTICATION METHODS LIST/i
-      select 'Test', from: 'authentication_method[environment]'
+      select2 'Test', from: 'Environment'
       select2 'Github', from: 'Social Provider'
-      fill_in 'API Key', with: 'KEY123'
-      fill_in 'API Secret', with: 'SEC123'
 
       click_button 'Create'
       expect(page).to have_text 'successfully created!'
     end
-
-    scenario 'does not save with empty fields' do
-      click_link 'New Authentication Method'
-      click_button 'Create'
-      expect(page).to have_text 'errors prohibited this record from being saved'
-    end
   end
 
   context 'when auth method exists' do
@@ -58,20 +50,19 @@ RSpec.feature 'Admin Authentication Methods', :js do
         click_icon :edit
       end
 
-      fill_in 'API Key', with: 'fake'
-      fill_in 'API Secret', with: 'fake'
+      find('#authentication_method_active_false').click
 
       click_button 'Update'
       expect(page).to have_text 'successfully updated!'
     end
 
     scenario 'can be deleted' do
-      within_row(1) do
-        click_icon :trash
+      accept_alert do
+        within_row(1) do
+          click_icon :trash
+        end
       end
 
-      page.driver.browser.switch_to.alert.accept unless Capybara.javascript_driver == :poltergeist
-
       expect(page).to have_text 'successfully removed!'
       expect(page).not_to have_text authentication_method.provider
     end

data/spec/features/spree/sign_in_spec.rb

@@ -24,30 +24,27 @@ RSpec.feature 'signing in using Omniauth', :js do
     end
 
     scenario 'going to sign in' do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+      visit spree.login_path
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
       click_link 'Logout'
       click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
     end
 
     # Regression test for #91
     scenario "attempting to view 'My Account' works" do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+      visit spree.login_path
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
       click_link 'My Account'
       expect(page).to have_text 'My Account'
     end
 
     scenario "view 'My Account'" do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with facebook"]').trigger('click')
+      visit spree.login_path
+      click_on 'Login with facebook'
       expect(page).to have_text 'You are now signed in with your facebook account.'
       click_link 'My Account'
       expect(page).not_to have_selector 'div#social-signin-links'
@@ -78,9 +75,8 @@ RSpec.feature 'signing in using Omniauth', :js do
     end
 
     scenario 'going to sign in' do
-      visit spree.root_path
-      click_link 'Login'
-      find('a[title="Login with twitter"]').trigger('click')
+      visit spree.login_path
+      click_on 'Login with twitter'
       expect(page).to have_text 'Please confirm your email address to continue'.upcase
       fill_in 'Email', with: 'user@example.com'
       click_button 'Create'

data/spec/lib/spree/social_config_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe Spree::SocialConfig do
+  it "changing a preference does not create a Spree::Preference" do
+    expect { subject.path_prefix = 'customer' }.not_to change(Spree::Preference, :count)
+  end
+
+  it "holds configuration for the five default providers" do
+    expect(subject.providers.keys).to match_array([:amazon, :facebook, :github, :google_oauth2, :twitter])
+  end
+end

data/spec/lib/spree_social/engine_spec.rb

@@ -1,16 +1,23 @@
 RSpec.describe SolidusSocial do
-  context 'constants' do
-    it { is_expected.to be_const_defined(:OAUTH_PROVIDERS) }
+  describe '.configured_providers' do
+    subject { described_class.configured_providers }
 
-    it 'contain all providers' do
-      oauth_providers = [
-        %w(Amazon amazon),
-        %w(Facebook facebook),
-        %w(Twitter twitter),
-        %w(Github github),
-        %w(Google google_oauth2)
-      ]
-      expect(described_class::OAUTH_PROVIDERS).to match_array oauth_providers
+    it { is_expected.to match_array(["amazon", "facebook", "github", "google_oauth2", "twitter"]) }
+  end
+
+  describe '.init_providers' do
+    subject { described_class.init_providers }
+
+    around do |example|
+      previous_providers = Spree::SocialConfig.providers
+      Spree::SocialConfig.providers = { facebook: { api_key: "secret_key", api_secret: "secret_secret" } }
+      example.run
+      Spree::SocialConfig.providers = previous_providers
+    end
+
+    it "sets up Devise for the given providers" do
+      expect(SolidusSocial).to receive(:setup_key_for).with(:facebook, "secret_key", "secret_secret")
+      subject
     end
   end
 end

data/spec/models/spree/authentication_method_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe Spree::AuthenticationMethod do
+  describe '.provider_options' do
+    let(:expected_provider_options) do
+      [
+        %w(Amazon amazon),
+        %w(Facebook facebook),
+        %w(Twitter twitter),
+        %w(Github github),
+        %w(Google google_oauth2)
+      ]
+    end
+
+    subject { described_class.provider_options }
+
+    it { is_expected.to match_array(expected_provider_options) }
+  end
+end

data/spec/models/spree/social_configuration_spec.rb

@@ -0,0 +1,4 @@
+RSpec.describe Spree::SocialConfiguration do
+  it { is_expected.to respond_to(:path_prefix) }
+  it { is_expected.to respond_to(:providers) }
+end

data/spec/models/spree/user_decorator_spec.rb

@@ -21,6 +21,27 @@ RSpec.describe Spree::User, type: :model do
         expect(user.email).to eq 'test@example.com'
       end
     end
+
+    context 'instance is valid' do
+      let(:user) { create(:user) { |user| user.email = nil } }
+      let(:omni_params) do
+        {
+          'provider' => 'any_provider',
+          'uid' => 12_345,
+          'info' => { 'email' => 'test@example.com' }
+        }
+      end
+
+      before do
+        allow(auths).to receive(:build)
+        allow(auths).to receive(:empty?).and_return(false)
+      end
+
+      it 'builds a valid user' do
+        user.apply_omniauth(omni_params)
+        expect(user.valid?).to be_truthy
+      end
+    end
   end
 
   context '.password_required?' do

data/spec/support/capybara.rb

@@ -1,18 +1,11 @@
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara/poltergeist'
+require 'capybara-screenshot/rspec'
+require 'selenium-webdriver'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods, type: :requests
 
-  Capybara.javascript_driver = :poltergeist
-  Capybara.register_driver(:poltergeist) do |app|
-    Capybara::Poltergeist::Driver.new app, js_errors: true, timeout: 60
-  end
-
-  config.before(:each, :js) do
-    if Capybara.javascript_driver == :selenium
-      page.driver.browser.manage.window.maximize
-    end
-  end
+  Capybara.javascript_driver = :selenium_chrome_headless
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_social
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - John Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_auth_devise
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.41.0
+- !ruby/object:Gem::Dependency
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -320,17 +362,16 @@ files:
 - app/views/spree/admin/authentication_methods/edit.html.erb
 - app/views/spree/admin/authentication_methods/index.html.erb
 - app/views/spree/admin/authentication_methods/new.html.erb
-- app/views/spree/admin/shared/_configurations_menu.html.erb
 - app/views/spree/shared/_social.html.erb
 - app/views/spree/shared/_user_form.html.erb
 - app/views/spree/users/_new-customer.html.erb
 - app/views/spree/users/_social.html.erb
 - bin/rails
-- config/initializers/devise.rb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/sv.yml
@@ -338,6 +379,7 @@ files:
 - db/migrate/20120120163432_create_user_authentications.rb
 - db/migrate/20120123163222_create_authentication_methods.rb
 - lib/generators/solidus_social/install/install_generator.rb
+- lib/generators/solidus_social/install/templates/config/initializers/solidus_social.rb
 - lib/solidus_social.rb
 - lib/solidus_social/engine.rb
 - lib/solidus_social/version.rb
@@ -345,7 +387,10 @@ files:
 - spec/controllers/spree/omniauth_callbacks_controller_spec.rb
 - spec/features/spree/admin/authentication_methods_configuration_spec.rb
 - spec/features/spree/sign_in_spec.rb
+- spec/lib/spree/social_config_spec.rb
 - spec/lib/spree_social/engine_spec.rb
+- spec/models/spree/authentication_method_spec.rb
+- spec/models/spree/social_configuration_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
@@ -374,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Adds social network login services (OAuth) to Spree
@@ -382,7 +427,10 @@ test_files:
 - spec/controllers/spree/omniauth_callbacks_controller_spec.rb
 - spec/features/spree/admin/authentication_methods_configuration_spec.rb
 - spec/features/spree/sign_in_spec.rb
+- spec/lib/spree/social_config_spec.rb
 - spec/lib/spree_social/engine_spec.rb
+- spec/models/spree/authentication_method_spec.rb
+- spec/models/spree/social_configuration_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb

data/app/views/spree/admin/shared/_configurations_menu.html.erb

@@ -1,4 +0,0 @@
-<tr>
-  <td><%= link_to Spree.t(:social_authentication_methods), spree.admin_authentication_methods_path %></td>
-  <td><%= Spree.t(:social_authentication_methods_description) %></td>
-</tr>

data/config/initializers/devise.rb

@@ -1,13 +0,0 @@
-SolidusSocial::OAUTH_PROVIDERS.each do |provider|
-  SolidusSocial.init_provider(provider[1])
-end
-
-OmniAuth.config.logger = Logger.new(STDOUT)
-OmniAuth.logger.progname = 'omniauth'
-
-OmniAuth.config.on_failure = proc do |env|
-  env['devise.mapping'] = Devise.mappings[Spree.user_class.table_name.singularize.to_sym]
-  controller_name  = ActiveSupport::Inflector.camelize(env['devise.mapping'].controllers[:omniauth_callbacks])
-  controller_klass = ActiveSupport::Inflector.constantize("#{controller_name}Controller")
-  controller_klass.action(:failure).call(env)
-end