solidus_social 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86b6cfe4109e24c01c128b99b42a23c5387001a642acbdb4ae78d0efbf5e108
-  data.tar.gz: 116bca0155aa00db87caac0c00a59bbc2139729e2addd378d7159641ba424613
+  metadata.gz: 8f6748bb52dec9c0adf020256d086ea0d55190ed7922d3a6d2def8061763ef5f
+  data.tar.gz: 13ea181f254b90bbbdf1c0c100e738cc28a1621f40a3843cd1ca929877f59cee
 SHA512:
-  metadata.gz: 3d37b9986abcee5ddd8dd82c003f92b5a497ccbe36c619268f20fc390db9375dd88a05a4536942418afc4193e147fd82028b136d4578cd8888157daa4ea5ce7c
-  data.tar.gz: 737587a8380670d75146924a52a3794bf628679e6b1701129b10f88fbace10259920b5654b9108f7ba0859a739f529d2c5249afc5e91941cd6016b7ccfc6708b
+  metadata.gz: d1c34977fa94f9bfed99c58ab509f891fe2e3b47c10a8ac1a8acce57fdd235c615428a475d5d0c8083828887ca53fd5fdd4bc4341b1b40a47e8af5358b9d52e5
+  data.tar.gz: 4a8f38b3f9ec00f1c742425d25d6004586aeca3f7577d971cd3cf107fa6e534b6a466788771571824828b951024dfded8d55fddff43de7e22cd00b45853d384d

data/.circleci/config.yml

@@ -8,28 +8,55 @@ orbs:
   solidusio_extensions: solidusio/extensions@volatile
 
 jobs:
-  run-specs-with-postgres:
-    executor: solidusio_extensions/postgres
+  run-specs:
+    parameters:
+      solidus:
+        type: string
+        default: main
+      db:
+        type: string
+        default: "postgres"
+      ruby:
+        type: string
+        default: "3.2"
+    executor:
+      name: solidusio_extensions/<< parameters.db >>
+      ruby_version: << parameters.ruby >>
     steps:
-      - solidusio_extensions/run-tests
-  run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
-    steps:
-      - solidusio_extensions/run-tests
+      - checkout
+      - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-  "Weekly run specs against master":
+      - run-specs:
+          name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
+
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
+

data/.github/dependabot.yml

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

data/CHANGELOG.md

@@ -1,35 +1 @@
-## Unreleased
-
-## v1.3.0
-
-- Migrated factories from FactoryGirl to FactoryBot
-- Add support for Solidus 2.4+
-- Reduced compatible versions of `solidus_core` to 2.x
-- Removed the deprecated `icon:` argument from admin buttons
-- Fixed an issue when using Safari to authenticate
-- `Spree::UserRegistrationsController` and `Spree.user_class` are now decorated by
-  prepending modules in the `SolidusSocial::Spree` namespace instead of using `class_eval`
-- Development of the extension is not relying on `solidus_dev_support` and CircleCI
-- Moved the Facebook strategy patch to it's own prepended module
-
-## v1.2.0
-
-- Switched to using the install generator to import the solidus social
-  initializer into apps. **Please run `bin/rails generate solidus_social:install`
-  in order to upgrade.**
-- Removed the `SolidusSocial::OAUTH_PROVIDERS` constant in favour of
-  the `Spree::AuthenticationMethod.providers_options` class
-  method. This is populated using the `Spree::SocialConfig#providers` Hash.
-- Added support for Rails 5.1.
-- Added Italian translations
-
-## v1.1.0
-
-- Added support for Solidus 2/Rails 5
-- Bugfixes
-
-## v1.0.0
-
-- Renamed SpreeSocial to SolidusSocial
-- Relaxed versions to support solidus 1.0+
-- Port of https://github.com/DynamoMTL/spree_social's solidus branch
+See https://github.com/solidusio-contrib/solidus_social/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.

data/Gemfile

@@ -3,9 +3,18 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
+# The solidus_frontend gem has been pulled out since v3.2
+if branch >= 'v3.2'
+  gem 'solidus_frontend'
+elsif branch == 'main'
+  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+else
+  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+end
+
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677

data/OLD_CHANGELOG.md

@@ -0,0 +1,35 @@
+## Unreleased
+
+## v1.3.0
+
+- Migrated factories from FactoryGirl to FactoryBot
+- Add support for Solidus 2.4+
+- Reduced compatible versions of `solidus_core` to 2.x
+- Removed the deprecated `icon:` argument from admin buttons
+- Fixed an issue when using Safari to authenticate
+- `Spree::UserRegistrationsController` and `Spree.user_class` are now decorated by
+  prepending modules in the `SolidusSocial::Spree` namespace instead of using `class_eval`
+- Development of the extension is not relying on `solidus_dev_support` and CircleCI
+- Moved the Facebook strategy patch to it's own prepended module
+
+## v1.2.0
+
+- Switched to using the install generator to import the solidus social
+  initializer into apps. **Please run `bin/rails generate solidus_social:install`
+  in order to upgrade.**
+- Removed the `SolidusSocial::OAUTH_PROVIDERS` constant in favour of
+  the `Spree::AuthenticationMethod.providers_options` class
+  method. This is populated using the `Spree::SocialConfig#providers` Hash.
+- Added support for Rails 5.1.
+- Added Italian translations
+
+## v1.1.0
+
+- Added support for Solidus 2/Rails 5
+- Bugfixes
+
+## v1.0.0
+
+- Renamed SpreeSocial to SolidusSocial
+- Relaxed versions to support solidus 1.0+
+- Port of https://github.com/DynamoMTL/spree_social's solidus branch

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/Rakefile

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'bundler/gem_tasks'
+
 require 'solidus_dev_support/rake_tasks'
 SolidusDevSupport::RakeTasks.install
 

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/views/spree/admin/authentication_methods/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_social_methods_form_fields" class="row">
-  <div class="alpha five columns">
+  <div class="col-4">
     <div data-hook="environment" class="field">
       <%= f.field_container :environment do %>
         <%= label_tag nil, Spree::AuthenticationMethod.human_attribute_name(:environment) %>
@@ -7,7 +7,7 @@
       <% end %>
     </div>
   </div>
-  <div class="alpha five columns">
+  <div class="col-4">
     <div data-hook="environment" class="field">
       <%= f.field_container :provider do %>
         <%= f.label :provider, I18n.t('spree.social_provider') %>
@@ -15,14 +15,12 @@
       <% end %>
     </div>
   </div>
-  <div class="alpha five columns">
+  <div class="col-4">
     <div data-hook="environment" class="field">
       <%= f.field_container :active do %>
-        <span style="padding:0 10px 2px;"><%= f.label :active, I18n.t('spree.active') %></span>
-        <%= f.radio_button :active, :true %>
-        <span style="padding:0 2px;"><%= I18n.t('spree.say_yes') %></span>
-        <%= f.radio_button :active, :false %>
-        <span style="padding:0 2px"><%= I18n.t('spree.say_no') %></span>
+        <%= f.label :active, I18n.t('spree.active') %><br>
+        <%= f.radio_button :active, :true %><span style="padding:0 2px;"><%= I18n.t('spree.say_yes') %></span>
+        <%= f.radio_button :active, :false %><span style="padding:0 2px"><%= I18n.t('spree.say_no') %></span>
       <% end %>
     </div>
   </div>

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

@@ -1,13 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
+<% admin_breadcrumb(link_to I18n.t('spree.social_authentication_methods'), spree.admin_authentication_methods_path) %>
+
 <% content_for :page_title do %>
   <%= I18n.t('spree.edit_social_method') %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', I18n.t('spree.back_to_authentication_methods_list'), admin_authentication_methods_path, class: 'button' %></li>
-<% end %>
-
 <%= render 'spree/shared/error_messages', target: @authentication_method %>
 
 <%= form_for [:admin, @authentication_method] do |f| %>

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

@@ -8,7 +8,7 @@
   <% 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' %>
+        <%= link_to I18n.t('spree.new_social_method'), new_object_url, id: 'admin_new_slide_link', class: "btn btn-primary" %>
       </li>
     </ul>
   <% end %>
@@ -29,17 +29,17 @@
       <th><%= I18n.t('spree.social_api_key') %></th>
       <th><%= I18n.t('spree.social_api_secret') %></th>
       <th><%= I18n.t('spree.environment') %></th>
-      <th><%= I18n.t('spree.active') %></th>
+      <th class="align-right"><%= I18n.t('spree.active') %></th>
       <th data-hook="admin_social_methods_index_header_actions" class="actions"></th>
     </thead>
     <tbody>
       <% @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: 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 ? I18n.t('spree.yes') : I18n.t('spree.no') %></td>
+          <td><%= method.provider %></td>
+          <td><%= truncate method.api_key, length: 10 %></td>
+          <td><%= truncate method.api_secret, length: 10 %></td>
+          <td><%= method.environment.to_s.titleize %></td>
+          <td class="align-right"><%= method.active ? I18n.t('spree.say_yes') : I18n.t('spree.say_no') %></td>
           <td class="actions">
             <% if can? :manage, Spree::AuthenticationMethod %>
               <%= link_to_edit method, no_text: true %>

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

@@ -1,13 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
+<% admin_breadcrumb(link_to I18n.t('spree.social_authentication_methods'), spree.admin_authentication_methods_path) %>
+
 <% content_for :page_title do %>
   <%= I18n.t('spree.new_social_method') %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', I18n.t('spree.back_to_authentication_methods_list'), admin_authentication_methods_path, class: 'button' %></li>
-<% end %>
-
 <%= render 'spree/shared/error_messages', target: @authentication_method %>
 
 <%= form_for [:admin, @authentication_method] do |f| %>

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/en.yml

@@ -8,7 +8,6 @@ en:
     add_another_service: "Add another service to sign in with:"
     authentications:
       destroy: 'Successfully destroyed authentication method.'
-    back_to_authentication_methods_list: "Back To Authentication Methods List"
     edit_social_method: "Editing Social Authentication Method"
     environment: "Environment"
     new_social_method: "New Authentication Method"

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'],
@@ -30,9 +26,9 @@ Spree::SocialConfig.configure do |config|
       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'],
+    twitter2: {
+      api_key: ENV['TWITTER_API_KEY'],
+      api_secret: ENV['TWITTER_API_SECRET']
     }
   }
 end
@@ -44,7 +40,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,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'omniauth-twitter'
 require 'omniauth-facebook'
 require 'omniauth-github'
 require 'omniauth-google-oauth2'
-require 'omniauth-amazon'
+require 'omniauth/twitter2'
+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
@@ -27,10 +27,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.4.0'
+  VERSION = '1.6.0'
 end

data/solidus_social.gemspec

@@ -31,13 +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 'omniauth-twitter2'
   spec.add_dependency 'solidus_auth_devise'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_core', '>= 2.0.0', '< 5'
   spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'solidus_dev_support'

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,9 @@ 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
       select2 'Test', from: 'Environment'
       select2 'Github', from: 'Social Provider'
 

data/spec/features/spree/sign_in_spec.rb

@@ -53,18 +53,122 @@ RSpec.describe 'Signing in using Omniauth', :js do
     end
   end
 
+  context 'github' do
+    before do
+      Spree::AuthenticationMethod.create!(
+        provider: 'github',
+        api_key: 'fake',
+        api_secret: 'fake',
+        environment: Rails.env,
+        active: true
+      )
+      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' => {
+          'token' => 'mock_token',
+          'secret' => 'mock_secret'
+        }
+      }
+    end
+
+    it 'going to sign in' 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 '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
+
   context 'twitter' do
     before do
       Spree::AuthenticationMethod.create!(
-        provider: 'twitter',
+        provider: 'twitter2',
         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[:twitter2] = {
+        'provider' => 'twitter2',
         'uid' => '123545',
         'info' => {
           'name' => 'mockuser',

data/spec/lib/spree/social_config_spec.rb

@@ -5,7 +5,8 @@ RSpec.describe Spree::SocialConfig 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])
+  it "holds configuration for default providers" do
+    providers = %i[facebook github google_oauth2 twitter2]
+    expect(subject.providers.keys).to match_array(providers)
   end
 end

data/spec/models/spree/authentication_method_spec.rb

@@ -6,11 +6,10 @@ 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)
+        %w(Google google_oauth2),
+        %w(Twitter2 twitter2)
       ]
     end
 

data/spec/spec_helper.rb

@@ -11,13 +11,12 @@ require File.expand_path('dummy/config/environment.rb', __dir__)
 # Requires factories and other useful helpers defined in spree_core.
 require 'solidus_dev_support/rspec/feature_helper'
 
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusSocial::Engine, Spree::Auth::Engine)
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
-# Requires factories defined in lib/solidus_social/factories.rb
-require 'solidus_social/factories'
-
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_social
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - John Dyer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-amazon
+  name: omniauth-facebook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-facebook
+  name: omniauth-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-github
+  name: omniauth-google-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-google-oauth2
+  name: omniauth-rails_csrf_protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-twitter
+  name: omniauth-twitter2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,7 +145,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -200,6 +201,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- OLD_CHANGELOG.md
 - README.md
 - Rakefile
 - app/assets/stylesheets/spree/frontend/fontello.css
@@ -213,7 +215,6 @@ files:
 - 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
@@ -249,6 +250,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
@@ -284,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Adds social network login services (OAuth) to Solidus