solidus_social 1.0.0 → 1.4.0

data/Rakefile

@@ -1,15 +1,6 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
-RSpec::Core::RakeTask.new
-
-task default: :spec
-
-desc 'Generates a dummy app for testing'
-task :test_app do
-  ENV['LIB_NAME'] = 'solidus_social'
-  Rake::Task['common:test_app'].invoke('Spree::User')
-end
+task default: 'extension:specs'

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

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

data/app/controllers/spree/omniauth_callbacks_controller.rb

@@ -1,55 +1,59 @@
+# frozen_string_literal: true
+
 class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Store
 
-  def self.provides_callback_for(*providers)
-    providers.each do |provider|
-      class_eval <<-FUNCTION_DEFS, __FILE__, __LINE__ + 1
-        def #{provider}
-          if request.env['omniauth.error'].present?
-            flash[:error] = I18n.t('devise.omniauth_callbacks.failure', kind: auth_hash['provider'], reason: Spree.t(:user_was_not_valid))
-            redirect_back_or_default(root_url)
-            return
-          end
+  class << self
+    def provides_callback_for(*providers)
+      providers.each do |provider|
+        define_method(provider) { omniauth_callback }
+      end
+    end
+  end
+
+  Spree::SocialConfig.providers.keys.each do |provider|
+    provides_callback_for provider
+  end
 
-          authentication = Spree::UserAuthentication.find_by_provider_and_uid(auth_hash['provider'], auth_hash['uid'])
+  def omniauth_callback
+    if request.env['omniauth.error'].present?
+      flash[:error] = I18n.t('devise.omniauth_callbacks.failure', kind: auth_hash['provider'], reason: I18n.t('spree.user_was_not_valid'))
+      redirect_back_or_default(root_url)
+      return
+    end
 
-          if authentication.present? and authentication.try(:user).present?
-            flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
-            sign_in_and_redirect :spree_user, authentication.user
-          elsif spree_current_user
-            spree_current_user.apply_omniauth(auth_hash)
-            spree_current_user.save!
-            flash[:notice] = I18n.t('devise.sessions.signed_in')
-            redirect_back_or_default(account_url)
-          else
-            user = Spree::User.find_by_email(auth_hash['info']['email']) || Spree::User.new
-            user.apply_omniauth(auth_hash)
-            if user.save
-              flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
-              sign_in_and_redirect :spree_user, user
-            else
-              session[:omniauth] = auth_hash.except('extra')
-              flash[:notice] = Spree.t(:one_more_step, kind: auth_hash['provider'].capitalize)
-              redirect_to new_spree_user_registration_url
-              return
-            end
-          end
+    authentication = Spree::UserAuthentication.find_by(provider: auth_hash['provider'], uid: auth_hash['uid'])
 
-          if current_order
-            user = spree_current_user || authentication.user
-            current_order.associate_user!(user)
-            session[:guest_token] = nil
-          end
-        end
-      FUNCTION_DEFS
+    if authentication.present? && authentication.try(:user).present?
+      flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
+      sign_in_and_redirect :spree_user, authentication.user
+    elsif spree_current_user
+      spree_current_user.apply_omniauth(auth_hash)
+      spree_current_user.save!
+      flash[:notice] = I18n.t('devise.sessions.signed_in')
+      redirect_back_or_default(account_url)
+    else
+      user = Spree.user_class.find_by(email: auth_hash['info']['email']) || Spree.user_class.new
+      user.apply_omniauth(auth_hash)
+      if user.save
+        flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
+        sign_in_and_redirect :spree_user, user
+      else
+        session[:omniauth] = auth_hash.except('extra')
+        flash[:notice] = I18n.t('spree.one_more_step', kind: auth_hash['provider'].capitalize)
+        redirect_to new_spree_user_registration_url
+        return
+      end
     end
-  end
 
-  SolidusSocial::OAUTH_PROVIDERS.each do |provider|
-    provides_callback_for provider[1].to_sym
+    if current_order
+      user = spree_current_user || authentication.user
+      current_order.associate_user!(user)
+      session[:guest_token] = nil
+    end
   end
 
   def failure
@@ -58,7 +62,7 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def passthru
-    render file: "#{Rails.root}/public/404", formats: [:html], status: 404, layout: false
+    render file: "#{Rails.root}/public/404", formats: [:html], status: :not_found, layout: false
   end
 
   def auth_hash

data/app/controllers/spree/user_authentications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::UserAuthenticationsController < Spree::StoreController
   def index
     @authentications = spree_current_user.user_authentications if spree_current_user
@@ -6,7 +8,7 @@ class Spree::UserAuthenticationsController < Spree::StoreController
   def destroy
     @authentication = spree_current_user.user_authentications.find(params[:id])
     @authentication.destroy
-    flash[:notice] = Spree.t(:destroy, scope: :authentications)
+    flash[:notice] = I18n.t('spree.destroy', scope: :authentications)
     redirect_to spree.account_path
   end
 end

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/decorators/controllers/solidus_social/spree/user_registrations_controller_decorator.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module SolidusSocial
+  module Spree
+    module UserRegistrationsControllerDecorator
+      def self.prepended(base)
+        base.class_eval do
+          after_action :clear_omniauth, only: :create
+        end
+      end
+
+      private
+
+      def build_resource(*args)
+        super
+        @spree_user.apply_omniauth(session[:omniauth]) if session[:omniauth]
+        @spree_user
+      end
+
+      def clear_omniauth
+        session[:omniauth] = nil unless @spree_user.new_record?
+      end
+
+      ::Spree::UserRegistrationsController.prepend self
+    end
+  end
+end

data/app/decorators/models/solidus_social/spree/user_decorator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SolidusSocial
+  module Spree
+    module UserDecorator
+      def self.prepended(base)
+        base.class_eval do
+          has_many :user_authentications, dependent: :destroy
+
+          devise :omniauthable
+        end
+      end
+
+      def apply_omniauth(omniauth)
+        if omniauth.fetch('info', {})['email'].present?
+          self.email = omniauth['info']['email'] if email.blank?
+        end
+        user_authentications.build(provider: omniauth['provider'], uid: omniauth['uid'])
+      end
+
+      def password_required?
+        (user_authentications.empty? || password.present?) && super
+      end
+
+      ::Spree.user_class.prepend self
+    end
+  end
+end

data/app/helpers/spree/omniauth_callbacks_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module OmniauthCallbacksHelper
     include Spree::BaseHelper

data/app/models/spree/authentication_method.rb

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

data/app/models/spree/social_configuration.rb

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

data/app/models/spree/user_authentication.rb

@@ -1,3 +1,5 @@
-class Spree::UserAuthentication < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Spree::UserAuthentication < ApplicationRecord
   belongs_to :user
 end

data/app/overrides/add_authentications_to_account_summary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(virtual_path: 'spree/users/show',
                      name: 'add_socials_to_account_summary',
                      insert_after: '[data-hook="account_my_orders"]',

data/app/overrides/admin_configuration_decorator.rb

@@ -1,5 +1,12 @@
+# frozen_string_literal: true
+
 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 Spree.t(: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/overrides/user_registrations_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(virtual_path: 'spree/user_registrations/new',
                      name: 'add_socials_to_login_extras',
                      insert_after: '[data-hook="login_extras"]',

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

@@ -2,7 +2,7 @@
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :environment do %>
-        <%= label_tag nil, Spree.t(:environment) %>
+        <%= label_tag nil, Spree::AuthenticationMethod.human_attribute_name(:environment) %>
         <%= collection_select(:authentication_method, :environment, Rails.configuration.database_configuration.keys, :to_s, :titleize, {}, { class: 'select2 fullwidth' }) %>
       <% end %>
     </div>
@@ -10,35 +10,19 @@
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :provider do %>
-        <%= f.label :provider, Spree.t(:social_provider) %>
-        <%= f.select :provider, SolidusSocial::OAUTH_PROVIDERS, {}, { include_blank: false, class: 'select2 fullwidth' } %>
-      <% end %>
-    </div>
-  </div>
-  <div class="alpha five columns">
-    <div data-hook="environment" class="field">
-      <%= f.field_container :api_key do %>
-        <%= f.label :api_key, Spree.t(:social_api_key) %> <span class="required">*</span><br />
-        <%= f.text_field :api_key, class: 'fullwidth' %>
-      <% end %>
-    </div>
-  </div>
-  <div class="alpha five columns">
-    <div data-hook="environment" class="field">
-      <%= f.field_container :api_secret do %>
-        <%= f.label :api_secret, Spree.t(:social_api_secret) %> <span class="required">*</span><br />
-        <%= f.text_field :api_secret, class: 'fullwidth' %>
+        <%= f.label :provider, I18n.t('spree.social_provider') %>
+        <%= f.select :provider, Spree::AuthenticationMethod.provider_options, {}, { include_blank: false, class: 'select2 fullwidth' } %>
       <% end %>
     </div>
   </div>
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :active do %>
-        <span style="padding:0 10px 2px;"><%= f.label :active, Spree.t(:active) %></span>
+        <span style="padding:0 10px 2px;"><%= f.label :active, I18n.t('spree.active') %></span>
         <%= f.radio_button :active, :true %>
-        <span style="padding:0 2px;"><%= Spree.t(:say_yes) %></span>
+        <span style="padding:0 2px;"><%= I18n.t('spree.say_yes') %></span>
         <%= f.radio_button :active, :false %>
-        <span style="padding:0 2px"><%= Spree.t(:say_no) %></span>
+        <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,11 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:edit_social_method) %>
+  <%= I18n.t('spree.edit_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/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

@@ -1,15 +1,17 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:social_authentication_methods) %>
+  <%= I18n.t('spree.social_authentication_methods') %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= button_link_to Spree.t(:new_social_method), new_object_url, icon: 'icon-plus', 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? %>
@@ -23,24 +25,26 @@
       <col style="width: 20%" />
     </colgroup>
     <thead data-hook="admin_social_methods_index_headers">
-      <th><%= Spree.t(:social_provider) %></th>
-      <th><%= Spree.t(:social_api_key) %></th>
-      <th><%= Spree.t(:social_api_secret) %></th>
-      <th><%= Spree.t(:environment) %></th>
-      <th><%= Spree.t(:active) %></th>
+      <th><%= I18n.t('spree.social_provider') %></th>
+      <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 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: 20 %></td>
-          <td class="align-center"><%= truncate method.api_secret, length: 20 %></td>
+          <td class="align-center"><%= truncate method.api_key, length: 10 %></td>
+          <td class="align-center"><%= truncate method.api_secret, length: 10 %></td>
           <td class="align-center"><%= method.environment.to_s.titleize %></td>
-          <td class="align-center"><%= method.active ? Spree.t(:yes) : Spree.t(:no) %></td>
+          <td class="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 %>
@@ -48,7 +52,7 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_authentication_methods_found) %>,
-    <%= Spree.t(:add_one) %>!
+    <%= I18n.t('spree.no_authentication_methods_found') %>,
+    <%= I18n.t('spree.add_one') %>!
   </div>
 <% end %>