solidus_social 1.0.0 → 1.4.0

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

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:new_social_method) %>
+  <%= I18n.t('spree.new_social_method') %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_authentication_methods_list), admin_authentication_methods_path, class: 'button' %></li>
+  <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 %>
@@ -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

@@ -1,11 +1,11 @@
 <div id="social-signin-links">
   <% if (!spree_current_user || !spree_current_user.user_authentications) && Spree::AuthenticationMethod.active_authentication_methods? %>
-    <h2><%= Spree.t(:sign_in_through_one_of_these_services) %></h2>
+    <h2><%= I18n.t('spree.sign_in_through_one_of_these_services') %></h2>
   <% end %>
 
-  <% Spree::AuthenticationMethod.available_for(@spree_user).each do |method| %>
-    <%= link_to(content_tag(:i, '', class: "icon-spree-#{method.provider.to_url}-circled"),
-          spree.spree_user_omniauth_authorize_url(provider: method.provider),
-          title: Spree.t(:sign_in_with, provider: method.provider)) if method.active %>
+  <% 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 %>
   <% end %>
 </div>

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

@@ -1,16 +1,16 @@
 <p>
-  <%= f.label :email, Spree.t(:email) %><br />
+  <%= f.label :email, I18n.t('spree.email') %><br />
   <%= f.email_field :email, class: 'title' %>
 </p>
 <% if spree_current_user.nil? || spree_current_user.password_required? %>
   <div id="password-credentials">
     <p>
-      <%= f.label :password, Spree.t(:password) %><br />
+      <%= f.label :password, I18n.t('spree.password') %><br />
       <%= f.password_field :password, class: 'title' %>
     </p>
 
     <p>
-      <%= f.label :password_confirmation, Spree.t(:confirm_password) %><br />
+      <%= f.label :password_confirmation, I18n.t('spree.confirm_password') %><br />
       <%= f.password_field :password_confirmation, class: 'title' %>
     </p>
   </div>

data/app/views/spree/users/_new-customer.html.erb

@@ -1,5 +1,5 @@
 <% if session[:omniauth] %>
-  <h6><%= Spree.t(:please_confirm_your_email) %></h6>
+  <h6><%= I18n.t('spree.please_confirm_your_email') %></h6>
 <% else %>
-  <h6><%= Spree.t(:new_customer) %></h6>
+  <h6><%= I18n.t('spree.new_customer') %></h6>
 <% end %>

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

@@ -1,28 +1,30 @@
 <% if Spree::AuthenticationMethod.active_authentication_methods? %>
-<% @body_id = 'login' %>
-<div id="existing-customer">
-  <% if spree_current_user.user_authentications %>
-    <% unless spree_current_user.user_authentications.empty? %>
-      <p><strong><%= Spree.t(:you_have_signed_in_with_these_services) %>:</strong></p>
-      <div class="authentications">
-        <% for user_authentication in spree_current_user.user_authentications %>
-          <div class="authentication">
-            <div class="provider columns two">
-              <%= content_tag(:i, '', class: "icon-spree-#{user_authentication.provider.to_url}-circled columns") %>
-              <%= user_authentication.provider %>
+  <% @body_id = 'login' %>
+  <div id="existing-customer">
+    <% if spree_current_user.user_authentications %>
+      <% unless spree_current_user.user_authentications.empty? %>
+        <p><strong><%= I18n.t('spree.you_have_signed_in_with_these_services') %>:</strong></p>
+        <div class="authentications">
+          <% for user_authentication in spree_current_user.user_authentications %>
+            <div class="authentication">
+              <div class="provider columns two">
+                <%= content_tag(:i, '', class: "icon-spree-#{user_authentication.provider.dasherize}-circled columns") %>
+                <%= user_authentication.provider %>
+              </div>
+              <div class="uid columns two"><%= user_authentication.uid %></div>
+              <%= link_to 'X', user_authentication, data: { confirm: I18n.t('spree.remove_authentication_option_confirmation') }, method: :delete, class: 'remove' %>
             </div>
-            <div class="uid columns two"><%= user_authentication.uid %></div>
-            <%= link_to 'X', user_authentication, data: { confirm: "#{Spree.t(:remove_authentication_option_confirmation)}" }, method: :delete, class: 'remove' %>
-          </div>
-        <% end %>
-        <div class="clear"></div>
-      </div>
+          <% end %>
+          <div class="clear"></div>
+        </div>
+      <% end %>
     <% end %>
 
-  <% end %>
-  <%= content_tag(:p, content_tag(:strong, Spree.t(:add_another_service))) if Spree::AuthenticationMethod.available_for(spree_current_user).exists? %>
-  <%= render 'spree/shared/social' %>
-</div>
+    <% if Spree::AuthenticationMethod.available_for(spree_current_user).present? %>
+      <%= content_tag(:p, content_tag(:strong, I18n.t('spree.add_another_service'))) %>
+      <%= render 'spree/shared/social' %>
+    <% end %>
+  </div>
 
-<div class="clear"></div>
+  <div class="clear"></div>
 <% end %>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_social"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,18 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_social/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sandbox

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+set -e
+
+case "$DB" in
+postgres|postgresql)
+  RAILSDB="postgresql"
+  ;;
+mysql)
+  RAILSDB="mysql"
+  ;;
+sqlite|'')
+  RAILSDB="sqlite3"
+  ;;
+*)
+  echo "Invalid DB specified: $DB"
+  exit 1
+  ;;
+esac
+
+extension_name="solidus_social"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox --database="$RAILSDB" \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+
+gem '$extension_name', path: '..'
+gem 'solidus_auth_devise', '>= 2.1.0'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+
+group :test, :development do
+  platforms :mri do
+    gem 'pry-byebug'
+  end
+end
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+
+unbundled bundle exec rake db:drop db:create
+
+unbundled bundle exec rails generate spree:install \
+  --auto-accept \
+  --user_class=Spree::User \
+  --enforce_available_locales=true \
+  $@
+
+unbundled bundle exec rails generate solidus:auth:install
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 This app is intended for test purposes."

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bin/rake clobber

data/config/locales/en.yml

@@ -10,6 +10,7 @@ en:
       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"
     no_authentication_methods_found: "No Authentication Methods Found"
     one_more_step: 'One more step to complete your registration from %{kind}'

data/config/locales/es-MX.yml

@@ -1,17 +1,20 @@
 ---
 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:'
     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 +25,6 @@ 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"
+    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/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,9 +1,11 @@
-Spree::Core::Engine.add_routes do
+# frozen_string_literal: true
+
+Spree::Core::Engine.routes.draw do
   devise_for :spree_user,
-             class_name: Spree::User,
-             only: [:omniauth_callbacks],
-             controllers: { omniauth_callbacks: 'spree/omniauth_callbacks' },
-             path: Spree::SocialConfig[:path_prefix]
+    class_name: Spree.user_class,
+    only: [:omniauth_callbacks],
+    controllers: { omniauth_callbacks: 'spree/omniauth_callbacks' },
+    path: Spree::SocialConfig[:path_prefix]
   resources :user_authentications
 
   get 'account' => 'users#show', as: 'user_root'

data/db/migrate/20120120163432_create_user_authentications.rb

@@ -1,4 +1,6 @@
-class CreateUserAuthentications < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,6 @@
-class CreateAuthenticationMethods < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,22 +1,30 @@
+# frozen_string_literal: true
+
 module SolidusSocial
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      source_root "#{__dir__}/templates"
+
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_social\n", before: /\*\//, verbose: true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_social\n", before: %r{\*/}, verbose: true
       end
 
       def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=solidus_social'
+        run 'bin/rails 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]')
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations
-          run 'bundle exec rake db:migrate'
+          run 'bin/rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
     end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+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