spree_auth_devise 1.3.1 → 3.0.5

data/app/assets/javascripts/admin/spree_auth.js

@@ -1 +0,0 @@
-//= require admin/spree_core

data/app/assets/javascripts/store/spree_auth.js

@@ -1 +0,0 @@
-//= require store/spree_core

data/app/assets/stylesheets/admin/spree_auth.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_core
-*/

data/app/assets/stylesheets/store/spree_auth.css

@@ -1,3 +0,0 @@
-/*
- *= require store/spree_core
-*/

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

@@ -1,7 +0,0 @@
-require File.expand_path('../../base_controller_decorator', __FILE__)
-Spree::Admin::BaseController.class_eval do
-  protected
-    def model_class
-      "Spree::#{controller_name.classify}".constantize
-    end
-end

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

@@ -1,21 +0,0 @@
-require File.expand_path('../../base_controller_decorator', __FILE__)
-Spree::Admin::UsersController.class_eval do
-  rescue_from Spree::User::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
-
-  update.after :sign_in_if_change_own_password
-
-  before_filter :load_roles, :only => [:edit, :new, :update, :create]
-
-  private
-
-    def sign_in_if_change_own_password
-      if spree_current_user == @user && @user.password.present?
-        sign_in(@user, :event => :authentication, :bypass => true)
-      end
-    end
-
-    def load_roles
-      @roles = Spree::Role.scoped
-    end
-end
-

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

@@ -1,77 +0,0 @@
-module Spree
-  module Admin
-    class UsersController < ResourceController
-
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
-      before_filter :load_roles, :only => [:edit, :new, :update, :create, :generate_api_key, :clear_api_key]
-
-      def index
-        respond_with(@collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
-      end
-
-      def generate_api_key
-        if @user.generate_spree_api_key!
-          flash.notice = t('key_generated', :scope => 'spree.api')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
-      def clear_api_key
-        if @user.clear_spree_api_key!
-          flash.notice = t('key_cleared', :scope => 'spree.api')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
-
-      protected
-
-        def collection
-          return @collection if @collection.present?
-          unless request.xhr?
-            @search = Spree::User.registered.ransack(params[:q])
-            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-          else
-            #disabling proper nested include here due to rails 3.1 bug
-            #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
-            @collection = Spree::User.includes(:bill_address, :ship_address).
-                              where("spree_users.email #{LIKE} :search
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
-              { :search => "#{params[:q].strip}%" }).
-                limit(params[:limit] || 100)
-            end
-          end
-
-      private
-
-        # handling raise from Spree::Admin::ResourceController#destroy
-        def user_destroy_with_orders_error
-          invoke_callbacks(:destroy, :fails)
-          render :status => :forbidden, :text => t(:error_user_destroy_with_orders)
-        end
-
-        # Allow different formats of json data to suit different ajax calls
-        def json_data
-          json_format = params[:json_format] or 'default'
-          case json_format
-          when 'basic'
-            collection.map { |u| { 'id' => u.id, 'name' => u.email } }.to_json
-          else
-            address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
-            includes = { :only => address_fields , :include => { :state => { :only => :name }, :country => { :only => :name } } }
-
-            collection.to_json(:only => [:id, :email], :include =>
-                               { :bill_address => includes, :ship_address => includes })
-          end
-        end
-
-    end
-  end
-end

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,18 +0,0 @@
-Spree::BaseController.class_eval do
-  def spree_login_path
-    spree.login_path
-  end
-
-  def spree_signup_path
-    spree.signup_path
-  end
-
-  def spree_logout_path
-    spree.destroy_user_session_path
-  end
-
-  def spree_current_user
-    current_user
-  end
-end
-

data/app/controllers/spree/orders_controller_decorator.rb

@@ -1,15 +0,0 @@
-Spree::OrdersController.class_eval do
-  before_filter :check_authorization
-
-  private
-    def check_authorization
-      session[:access_token] ||= params[:token]
-      order = Spree::Order.find_by_number(params[:id]) || current_order
-
-      if order
-        authorize! :edit, order, session[:access_token]
-      else
-        authorize! :create, Spree::Order.new
-      end
-    end
-end

data/app/controllers/spree/user_sessions_controller.rb

@@ -1,54 +0,0 @@
-class Spree::UserSessionsController < Devise::SessionsController
-  include SslRequirement
-  helper 'spree/users', 'spree/base'
-  if defined?(Spree::Dash)
-    helper 'spree/analytics'
-  end
-
-  include Spree::Core::ControllerHelpers::Auth
-  include Spree::Core::ControllerHelpers::Common
-  include Spree::Core::ControllerHelpers::Order
-
-  ssl_required :new, :create, :destroy, :update
-  ssl_allowed :login_bar
-
-  def create
-    authenticate_user!
-
-    if user_signed_in?
-      respond_to do |format|
-        format.html {
-          flash[:success] = t(:logged_in_succesfully)
-          redirect_back_or_default(root_path)
-        }
-        format.js {
-          user = resource.record
-          render :json => {:ship_address => user.ship_address, :bill_address => user.bill_address}.to_json
-        }
-      end
-    else
-      flash.now[:error] = t('devise.failure.invalid')
-      render :new
-    end
-  end
-
-  def destroy
-    cookies.clear
-    session.clear
-    super
-  end
-
-  def nav_bar
-    render :partial => 'spree/shared/nav_bar'
-  end
-
-  private
-    def accurate_title
-      t(:login)
-    end
-
-    def redirect_back_or_default(default)
-      redirect_to(session["user_return_to"] || default)
-      session["user_return_to"] = nil
-    end
-end

data/app/helpers/spree/users_helper.rb

@@ -1,15 +0,0 @@
-module Spree
-  module UsersHelper
-    def password_style(user)
-      ActiveSupport::Deprecation.warn '[SPREE] Password style has be depreciated due to the removal of OpenID from the Auth Gem. '
-        'Please install the spree_social gem to regain this functionality and more.'
-      ''
-    end
-
-    def openid_style(user)
-      ActiveSupport::Deprecation.warn '[SPREE] Password style has be depreciated due to the removal of OpenID from the Auth Gem. '
-        'Please install the spree_social gem to regain this functionality and more.'
-      'display:none'
-    end
-  end
-end

data/app/models/spree/current_order_decorator.rb

@@ -1,12 +0,0 @@
-Spree::Core::ControllerHelpers::Order.module_eval do
-  # Associate the new order with the currently authenticated user before saving
-  def before_save_new_order
-    @current_order.user ||= try_spree_current_user
-  end
-
-  def after_save_new_order
-    # make sure the user has permission to access the order (if they are a guest)
-    return if spree_current_user
-    session[:access_token] = @current_order.token
-  end
-end

data/app/overrides/admin_tab.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/layouts/admin",
-                     :name => "user_admin_tabs",
-                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     :text => "<%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %>",
-                     :disabled => false)
-

data/app/overrides/auth_admin_login_navigation_bar.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/layouts/admin",
-                     :name => "auth_admin_login_navigation_bar",
-                     :insert_top => "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
-                     :partial => "spree/layouts/admin/login_nav",
-                     :original => '0a5476d4d5db90ec8dd200ebaa0109a6a54ec6bc' )

data/app/overrides/auth_user_login_form.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/checkout/registration",
-                     :name => "auth_user_login_form",
-                     :replace_contents => "[data-hook='registration'] #account, #registration[data-hook] #account",
-                     :template => "spree/user_sessions/new",
-                     :disabled => false,
-                     :original => 'ab20ac9e90baa11b847b30040aef863d2e1af17a')

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

@@ -1,37 +0,0 @@
-<div data-hook="admin_user_form_fields" class="row">
-  <div class="alpha five columns">
-    <%= f.field_container :email do %>
-      <%= f.label :email, t(:email) %>
-      <%= f.email_field :email, :class => 'fullwidth' %>
-      <%= error_message_on :user, :email %>
-    <% end %>
-
-    <div data-hook="admin_user_form_roles" class="field">      
-      <%= label_tag nil, t(:roles) %>
-      <ul>
-        <% @roles.each do |role| %>
-          <li>
-            <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
-            <%= label_tag role.name %>  
-          </li>
-        <% end %>      
-      </ul>
-      <%= hidden_field_tag 'user[spree_role_ids][]', '' %>
-    </div>
-
-  </div>
-  
-  <div class="omega five columns">
-    <%= f.field_container :password do %>
-      <%= f.label :password, t(:password) %>
-      <%= f.password_field :password, :class => 'fullwidth' %>
-      <%= f.error_message_on :password %>
-    <% end %>
-
-    <%= f.field_container :password do %>
-      <%= f.label :password_confirmation, t(:confirm_password) %>
-      <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
-      <%= f.error_message_on :password_confirmation %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,28 +0,0 @@
-  <% content_for :page_title do %>
-    <%= t(:editing_user) %>
-  <% end %>
-
-  <% content_for :page_actions do %>
-    <li>
-      <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
-    </li>
-  <% end %>
-
-  <fieldset data-hook="admin_user_edit_general_settings" class="alpha ten columns">
-    <legend><%= t(:general_settings) %></legend>
-
-    <div data-hook="admin_user_edit_form_header">
-      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-    </div>
-
-    <div data-hook="admin_user_edit_form">
-      <%= form_for [:admin, @user] do |f| %>
-        <%= render :partial => 'form', :locals => { :f => f } %>
-
-        <div data-hook="admin_user_edit_form_button">
-          <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-        </div>
-      <% end %>
-    </div>
-
-  </fieldset>

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

@@ -1,53 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:listing_users) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to t(:new_user), new_object_url, :icon => 'icon-plus', :id => 'admin_new_user_link' %>
-  </li>
-<% end %>
-
-<table class="index" id="listing_users" data-hook>
-  <colgroup>
-    <col style="width: 85%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search,:email, t(:user), {}, {:title => 'users_email_title'} %></th>
-      <th data-hook="admin_users_index_header_actions" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @users.each do |user|%>
-      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class='user_email'><%=link_to user.email, object_url(user) %></td>
-        <td data-hook="admin_users_index_row_actions" class="actions">
-          <%= link_to_edit user, :no_text => true %>
-          <%= link_to_delete user, :no_text => true %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<%= paginate @users %>
-
-<% content_for :sidebar_title do %>
-  <%= t(:search) %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <div class="box align-center" data-hook="admin_users_index_search">    
-    <%= search_form_for [:admin, @search] do |f| %>
-      <div class="field">
-        <%= f.label t(:email) %> <br>
-        <%= f.text_field :email_cont, :class => 'fullwidth' %>
-      </div>
-      <div data-hook="admin_users_index_search_buttons">
-        <%= button t(:search), 'icon-search' %>
-      </div>
-    <% end %>
-  </div>
-<% end %>

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

@@ -1,23 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:new_user) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to t(:back_to_users_list), spree.admin_users_path, :icon => 'icon-arrow-left' %>
-  </li>
-<% end %>
-
-<div data-hook="admin_user_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-</div>
-
-<div data-hook="admin_user_new_form">
-  <%= form_for [:admin, @user] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div data-hook="admin_user_new_form_buttons">
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-    </div>
-  <% end %>
-</div>

data/app/views/spree/admin/users/show.html.erb

@@ -1,21 +0,0 @@
-<h1><%= t(:user_account) %></h1>
-
-<table>
-  <tr data-hook="email">
-    <th><%= t(:email) %></th>
-    <td>
-      <%= @user.email %>
-    </td>
-  </tr>
-  <tr data-hook="roles">
-    <th><%= t(:roles) %></th>
-    <td>
-      <%= @user.spree_roles.pluck(:name).join(', ') %>
-    </td>
-  </tr>
-</table>
-
-<p>
-  <%= link_to_edit @user, :class => 'edit_user' %> <%= t(:or) %>
-  <%= link_to t(:back), collection_url %>
-</p>