mirror of
https://github.com/heartcombo/devise.git
synced 2026-01-13 16:57:57 -05:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4902af15a | ||
|
|
ab9d856568 | ||
|
|
dd1d128333 |
@@ -1,3 +1,8 @@
|
||||
== 1.4.7
|
||||
|
||||
* bug fix
|
||||
* Fix backward incompatible change from 1.4.6 for those using custom controllers
|
||||
|
||||
== 1.4.6
|
||||
|
||||
* enhancements
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
class Devise::SessionsController < ApplicationController
|
||||
prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
|
||||
before_filter :allow_params_authentication!, :only => :create
|
||||
prepend_before_filter :allow_params_authentication!, :only => :create
|
||||
include Devise::Controllers::InternalHelpers
|
||||
|
||||
# GET /resource/sign_in
|
||||
|
||||
@@ -182,7 +182,6 @@ module ActionDispatch::Routing
|
||||
options[:path_names] = (@scope[:path_names] || {}).merge(options[:path_names] || {})
|
||||
options[:constraints] = (@scope[:constraints] || {}).merge(options[:constraints] || {})
|
||||
options[:defaults] = (@scope[:defaults] || {}).merge(options[:defaults] || {})
|
||||
|
||||
@scope[:options] = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false
|
||||
|
||||
resources.map!(&:to_sym)
|
||||
|
||||
@@ -85,7 +85,17 @@ module Devise
|
||||
|
||||
# By default, a request is valid if the controller is allowed and the VERB is POST.
|
||||
def valid_request?
|
||||
env["devise.allow_params_authentication"]
|
||||
if env["devise.allow_params_authentication"]
|
||||
true
|
||||
elsif request.post? && mapping.controllers[:sessions] == params[:controller]
|
||||
ActiveSupport::Deprecation.warn "It seems that you are using a custom SessionsController. " \
|
||||
"In order for it to work from Devise 1.4.6 forward, you need to add the following:" \
|
||||
"\n\n prepend_before_filter :allow_params_authentication!, :only => :create\n\n" \
|
||||
"This will ensure your controller can authenticate from params for the create action.", caller
|
||||
true
|
||||
else
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
# If the request is valid, finally check if params_auth_hash returns a hash.
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
module Devise
|
||||
VERSION = "1.4.6".freeze
|
||||
VERSION = "1.4.7".freeze
|
||||
end
|
||||
|
||||
@@ -72,12 +72,11 @@ Devise.setup do |config|
|
||||
# config.pepper = <%= SecureRandom.hex(64).inspect %>
|
||||
|
||||
# ==> Configuration for :confirmable
|
||||
# The time you want to give your user to confirm his account. During this time
|
||||
# he will be able to access your application without confirming. Default is 0.days
|
||||
# When confirm_within is zero, the user won't be able to sign in without confirming.
|
||||
# You can use this to let your user access some features of your application
|
||||
# without confirming the account, but blocking it after a certain period
|
||||
# (ie 2 days).
|
||||
# A period that the user is allowed to access the website even without
|
||||
# confirming his account. For instance, if set to 2.days, the user will be
|
||||
# able to access the website for two days without confirming his account,
|
||||
# access will be blocked just in the third day. Default is 0.days, meaning
|
||||
# the user cannot access the website without confirming his account.
|
||||
# config.confirm_within = 2.days
|
||||
|
||||
# Defines which key will be used when confirming an account
|
||||
|
||||
Reference in New Issue
Block a user