solidus_social 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f865f400fb253b1ee9b52a8b75e20bd3ff18f6f9a0444c579fa5dd864875c88
-  data.tar.gz: 3812d2d3438a99fa911bfbc3532859abdb1c5cd04f80f823503920c837e28e8f
+  metadata.gz: 1877be6601ecd77f99eb28f6bb0ddf0b6b702cb80a7ca163f5472f5a34a3937f
+  data.tar.gz: 9ac2438fad599892a90abde85e1d20bed50641e0a5661c906e8950436fa52041
 SHA512:
-  metadata.gz: 622ca61bd56193b5bd3a8abe1c17b7a7e2be7bdb8b903167ea212ea988ac8c4b2ae82001476440c57271c55e8c6013cdca0f87f6e2859c79fc29d1a0104eec59
-  data.tar.gz: 528320886591e648f18196a7b3811f173a5c2f70352d40d762c4a635ae86430bad30a215611aad1dd738a63d3e56325f0d907edf67f972a6280f18e90034a92b
+  metadata.gz: c3c7b24eee76fbe4a361c6da83ad7e3f4d88e78b4686db243b6ec995a48454929ef9bb00e92d987994a0b7bbb6cae1e10598f75cb10a82ec30225c5c16208c22
+  data.tar.gz: e96864533c0a6d567afef96682601126ce50591f99d179205e9e8420ab6942b0e58ffb9e2b39eccdbc7de119cbbc182cb3366d290e025e42c051c15298b70e85

data/.circleci/config.yml

@@ -1,6 +1,7 @@
 version: 2.1
 
 orbs:
+  browser-tools: circleci/browser-tools@1.4
   # Always take the latest version of the orb, this allows us to
   # run specs against Solidus supported versions only without the need
   # to change this configuration every time a Solidus version is released
@@ -11,10 +12,12 @@ jobs:
   run-specs-with-postgres:
     executor: solidusio_extensions/postgres
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor: solidusio_extensions/mysql
     steps:
+      - browser-tools/install-browser-tools
       - solidusio_extensions/run-tests
 
 workflows:

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/Gemfile

@@ -4,7 +4,13 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
+                                      %w[solidusio/solidus solidusio/solidus_frontend]
+                                    else
+                                      %w[solidusio/solidus] * 2
+                                    end
+gem 'solidus', github: solidus_git, branch: branch
+gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
@@ -27,4 +33,4 @@ gemspec
 
 # Use a local Gemfile to include development dependencies that might not be
 # relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
-eval_gemfile 'Gemfile-local' if File.exist? 'Gemfile-local'
+send :eval_gemfile, 'Gemfile-local' if File.exist? 'Gemfile-local'

data/README.md

@@ -5,8 +5,8 @@ SolidusSocial
 [![Code Climate](https://codeclimate.com/github/solidusio-contrib/solidus_social/badges/gpa.svg)](https://codeclimate.com/github/solidusio-contrib/solidus_social)
 
 Social login support for Solidus. Solidus Social handles authorization, account
-creation and association through third-party services. Currently Twitter,
-Facebook, Github, Google OAuth2, and Amazon are available out of the box.
+creation and association through third-party services.
+Currently Facebook, Github and Google OAuth2 are available out of the box.
 
 Installation
 ------------
@@ -44,7 +44,7 @@ Click "New Authentication Method" and choose one of your configured providers.
 Registering Your Application
 ----------------------------
 
-Facebook, Twitter, Github, Google OAuth2, and Amazon are supported out of the
+Facebook, Github and Google OAuth2 are supported out of the
 box but, you will need to register your application with each of the sites you
 want to use.
 
@@ -64,20 +64,6 @@ Make sure you specifity the right IP address.
     `http://your-site.com` for production
   - Site domain: `yourhostname.local` and `your-site.com` respectively
 
-### Twitter
-
-[Twitter / Application Management / Create an application][3]
-
-1. Fill in the name and description.
-2. Fill in the rest of the details:
-  - 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
-    `http://your-site.com` for production
-  - Default Access Type: "Read & Write"
-6. Save the application.
-
 ### Github
 
 [Github / Applications / Register a new OAuth application][4]
@@ -90,18 +76,6 @@ Make sure you specifity the right IP address.
     `http://your-site.com` for production
 4. Click Create.
 
-### Amazon
-
-[Amazon / App Console / Register a new OAuth application][10]
-
-1. Register New Application.
-2. Name the Application, provide description and URL for Privacy Policy.
-3. Click Save.
-4. Add Your site under Web Settings > Allowed Return URLs (example:
-   `http://localhost:3000/users/auth/amazon/callback`)
-
-> The app console is available at [https://login.amazon.com/manageApps](https://login.amazon.com/manageApps)
-
 ### Google OAuth2
 [Google / APIs / Credentials/ Create Credential](https://console.developers.google.com/)
 
@@ -140,11 +114,40 @@ strategy][12] for them. (If there isn't, you can [write one][13].)
      your LinkedIn link.
    - Include in your CSS a definition for `.icon-spree-linkedin-circled` and an
      embedded icon font for LinkedIn from [Fontello][14] (the way existing
-     icons for Facebook, Twitter, etc are implemented). You can also override
+     icons for Facebook etc are implemented). You can also override
      CSS classes for other providers, `.icon-spree-<provider>-circled`, to use
      different font icons or classic background images, without having to
      override views.
 
+#### Apple Id Example
+
+1. Add `gem "omniauth-apple"` to your Gemfile and run `bundle install`.
+2. In `config/initializers/solidus_social.rb` add and initialize a new provider
+   for SolidusSocial:
+
+   ```ruby
+
+     config.providers = {
+        apple:          {
+          icon:   'fa-apple',
+          title:  'Apple'
+        },
+       # More providers here
+   ```
+   add its configuration after `SolidusSocial.init_providers` line:
+   ```ruby
+   
+     Devise.setup do |config|
+       # The configuration key has to match your omniauth strategy.
+       config.omniauth :apple, ENV['APPLE_CLIENT_ID'], '',
+                       scope:    'email',
+                       team_id:  ENV['APPLE_TEAM_ID'],
+                       key_id:   ENV['APPLE_KEY_ID'],
+                       pem:      ENV['APPLE_PRIVATE_KEY'].gsub('\n', "\n")
+     end
+   ```
+   Notice: APPLE_PRIVATE_KEY should consist from one-line p8-file content, like this `'\n-----BEGIN PRIVATE KEY-----\nsecret\n-----END PRIVATE KEY-----\n'`
+
 Documentation
 -------------
 
@@ -188,16 +191,14 @@ Copyright (c) 2014 [John Dyer][7] and [contributors][8], released under the [New
 
 [1]: https://github.com/spree/spree
 [2]: https://developers.facebook.com/apps/?action=create
-[3]: https://apps.twitter.com/app/new
-[4]: https://github.com/settings/applications/new
-[5]: http://www.fsf.org/licensing/essays/free-sw.html
-[6]: https://github.com/solidusio-contrib/solidus_social/issues
-[7]: https://github.com/LBRapid
-[8]: https://github.com/solidusio-contrib/solidus_social/graphs/contributors
-[9]: https://github.com/solidusio-contrib/solidus_social/blob/master/LICENSE
-[10]: https://login.amazon.com/manageApps
-[11]: https://github.com/solidusio-contrib/solidus_social/blob/master/CONTRIBUTING.md
-[12]: https://github.com/intridea/omniauth/wiki/List-of-Strategies
-[13]: https://github.com/intridea/omniauth/wiki/Strategy-Contribution-Guide
-[14]: http://fontello.com/
-[15]: http://www.rubydoc.info/github/solidusio-contrib/solidus_social/
+[3]: https://github.com/settings/applications/new
+[4]: http://www.fsf.org/licensing/essays/free-sw.html
+[5]: https://github.com/solidusio-contrib/solidus_social/issues
+[6]: https://github.com/LBRapid
+[7]: https://github.com/solidusio-contrib/solidus_social/graphs/contributors
+[8]: https://github.com/solidusio-contrib/solidus_social/blob/master/LICENSE
+[9]: https://github.com/solidusio-contrib/solidus_social/blob/master/CONTRIBUTING.md
+[10]: https://github.com/intridea/omniauth/wiki/List-of-Strategies
+[11]: https://github.com/intridea/omniauth/wiki/Strategy-Contribution-Guide
+[12]: http://fontello.com/
+[13]: http://www.rubydoc.info/github/solidusio-contrib/solidus_social/

data/app/controllers/spree/omniauth_callbacks_controller.rb

@@ -62,7 +62,7 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def passthru
-    render file: "#{Rails.root}/public/404", formats: [:html], status: :not_found, layout: false
+    render file: "#{Rails.root}/public/404.html", formats: [:html], status: :not_found, layout: false
   end
 
   def auth_hash

data/app/core/spree/permission_sets/authentication_method_display.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  module PermissionSets
+    class AuthenticationMethodDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::AuthenticationMethod
+      end
+    end
+  end
+end

data/app/core/spree/permission_sets/authentication_method_management.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spree
+  module PermissionSets
+    class AuthenticationMethodManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::AuthenticationMethod
+      end
+    end
+  end
+end

data/app/overrides/admin_configuration_decorator.rb

@@ -3,5 +3,10 @@
 Deface::Override.new(virtual_path: 'spree/admin/shared/_configuration_menu',
                      name: 'add_social_providers_link_configuration_menu',
                      insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
-                     text: '<%= configurations_sidebar_menu_item I18n.t("spree.social_authentication_methods"), spree.admin_authentication_methods_path %>',
-                     disabled: false)
+                     disabled: false) do
+                       <<-HTML
+                        <% if can? :admin, Spree::AuthenticationMethod %>
+                          <%= configurations_sidebar_menu_item I18n.t("spree.social_authentication_methods"), spree.admin_authentication_methods_path %>
+                        <% end %>
+                        HTML
+                     end

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

@@ -13,6 +13,8 @@
 <%= form_for [:admin, @authentication_method] do |f| %>
   <fieldset class="no-border-top">
     <%= render 'form', f: f %>
-    <%= render 'spree/admin/shared/edit_resource_links' %>
+    <% if can? :manage, Spree::AuthenticationMethod %>
+      <%= render 'spree/admin/shared/edit_resource_links' %>
+    <% end %>
   </fieldset>
 <% end %>

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

@@ -5,11 +5,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= link_to I18n.t('spree.new_social_method'), new_object_url, id: 'admin_new_slide_link' %>
-    </li>
-  </ul>
+  <% if can? :manage, Spree::AuthenticationMethod %>
+    <ul class="actions inline-menu">
+      <li>
+        <%= link_to I18n.t('spree.new_social_method'), new_object_url, id: 'admin_new_slide_link' %>
+      </li>
+    </ul>
+  <% end %>
 <% end %>
 
 <% if @authentication_methods.any? %>
@@ -39,8 +41,10 @@
           <td class="align-center"><%= method.environment.to_s.titleize %></td>
           <td class="align-center"><%= method.active ? I18n.t('spree.yes') : I18n.t('spree.no') %></td>
           <td class="actions">
-            <%= link_to_edit method, no_text: true %>
-            <%= link_to_delete method, no_text: true %>
+            <% if can? :manage, Spree::AuthenticationMethod %>
+              <%= link_to_edit method, no_text: true %>
+              <%= link_to_delete method, no_text: true %>
+            <% end %>
           </td>
         </tr>
       <% end %>

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

@@ -13,6 +13,8 @@
 <%= form_for [:admin, @authentication_method] do |f| %>
   <fieldset class="no-border-top">
     <%= render 'form', f: f %>
-    <%= render 'spree/admin/shared/new_resource_links' %>
+    <% if can? :manage, Spree::AuthenticationMethod %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    <% end %>
   </fieldset>
 <% end %>

data/app/views/spree/shared/_social.html.erb

@@ -4,8 +4,12 @@
   <% end %>
 
   <% Spree::AuthenticationMethod.available_for(spree_current_user).each do |method| %>
-    <%= link_to(content_tag(:i, '', class: "icon-spree-#{method.provider.dasherize}-circled"),
-          spree.send("spree_user_#{method.provider}_omniauth_authorize_path", r: rand),
-          title: t('spree.sign_in_with', provider: method.provider)) if method.active %>
+    <% if method.active %>
+      <%= form_tag(spree.send("spree_user_#{method.provider}_omniauth_authorize_path", r: rand), method: 'post') do %>
+        <%= button_tag(type: 'submit', title: t('spree.sign_in_with', provider: method.provider)) do %>
+          <%= content_tag(:i, '', class: "icon-spree-#{method.provider.dasherize}-circled") %>
+        <% end %>
+      <% end %>
+    <% end %>
   <% end %>
 </div>

data/config/locales/es-MX.yml

@@ -1,8 +1,11 @@
 ---
 es-MX:
+  authentications:
+    spree:
+      destroy: Método de autenticación eliminado
   devise:
     omniauth_callbacks:
-      success: "Estás sesión con tu cuenta de %{kind}."
+      success: "Estás en sesión con tu cuenta de %{kind}."
   spree:
     user_was_not_valid: "El usuario no fue válido."
     add_another_service: 'Añadir otro servicio para inicio de sesión:'
@@ -24,3 +27,4 @@ es-MX:
     please_confirm_your_email: 'Por favor confirme su email para continuar'
     sign_in_with: 'Autenticado con %{provider}'
     you_have_signed_in_with_these_services: "Has iniciado sesión con estos servicios"
+    environment: Ambiente

data/config/locales/es.yml

@@ -0,0 +1,30 @@
+---
+es:
+  authentications:
+    spree:
+      destroy: Método de autenticación eliminado
+  devise:
+    omniauth_callbacks:
+      success: "Estás en sesión con tu cuenta de %{kind}."
+  spree:
+    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 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 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:'
+    sign_in_through_one_of_these_services: 'Iniciar sesión a través de uno de estos servicios:'
+    social_api_key: 'API Clave'
+    social_api_secret: 'API Secreto'
+    social_authentication_methods: 'Métodos de autenticación'
+    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: 'Autenticado con %{provider}'
+    you_have_signed_in_with_these_services: "Has iniciado sesión con estos servicios"
+    environment: Ambiente

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

@@ -18,10 +18,6 @@ Spree::SocialConfig.configure do |config|
       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'],
@@ -29,10 +25,6 @@ Spree::SocialConfig.configure do |config|
     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
@@ -44,7 +36,6 @@ 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 = ActiveSupport::Inflector.constantize("Spree::OmniauthCallbacksController")
   controller_klass.action(:failure).call(env)
 end

data/lib/solidus_social/engine.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'omniauth-twitter'
 require 'omniauth-facebook'
 require 'omniauth-github'
 require 'omniauth-google-oauth2'
-require 'omniauth-amazon'
+require 'omniauth/rails_csrf_protection'
 require 'deface'
-require 'coffee_script'
 require 'spree/core'
+require 'solidus_social/social_configuration'
 require 'solidus_social/facebook_omniauth_strategy_ext'
 
 module SolidusSocial
   class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions::Decorators
+    include SolidusSupport::EngineExtensions
 
     isolate_namespace ::Spree
 
@@ -27,10 +26,6 @@ module SolidusSocial
       "app/decorators/models/solidus_social/spree/user_decorator.rb"
     ).to_s
 
-    initializer 'solidus_social.environment', before: 'spree.environment' do
-      ::Spree::SocialConfig = ::Spree::SocialConfiguration.new
-    end
-
     initializer 'solidus_social.decorate_spree_user' do |app|
       next unless app.respond_to?(:reloader)
 

data/{app/models/spree → lib/solidus_social}/social_configuration.rb

@@ -4,5 +4,7 @@ module Spree
   class SocialConfiguration < Preferences::Configuration
     attr_accessor :providers
     preference :path_prefix, :string, default: 'users'
+
+    ::Spree::SocialConfig = Spree::SocialConfiguration.new
   end
 end

data/lib/solidus_social/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusSocial
-  VERSION = '1.3.0'
+  VERSION = '1.5.0'
 end

data/solidus_social.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_social'
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_social/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.4')
+  spec.required_ruby_version = '>= 2.4'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,14 +31,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deface'
   spec.add_dependency 'oa-core'
   spec.add_dependency 'omniauth'
-  spec.add_dependency 'omniauth-amazon'
   spec.add_dependency 'omniauth-facebook'
   spec.add_dependency 'omniauth-github'
   spec.add_dependency 'omniauth-google-oauth2'
-  spec.add_dependency 'omniauth-twitter'
+  spec.add_dependency 'omniauth-rails_csrf_protection'
   spec.add_dependency 'solidus_auth_devise'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.4.0'
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'solidus_dev_support'
 end

data/spec/controllers/spree/omniauth_callbacks_controller_spec.rb

@@ -18,17 +18,17 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
     it 'redirects properly' do
       expect(controller).to receive(:redirect_back_or_default)
-      controller.twitter
+      controller.github
     end
 
     it 'displays an error message' do
-      controller.twitter
+      controller.github
       expect(flash[:error]).not_to be_blank
     end
 
     it 'does not attempt authentication' do
       expect(controller).not_to receive(:sign_in_and_redirect)
-      controller.twitter
+      controller.github
     end
   end
 
@@ -37,7 +37,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
     it 'associates the order with the user' do
       expect(order).to receive(:associate_user!).with(user)
-      controller.twitter
+      controller.github
     end
   end
 
@@ -64,17 +64,17 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
         it 'does not need to create the user_authentication' do
           expect(user.user_authentications).not_to receive(:create!)
-          controller.twitter
+          controller.github
         end
 
         it 'sets the flash notice' do
-          controller.twitter
+          controller.github
           expect(flash[:notice]).not_to be_blank
         end
 
         it 'authenticates as that user' do
           expect(controller).to receive(:sign_in_and_redirect)
-          controller.twitter
+          controller.github
         end
       end
 
@@ -86,17 +86,17 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
         it 'creates a new user_authentication' do
           expect(user).to receive(:apply_omniauth)
           expect(user).to receive(:save!)
-          controller.twitter
+          controller.github
         end
 
         it 'sets the flash notice' do
-          controller.twitter
+          controller.github
           expect(flash[:notice]).not_to be_blank
         end
 
         it 'redirects properly' do
           expect(controller).to receive(:redirect_back_or_default)
-          controller.twitter
+          controller.github
         end
 
         it_behaves_like 'associate_order'
@@ -119,17 +119,17 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
         it 'does not need to create the user_authentication' do
           expect(user.user_authentications).not_to receive(:create!)
-          controller.twitter
+          controller.github
         end
 
         it 'does not create a new user account' do
           expect(Spree::User).not_to receive :new
-          controller.twitter
+          controller.github
         end
 
         it 'authenticates as that user' do
           expect(controller).to receive(:sign_in_and_redirect).with(:spree_user, user)
-          controller.twitter
+          controller.github
         end
       end
 
@@ -144,7 +144,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
         context "email doesn't belongs to anyone" do
           it 'creates a new user' do
             expect(controller).to receive(:sign_in_and_redirect)
-            expect { controller.twitter }.to change(Spree::User, :count).by(1)
+            expect { controller.github }.to change(Spree::User, :count).by(1)
           end
 
           context 'when `Spree.user_class` has changed' do
@@ -170,7 +170,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
               expect(Spree::User).not_to receive :new
               expect_any_instance_of(Spree::User).not_to receive :save
 
-              expect { controller.twitter }
+              expect { controller.github }
                 .to change(Spree::LegacyUser, :count).by(1)
             end
           end
@@ -180,11 +180,11 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
           before { @user = create(:user, email: 'spree@gmail.com') }
 
           it 'does not create new user' do
-            expect { controller.twitter }.not_to change(Spree::User, :count)
+            expect { controller.github }.not_to change(Spree::User, :count)
           end
 
           it 'assigns authentication to existing user' do
-            expect { controller.twitter }.to change(@user.user_authentications, :count).by(1)
+            expect { controller.github }.to change(@user.user_authentications, :count).by(1)
           end
         end
       end

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

@@ -19,10 +19,10 @@ RSpec.describe 'Admin Authentication Methods', :js do
     end
 
     it 'can create new' do
-      expect(page).to have_text /NO AUTHENTICATION METHODS FOUND, ADD ONE!/i
+      expect(page).to have_text 'No Authentication Methods Found, Add One!'
 
       click_link 'New Authentication Method'
-      expect(page).to have_text /BACK TO AUTHENTICATION METHODS LIST/i
+      expect(page).to have_link 'Back To Authentication Methods List'
       select2 'Test', from: 'Environment'
       select2 'Github', from: 'Social Provider'
 

data/spec/features/spree/sign_in_spec.rb

@@ -53,21 +53,73 @@ RSpec.describe 'Signing in using Omniauth', :js do
     end
   end
 
-  context 'twitter' do
+  context 'github' do
     before do
       Spree::AuthenticationMethod.create!(
-        provider: 'twitter',
+        provider: 'github',
         api_key: 'fake',
         api_secret: 'fake',
         environment: Rails.env,
         active: true
       )
-      OmniAuth.config.test_mode = true
-      OmniAuth.config.mock_auth[:twitter] = {
-        'provider' => 'twitter',
+      OmniAuth.config.mock_auth[:github] = {
+        'provider' => 'github',
         'uid' => '123545',
         'info' => {
           'name' => 'mockuser',
+          'email' => 'mockuser@example.com',
+          'image' => 'mock_user_thumbnail_url'
+        },
+        'credentials' => {
+          'token' => 'mock_token',
+          'secret' => 'mock_secret'
+        }
+      }
+    end
+
+    it 'going to sign in' do
+      visit spree.login_path
+      click_on 'Login with github'
+      expect(page).to have_text 'You are now signed in with your github account.'
+      click_link 'Logout'
+      click_link 'Login'
+      click_on 'Login with github'
+      expect(page).to have_text 'You are now signed in with your github account.'
+    end
+
+    # Regression test for #91
+    it "attempting to view 'My Account' works" do
+      visit spree.login_path
+      click_on 'Login with github'
+      expect(page).to have_text 'You are now signed in with your github account.'
+      click_link 'My Account'
+      expect(page).to have_text 'My Account'
+    end
+
+    it "view 'My Account'" do
+      visit spree.login_path
+      click_on 'Login with github'
+      expect(page).to have_text 'You are now signed in with your github account.'
+      click_link 'My Account'
+      expect(page).not_to have_selector 'div#social-signin-links'
+    end
+  end
+
+  context 'google_oauth2' do
+    before do
+      Spree::AuthenticationMethod.create!(
+        provider: 'google_oauth2',
+        api_key: 'fake',
+        api_secret: 'fake',
+        environment: Rails.env,
+        active: true
+      )
+      OmniAuth.config.mock_auth[:google_oauth2] = {
+        'provider' => 'google_oauth2',
+        'uid' => '123545',
+        'info' => {
+          'name' => 'mockuser',
+          'email' => 'mockuser@example.com',
           'image' => 'mock_user_thumbnail_url'
         },
         'credentials' => {
@@ -79,11 +131,29 @@ RSpec.describe 'Signing in using Omniauth', :js do
 
     it 'going to sign in' do
       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'
-      expect(page).to have_text 'Welcome! You have signed up successfully.'
+      click_on 'Login with google_oauth2'
+      expect(page).to have_text 'You are now signed in with your google_oauth2 account.'
+      click_link 'Logout'
+      click_link 'Login'
+      click_on 'Login with google_oauth2'
+      expect(page).to have_text 'You are now signed in with your google_oauth2 account.'
+    end
+
+    # Regression test for #91
+    it "attempting to view 'My Account' works" do
+      visit spree.login_path
+      click_on 'Login with google_oauth2'
+      expect(page).to have_text 'You are now signed in with your google_oauth2 account.'
+      click_link 'My Account'
+      expect(page).to have_text 'My Account'
+    end
+
+    it "view 'My Account'" do
+      visit spree.login_path
+      click_on 'Login with google_oauth2'
+      expect(page).to have_text 'You are now signed in with your google_oauth2 account.'
+      click_link 'My Account'
+      expect(page).not_to have_selector 'div#social-signin-links'
     end
   end
 end

data/spec/lib/spree/social_config_spec.rb

@@ -6,6 +6,6 @@ RSpec.describe Spree::SocialConfig do
   end
 
   it "holds configuration for the five default providers" do
-    expect(subject.providers.keys).to match_array([:amazon, :facebook, :github, :google_oauth2, :twitter])
+    expect(subject.providers.keys).to match_array([:facebook, :github, :google_oauth2])
   end
 end

data/spec/models/spree/authentication_method_spec.rb

@@ -6,9 +6,7 @@ RSpec.describe Spree::AuthenticationMethod do
 
     let(:expected_provider_options) do
       [
-        %w(Amazon amazon),
         %w(Facebook facebook),
-        %w(Twitter twitter),
         %w(Github github),
         %w(Google google_oauth2)
       ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_social
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - John Dyer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: omniauth-amazon
-  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: omniauth-facebook
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-twitter
+  name: omniauth-rails_csrf_protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,7 +131,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,21 +141,21 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +170,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: jdyer@spreecommerce.com
 executables: []
 extensions: []
@@ -192,7 +178,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
-- ".github/stale.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -208,11 +194,12 @@ files:
 - app/controllers/spree/admin/authentication_methods_controller.rb
 - app/controllers/spree/omniauth_callbacks_controller.rb
 - app/controllers/spree/user_authentications_controller.rb
+- app/core/spree/permission_sets/authentication_method_display.rb
+- app/core/spree/permission_sets/authentication_method_management.rb
 - app/decorators/controllers/solidus_social/spree/user_registrations_controller_decorator.rb
 - app/decorators/models/solidus_social/spree/user_decorator.rb
 - app/helpers/spree/omniauth_callbacks_helper.rb
 - app/models/spree/authentication_method.rb
-- app/models/spree/social_configuration.rb
 - app/models/spree/user_authentication.rb
 - app/overrides/add_authentications_to_account_summary.rb
 - app/overrides/admin_configuration_decorator.rb
@@ -233,6 +220,7 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
+- config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
@@ -247,6 +235,7 @@ files:
 - lib/solidus_social/engine.rb
 - lib/solidus_social/facebook_omniauth_strategy_ext.rb
 - lib/solidus_social/factories.rb
+- lib/solidus_social/social_configuration.rb
 - lib/solidus_social/version.rb
 - solidus_social.gemspec
 - spec/controllers/spree/omniauth_callbacks_controller_spec.rb
@@ -267,13 +256,13 @@ metadata:
   homepage_uri: https://github.com/solidusio-contrib/solidus_social#readme
   source_code_uri: https://github.com/solidusio-contrib/solidus_social
   changelog_uri: https://github.com/solidusio-contrib/solidus_social/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -282,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: Adds social network login services (OAuth) to Solidus
 test_files:

data/.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false