spree_auth_devise 1.3.1 → 3.0.5

data/lib/controllers/frontend/spree/user_sessions_controller.rb

@@ -0,0 +1,46 @@
+class Spree::UserSessionsController < Devise::SessionsController
+  helper 'spree/base'
+
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
+  include Spree::Core::ControllerHelpers::Store
+
+  def create
+    authenticate_spree_user!
+
+    if spree_user_signed_in?
+      respond_to do |format|
+        format.html {
+          flash[:success] = Spree.t(:logged_in_succesfully)
+          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
+        }
+        format.js {
+          render :json => {:user => spree_current_user,
+                           :ship_address => spree_current_user.ship_address,
+                           :bill_address => spree_current_user.bill_address}.to_json
+        }
+      end
+    else
+      respond_to do |format|
+        format.html {
+          flash.now[:error] = t('devise.failure.invalid')
+          render :new
+        }
+        format.js {
+          render :json => { error: t('devise.failure.invalid') }, status: :unprocessable_entity
+        }
+      end
+    end
+  end
+
+  private
+    def accurate_title
+      Spree.t(:login)
+    end
+
+    def redirect_back_or_default(default)
+      redirect_to(session["spree_user_return_to"] || default)
+      session["spree_user_return_to"] = nil
+    end
+end

data/{app/controllers → lib/controllers/frontend}/spree/users_controller.rb

@@ -1,16 +1,16 @@
-class Spree::UsersController < Spree::BaseController
-  include Spree::Core::ControllerHelpers::Order
-
-  ssl_required
+class Spree::UsersController < Spree::StoreController
+  skip_before_filter :set_current_order, :only => :show
   prepend_before_filter :load_object, :only => [:show, :edit, :update]
   prepend_before_filter :authorize_actions, :only => :new
 
+  include Spree::Core::ControllerHelpers
+
   def show
-    @orders = @user.orders.complete
+    @orders = @user.orders.complete.order('completed_at desc')
   end
 
   def create
-    @user = Spree::User.new(params[:user])
+    @user = Spree::User.new(user_params)
     if @user.save
 
       if current_order
@@ -24,19 +24,23 @@ class Spree::UsersController < Spree::BaseController
   end
 
   def update
-    if @user.update_attributes(params[:user])
+    if @user.update_attributes(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
         user = Spree::User.reset_password_by_token(params[:user])
         sign_in(@user, :event => :authentication, :bypass => !Spree::Auth::Config[:signout_after_password_change])
       end
-      redirect_to spree.account_url, :notice => t(:account_updated)
+      redirect_to spree.account_url, :notice => Spree.t(:account_updated)
     else
       render :edit
     end
   end
 
   private
+    def user_params
+      params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
+    end
+
     def load_object
       @user ||= spree_current_user
       authorize! params[:action].to_sym, @user
@@ -47,6 +51,6 @@ class Spree::UsersController < Spree::BaseController
     end
 
     def accurate_title
-      t(:my_account)
+      Spree.t(:my_account)
     end
 end

data/lib/generators/spree/auth/install/install_generator.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Auth
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        def self.source_paths
+          paths = self.superclass.source_paths
+          paths << File.expand_path('../templates', __FILE__)
+          paths.flatten
+        end
+
+        def generate_devise_key
+          return if ENV['CI']
+          template 'config/initializers/devise.rb', 'config/initializers/devise.rb'
+        end
+
+        def add_migrations
+          run 'bundle exec rake railties:install:migrations FROM=spree_auth_devise'
+        end
+
+        def run_migrations
+          run 'bundle exec rake db:migrate'
+        end
+      end
+    end
+  end
+end

data/lib/generators/spree/auth/install/templates/config/initializers/devise.rb

@@ -0,0 +1 @@
+Devise.secret_key = <%= SecureRandom.hex(50).inspect %>

data/lib/spree/auth.rb

@@ -1 +1,2 @@
-require 'spree/auth/devise'
+# This file is required by the dummy app's config/environment
+require 'spree_auth_devise'

data/lib/spree/auth/devise.rb

@@ -1,13 +1,20 @@
 require 'spree/core'
 require 'devise'
+require 'devise-encryptable'
 require 'cancan'
 
+Devise.secret_key = SecureRandom.hex(50)
+
 module Spree
   module Auth
+    mattr_accessor :default_secret_key
+
     def self.config(&block)
       yield(Spree::Auth::Config)
     end
   end
 end
 
+Spree::Auth.default_secret_key = Devise.secret_key
+
 require 'spree/auth/engine'

data/lib/spree/auth/engine.rb

@@ -1,3 +1,6 @@
+require 'devise'
+require 'devise-encryptable'
+
 module Spree
   module Auth
     class Engine < Rails::Engine
@@ -8,14 +11,66 @@ module Spree
         Spree::Auth::Config = Spree::AuthConfiguration.new
       end
 
+      initializer "spree_auth_devise.set_user_class", :after => :load_config_initializers do
+        Spree.user_class = "Spree::User"
+      end
+
+      initializer "spree_auth_devise.check_secret_token" do
+        if Spree::Auth.default_secret_key == Devise.secret_key
+          puts "[WARNING] You are not setting Devise.secret_key within your application!"
+          puts "You must set this in config/initializers/devise.rb. Here's an example:"
+          puts " "
+          puts %Q{Devise.secret_key = "#{SecureRandom.hex(50)}"}
+        end
+      end
+
       def self.activate
-        Dir.glob(File.join(File.dirname(__FILE__), "../../../app/**/*_decorator*.rb")) do |c|
+        Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
-
+        if Spree::Auth::Engine.backend_available?
+          Rails.application.config.assets.precompile += [
+            'lib/assets/javascripts/spree/backend/spree_auth.js',
+            'lib/assets/javascripts/spree/backend/spree_auth.css'
+          ]
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
+            Rails.configuration.cache_classes ? require(c) : load(c)
+          end
+        end
+        if Spree::Auth::Engine.frontend_available?
+          Rails.application.config.assets.precompile += [
+            'lib/assets/javascripts/spree/frontend/spree_auth.js',
+            'lib/assets/javascripts/spree/frontend/spree_auth.css'
+          ]
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
+            Rails.configuration.cache_classes ? require(c) : load(c)
+          end
+        end
         ApplicationController.send :include, Spree::AuthenticationHelpers
       end
 
+      def self.backend_available?
+        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+      end
+
+      def self.dash_available?
+        @@dash_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Dash::Engine')
+      end
+
+      def self.frontend_available?
+        @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
+      end
+
+      if self.backend_available?
+        paths["app/controllers"] << "lib/controllers/backend"
+        paths["app/views"] << "lib/views/backend"
+      end
+
+      if self.frontend_available?
+        paths["app/controllers"] << "lib/controllers/frontend"
+        paths["app/views"] << "lib/views/frontend"
+      end
+
       config.to_prepare &method(:activate).to_proc
     end
   end

data/lib/spree/authentication_helpers.rb

@@ -8,7 +8,7 @@ module Spree
     end
 
     def spree_current_user
-      current_user
+      current_spree_user
     end
 
     def spree_login_path

data/lib/spree_auth_devise.rb

@@ -1,2 +1,5 @@
+require 'spree_core'
 require 'spree/auth/devise'
 require 'spree/authentication_helpers'
+require 'sass/rails'
+require 'coffee_script'

data/lib/views/backend/spree/admin/user_passwords/edit.html.erb

@@ -0,0 +1,15 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+<h2><%= Spree.t(:change_my_password) %></h2>
+
+<%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
+  <p>
+    <%= f.label :password, Spree.t(:password) %><br />
+    <%= f.password_field :password %><br />
+  </p>
+  <p>
+    <%= f.label :password_confirmation, Spree.t(:confirm_password) %><br />
+    <%= f.password_field :password_confirmation %><br />
+  </p>
+  <%= f.hidden_field :reset_password_token %>
+  <%= f.submit Spree.t(:update), :class => 'button primary' %>
+<% end %>

data/lib/views/backend/spree/admin/user_passwords/new.html.erb

@@ -0,0 +1,17 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+
+<div id="forgot-password">
+  <h6><%= Spree.t(:forgot_password) %></h6>
+
+  <p><%= Spree.t(:instructions_to_reset_password) %></p>
+
+  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
+    <p>
+      <%= f.label :email, Spree.t(:email) %><br />
+      <%= f.email_field :email %>
+    </p>
+    <p>
+      <%= f.submit Spree.t(:reset_password), :class => 'button primary' %>
+    </p>
+  <% end %>
+</div>

data/lib/views/backend/spree/admin/user_sessions/authorization_failure.html.erb

@@ -0,0 +1,4 @@
+<div class="alert alert-danger">
+  <%= Spree.t(:authorization_failure) %>
+</div>
+<!-- Add your own custom access denied message here if you like -->

data/lib/views/backend/spree/admin/user_sessions/new.html.erb

@@ -0,0 +1,38 @@
+<% if flash[:alert] %>
+  <div class="alert alert-danger"><%= flash[:alert] %></div>
+<% end %>
+
+<div data-hook="login" class="panel">
+  <div class="panel-body">
+    <%= form_for Spree::User.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
+      <div id="password-credentials">
+        <div class="form-group text-center">
+          <%= f.label :email, Spree.t(:email) %>
+          <%= f.email_field :email, class: 'form-control', tabindex: 1, placeholder: Spree.t(:email) %>  
+        </div>
+        <div class="form-group text-center">
+          <%= f.label :password, Spree.t(:password) %>
+          <%= f.password_field :password, :class => 'form-control', :tabindex => 2, placeholder: Spree.t(:password) %>
+        </div>
+      </div>
+      <div class="checkbox form-group">
+        <div class="row">
+          <div class="col-md-6">
+            <%= f.label :remember_me do %>
+              <%= f.check_box :remember_me, :tabindex => 3 %>
+              <%= Spree.t(:remember_me) %>
+            <% end %>  
+          </div>
+          <div class="col-md-6 text-right">
+            <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
+          </div>  
+        </div>      
+      </div>
+      <div class="form-group">
+        <%= f.submit Spree.t(:login), :class => 'btn btn-primary btn-block', :tabindex => 4 %>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div data-hook="login_extras"></div>

data/lib/views/backend/spree/layouts/admin/_login_nav.html.erb

@@ -0,0 +1,33 @@
+<% if spree_current_user %>
+  <ul class="nav navbar-nav">
+    <li class="dropdown user user-menu">
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        <i class="glyphicon glyphicon-user"></i>
+        <span><%= spree_current_user.email %> <i class="caret"></i></span>
+      </a>
+      <ul class="dropdown-menu">
+        <li class="user-header bg-light-blue">
+          <p>
+            <%= spree_current_user.email %>
+          </p>
+        </li>
+        <% if spree.respond_to? :root_path %>
+          <li class="user-body">
+            <div class="col-xs-12 text-center" data-hook="store-frontend-link">
+              <%= link_to Spree.t(:back_to_store), spree.root_path, :target => '_blank' %>
+            </div>
+          </li>
+        <% end %>
+
+        <li class="user-footer" id="login-nav">
+          <div class="pull-left" data-hook="user-account-link">
+            <%= link_to Spree.t(:account), spree.edit_user_path(spree_current_user), class: "btn btn-default btn-flat" %>
+          </div>
+          <div class="pull-right" data-hook="user-logout-link">
+            <%= link_to Spree.t(:logout), spree.admin_logout_path, class: "btn btn-default btn-flat" %>
+          </div>
+        </li>
+      </ul>
+    </li>
+  </ul>
+<% end %>

data/lib/views/backend/spree/layouts/login.html.erb

@@ -0,0 +1,25 @@
+<!doctype html>
+  <!--[if lt IE 7 ]> <html class="ie ie6" lang="<%= I18n.locale %>"> <![endif]-->
+  <!--[if IE 7 ]>    <html class="ie ie7" lang="<%= I18n.locale %>"> <![endif]-->
+  <!--[if IE 8 ]>    <html class="ie ie8" lang="<%= I18n.locale %>"> <![endif]-->
+  <!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
+  <!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
+  <head data-hook="admin_inside_head">
+    <%= render partial: 'spree/admin/shared/head' %>
+  </head>
+
+  <body>
+    <div class="container">
+
+      <div class="row">
+        <div class="col-md-4 col-md-offset-4">
+          <%= render partial: 'spree/admin/shared/header' %>
+
+          <%= flash_alert(flash) %>
+
+          <%= yield %>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

data/lib/views/frontend/spree/checkout/_new_user.html.erb

@@ -0,0 +1,20 @@
+<div class="col-md-6">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title"><%= Spree.t(:create_a_new_account) %></h3>
+    </div>
+    <div id="new-customer" class="panel-body" data-hook="login">
+      <%= form_for @user, :as => :spree_user, :url => spree.registration_path(@user) do |f| %>
+        <div data-hook="signup_inside_form">
+          <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
+          <p><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></p>
+        </div>
+      <% end %>
+      <div class="text-center">
+        <%= Spree.t(:or) %>
+          <%= link_to Spree.t(:login_as_existing), spree.login_path %>
+      </div>
+      <div data-hook="login_extras"></div>
+    </div>
+  </div>
+</div>

data/lib/views/frontend/spree/checkout/registration.html.erb

@@ -0,0 +1,27 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<h1><%= Spree.t(:registration) %></h1>
+<div id="registration" class="row" data-hook>
+  <div id="account">
+    <%= render :partial => 'new_user' %>
+  </div>
+  <% if Spree::Config[:allow_guest_checkout] %>
+    <div class="col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h3 class="panel-title"><%= Spree.t(:guest_user_account) %></h3>
+        </div>
+        <div id="guest_checkout" class="panel-body" data-hook>
+          <% if flash[:registration_error] %>
+            <div class='flash error'><%= flash[:registration_error] %></div>
+          <% end %>
+          <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
+            <p>
+              <%= f.email_field :email, :class => 'form-control title', :placeholder => Spree.t(:email) %>
+            </p>
+            <p><%= f.submit Spree.t(:continue), :class => 'btn btn-lg btn-success btn-block' %></p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>