solidus_social 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1877be6601ecd77f99eb28f6bb0ddf0b6b702cb80a7ca163f5472f5a34a3937f
-  data.tar.gz: 9ac2438fad599892a90abde85e1d20bed50641e0a5661c906e8950436fa52041
+  metadata.gz: 8f6748bb52dec9c0adf020256d086ea0d55190ed7922d3a6d2def8061763ef5f
+  data.tar.gz: 13ea181f254b90bbbdf1c0c100e738cc28a1621f40a3843cd1ca929877f59cee
 SHA512:
-  metadata.gz: c3c7b24eee76fbe4a361c6da83ad7e3f4d88e78b4686db243b6ec995a48454929ef9bb00e92d987994a0b7bbb6cae1e10598f75cb10a82ec30225c5c16208c22
-  data.tar.gz: e96864533c0a6d567afef96682601126ce50591f99d179205e9e8420ab6942b0e58ffb9e2b39eccdbc7de119cbbc182cb3366d290e025e42c051c15298b70e85
+  metadata.gz: d1c34977fa94f9bfed99c58ab509f891fe2e3b47c10a8ac1a8acce57fdd235c615428a475d5d0c8083828887ca53fd5fdd4bc4341b1b40a47e8af5358b9d52e5
+  data.tar.gz: 4a8f38b3f9ec00f1c742425d25d6004586aeca3f7577d971cd3cf107fa6e534b6a466788771571824828b951024dfded8d55fddff43de7e22cd00b45853d384d

data/.circleci/config.yml

@@ -1,7 +1,6 @@
 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
@@ -9,30 +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:
-      - 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
+      - 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/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,14 +3,17 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-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
+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.

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

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

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

@@ -25,6 +25,10 @@ Spree::SocialConfig.configure do |config|
     google_oauth2: {
       api_key: ENV['GOOGLE_OAUTH2_API_KEY'],
       api_secret: ENV['GOOGLE_OAUTH2_API_SECRET'],
+    },
+    twitter2: {
+      api_key: ENV['TWITTER_API_KEY'],
+      api_secret: ENV['TWITTER_API_SECRET']
     }
   }
 end

data/lib/solidus_social/engine.rb

@@ -3,6 +3,7 @@
 require 'omniauth-facebook'
 require 'omniauth-github'
 require 'omniauth-google-oauth2'
+require 'omniauth/twitter2'
 require 'omniauth/rails_csrf_protection'
 require 'deface'
 require 'spree/core'

data/lib/solidus_social/version.rb

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

data/solidus_social.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'omniauth-github'
   spec.add_dependency 'omniauth-google-oauth2'
   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/features/spree/admin/authentication_methods_configuration_spec.rb

@@ -22,7 +22,6 @@ RSpec.describe 'Admin Authentication Methods', :js do
       expect(page).to have_text 'No Authentication Methods Found, Add One!'
 
       click_link 'New Authentication Method'
-      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

@@ -156,4 +156,38 @@ RSpec.describe 'Signing in using Omniauth', :js do
       expect(page).not_to have_selector 'div#social-signin-links'
     end
   end
+
+  context 'twitter' do
+    before do
+      Spree::AuthenticationMethod.create!(
+        provider: 'twitter2',
+        api_key: 'fake',
+        api_secret: 'fake',
+        environment: Rails.env,
+        active: true
+      )
+      OmniAuth.config.test_mode = true
+      OmniAuth.config.mock_auth[:twitter2] = {
+        'provider' => 'twitter2',
+        'uid' => '123545',
+        'info' => {
+          'name' => 'mockuser',
+          '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 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.'
+    end
+  end
 end

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([:facebook, :github, :google_oauth2])
+  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

@@ -8,7 +8,8 @@ RSpec.describe Spree::AuthenticationMethod do
       [
         %w(Facebook facebook),
         %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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - John Dyer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-twitter2
+  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
@@ -131,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
@@ -141,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
@@ -187,6 +201,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- OLD_CHANGELOG.md
 - README.md
 - Rakefile
 - app/assets/stylesheets/spree/frontend/fontello.css
@@ -271,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Adds social network login services (OAuth) to Solidus