Release v3.2.3

Merge pull request #2868 from rmm5t/patch-1
Update password_length docs in config template
2026-01-11 08:37:56 -05:00 · 2014-02-20 15:30:48 -03:00 · 2014-02-16 14:45:05 +01:00 · 2014-02-16 08:19:47 -05:00 · 2014-02-16 10:04:26 +01:00 · 2014-02-16 12:06:55 +11:00
114 changed files with 1107 additions and 1205 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ rdoc/*
 pkg
 log
 test/tmp/*
+gemfiles/*.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,22 @@
 language: ruby
 script: "bundle exec rake test"
+before_install:
+  - gem install bundler -v '>= 1.5.1'
 rvm:
  - 1.9.3
  - 2.0.0
+  - 2.1.0
 env:
  - DEVISE_ORM=mongoid
  - DEVISE_ORM=active_record
 gemfile:
-  - gemfiles/Gemfile.rails-3.2.x
+  - gemfiles/Gemfile.rails-head
+  - gemfiles/Gemfile.rails-4.0-stable
+  - gemfiles/Gemfile.rails-3.2-stable
  - Gemfile
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.rails-head
 services:
  - mongodb
 notifications:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,64 @@
-== 3.1.0
+### Unreleased
+
+### 3.2.3
+
+* enhancements
+  * Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`.
+    You can change this and use your own secret by changing the `devise.rb` initializer.
+
+* bug fix
+  * Migrations will be properly generated when using rails 4.1.0.
+
+### 3.2.2
+
+* bug fix
+  * Ensure timeoutable works when `sign_out_all_scopes` is false (by @louman)
+  * Keep the query string when storing location (by @csexton)
+  * Require rails generator base class in devise generators
+
+### 3.2.1
+
+Security announcement: http://blog.plataformatec.com.br/2013/11/e-mail-enumeration-in-devise-in-paranoid-mode
+
+* enhancements
+  * Add `store_location_for` helper and ensure it is safe (by @matthewrudy and @homakov)
+  * Add `yield` around resource methods in Devise controllers (by @edelpero)
+
+* bug fix
+  * Bring `password_digest` back to fix compatibility with `devise-encryptable`
+  * Avoid e-mail enumeration on sign in when in paranoid mode
+
+### 3.2.0
+
+* enhancements
+  * Previously deprecated token authenticatable and insecure lookups have been removed
+  * Add a class method so you can encrypt passwords from fixtures (by @tenderlove)
+  * Send custom message when user enters invalid password and it has only one attempt
+  to enter correct password before their account will be locked (by @Lightpower)
+  * Prevent mutation of values assigned to case and whitespace santitized members (by @iamvery)
+  * Separate redirects and flash messages in `navigational_formats` and `flashing_formats` (by @ssendev)
+
+* bug fix
+  * A GET to sign_in page shouldn't extend the session (by @drewish)
+  * Splat the arguments to `strong_parameters#permit` to work around a limitation in the `strong_parameters` gem (by @memberful)
+  * Omniauth now uses `mapping.fullpath` when generating routes. This means if you call `devise_for :users` inside a scope, like `scope "/api"`, the scope will now apply to the omniauth route (by @AlexanderZaytsev)
+  * Ensure timeoutable hook respects `Devise.sign_out_all_scopes` configuration
+
+* deprecations
+  * `expire_session_data_after_sign_in!` has been deprecated in favor of `expire_data_after_sign_in!`
+
+### 3.1.1
+
+* bug fix
+  * Improve default message which asked users to sign in even when they were already signed (by @gregates)
+  * Improve error message for when the config.secret_key is missing
+
+### 3.1.0

 Security announcement: http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/

 * backwards incompatible changes
-  * Do not store confirmation, unlock and reset password tokens directly in the database. This means tokens previously stored in the database are no longer valid. You can reenable this temporarily by setting `config.allow_insecure_tokens_lookup = true` in your configuration file. It is recommended to keep this configuration set to true just temporarily in your production servers only to aid migration
+  * Do not store confirmation, unlock and reset password tokens directly in the database. This means tokens previously stored in the database are no longer valid. You can reenable this temporarily by setting `config.allow_insecure_token_lookup = true` in your configuration file. It is recommended to keep this configuration set to true just temporarily in your production servers only to aid migration
  * The Devise mailer and its views were changed to explicitly receive a token argument as `@token`. You will need to update your mailers and re-copy the views to your application with `rails g devise:views`
  * Sanitization of parameters should be done by calling `devise_parameter_sanitizer.sanitize(:action)` instead of `devise_parameter_sanitizer.for(:action)`

@@ -21,12 +76,12 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/devise-3-1-now-w
  * Do not compare directly against confirmation, unlock and reset password tokens
  * Skip storage for cookies on unverified requests

-== 3.0.2
+### 3.0.2

 * bug fix
  * Skip storage for cookies on unverified requests

-== 3.0.1
+### 3.0.1

 Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixation-attacks-in-devise/

@@ -37,7 +92,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
  * When using rails 3.2, the generator adds 'attr_accessible' to the model (by @jcoyne)
  * Clean up CSRF token after authentication (by @homakov). Notice this change will clean up the CSRF Token after authentication (sign in, sign up, etc). So if you are using AJAX for such features, you will need to fetch a new CSRF token from the server.

-== 3.0.0
+### 3.0.0

 * enhancements
  * Rails 4 and Strong Parameters compatibility (by @carlosantoniodasilva, @josevalim, @latortuga, @lucasmazza, @nashby, @rafaelfranca, @spastorino)
@@ -47,10 +102,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
 * bug fix
  * Errors on unlock are now properly reflected on the first `unlock_keys`

-* backwards incompatible changes
-  * Changes on session storage will expire all existing sessions on upgrade
-
-== 2.2.4
+### 2.2.4

 * enhancements
  * Add `destroy_with_password` to `DatabaseAuthenticatable`. Allows destroying a record when `:current_password` matches, similarly to how `update_with_password` works. (by @michiel3)
@@ -66,25 +118,28 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
  * Fix inheriting mailer templates from `Devise::Mailer`
  * Fix a bug when procs are used as default mailer in Devise (by @tomasv)

-== 2.2.3
+* backwards incompatible changes
+  * Changes on session storage will expire all existing sessions on upgrade. For those storing the session in the DB, they can be upgraded according to this gist: https://gist.github.com/moll/6417606
+
+### 2.2.3

 Security announcement: http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/

 * bug fix
  * Require string conversion for all values

-== 2.2.2
+### 2.2.2

 * bug fix
  * Fix bug when checking for reconfirmable in templates

-== 2.2.1
+### 2.2.1

 * bug fix
  * Fix regression with case_insensitive_keys
  * Fix regression when password is blank when it is invalid

-== 2.2.0
+### 2.2.0

 * backwards incompatible changes
  * `headers_for` is deprecated, customize the mailer directly instead
@@ -115,7 +170,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
  * `update_with_password` doesn't change encrypted password when it is invalid (by @nashby)
  * Properly handle namespaced models on Active Record generator (by @nashby)

-== 2.1.2
+### 2.1.2

 * enhancements
  * Handle backwards incompatibility between Rails 3.2.6 and Thor 0.15.x
@@ -123,7 +178,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
 * bug fix
  * Fix regression on strategy validation on previous release

-== 2.1.1 (yanked)
+### 2.1.1 (yanked)

 * enhancements
  * `sign_out_all_scopes` now locks warden and does not allow new logins in the same action
@@ -140,7 +195,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
 * deprecations
  * Strategy#validate() no longer validates nil resources

-== 2.1.0
+### 2.1.0

 * enhancements
  * Add `check_fields!(model_class)` method on Devise::Models to check if the model includes the fields that Devise uses
@@ -167,7 +222,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
  * Return `head :no_content` in SessionsController now that most JS libraries handle it (by @julianvargasalvarez)
  * Reverted moving devise/shared/_links.erb to devise/_links.erb

-== 2.0.4
+### 2.0.4

 Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0

@@ -175,7 +230,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix when :host is used with devise_for  (by @mreinsch)
  * Fix a regression that caused Warden to be initialized too late

-== 2.0.3 (yanked)
+### 2.0.3 (yanked)

 * bug fix
  * Ensure warning is not shown by mistake on apps with mounted engines
@@ -183,7 +238,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure serializable_hash does not depend on accessible attributes
  * Ensure that timeout callback does not run on sign out action

-== 2.0.2
+### 2.0.2

 * enhancements
  * Add devise_i18n_options to customize I18n message
@@ -195,7 +250,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Show a warning in case someone gives a pluralized name to devise generator
  * Fix test behavior for rspec subject requests (by @sj26)

-== 2.0.1
+### 2.0.1

 * enhancements
  * Improved error messages on deprecation warnings
@@ -204,7 +259,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Removed tmp and log files from gem

-== 2.0.0
+### 2.0.0

 * enhancements
  * Add support for e-mail reconfirmation on change (by @Mandaryn and @heimidal)
@@ -230,14 +285,14 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Deprecated support to devise.registrations.reasons and devise.registrations.inactive_signed_up in favor of devise.registrations.signed_up_but_*
  * Protected method render_with_scope was removed.

-== 1.5.3
+### 1.5.3

 * bug fix
  * Ensure delegator converts scope to symbol (by @dmitriy-kiriyenko)
  * Ensure passing :format => false to devise_for is not permanent
  * Ensure path checker does not check invalid routes

-== 1.5.2
+### 1.5.2

 * enhancements
  * Add support for Rails 3.1 new mass assignment conventions (by @kirs)
@@ -246,12 +301,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * OmniAuth error message now shows the proper option (:strategy_class instead of :klass)

-== 1.5.1
+### 1.5.1

 * bug fix
  * Devise should not attempt to load OmniAuth strategies. Strategies should be loaded before hand by the developer or explicitly given to Devise.

-== 1.5.0
+### 1.5.0

 * enhancements
  * Timeoutable also skips tracking if skip_trackable is given
@@ -272,12 +327,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * redirect_location is deprecated, please use after_sign_in_path_for
  * after_sign_in_path_for now redirects to session[scope_return_to] if any value is stored in it

-== 1.4.9
+### 1.4.9

 * bug fix
  * url helpers were not being set under some circumstances

-== 1.4.8
+### 1.4.8

 * enhancements
  * Add docs for assets pipeline and Heroku
@@ -285,12 +340,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * confirmation_url was not being set under some circumstances

-== 1.4.7
+### 1.4.7

 * bug fix
  * Fix backward incompatible change from 1.4.6 for those using custom controllers

-== 1.4.6 (yanked)
+### 1.4.6 (yanked)

 * enhancements
  * Allow devise_for :skip => :all
@@ -298,7 +353,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow --skip-routes to devise generator
  * Add allow_params_authentication! to make it explicit when params authentication is allowed in a controller

-== 1.4.5
+### 1.4.5

 * bug fix
  * Failure app tries the root path if a session one does not exist
@@ -306,12 +361,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Reset password shows proper message if user is not active
  * `clean_up_passwords` sets the accessors to nil to skip validations

-== 1.4.4
+### 1.4.4

 * bug fix
  * Do not always skip helpers, instead provide :skip_helpers as option to trigger it manually

-== 1.4.3
+### 1.4.3

 * enhancements
  * Improve Rails 3.1 compatibility
@@ -327,12 +382,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecations
  * Loosened the used email regexp to simply assert the existent of "@". If someone relies on a more strict regexp, they may use https://github.com/SixArm/sixarm_ruby_email_address_validation

-== 1.4.2
+### 1.4.2

 * bug fix
  * Provide a more robust behavior to serializers and add :force_except option

-== 1.4.1
+### 1.4.1

 * enhancements
  * Add :defaults and :format support on router
@@ -343,10 +398,10 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure to_xml is properly white listened
  * Ensure handle_unverified_request clean up any cached signed-in user

-== 1.4.0
+### 1.4.0

 * enhancements
-  * Added authenticated and unauthenticated to the router to route the used based on his status (by @sj26)
+  * Added authenticated and unauthenticated to the router to route the used based on their status (by @sj26)
  * Improve e-mail regexp (by @rodrigoflores)
  * Add strip_whitespace_keys and default to e-mail (by @swrobel)
  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by @Thibaut)
@@ -355,28 +410,28 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.

 * bug fix
  * password_required? should not affect length validation
-  * User cannot access sign up and similar pages if he is already signed in through a cookie or token
+  * User cannot access sign up and similar pages if they are already signed in through a cookie or token
  * Do not convert booleans to strings on finders (by @xavier)
  * Run validations even if current_password fails (by @crx)
  * Devise now honors routes constraints (by @macmartine)
  * Do not return the user resource when requesting instructions (by @rodrigoflores)

-== 1.3.4
+### 1.3.4

 * bug fix
  * Do not add formats if html or "*/*"

-== 1.3.3
+### 1.3.3

 * bug fix
  * Explicitly mark the token as expired if so

-== 1.3.2
+### 1.3.2

 * bug fix
  * Fix another regression related to reset_password_sent_at (by @alexdreher)

-== 1.3.1
+### 1.3.1

 * enhancements
  * Improve failure_app responses (by @indirect)
@@ -385,7 +440,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fix a regression that occurred if reset_password_sent_at is not present (by @stevehodgkiss)

-== 1.3.0
+### 1.3.0

 * enhancements
  * All controllers can now handle different mime types than html using Responders (by @sikachu)
@@ -405,19 +460,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * backward incompatible changes
  * authentication_keys are no longer considered when creating the e-mail validations, the previous behavior was buggy. You must double check if you were relying on such behavior.

-== 1.2.1
+### 1.2.1

 * enhancements
  * Improve update path messages

-== 1.2.0
+### 1.2.0

 * bug fix
  * Properly ignore path prefix on omniauthable
  * Faster uniqueness queries
  * Rename active? to active_for_authentication? to avoid conflicts

-== 1.2.rc2
+### 1.2.rc2

 * enhancements
  * Make friendly_token 20 chars long
@@ -447,7 +502,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Removed --haml and --slim view templates
  * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode

-== 1.2.rc
+### 1.2.rc

 * deprecations
  * cookie_domain is deprecated in favor of cookie_options
@@ -463,10 +518,10 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by @rymai)
  * Extracted encryptors into :encryptable for better bcrypt support
  * :rememberable is now able to use salt as token if no remember_token is provided
-  * Store the salt in session and expire the session if the user changes his password
+  * Store the salt in session and expire the session if the user changes their password
  * Allow :stateless_token to be set to true avoiding users to be stored in session through token authentication
  * cookie_options uses session_options values by default
-  * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
+  * Sign up now checks if the user is active or not and redirect them accordingly, setting the inactive_signed_up message
  * Use ActiveModel#to_key instead of #id
  * sign_out_all_scopes now destroys the whole session
  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by @adahl)
@@ -485,13 +540,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure namespaces has proper scoped views
  * Ensure Devise does not set empty flash messages (by @sxross)

-== 1.1.6
+### 1.1.6

 * Use a more secure e-mail regexp
 * Implement Rails 3.0.4 handle unverified request
 * Use secure_compare to compare passwords

-== 1.1.5
+### 1.1.5

 * bugfix
  * Ensure to convert keys on indifferent hash
@@ -499,12 +554,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * defaults
  * Set config.http_authenticatable to false to avoid confusion

-== 1.1.4
+### 1.1.4

 * bugfix
  * Avoid session fixation attacks

-== 1.1.3
+### 1.1.3

 * bugfix
  * Add reply-to to e-mail headers by default
@@ -515,17 +570,17 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by @bensie)
  * :default options is now honored in migrations

-== 1.1.2
+### 1.1.2

 * bugfix
  * Compatibility with latest Rails routes schema

-== 1.1.1
+### 1.1.1

 * bugfix
  * Fix a small bug where generated locale file was empty on devise:install

-== 1.1.0
+### 1.1.0

 * enhancements
  * Rememberable module allows user to be remembered across browsers and is enabled by default (by @trevorturk)
@@ -545,7 +600,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecations
  * use_default_scope is deprecated and has no effect. Use :as or :devise_scope in the router instead

-== 1.1.rc2
+### 1.1.rc2

 * enhancements
  * Allow to set cookie domain for the remember token. (by @mantas)
@@ -563,7 +618,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * devise.mailer.user.confirmations_instructions now should be devise.mailer.confirmations_instructions.user_subject
  * Generators now use Rails 3 syntax (devise:install) instead of devise_install

-== 1.1.rc1
+### 1.1.rc1

 * enhancements
  * Rails 3 compatibility
@@ -595,7 +650,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * All messages under devise.sessions, except :signed_in and :signed_out, should be moved to devise.failure
  * :as and :scope in routes is deprecated. Use :path and :singular instead

-== 1.0.8
+### 1.0.8

 * enhancements
  * Support for latest MongoMapper
@@ -604,7 +659,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * confirmation_required? is properly honored on active? calls. (by @paulrosania)

-== 1.0.7
+### 1.0.7

 * bug fix
  * Ensure password confirmation is always required
@@ -613,14 +668,14 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * authenticatable was deprecated and renamed to database_authenticatable
  * confirmable is not included by default on generation

-== 1.0.6
+### 1.0.6

 * bug fix
  * Do not allow unlockable strategies based on time to access a controller.
  * Do not send unlockable email several times.
  * Allow controller to upstram custom! failures to Warden.

-== 1.0.5
+### 1.0.5

 * bug fix
  * Use prepend_before_filter in require_no_authentication.
@@ -628,19 +683,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix a bug when giving an association proxy to devise.
  * Do not use lock! on lockable since it's part of ActiveRecord API.

-== 1.0.4
+### 1.0.4

 * bug fix
  * Fixed a bug when deleting an account with rememberable
  * Fixed a bug with custom controllers

-== 1.0.3
+### 1.0.3

 * enhancements
  * HTML e-mails now have proper formatting
  * Do not remove MongoMapper options in find

-== 1.0.2
+### 1.0.2

 * enhancements
  * Allows you set mailer content type (by @glennr)
@@ -648,7 +703,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Uses the same content type as request on http authenticatable 401 responses

-== 1.0.1
+### 1.0.1

 * enhancements
  * HttpAuthenticatable is not added by default automatically.
@@ -657,7 +712,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fixed encryptors autoload

-== 1.0.0
+### 1.0.0

 * deprecation
  * :old_password in update_with_password is deprecated, use :current_password instead
@@ -668,7 +723,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow scoped_views to be customized per controller/mailer class
  * Allow authenticatable to used in change_table statements

-== 0.9.2
+### 0.9.2

 * bug fix
  * Ensure inactive user cannot sign in
@@ -678,13 +733,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added gemspec to repo
  * Added token authenticatable (by @grimen)

-== 0.9.1
+### 0.9.1

 * bug fix
  * Allow bigger salt size (by @jgeiger)
  * Fix relative url root

-== 0.9.0
+### 0.9.0

 * deprecation
  * devise :all is deprecated
@@ -701,7 +756,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Accept path prefix not starting with slash
  * url helpers should rely on find_scope!

-== 0.8.2
+### 0.8.2

 * enhancements
  * Allow Devise.mailer_sender to be a proc (by @grimen)
@@ -709,7 +764,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fix bug with passenger, update is required to anyone deploying on passenger (by @dvdpalm)

-== 0.8.1
+### 0.8.1

 * enhancements
  * Move salt to encryptors
@@ -719,7 +774,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Bcrypt generator was not being loaded neither setting the proper salt

-== 0.8.0
+### 0.8.0

 * enhancements
  * Warden 0.8.0 compatibility
@@ -733,19 +788,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecation
  * Removed DeviseMailer.sender

-== 0.7.5
+### 0.7.5

 * enhancements
  * Set a default value for mailer to avoid find_template issues
  * Add models configuration to MongoMapper::EmbeddedDocument as well

-== 0.7.4
+### 0.7.4

 * enhancements
  * Extract Activatable from Confirmable
  * Decouple Serializers from Devise modules

-== 0.7.3
+### 0.7.3

 * bug fix
  * Give scope to the proper model validation
@@ -755,7 +810,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added update_with_password for authenticatable
  * Allow render_with_scope to accept :controller option

-== 0.7.2
+### 0.7.2

 * deprecation
  * Renamed reset_confirmation! to resend_confirmation!
@@ -765,12 +820,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fixed render_with_scope to work with all controllers
  * Allow sign in with two different users in Devise::TestHelpers

-== 0.7.1
+### 0.7.1

 * enhancements
  * Small enhancements for other plugins compatibility (by @grimen)

-== 0.7.0
+### 0.7.0

 * deprecations
  * :authenticatable is not included by default anymore
@@ -779,25 +834,25 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Improve loading process
  * Extract SessionSerializer from Authenticatable

-== 0.6.3
+### 0.6.3

 * bug fix
  * Added trackable to migrations
  * Allow inflections to work

-== 0.6.2
+### 0.6.2

 * enhancements
  * More DataMapper compatibility
  * Devise::Trackable - track sign in count, timestamps and ips

-== 0.6.1
+### 0.6.1

 * enhancements
  * Devise::Timeoutable - timeout sessions without activity
  * DataMapper now accepts conditions

-== 0.6.0
+### 0.6.0

 * deprecations
  * :authenticatable is still included by default, but yields a deprecation warning
@@ -808,19 +863,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow a strategy to be placed after authenticatable
  * Do not rely attribute? methods, since they are not added on Datamapper

-== 0.5.6
+### 0.5.6

 * enhancements
  * Do not send nil to build (DataMapper compatibility)
  * Allow to have scoped views

-== 0.5.5
+### 0.5.5

 * enhancements
  * Allow overwriting find for authentication method
  * Remove Ruby 1.8.7 dependency

-== 0.5.4
+### 0.5.4

 * deprecations
  * Deprecate :singular in devise_for and use :scope instead
@@ -831,7 +886,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Create sign_in_and_redirect and sign_out_and_redirect helpers
  * Warden::Manager.default_scope is automatically configured to the first given scope

-== 0.5.3
+### 0.5.3

 * bug fix
  * MongoMapper now converts DateTime to Time
@@ -843,20 +898,20 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added Devise.apply_schema, so you can turn it to false in Datamapper or MongoMapper
    in cases you don't want it be handlded automatically

-== 0.5.2
+### 0.5.2

 * enhancements
  * Improved sign_in and sign_out helpers to accepts resources
  * Added stored_location_for as a helper
  * Added test helpers

-== 0.5.1
+### 0.5.1

 * enhancements
  * Added serializers based on Warden ones
  * Allow authentication keys to be set

-== 0.5.0
+### 0.5.0

 * bug fix
  * Fixed a bug where remember me module was not working properly
@@ -866,13 +921,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by @mhfs)
  * Added support for MongoMapper (by @shingara)

-== 0.4.3
+### 0.4.3

 * bug fix
  * Authentication just fails if user cannot be serialized from session, without raising errors;
  * Default configuration values should not overwrite user values;

-== 0.4.2
+### 0.4.2

 * deprecations
  * Renamed mail_sender to mailer_sender
@@ -884,12 +939,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow :path_prefix to be given to devise_for
  * Allow default_url_options to be configured through devise (:path_prefix => "/:locale" is now supported)

-== 0.4.1
+### 0.4.1

 * bug fix
  * Ensure options can be set even if models were not loaded

-== 0.4.0
+### 0.4.0

 * deprecations
  * Notifier is deprecated, use DeviseMailer instead. Remember to rename
@@ -902,17 +957,17 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow Warden::Manager to be configured through Devise
  * Created a generator which creates an initializer

-== 0.3.0
+### 0.3.0

 * bug fix
  * Allow yml messages to be configured by not using engine locales

 * deprecations
  * Renamed confirm_in to confirm_within
-  * Do not send confirmation messages when user changes his e-mail
+  * Do not send confirmation messages when user changes their e-mail
  * Renamed authenticable to authenticatable and added deprecation warnings

-== 0.2.3
+### 0.2.3

 * enhancements
  * Ensure fail! works inside strategies
@@ -922,12 +977,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Do not redirect on invalid authenticate
  * Allow model configuration to be set to nil

-== 0.2.2
+### 0.2.2

 * bug fix
  * Fix a bug when using customized resources

-== 0.2.1
+### 0.2.1

 * refactor
  * Clean devise_views generator to use devise existing views
@@ -939,7 +994,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fix a bug with Mongrel and Ruby 1.8.6

-== 0.2.0
+### 0.2.0

 * enhancements
  * Allow option :null => true in authenticable migration
@@ -954,12 +1009,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fixes
  * Fixed requiring devise strategies

-== 0.1.1
+### 0.1.1

 * bug fixes
  * Fixed requiring devise mapping

-== 0.1.0
+### 0.1.0

 * Devise::Authenticable
 * Devise::Confirmable
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 ### Please read before contributing

-1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise). 
+1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).

-2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [developers@plataformatec.com.br](mailto:developers@plataformatec.com.br) instead.
+2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br) instead.

 3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.

--- a/6
+++ b/6
@@ -24,8 +24,6 @@ platforms :ruby do
  gem "sqlite3"
 end

-platforms :mri_19, :mri_20 do
-  group :mongoid do
-    gem "mongoid", github: "mongoid/mongoid", branch: "master"
-  end
+group :mongoid do
+  gem "mongoid", github: "mongoid/mongoid", branch: "master"
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GIT
 PATH
  remote: .
  specs:
-    devise (3.1.0)
+    devise (3.2.3)
      bcrypt-ruby (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 3.2.6, < 5)
@@ -48,7 +48,7 @@ GEM
      tzinfo (~> 0.3.37)
    arel (4.0.0)
    atomic (1.1.12)
-    bcrypt-ruby (3.1.1)
+    bcrypt-ruby (3.1.2)
    builder (3.1.4)
    erubis (2.7.0)
    faraday (0.8.8)
@@ -90,7 +90,7 @@ GEM
      omniauth (~> 1.0)
      rack-openid (~> 1.3.1)
    origin (1.1.0)
-    orm_adapter (0.4.0)
+    orm_adapter (0.5.0)
    polyglot (0.3.3)
    rack (1.5.2)
    rack-openid (1.3.1)
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
+Copyright 2009-2014 Plataformatec. http://plataformatec.com.br

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 It's composed of 10 modules:

 * [Database Authenticatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/DatabaseAuthenticatable): encrypts and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
-* [Omniauthable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Omniauthable): adds Omniauth (https://github.com/intridea/omniauth) support;
+* [Omniauthable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Omniauthable): adds Omniauth (https://github.com/intridea/omniauth) support.
 * [Confirmable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Confirmable): sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
 * [Recoverable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Recoverable): resets the user password and sends reset instructions.
 * [Registerable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Registerable): handles signing up users through a registration process, also allowing them to edit and destroy their account.
@@ -35,7 +35,7 @@ Devise is guaranteed to be thread-safe on YARV. Thread-safety support on JRuby i

 The Devise Wiki has lots of additional information about Devise including many "how-to" articles and answers to the most frequently asked questions. Please browse the Wiki after finishing this README:

-https://wiki.github.com/plataformatec/devise
+https://github.com/plataformatec/devise/wiki

 ### Bug reports

@@ -43,7 +43,7 @@ If you discover a problem with Devise, we would like to know about it. However,

 https://github.com/plataformatec/devise/wiki/Bug-reports

-If you found a security bug, do *NOT* use the GitHub issue tracker. Send an email to the maintainers listed at the bottom of the README.
+If you found a security bug, do *NOT* use the GitHub issue tracker. Send an email to opensource@plataformatec.com.br.

 ### Mailing list

@@ -110,9 +110,15 @@ The generator will install an initializer which describes ALL Devise's configura
 rails generate devise MODEL
 ```

-Replace MODEL by the class name used for the applications users, it's frequently `User` but could also be `Admin`. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run `rake db:migrate` as the generator will have created a migration file (if your ORM supports them). This generator also configures your config/routes.rb file to point to the Devise controller.
+Replace MODEL by the class name used for the applications users, it's frequently `User` but could also be `Admin`. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run `rake db:migrate` as the generator will have created a migration file (if your ORM supports them). This generator also configures your `config/routes.rb` file to point to the Devise controller.

-Note that you should re-start your app here if you've already started it. Otherwise you'll run into strange errors like users being unable to login and the route helpers being undefined.
+Next, you need to set up the default url options for the Devise mailer in each environment. Here is a possible configuration for `config/environments/development.rb`:
+
+```ruby
+config.action_mailer.default_url_options = { host: 'localhost:3000' }
+```
+
+You should restart your application after changing Devise's configuration options. Otherwise you'll run into strange errors like users being unable to login and route helpers being undefined.

 ### Controller filters and helpers

@@ -140,21 +146,15 @@ You can access the session for this scope:
 user_session
 ```

-After signing in a user, confirming the account or updating the password, Devise will look for a scoped root path to redirect. Example: For a :user resource, it will use `user_root_path` if it exists, otherwise default `root_path` will be used. This means that you need to set the root inside your routes:
+After signing in a user, confirming the account or updating the password, Devise will look for a scoped root path to redirect. For instance, for a `:user` resource, the `user_root_path` will be used if it exists, otherwise the default `root_path` will be used. This means that you need to set the root inside your routes:

 ```ruby
 root to: "home#index"
 ```

-You can also overwrite `after_sign_in_path_for` and `after_sign_out_path_for` to customize your redirect hooks.
+You can also override `after_sign_in_path_for` and `after_sign_out_path_for` to customize your redirect hooks.

-Finally, you need to set up default url options for the mailer in each environment. Here is the configuration for "config/environments/development.rb":
-
-```ruby
-config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-```
-
-Notice that if your devise model is not called "user" but "member", then the helpers you should use are:
+Notice that if your Devise model is called `Member` instead of `User`, for example, then the helpers available are:

 ```ruby
 before_filter :authenticate_member!
@@ -168,19 +168,19 @@ member_session

 ### Configuring Models

-The devise method in your models also accepts some options to configure its modules. For example, you can choose the cost of the encryption algorithm with:
+The Devise method in your models also accepts some options to configure its modules. For example, you can choose the cost of the encryption algorithm with:

 ```ruby
-devise :database_authenticatable, :registerable, :confirmable, :recoverable, :stretches => 20
+devise :database_authenticatable, :registerable, :confirmable, :recoverable, stretches: 20
 ```

-Besides :stretches, you can define :pepper, :encryptor, :confirm_within, :remember_for, :timeout_in, :unlock_in and other values. For details, see the initializer file that was created when you invoked the "devise:install" generator described above.
+Besides `:stretches`, you can define `:pepper`, `:encryptor`, `:confirm_within`, `:remember_for`, `:timeout_in`, `:unlock_in` among other options. For more details, see the initializer file that was created when you invoked the "devise:install" generator described above.

 ### Strong Parameters

 When you customize your own views, you may end up adding new attributes to forms. Rails 4 moved the parameter sanitization from the model to the controller, causing Devise to handle this concern at the controller as well.

-There are just three actions in Devise that allows any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and the permited parameters by default are:
+There are just three actions in Devise that allows any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and the permitted parameters by default are:

 * `sign_in` (`Devise::SessionsController#new`) - Permits only the authentication keys (like `email`)
 * `sign_up` (`Devise::RegistrationsController#create`) - Permits authentication keys plus `password` and `password_confirmation`
@@ -200,7 +200,9 @@ class ApplicationController < ActionController::Base
 end
 ```

-To completely change Devise defaults or invoke custom behaviour, you can also pass a block:
+The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_parameters_for`), then you will need to tell devise about those nestings and types. Devise allows you to completely change Devise defaults or invoke custom behaviour by passing a block:
+
+To permit simple scalar values for username and email, use this

 ```ruby
 def configure_permitted_parameters
@@ -208,6 +210,17 @@ def configure_permitted_parameters
 end
 ```

+If you have some checkboxes that express the roles a user may take on registration, the browser will send those selected checkboxes as an array. An array is not one of Strong Parameters permitted scalars, so we need to configure Devise thusly:
+
+```ruby
+def configure_permitted_parameters
+  devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(roles: [], :email, :password, :password_confirmation) }
+end
+```
+For the list of permitted scalars, and how to declare permitted keys in nested hashes and arrays, see
+
+https://github.com/rails/strong_parameters#nested-parameters
+
 If you have multiple Devise models, you may want to set up different parameter sanitizer per model. In this case, we recommend inheriting from `Devise::ParameterSanitizer` and add your own logic:

 ```ruby
@@ -246,9 +259,9 @@ Since Devise is an engine, all its views are packaged inside the gem. These view
 rails generate devise:views
 ```

-If you have more than one Devise model in your application (such as "User" and "Admin"), you will notice that Devise uses the same views for all models. Fortunately, Devise offers an easy way to customize views. All you need to do is set "config.scoped_views = true" inside "config/initializers/devise.rb".
+If you have more than one Devise model in your application (such as `User` and `Admin`), you will notice that Devise uses the same views for all models. Fortunately, Devise offers an easy way to customize views. All you need to do is set `config.scoped_views = true` inside the `config/initializers/devise.rb` file.

-After doing so, you will be able to have views based on the role like "users/sessions/new" and "admins/sessions/new". If no view is found within the scope, Devise will use the default view at "devise/sessions/new". You can also use the generator to generate scoped views:
+After doing so, you will be able to have views based on the role like `users/sessions/new` and `admins/sessions/new`. If no view is found within the scope, Devise will use the default view at `devise/sessions/new`. You can also use the generator to generate scoped views:

 ```console
 rails generate devise:views users
@@ -270,19 +283,45 @@ If the customization at the views level is not enough, you can customize each co
 2. Tell the router to use this controller:

    ```ruby
-    devise_for :admins, :controllers => { :sessions => "admins/sessions" }
+    devise_for :admins, controllers: { sessions: "admins/sessions" }
    ```

-3. And since we changed the controller, it won't use the `"devise/sessions"` views, so remember to copy `"devise/sessions"` to `"admin/sessions"`.
+3. Copy the views from `devise/sessions` to `admins/sessions`. Since the controller was changed, it won't use the default views located in `devise/sessions`.

-    Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call `"flash[:notice]"` and `"flash[:alert]"` as appropriate. Do not print the entire flash hash, print specific keys or at least remove the `:timedout` key from the hash as Devise adds this key in some circumstances, this key is not meant for display.
+4. Finally, change or extend the desired controller actions.
+
+    You can completely override a controller action:
+
+    ```ruby
+    class Admins::SessionsController < Devise::SessionsController
+      def create
+        # custom sign-in code
+      end
+    end
+    ```
+
+    Or you can simply add new behaviour to it:
+
+    ```ruby
+    class Admins::SessionsController < Devise::SessionsController
+      def create
+        super do |resource|
+          BackgroundWorker.trigger(resource)
+        end
+      end
+    end
+    ```
+
+    This is useful for triggering background jobs or logging events during certain actions.
+
+Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call `flash[:notice]` and `flash[:alert]` as appropriate. Do not print the entire flash hash, print only specific keys. In some circumstances, Devise adds a `:timedout` key to the flash hash, which is not meant for display. Remove this key from the hash if you intend to print the entire hash.

 ### Configuring routes

 Devise also ships with default routes. If you need to customize them, you should probably be able to do it through the devise_for method. It accepts several options like :class_name, :path_prefix and so on, including the possibility to change path names for I18n:

 ```ruby
-devise_for :users, :path => "auth", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'cmon_let_me_in' }
+devise_for :users, path: "auth", path_names: { sign_in: 'login', sign_out: 'logout', password: 'secret', confirmation: 'verification', unlock: 'unblock', registration: 'register', sign_up: 'cmon_let_me_in' }
 ```

 Be sure to check `devise_for` documentation for details.
@@ -291,11 +330,11 @@ If you have the need for more deep customization, for instance to also allow "/s

 ```ruby
 devise_scope :user do
-  get "sign_in", :to => "devise/sessions#new"
+  get "sign_in", to: "devise/sessions#new"
 end
 ```

-This way you tell devise to use the scope :user when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.
+This way you tell Devise to use the scope `:user` when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.

 ### I18n

@@ -339,7 +378,7 @@ https://github.com/plataformatec/devise/wiki/I18n

 ### Test helpers

-Devise includes some tests helpers for functional specs. In order to use them, you need to include Devise in your functional tests by adding the following to the bottom of your `test/test_helper.rb` file:
+Devise includes some test helpers for functional specs. In order to use them, you need to include Devise in your functional tests by adding the following to the bottom of your `test/test_helper.rb` file:

 ```ruby
 class ActionController::TestCase
@@ -351,7 +390,7 @@ If you're using RSpec, you can put the following inside a file named `spec/suppo

 ```ruby
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
 end
 ```

@@ -381,7 +420,7 @@ There are two things that is important to keep in mind:
 Devise comes with Omniauth support out of the box to authenticate with other providers. To use it, just specify your omniauth configuration in `config/initializers/devise.rb`:

 ```ruby
-config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
 ```

 You can read more about Omniauth support in the wiki:
@@ -427,7 +466,7 @@ Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you jus

 ### Heroku

-Using devise on Heroku with Ruby on Rails 3.1 requires setting:
+Using Devise on Heroku with Ruby on Rails 3.1 requires setting:

 ```ruby
 config.assets.initialize_on_precompile = false
@@ -445,10 +484,10 @@ https://github.com/hassox/warden

 We have a long list of valued contributors. Check them all at:

-https://github.com/plataformatec/devise/contributors
+https://github.com/plataformatec/devise/graphs/contributors

 ## License

-MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2014 Plataformatec. http://plataformatec.com.br

 You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Devise name or logo.
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -7,6 +7,7 @@ class Devise::ConfirmationsController < DeviseController
  # POST /resource/confirmation
  def create
    self.resource = resource_class.send_confirmation_instructions(resource_params)
+    yield resource if block_given?

    if successfully_sent?(resource)
      respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
@@ -18,14 +19,10 @@ class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation?confirmation_token=abcdef
  def show
    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+    yield resource if block_given?

    if resource.errors.empty?
-      if Devise.allow_insecure_sign_in_after_confirmation
-        set_flash_message(:notice, :confirmed_and_signed_in) if is_navigational_format?
-        sign_in(resource_name, resource)
-      else
-        set_flash_message(:notice, :confirmed) if is_navigational_format?
-      end
+      set_flash_message(:notice, :confirmed) if is_flashing_format?
      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
    else
      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
@@ -41,8 +38,8 @@ class Devise::ConfirmationsController < DeviseController

    # The path used after confirmation.
    def after_confirmation_path_for(resource_name, resource)
-      if Devise.allow_insecure_sign_in_after_confirmation
-        after_sign_in_path_for(resource)
+      if signed_in?
+        signed_in_root_path(resource)
      else
        new_session_path(resource_name)
      end
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -11,6 +11,7 @@ class Devise::PasswordsController < DeviseController
  # POST /resource/password
  def create
    self.resource = resource_class.send_reset_password_instructions(resource_params)
+    yield resource if block_given?

    if successfully_sent?(resource)
      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
@@ -28,11 +29,12 @@ class Devise::PasswordsController < DeviseController
  # PUT /resource/password
  def update
    self.resource = resource_class.reset_password_by_token(resource_params)
+    yield resource if block_given?

    if resource.errors.empty?
      resource.unlock_access! if unlockable?(resource)
      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
-      set_flash_message(:notice, flash_message) if is_navigational_format?
+      set_flash_message(:notice, flash_message) if is_flashing_format?
      sign_in(resource_name, resource)
      respond_with resource, :location => after_resetting_password_path_for(resource)
    else
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -13,13 +13,14 @@ class Devise::RegistrationsController < DeviseController
    build_resource(sign_up_params)

    if resource.save
+      yield resource if block_given?
      if resource.active_for_authentication?
-        set_flash_message :notice, :signed_up if is_navigational_format?
+        set_flash_message :notice, :signed_up if is_flashing_format?
        sign_up(resource_name, resource)
        respond_with resource, :location => after_sign_up_path_for(resource)
      else
-        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
-        expire_session_data_after_sign_in!
+        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_flashing_format?
+        expire_data_after_sign_in!
        respond_with resource, :location => after_inactive_sign_up_path_for(resource)
      end
    else
@@ -41,7 +42,8 @@ class Devise::RegistrationsController < DeviseController
    prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)

    if update_resource(resource, account_update_params)
-      if is_navigational_format?
+      yield resource if block_given?
+      if is_flashing_format?
        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
          :update_needs_confirmation : :updated
        set_flash_message :notice, flash_key
@@ -58,7 +60,8 @@ class Devise::RegistrationsController < DeviseController
  def destroy
    resource.destroy
    Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
-    set_flash_message :notice, :destroyed if is_navigational_format?
+    set_flash_message :notice, :destroyed if is_flashing_format?
+    yield resource if block_given?
    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name) }
  end

@@ -68,7 +71,7 @@ class Devise::RegistrationsController < DeviseController
  # cancel oauth signing in/up in the middle of the process,
  # removing all OAuth session data.
  def cancel
-    expire_session_data_after_sign_in!
+    expire_data_after_sign_in!
    redirect_to new_registration_path(resource_name)
  end

--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,7 +1,7 @@
 class Devise::SessionsController < DeviseController
  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
  prepend_before_filter :allow_params_authentication!, :only => :create
-  prepend_before_filter { request.env["devise.skip_timeout"] = true }
+  prepend_before_filter :only => [ :create, :destroy ] { request.env["devise.skip_timeout"] = true }

  # GET /resource/sign_in
  def new
@@ -13,8 +13,9 @@ class Devise::SessionsController < DeviseController
  # POST /resource/sign_in
  def create
    self.resource = warden.authenticate!(auth_options)
-    set_flash_message(:notice, :signed_in) if is_navigational_format?
+    set_flash_message(:notice, :signed_in) if is_flashing_format?
    sign_in(resource_name, resource)
+    yield resource if block_given?
    respond_with resource, :location => after_sign_in_path_for(resource)
  end

@@ -22,7 +23,8 @@ class Devise::SessionsController < DeviseController
  def destroy
    redirect_path = after_sign_out_path_for(resource_name)
    signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
-    set_flash_message :notice, :signed_out if signed_out && is_navigational_format?
+    set_flash_message :notice, :signed_out if signed_out && is_flashing_format?
+    yield resource if block_given?

    # We actually need to hardcode this as Rails default responder doesn't
    # support returning empty response on GET request
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -9,6 +9,7 @@ class Devise::UnlocksController < DeviseController
  # POST /resource/unlock
  def create
    self.resource = resource_class.send_unlock_instructions(resource_params)
+    yield resource if block_given?

    if successfully_sent?(resource)
      respond_with({}, :location => after_sending_unlock_instructions_path_for(resource))
@@ -20,9 +21,10 @@ class Devise::UnlocksController < DeviseController
  # GET /resource/unlock?unlock_token=abcdef
  def show
    self.resource = resource_class.unlock_access_by_token(params[:unlock_token])
+    yield resource if block_given?

    if resource.errors.empty?
-      set_flash_message :notice, :unlocked if is_navigational_format?
+      set_flash_message :notice, :unlocked if is_flashing_format?
      respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
    else
      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -123,7 +123,7 @@ MESSAGE
    end

    if notice
-      set_flash_message :notice, notice if is_navigational_format?
+      set_flash_message :notice, notice if is_flashing_format?
      true
    end
  end
@@ -147,12 +147,16 @@ MESSAGE
    flash[key] = message if message.present?
  end

+  def devise_i18n_options(options)
+    options
+  end
+
  # Get message for given
  def find_message(kind, options = {})
    options[:scope] = "devise.#{controller_name}"
    options[:default] = Array(options[:default]).unshift(kind.to_sym)
    options[:resource_name] = resource_name
-    options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
+    options = devise_i18n_options(options)
    I18n.t("#{options[:resource_name]}.#{kind}", options)
  end

--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -1,18 +1,20 @@
-class Devise::Mailer < Devise.parent_mailer.constantize
-  include Devise::Mailers::Helpers
+if defined?(ActionMailer)
+  class Devise::Mailer < Devise.parent_mailer.constantize
+    include Devise::Mailers::Helpers

-  def confirmation_instructions(record, token, opts={})
-    @token = token
-    devise_mail(record, :confirmation_instructions, opts)
-  end
+    def confirmation_instructions(record, token, opts={})
+      @token = token
+      devise_mail(record, :confirmation_instructions, opts)
+    end

-  def reset_password_instructions(record, token, opts={})
-    @token = token
-    devise_mail(record, :reset_password_instructions, opts)
-  end
+    def reset_password_instructions(record, token, opts={})
+      @token = token
+      devise_mail(record, :reset_password_instructions, opts)
+    end

-  def unlock_instructions(record, token, opts={})
-    @token = token
-    devise_mail(record, :unlock_instructions, opts)
+    def unlock_instructions(record, token, opts={})
+      @token = token
+      devise_mail(record, :unlock_instructions, opts)
+    end
  end
 end
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,16 +3,15 @@
 en:
  devise:
    confirmations:
-      confirmed: "Your account was successfully confirmed. Please sign in."
-      confirmed_and_signed_in: "Your account was successfully confirmed. You are now signed in."
+      confirmed: "Your account was successfully confirmed."
      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
    failure:
      already_authenticated: "You are already signed in."
      inactive: "Your account is not activated yet."
      invalid: "Invalid email or password."
-      invalid_token: "Invalid authentication token."
      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account will be locked."
      not_found_in_database: "Invalid email or password."
      timeout: "Your session expired. Please sign in again to continue."
      unauthenticated: "You need to sign in or sign up before continuing."
@@ -29,7 +28,7 @@ en:
      success: "Successfully authenticated from %{kind} account."
    passwords:
      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
      updated: "Your password was changed successfully. You are now signed in."
      updated_not_active: "Your password was changed successfully."
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
  s.licenses    = ["MIT"]
  s.summary     = "Flexible authentication solution for Rails with Warden"
  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "http://github.com/plataformatec/devise"
+  s.homepage    = "https://github.com/plataformatec/devise"
  s.description = "Flexible authentication solution for Rails with Warden"
  s.authors     = ['José Valim', 'Carlos Antônio']

--- a/gemfiles/Gemfile.rails-3.2-stable
+++ b/gemfiles/Gemfile.rails-3.2-stable
@@ -2,7 +2,7 @@ source "https://rubygems.org"

 gemspec :path => '..'

-gem "rails", "~> 3.2.6"
+gem "rails", github: 'rails/rails', branch: '3-2-stable'
 gem "omniauth", "~> 1.0.0"
 gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"
@@ -24,8 +24,6 @@ platforms :ruby do
  gem "sqlite3"
 end

-platforms :mri_19, :mri_20 do
-  group :mongoid do
-    gem "mongoid", "~> 3.0"
-  end
+group :mongoid do
+  gem "mongoid", "~> 3.0"
 end
--- a/gemfiles/Gemfile.rails-3.2.x.lock
+++ b/gemfiles/Gemfile.rails-3.2.x.lock
@@ -1,159 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    devise (3.1.0)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
-      mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    atomic (1.1.13)
-    bcrypt-ruby (3.1.1)
-    builder (3.0.4)
-    erubis (2.7.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    hashie (1.2.0)
-    hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    journey (1.0.4)
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    mongoid (3.1.4)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.5.1)
-    multi_json (1.7.9)
-    multipart-post (1.2.0)
-    nokogiri (1.5.9)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    omniauth (1.0.3)
-      hashie (~> 1.2)
-      rack
-    omniauth-facebook (1.4.0)
-      omniauth-oauth2 (~> 1.0.2)
-    omniauth-oauth2 (1.0.3)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    origin (1.1.0)
-    orm_adapter (0.4.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ruby-openid (2.2.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    warden (1.2.3)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  devise!
-  jruby-openssl
-  mocha (~> 0.13.1)
-  mongoid (~> 3.0)
-  omniauth (~> 1.0.0)
-  omniauth-facebook
-  omniauth-oauth2 (~> 1.0.0)
-  omniauth-openid (~> 1.0.1)
-  rails (~> 3.2.6)
-  rdoc
-  sqlite3
-  webrat (= 0.7.3)
--- a/gemfiles/Gemfile.rails-4.0-stable
+++ b/gemfiles/Gemfile.rails-4.0-stable
@@ -0,0 +1,29 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "rails", github: 'rails/rails', branch: '4-0-stable'
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
+gem "rdoc"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid", "~> 1.0.1"
+  gem "webrat", "0.7.3", :require => false
+  gem "mocha", "~> 0.13.1", :require => false
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+group :mongoid do
+  gem "mongoid", github: "mongoid/mongoid", branch: "master"
+end
--- a/gemfiles/Gemfile.rails-head
+++ b/gemfiles/Gemfile.rails-head
@@ -0,0 +1,29 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "rails", github: 'rails/rails'
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
+gem "rdoc"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid", "~> 1.0.1"
+  gem "webrat", "0.7.3", :require => false
+  gem "mocha", "~> 0.14", :require => false
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+group :mongoid do
+  gem "mongoid", github: "mongoid/mongoid", branch: "master"
+end
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -20,9 +20,15 @@ module Devise
    autoload :Helpers, 'devise/controllers/helpers'
    autoload :Rememberable, 'devise/controllers/rememberable'
    autoload :ScopedViews, 'devise/controllers/scoped_views'
+    autoload :SignInOut, 'devise/controllers/sign_in_out'
+    autoload :StoreLocation, 'devise/controllers/store_location'
    autoload :UrlHelpers, 'devise/controllers/url_helpers'
  end

+  module Hooks
+    autoload :Proxy, 'devise/hooks/proxy'
+  end
+
  module Mailers
    autoload :Helpers, 'devise/mailers/helpers'
  end
@@ -50,15 +56,21 @@ module Devise
  mattr_accessor :secret_key
  @@secret_key = nil

-  # Allow insecure token lookup. Must be used
-  # temporarily just for migration.
-  mattr_accessor :allow_insecure_token_lookup
-  @@allow_insecure_tokens_lookup = false
+  [ :allow_insecure_token_lookup,
+    :allow_insecure_sign_in_after_confirmation,
+    :token_authentication_key ].each do |method|
+    class_eval <<-RUBY
+    def self.#{method}
+      ActiveSupport::Deprecation.warn "Devise.#{method} is deprecated " \
+        "and has no effect"
+    end

-  # Allow insecure sign in after confirmation. Must be used
-  # temporarily just for migration.
-  mattr_accessor :allow_insecure_sign_in_after_confirmation
-  @@allow_insecure_sign_in_after_confirmation = false
+    def self.#{method}=(val)
+      ActiveSupport::Deprecation.warn "Devise.#{method}= is deprecated " \
+        "and has no effect"
+    end
+    RUBY
+  end

  # Custom domain or key for cookies. Not set by default
  mattr_accessor :rememberable_options
@@ -195,10 +207,6 @@ module Devise
  mattr_accessor :mailer_sender
  @@mailer_sender = nil

-  # Authentication token params key name of choice. E.g. /users/sign_in?some_key=...
-  mattr_accessor :token_authentication_key
-  @@token_authentication_key = :auth_token
-
  # Skip session storage for the following strategies
  mattr_accessor :skip_session_storage
  @@skip_session_storage = []
@@ -228,12 +236,12 @@ module Devise
  @@parent_mailer = "ActionMailer::Base"

  # The router Devise should use to generate routes. Defaults
-  # to :main_app. Should be overriden by engines in order
+  # to :main_app. Should be overridden by engines in order
  # to provide custom routes.
  mattr_accessor :router_name
  @@router_name = nil

-  # Set the omniauth path prefix so it can be overriden when
+  # Set the omniauth path prefix so it can be overridden when
  # Devise is used in a mountable engine
  mattr_accessor :omniauth_path_prefix
  @@omniauth_path_prefix = nil
@@ -266,6 +274,10 @@ module Devise
  mattr_accessor :paranoid
  @@paranoid = false

+  # When true, warn user if they just used next-to-last attempt of authentication
+  mattr_accessor :last_attempt_warning
+  @@last_attempt_warning = false
+
  # Stores the token generator
  mattr_accessor :token_generator
  @@token_generator = nil
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -3,6 +3,8 @@ module Devise
    # Those helpers are convenience methods added to ApplicationController.
    module Helpers
      extend ActiveSupport::Concern
+      include Devise::Controllers::SignInOut
+      include Devise::Controllers::StoreLocation

      included do
        helper_method :warden, :signed_in?, :devise_controller?
@@ -96,102 +98,7 @@ module Devise
        request.env["devise.allow_params_authentication"] = true
      end

-      # Return true if the given scope is signed in session. If no scope given, return
-      # true if any scope is signed in. Does not run authentication hooks.
-      def signed_in?(scope=nil)
-        [ scope || Devise.mappings.keys ].flatten.any? do |_scope|
-          warden.authenticate?(:scope => _scope)
-        end
-      end
-
-      # Sign in a user that already was authenticated. This helper is useful for logging
-      # users in after sign up.
-      #
-      # All options given to sign_in is passed forward to the set_user method in warden.
-      # The only exception is the :bypass option, which bypass warden callbacks and stores
-      # the user straight in session. This option is useful in cases the user is already
-      # signed in, but we want to refresh the credentials in session.
-      #
-      # Examples:
-      #
-      #   sign_in :user, @user                      # sign_in(scope, resource)
-      #   sign_in @user                             # sign_in(resource)
-      #   sign_in @user, :event => :authentication  # sign_in(resource, options)
-      #   sign_in @user, :store => false            # sign_in(resource, options)
-      #   sign_in @user, :bypass => true            # sign_in(resource, options)
-      #
-      def sign_in(resource_or_scope, *args)
-        options  = args.extract_options!
-        scope    = Devise::Mapping.find_scope!(resource_or_scope)
-        resource = args.last || resource_or_scope
-
-        expire_session_data_after_sign_in!
-
-        if options[:bypass]
-          warden.session_serializer.store(resource, scope)
-        elsif warden.user(scope) == resource && !options.delete(:force)
-          # Do nothing. User already signed in and we are not forcing it.
-          true
-        else
-          warden.set_user(resource, options.merge!(:scope => scope))
-        end
-      end
-
-      # Sign out a given user or scope. This helper is useful for signing out a user
-      # after deleting accounts. Returns true if there was a logout and false if there
-      # is no user logged in on the referred scope
-      #
-      # Examples:
-      #
-      #   sign_out :user     # sign_out(scope)
-      #   sign_out @user     # sign_out(resource)
-      #
-      def sign_out(resource_or_scope=nil)
-        return sign_out_all_scopes unless resource_or_scope
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        user = warden.user(:scope => scope, :run_callbacks => false) # If there is no user
-
-        warden.raw_session.inspect # Without this inspect here. The session does not clear.
-        warden.logout(scope)
-        warden.clear_strategies_cache!(:scope => scope)
-        instance_variable_set(:"@current_#{scope}", nil)
-
-        !!user
-      end
-
-      # Sign out all active users or scopes. This helper is useful for signing out all roles
-      # in one click. This signs out ALL scopes in warden. Returns true if there was at least one logout
-      # and false if there was no user logged in on all scopes.
-      def sign_out_all_scopes(lock=true)
-        users = Devise.mappings.keys.map { |s| warden.user(:scope => s, :run_callbacks => false) }
-
-        warden.raw_session.inspect
-        warden.logout
-        expire_devise_cached_variables!
-        warden.clear_strategies_cache!
-        warden.lock! if lock
-
-        users.any?
-      end
-
-      # Returns and delete (if it's navigational format) the url stored in the session for
-      # the given scope. Useful for giving redirect backs after sign up:
-      #
-      # Example:
-      #
-      #   redirect_to stored_location_for(:user) || root_path
-      #
-      def stored_location_for(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-
-        if is_navigational_format?
-          session.delete("#{scope}_return_to")
-        else
-          session["#{scope}_return_to"]
-        end
-      end
-
-      # The scope root url to be used when he's signed in. By default, it first
+      # The scope root url to be used when they're signed in. By default, it first
      # tries to find a resource_root_path, otherwise it uses the root_path.
      def signed_in_root_path(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
@@ -257,10 +164,6 @@ module Devise
        redirect_to after_sign_in_path_for(resource)
      end

-      def expire_session_data_after_sign_in!
-        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
-      end
-
      # Sign out a user and tries to redirect to the url specified by
      # after_sign_out_path_for.
      def sign_out_and_redirect(resource_or_scope)
@@ -275,7 +178,7 @@ module Devise
      def handle_unverified_request
        sign_out_all_scopes(false)
        request.env["devise.skip_storage"] = true
-        expire_devise_cached_variables!
+        expire_data_after_sign_out!
        super # call the default behaviour which resets the session
      end

@@ -287,10 +190,23 @@ module Devise
        Devise.navigational_formats.include?(request_format)
      end

+      # Check if flash messages should be emitted. Default is to do it on
+      # navigational formats
+      def is_flashing_format?
+        is_navigational_format?
+      end
+
      private

-      def expire_devise_cached_variables!
+      def expire_session_data_after_sign_in!
+        ActiveSupport::Deprecation.warn "expire_session_data_after_sign_in! is deprecated " \
+          "in favor of expire_data_after_sign_in!"
+        expire_data_after_sign_in!
+      end
+
+      def expire_data_after_sign_out!
        Devise.mappings.each { |_,m| instance_variable_set("@current_#{m.name}", nil) }
+        super
      end
    end
  end
--- a/lib/devise/controllers/rememberable.rb
+++ b/lib/devise/controllers/rememberable.rb
@@ -1,24 +1,14 @@
 module Devise
  module Controllers
    # A module that may be optionally included in a controller in order
-    # to provide remember me behavior.
+    # to provide remember me behavior. Useful when signing in is done
+    # through a callback, like in Omniauth.
    module Rememberable
      # Return default cookie values retrieved from session options.
      def self.cookie_values
        Rails.configuration.session_options.slice(:path, :domain, :secure)
      end

-      # A small warden proxy so we can remember and forget uses from hooks.
-      class Proxy #:nodoc:
-        include Devise::Controllers::Rememberable
-
-        delegate :cookies, :env, :to => :@warden
-
-        def initialize(warden)
-          @warden = warden
-        end
-      end
-
      # Remembers the given resource by setting up a cookie
      def remember_me(resource)
        return if env["devise.skip_storage"]
--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -14,4 +14,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -0,0 +1,103 @@
+module Devise
+  module Controllers
+    # Provide sign in and sign out functionality.
+    # Included by default in all controllers.
+    module SignInOut
+      # Return true if the given scope is signed in session. If no scope given, return
+      # true if any scope is signed in. Does not run authentication hooks.
+      def signed_in?(scope=nil)
+        [ scope || Devise.mappings.keys ].flatten.any? do |_scope|
+          warden.authenticate?(:scope => _scope)
+        end
+      end
+
+      # Sign in a user that already was authenticated. This helper is useful for logging
+      # users in after sign up.
+      #
+      # All options given to sign_in is passed forward to the set_user method in warden.
+      # The only exception is the :bypass option, which bypass warden callbacks and stores
+      # the user straight in session. This option is useful in cases the user is already
+      # signed in, but we want to refresh the credentials in session.
+      #
+      # Examples:
+      #
+      #   sign_in :user, @user                      # sign_in(scope, resource)
+      #   sign_in @user                             # sign_in(resource)
+      #   sign_in @user, :event => :authentication  # sign_in(resource, options)
+      #   sign_in @user, :store => false            # sign_in(resource, options)
+      #   sign_in @user, :bypass => true            # sign_in(resource, options)
+      #
+      def sign_in(resource_or_scope, *args)
+        options  = args.extract_options!
+        scope    = Devise::Mapping.find_scope!(resource_or_scope)
+        resource = args.last || resource_or_scope
+
+        expire_data_after_sign_in!
+
+        if options[:bypass]
+          warden.session_serializer.store(resource, scope)
+        elsif warden.user(scope) == resource && !options.delete(:force)
+          # Do nothing. User already signed in and we are not forcing it.
+          true
+        else
+          warden.set_user(resource, options.merge!(:scope => scope))
+        end
+      end
+
+      # Sign out a given user or scope. This helper is useful for signing out a user
+      # after deleting accounts. Returns true if there was a logout and false if there
+      # is no user logged in on the referred scope
+      #
+      # Examples:
+      #
+      #   sign_out :user     # sign_out(scope)
+      #   sign_out @user     # sign_out(resource)
+      #
+      def sign_out(resource_or_scope=nil)
+        return sign_out_all_scopes unless resource_or_scope
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        user = warden.user(:scope => scope, :run_callbacks => false) # If there is no user
+
+        warden.raw_session.inspect # Without this inspect here. The session does not clear.
+        warden.logout(scope)
+        warden.clear_strategies_cache!(:scope => scope)
+        instance_variable_set(:"@current_#{scope}", nil)
+
+        !!user
+      end
+
+      # Sign out all active users or scopes. This helper is useful for signing out all roles
+      # in one click. This signs out ALL scopes in warden. Returns true if there was at least one logout
+      # and false if there was no user logged in on all scopes.
+      def sign_out_all_scopes(lock=true)
+        users = Devise.mappings.keys.map { |s| warden.user(:scope => s, :run_callbacks => false) }
+
+        warden.raw_session.inspect
+        warden.logout
+        expire_data_after_sign_out!
+        warden.clear_strategies_cache!
+        warden.lock! if lock
+
+        users.any?
+      end
+
+      private
+
+      def expire_data_after_sign_in!
+        # session.keys will return an empty array if the session is not yet loaded.
+        # This is a bug in both Rack and Rails.
+        # A call to #empty? forces the session to be loaded.
+        session.empty?
+        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
+      end
+
+      def expire_data_after_sign_out!
+        # session.keys will return an empty array if the session is not yet loaded.
+        # This is a bug in both Rack and Rails.
+        # A call to #empty? forces the session to be loaded.
+        session.empty?
+        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
+      end
+    end
+  end
+end
--- a/lib/devise/controllers/store_location.rb
+++ b/lib/devise/controllers/store_location.rb
@@ -0,0 +1,50 @@
+require "uri"
+
+module Devise
+  module Controllers
+    # Provide the ability to store a location.
+    # Used to redirect back to a desired path after sign in.
+    # Included by default in all controllers.
+    module StoreLocation
+      # Returns and delete (if it's navigational format) the url stored in the session for
+      # the given scope. Useful for giving redirect backs after sign up:
+      #
+      # Example:
+      #
+      #   redirect_to stored_location_for(:user) || root_path
+      #
+      def stored_location_for(resource_or_scope)
+        session_key = stored_location_key_for(resource_or_scope)
+
+        if is_navigational_format?
+          session.delete(session_key)
+        else
+          session[session_key]
+        end
+      end
+
+      # Stores the provided location to redirect the user after signing in.
+      # Useful in combination with the `stored_location_for` helper.
+      #
+      # Example:
+      #
+      #   store_location_for(:user, dashboard_path)
+      #   redirect_to user_omniauth_authorize_path(:facebook)
+      #
+      def store_location_for(resource_or_scope, location)
+        session_key = stored_location_key_for(resource_or_scope)
+        if location
+          uri = URI.parse(location)
+          session[session_key] = [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
+        end
+      end
+
+      private
+
+      def stored_location_key_for(resource_or_scope)
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        "#{scope}_return_to"
+      end
+    end
+  end
+end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -13,6 +13,8 @@ module Devise
    include Rails.application.routes.url_helpers
    include Rails.application.routes.mounted_helpers

+    include Devise::Controllers::StoreLocation
+
    delegate :flash, :to => :request

    def self.call(env)
@@ -64,12 +66,21 @@ module Devise

  protected

+    def i18n_options(options)
+      options
+    end
+
    def i18n_message(default = nil)
      message = warden_message || default || :unauthenticated

      if message.is_a?(Symbol)
-        I18n.t(:"#{scope}.#{message}", :resource_name => scope,
-               :scope => "devise.failure", :default => [message])
+        options = {}
+        options[:resource_name] = scope
+        options[:scope] = "devise.failure"
+        options[:default] = [message]
+        options = i18n_options(options)
+
+        I18n.t(:"#{scope}.#{message}", options)
      else
        message.to_s
      end
@@ -180,7 +191,7 @@ module Devise
    # yet, but we still need to store the uri based on scope, so different scopes
    # would never use the same uri to redirect.
    def store_location!
-      session["#{scope}_return_to"] = attempted_path if request.get? && !http_auth?
+      store_location_for(scope, attempted_path) if request.get? && !http_auth?
    end

    def is_navigational_format?
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -1,6 +1,6 @@
-# Deny user access whenever his account is not active yet. All strategies that inherits from
+# Deny user access whenever their account is not active yet. All strategies that inherits from
 # Devise::Strategies::Authenticatable and uses the validate already check if the user is active_for_authentication?
-# before actively signing him in. However, we need this as hook to validate the user activity
+# before actively signing them in. However, we need this as hook to validate the user activity
 # in each request and in case the user is using other strategies beside Devise ones.
 Warden::Manager.after_set_user do |record, warden, options|
  if record && record.respond_to?(:active_for_authentication?) && !record.active_for_authentication?
@@ -8,4 +8,4 @@ Warden::Manager.after_set_user do |record, warden, options|
    warden.logout(scope)
    throw :warden, :scope => scope, :message => record.inactive_message
  end
-end
+end
--- a/lib/devise/hooks/forgetable.rb
+++ b/lib/devise/hooks/forgetable.rb
@@ -4,6 +4,6 @@
 # This avoids forgetting deleted users.
 Warden::Manager.before_logout do |record, warden, options|
  if record.respond_to?(:forget_me!)
-    Devise::Controllers::Rememberable::Proxy.new(warden).forget_me(record)
+    Devise::Hooks::Proxy.new(warden).forget_me(record)
  end
 end
--- a/lib/devise/hooks/proxy.rb
+++ b/lib/devise/hooks/proxy.rb
@@ -0,0 +1,21 @@
+module Devise
+  module Hooks
+    # A small warden proxy so we can remember, forget and
+    # sign out users from hooks.
+    class Proxy #:nodoc:
+      include Devise::Controllers::Rememberable
+      include Devise::Controllers::SignInOut
+
+      attr_reader :warden
+      delegate :cookies, :env, :to => :warden
+
+      def initialize(warden)
+        @warden = warden
+      end
+
+      def session
+        warden.request.session
+      end
+    end
+  end
+end
--- a/lib/devise/hooks/rememberable.rb
+++ b/lib/devise/hooks/rememberable.rb
@@ -2,6 +2,6 @@ Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
  scope = options[:scope]
  if record.respond_to?(:remember_me) && options[:store] != false &&
     record.remember_me && warden.authenticated?(scope)
-    Devise::Controllers::Rememberable::Proxy.new(warden).remember_me(record)
+    Devise::Hooks::Proxy.new(warden).remember_me(record)
  end
-end
+end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -9,12 +9,15 @@ Warden::Manager.after_set_user do |record, warden, options|

  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) && options[:store] != false
    last_request_at = warden.session(scope)['last_request_at']
+    proxy = Devise::Hooks::Proxy.new(warden)

    if record.timedout?(last_request_at) && !env['devise.skip_timeout']
-      warden.logout(scope)
+      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
+
      if record.respond_to?(:expire_auth_token_on_timeout) && record.expire_auth_token_on_timeout
        record.reset_authentication_token!
      end
+
      throw :warden, :scope => scope, :message => :timeout
    end

--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -84,11 +84,6 @@ module Devise
      devise_modules_hook! do
        include Devise::Models::Authenticatable

-        if selected_modules.include?(:token_authenticatable)
-          ActiveSupport::Deprecation.warn "devise :token_authenticatable is deprecated. " \
-            "Please check Devise 3.1 release notes for more information on how to upgrade."
-        end
-
        selected_modules.each do |m|
          mod = Devise::Models.const_get(m.to_s.classify)

--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -29,9 +29,7 @@ module Devise
    #     It also accepts an array specifying the strategies that should allow params authentication.
    #
    #   * +skip_session_storage+: By default Devise will store the user in session.
-    #     You can skip storage for http and token auth by appending values to array:
-    #     :skip_session_storage => [:token_auth] or :skip_session_storage => [:http_auth, :token_auth],
-    #     by default is set to :skip_session_storage => [:http_auth].
+    #     By default is set to :skip_session_storage => [:http_auth].
    #
    # == active_for_authentication?
    #
@@ -58,7 +56,7 @@ module Devise
      BLACKLIST_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
        :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip,
        :last_sign_in_ip, :password_salt, :confirmation_token, :confirmed_at, :confirmation_sent_at,
-        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at, :authentication_token]
+        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at]

      included do
        class_attribute :devise_modules, :instance_writer => false
@@ -129,7 +127,7 @@ module Devise
      end

      # This is an internal method called every time Devise needs
-      # to send a notification/mail. This can be overriden if you
+      # to send a notification/mail. This can be overridden if you
      # need to customize the e-mail delivery logic. For instance,
      # if you are using a queue to deliver e-mails (delayed job,
      # sidekiq, resque, etc), you must add the delivery to the queue
@@ -176,23 +174,24 @@ module Devise
      end

      def downcase_keys
-        self.class.case_insensitive_keys.each { |k| apply_to_attribute_or_variable(k, :downcase!) }
+        self.class.case_insensitive_keys.each { |k| apply_to_attribute_or_variable(k, :downcase) }
      end

      def strip_whitespace
-        self.class.strip_whitespace_keys.each { |k| apply_to_attribute_or_variable(k, :strip!) }
+        self.class.strip_whitespace_keys.each { |k| apply_to_attribute_or_variable(k, :strip) }
      end

      def apply_to_attribute_or_variable(attr, method)
        if self[attr]
-          self[attr].try(method)
+          self[attr] = self[attr].try(method)

        # Use respond_to? here to avoid a regression where globally
        # configured strip_whitespace_keys or case_insensitive_keys were
-        # attempting to strip! or downcase! when a model didn't have the
+        # attempting to strip or downcase when a model didn't have the
        # globally configured key.
-        elsif respond_to?(attr)
-          send(attr).try(method)
+        elsif respond_to?(attr) && respond_to?("#{attr}=")
+          new_value = send(attr).try(method)
+          send("#{attr}=", new_value)
        end
      end

--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -9,7 +9,7 @@ module Devise
    #
    # Confirmable adds the following options to +devise+:
    #
-    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access his account
+    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access their account
    #     before confirming it. After this period, the user access is denied. 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 7 days).
@@ -152,7 +152,7 @@ module Devise
      protected

        # A callback method used to deliver confirmation
-        # instructions on creation. This can be overriden
+        # instructions on creation. This can be overridden
        # in models to map to a nice sign up e-mail.
        def send_on_create_confirmation_instructions
          send_confirmation_instructions
@@ -275,10 +275,6 @@ module Devise
          confirmation_token = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)

          confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          if !confirmable.persisted? && Devise.allow_insecure_token_lookup
-            confirmable = find_or_initialize_with_error_by(:confirmation_token, original_token)
-          end
-
          confirmable.confirm! if confirmable.persisted?
          confirmable.confirmation_token = original_token
          confirmable
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -2,6 +2,11 @@ require 'devise/strategies/database_authenticatable'
 require 'bcrypt'

 module Devise
+  # Digests the password using bcrypt.
+  def self.bcrypt(klass, password)
+    ::BCrypt::Password.create("#{password}#{klass.pepper}", :cost => klass.stretches).to_s
+  end
+
  module Models
    # Authenticatable Module, responsible for encrypting password and validating
    # authenticity of a user while signing in.
@@ -96,7 +101,7 @@ module Devise
      end

      # Destroy record when :current_password matches, otherwise returns
-      # error on :current_password. It also automatically rejects 
+      # error on :current_password. It also automatically rejects
      # :current_password if it is blank.
      def destroy_with_password(current_password)
        result = if valid_password?(current_password)
@@ -110,6 +115,16 @@ module Devise
        result
      end

+      # A callback initiated after successfully authenticating. This can be
+      # used to insert your own logic that is only run after the user successfully
+      # authenticates.
+      #
+      # Example:
+      #
+      #   def after_database_authentication
+      #     self.update_attribute(:invite_code, nil)
+      #   end
+      #
      def after_database_authentication
      end

@@ -120,9 +135,13 @@ module Devise

    protected

-      # Digests the password using bcrypt.
+      # Digests the password using bcrypt. Custom encryption should override
+      # this method to apply their own algorithm.
+      #
+      # See https://github.com/plataformatec/devise-encryptable for examples
+      # of other encryption engines.
      def password_digest(password)
-        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
+        Devise.bcrypt(self.class, password)
      end

      module ClassMethods
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -34,10 +34,13 @@ module Devise
      end

      # Lock a user setting its locked_at to actual time.
-      def lock_access!
+      # * +opts+: Hash options if you don't want to send email
+      #   when you lock access, you could pass the next hash
+      #   `{ :send_instructions => false } as option`.
+      def lock_access!(opts = { })
        self.locked_at = Time.now.utc

-        if unlock_strategy_enabled?(:email)
+        if unlock_strategy_enabled?(:email) && opts.fetch(:send_instructions, true)
          send_unlock_instructions
        else
          save(:validate => false)
@@ -112,6 +115,8 @@ module Devise
        # leaks the existence of an account.
        if Devise.paranoid
          super
+        elsif lock_strategy_enabled?(:failed_attempts) && last_attempt?
+          :last_attempt
        elsif lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
          :locked
        else
@@ -122,7 +127,11 @@ module Devise
      protected

        def attempts_exceeded?
-          self.failed_attempts > self.class.maximum_attempts
+          self.failed_attempts >= self.class.maximum_attempts
+        end
+
+        def last_attempt?
+          self.failed_attempts == self.class.maximum_attempts - 1
        end

        # Tells if the lock is expired if :time unlock strategy is active
@@ -165,10 +174,6 @@ module Devise
          unlock_token   = Devise.token_generator.digest(self, :unlock_token, unlock_token)

          lockable = find_or_initialize_with_error_by(:unlock_token, unlock_token)
-          if !lockable.persisted? && Devise.allow_insecure_token_lookup
-            lockable = find_or_initialize_with_error_by(:unlock_token, original_token)
-          end
-
          lockable.unlock_access! if lockable.persisted?
          lockable.unlock_token = original_token
          lockable
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -101,11 +101,6 @@ module Devise
          recoverable
        end

-        # Generate a token checking if one does not already exist in the database.
-        def reset_password_token
-          generate_token(:reset_password_token)
-        end
-
        # Attempt to find a user by its reset_password_token to reset its
        # password. If a user is found and token is still valid, reset its password and automatically
        # try saving the record. If not user is found, returns a new user
@@ -116,9 +111,6 @@ module Devise
          reset_password_token = Devise.token_generator.digest(self, :reset_password_token, original_token)

          recoverable = find_or_initialize_with_error_by(:reset_password_token, reset_password_token)
-          if !recoverable.persisted? && Devise.allow_insecure_token_lookup
-            recoverable = find_or_initialize_with_error_by(:reset_password_token, original_token)
-          end

          if recoverable.persisted?
            if recoverable.reset_password_period_valid?
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -17,7 +17,7 @@ module Devise
    #
    #   * +remember_for+: the time you want the user will be remembered without
    #     asking for credentials. After this time the user will be blocked and
-    #     will have to enter his credentials again. This configuration is also
+    #     will have to enter their credentials again. This configuration is also
    #     used to calculate the expires time for the cookie created to remember
    #     the user. By default remember_for is 2.weeks.
    #
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -2,9 +2,9 @@ require 'devise/hooks/timeoutable'

 module Devise
  module Models
-    # Timeoutable takes care of verifyng whether a user session has already
+    # Timeoutable takes care of verifying whether a user session has already
    # expired or not. When a session expires after the configured time, the user
-    # will be asked for credentials again, it means, he/she will be redirected
+    # will be asked for credentials again, it means, they will be redirected
    # to the sign in page.
    #
    # == Options
--- a/lib/devise/models/token_authenticatable.rb
+++ b/lib/devise/models/token_authenticatable.rb
@@ -1,92 +0,0 @@
-require 'devise/strategies/token_authenticatable'
-
-module Devise
-  module Models
-    # The TokenAuthenticatable module is responsible for generating an authentication token and
-    # validating the authenticity of the same while signing in.
-    #
-    # This module only provides a few helpers to help you manage the token, but it is up to you
-    # to choose how to use it. For example, if you want to have a new token every time the user
-    # saves his account, you can do the following:
-    #
-    #   before_save :reset_authentication_token
-    #
-    # On the other hand, if you want to generate token unless one exists, you should use instead:
-    #
-    #   before_save :ensure_authentication_token
-    #
-    # If you want to delete the token after it is used, you can do so in the
-    # after_token_authentication callback.
-    #
-    # == APIs
-    #
-    # If you are using token authentication with APIs and using trackable. Every
-    # request will be considered as a new sign in (since there is no session in
-    # APIs). You can disable this by creating a before filter as follow:
-    #
-    #   before_filter :skip_trackable
-    #
-    #   def skip_trackable
-    #     request.env['devise.skip_trackable'] = true
-    #   end
-    #
-    # == Options
-    #
-    # TokenAuthenticatable adds the following options to devise_for:
-    #
-    #   * +token_authentication_key+: Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
-    #
-    module TokenAuthenticatable
-      extend ActiveSupport::Concern
-
-      def self.required_fields(klass)
-        [:authentication_token]
-      end
-
-      # Generate new authentication token (a.k.a. "single access token").
-      def reset_authentication_token
-        self.authentication_token = self.class.authentication_token
-      end
-
-      # Generate new authentication token and save the record.
-      def reset_authentication_token!
-        reset_authentication_token
-        save(:validate => false)
-      end
-
-      # Generate authentication token unless already exists.
-      def ensure_authentication_token
-        reset_authentication_token if authentication_token.blank?
-      end
-
-      # Generate authentication token unless already exists and save the record.
-      def ensure_authentication_token!
-        reset_authentication_token! if authentication_token.blank?
-      end
-
-      # Hook called after token authentication.
-      def after_token_authentication
-      end
-
-      def expire_auth_token_on_timeout
-        self.class.expire_auth_token_on_timeout
-      end
-
-      module ClassMethods
-        def find_for_token_authentication(conditions)
-          find_for_authentication(:authentication_token => conditions[token_authentication_key])
-        end
-
-        # Generate a token checking if one does not already exist in the database.
-        def authentication_token
-          loop do
-            token = Devise.friendly_token
-            break token unless to_adapter.find_first({ :authentication_token => token })
-          end
-        end
-
-        Devise::Models.config(self, :token_authentication_key, :expire_auth_token_on_timeout)
-      end
-    end
-  end
-end
--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -5,7 +5,6 @@ Devise.with_options :model => true do |d|
  d.with_options :strategy => true do |s|
    routes = [nil, :new, :destroy]
    s.add_module :database_authenticatable, :controller => :sessions, :route => { :session => routes }
-    s.add_module :token_authenticatable,    :controller => :sessions, :route => { :session => routes }, :no_input => true
    s.add_module :rememberable, :no_input => true
  end

@@ -26,4 +25,4 @@ Devise.with_options :model => true do |d|

  # Stats for last, so we make sure the user is really signed in
  d.add_module :trackable
-end
+end
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -1,3 +1,3 @@
 require 'orm_adapter/adapters/active_record'

-ActiveRecord::Base.extend Devise::Models
+ActiveRecord::Base.extend Devise::Models
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,3 +1,3 @@
 require 'orm_adapter/adapters/mongoid'

-Mongoid::Document::ClassMethods.send :include, Devise::Models
+Mongoid::Document::ClassMethods.send :include, Devise::Models
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -47,19 +47,25 @@ module Devise
    end

    def sign_in
-      default_params.permit self.for(:sign_in)
+      permit self.for(:sign_in)
    end

    def sign_up
-      default_params.permit self.for(:sign_up)
+      permit self.for(:sign_up)
    end

    def account_update
-      default_params.permit self.for(:account_update)
+      permit self.for(:account_update)
    end

    private

+    # TODO: We do need to flatten so it works with strong_parameters
+    # gem. We should drop it once we move to Rails 4 only support.
+    def permit(keys)
+      default_params.permit(*Array(keys))
+    end
+
    # Change for(kind) to return the values in the @permitted
    # hash, allowing the developer to customize at runtime.
    def default_for(kind)
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -29,7 +29,13 @@ module Devise
      end
    end

-    initializer "devise.secret_key" do
+    config.after_initialize do |app|
+      if app.respond_to?(:secrets)
+        Devise.secret_key ||= app.secrets.secret_key_base
+      elsif app.config.respond_to?(:secret_key_base)
+        Devise.secret_key ||= app.config.secret_key_base
+      end
+
      Devise.token_generator ||=
        if secret_key = Devise.secret_key
          Devise::TokenGenerator.new(
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -58,6 +58,28 @@ module ActionDispatch::Routing
    #      user_confirmation GET    /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"show"}
    #                        POST   /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"create"}
    #
+    # ==== Routes integration
+    #
+    # +devise_for+ is meant to play nicely with other routes methods. For example,
+    # by calling +devise_for+ inside a namespace, it automatically nests your devise
+    # controllers:
+    #
+    #     namespace :publisher do
+    #       devise_for :account
+    #     end
+    #
+    # The snippet above will use publisher/sessions controller instead of devise/sessions
+    # controller. You can revert this change or configure it directly by passing the :module
+    # option described below to +devise_for+.
+    #
+    # Also note that when you use a namespace it will affect all the helpers and methods
+    # for controllers and views. For example, using the above setup you'll end with
+    # following methods: current_publisher_account, authenticate_publisher_account!,
+    # publisher_account_signed_in, etc.
+    #
+    # The only aspect not affect by the router configuration is the model name. The
+    # model name can be explicitly set via the :class_name option.
+    #
    # ==== Options
    #
    # You can configure your routes with some options:
@@ -80,8 +102,11 @@ module ActionDispatch::Routing
    #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
    #    :password, :confirmation, :unlock.
    #
-    #      devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout',
-    #        :password => 'secret', :confirmation => 'verification', registration: 'register }
+    #      devise_for :users, path_names: {
+    #        sign_in: 'login', sign_out: 'logout',
+    #        password: 'secret', confirmation: 'verification',
+    #        registration: 'register', edit: 'edit/profile'
+    #      }
    #
    #  * :controllers => the controller which should be used. All routes by default points to Devise controllers.
    #    However, if you want them to point to custom controller, you should do:
@@ -104,20 +129,6 @@ module ActionDispatch::Routing
    #
    #      devise_for :users, :module => "users"
    #
-    #    Notice that whenever you use namespace in the router DSL, it automatically sets the module.
-    #    So the following setup:
-    #
-    #      namespace :publisher do
-    #        devise_for :account
-    #      end
-    #
-    #    Will use publisher/sessions controller instead of devise/sessions controller. You can revert
-    #    this by providing the :module option to devise_for.
-    #
-    #    Also pay attention that when you use a namespace it will affect all the helpers and methods for controllers
-    #    and views. For example, using the above setup you'll end with following methods:
-    #    current_publisher_account, authenticate_publisher_account!, publisher_account_signed_in, etc.
-    #
    #  * :skip => tell which controller you want to skip routes from being created:
    #
    #      devise_for :users, :skip => :sessions
@@ -221,6 +232,14 @@ module ActionDispatch::Routing
          raise_no_devise_method_error!(mapping.class_name)
        end

+        if options[:controllers] && options[:controllers][:omniauth_callbacks]
+          unless mapping.omniauthable?
+            msg =  "Mapping omniauth_callbacks on a resource that is not omniauthable\n"
+            msg << "Please add `devise :omniauthable` to the `#{mapping.class_name}` model"
+            raise msg
+          end
+        end
+
        routes  = mapping.used_routes

        devise_scope mapping.name do
@@ -362,6 +381,7 @@ module ActionDispatch::Routing
      def devise_registration(mapping, controllers) #:nodoc:
        path_names = {
          :new => mapping.path_names[:sign_up],
+          :edit => mapping.path_names[:edit],
          :cancel => mapping.path_names[:cancel]
        }

@@ -378,8 +398,29 @@ module ActionDispatch::Routing
      end

      def devise_omniauth_callback(mapping, controllers) #:nodoc:
+        if mapping.fullpath =~ /:[a-zA-Z_]/
+          raise <<-ERROR
+Devise does not support scoping omniauth callbacks under a dynamic segment
+and you have set #{mapping.fullpath.inspect}. You can work around by passing
+`skip: :omniauth_callbacks` and manually defining the routes. Here is an example:
+
+    match "/users/auth/:provider",
+      :constraints => { :provider => /google|facebook/ },
+      :to => "devise/omniauth_callbacks#passthru",
+      :as => :omniauth_authorize,
+      :via => [:get, :post]
+
+    match "/users/auth/:action/callback",
+      :constraints => { :action => /google|facebook/ },
+      :to => "devise/omniauth_callbacks",
+      :as => :omniauth_callback,
+      :via => [:get, :post]
+ERROR
+        end
+
        path, @scope[:path] = @scope[:path], nil
-        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.path}/auth".squeeze("/")
+        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.fullpath}/auth".squeeze("/")
+
        set_omniauth_path_prefix!(path_prefix)

        providers = Regexp.union(mapping.to.omniauth_providers.map(&:to_s))
@@ -442,6 +483,7 @@ Devise.secret_key was not set. Please add the following to your Devise initializ

  config.secret_key = '#{SecureRandom.hex(64)}'

+Please ensure you restarted your application after installing Devise or setting the key.
 ERROR
      end

--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -49,7 +49,7 @@ module Devise
        valid_params? && Devise::TRUE_VALUES.include?(params_auth_hash[:remember_me])
      end

-      # Check if this is strategy is valid for http authentication by:
+      # Check if this is a valid strategy for http authentication by:
      #
      #   * Validating if the model allows params authentication;
      #   * If any of the authorization headers were sent;
@@ -59,7 +59,7 @@ module Devise
        http_authenticatable? && request.authorization && with_authentication_hash(:http_auth, http_auth_hash)
      end

-      # Check if this is strategy is valid for params authentication by:
+      # Check if this is a valid strategy for params authentication by:
      #
      #   * Validating if the model allows params authentication;
      #   * If the request hits the sessions controller through POST;
@@ -102,9 +102,9 @@ module Devise
        params_auth_hash.is_a?(Hash)
      end

-      # Check if password is present and is not equal to "X" (default value for token).
+      # Check if password is present.
      def valid_password?
-        password.present? && password != "X"
+        password.present?
      end

      # Helper to decode credentials from HTTP.
--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -17,4 +17,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -2,16 +2,19 @@ require 'devise/strategies/authenticatable'

 module Devise
  module Strategies
-    # Default strategy for signing in a user, based on his email and password in the database.
+    # Default strategy for signing in a user, based on their email and password in the database.
    class DatabaseAuthenticatable < Authenticatable
      def authenticate!
-        resource = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
-        return fail(:not_found_in_database) unless resource
+        resource  = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
+        encrypted = false

-        if validate(resource){ resource.valid_password?(password) }
+        if validate(resource){ encrypted = true; resource.valid_password?(password) }
          resource.after_database_authentication
          success!(resource)
        end
+
+        mapping.to.new.password = password if !encrypted && Devise.paranoid
+        fail(:not_found_in_database) unless resource
      end
    end
  end
--- a/lib/devise/strategies/token_authenticatable.rb
+++ b/lib/devise/strategies/token_authenticatable.rb
@@ -1,91 +0,0 @@
-require 'devise/strategies/base'
-
-module Devise
-  module Strategies
-    # Strategy for signing in a user, based on a authenticatable token. This works for both params
-    # and http. For the former, all you need to do is to pass the params in the URL:
-    #
-    #   http://myapp.example.com/?user_token=SECRET
-    #
-    # For headers, you can use basic authentication passing the token as username and
-    # blank password. Since some clients may require a password, you can pass "X" as
-    # password and it will simply be ignored.
-    #
-    # You may also pass the token using the Token authentication mechanism provided
-    # by Rails: http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
-    # The token options are stored in request.env['devise.token_options']
-    class TokenAuthenticatable < Authenticatable
-      def store?
-        super && !mapping.to.skip_session_storage.include?(:token_auth)
-      end
-
-      def valid?
-        super || valid_for_token_auth?
-      end
-
-      def authenticate!
-        resource = mapping.to.find_for_token_authentication(authentication_hash)
-        return fail(:invalid_token) unless resource
-
-        if validate(resource)
-          resource.after_token_authentication
-          success!(resource)
-        end
-      end
-
-    private
-
-      # Token Authenticatable can be authenticated with params in any controller and any verb.
-      def valid_params_request?
-        true
-      end
-
-      # Do not use remember_me behavior with token.
-      def remember_me?
-        false
-      end
-
-      # Check if the model accepts this strategy as token authenticatable.
-      def token_authenticatable?
-        mapping.to.http_authenticatable?(:token_options)
-      end
-
-      # Check if this is strategy is valid for token authentication by:
-      #
-      #   * Validating if the model allows http token authentication;
-      #   * If the http auth token exists;
-      #   * If all authentication keys are present;
-      #
-      def valid_for_token_auth?
-        token_authenticatable? && auth_token.present? && with_authentication_hash(:token_auth, token_auth_hash)
-      end
-
-      # Extract the auth token from the request
-      def auth_token
-        @auth_token ||= ActionController::HttpAuthentication::Token.token_and_options(request)
-      end
-
-      # Extract a hash with attributes:values from the auth_token
-      def token_auth_hash
-        request.env['devise.token_options'] = auth_token.last
-        { authentication_keys.first => auth_token.first }
-      end
-
-      # Try both scoped and non scoped keys
-      def params_auth_hash
-        if params[scope].kind_of?(Hash) && params[scope].has_key?(authentication_keys.first)
-          params[scope]
-        else
-          params
-        end
-      end
-
-      # Overwrite authentication keys to use token_authentication_key.
-      def authentication_keys
-        @authentication_keys ||= [mapping.to.token_authentication_key]
-      end
-    end
-  end
-end
-
-Warden::Strategies.add(:token_authenticatable, Devise::Strategies::TokenAuthenticatable)
--- a/lib/devise/test_helpers.rb
+++ b/lib/devise/test_helpers.rb
@@ -108,6 +108,7 @@ module Devise
        Warden::Manager._run_callbacks(:before_failure, env, options)

        status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
+        @controller.response.headers.merge!(headers)
        @controller.send :render, :status => status, :text => response.body,
          :content_type => headers["Content-Type"], :location => headers["Location"]
        nil # causes process return @response
--- a/lib/devise/time_inflector.rb
+++ b/lib/devise/time_inflector.rb
@@ -11,4 +11,4 @@ module Devise

    @instance = new
  end
-end
+end
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "3.1.0".freeze
+  VERSION = "3.2.3".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -11,9 +11,9 @@ module ActiveRecord

      def copy_devise_migration
        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}"
+          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}.rb"
        else
-          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
+          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}.rb"
        end
      end

--- a/lib/generators/devise/devise_generator.rb
+++ b/lib/generators/devise/devise_generator.rb
@@ -1,3 +1,5 @@
+require 'rails/generators/named_base'
+
 module Devise
  module Generators
    class DeviseGenerator < Rails::Generators::NamedBase
--- a/lib/generators/devise/install_generator.rb
+++ b/lib/generators/devise/install_generator.rb
@@ -1,3 +1,4 @@
+require 'rails/generators/base'
 require 'securerandom'

 module Devise
@@ -19,6 +20,10 @@ module Devise
      def show_readme
        readme "README" if behavior == :invoke
      end
+
+      def rails_4?
+        Rails::VERSION::MAJOR == 4
+      end
    end
  end
 end
--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -1,3 +1,5 @@
+require 'rails/generators/base'
+
 module Devise
  module Generators
    # Include this module in your generator to generate Devise views.
--- a/lib/generators/mongoid/devise_generator.rb
+++ b/lib/generators/mongoid/devise_generator.rb
@@ -1,3 +1,4 @@
+require 'rails/generators/named_base'
 require 'generators/devise/orm_helpers'

 module Mongoid
@@ -47,9 +48,6 @@ module Mongoid
  # field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
  # field :locked_at,       :type => Time
-
-  ## Token authenticatable
-  # field :authentication_token, :type => String
 RUBY
      end
    end
--- a/lib/generators/templates/README
+++ b/lib/generators/templates/README
@@ -2,8 +2,8 @@

 Some setup you must do manually if you haven't yet:

-  1. Ensure you have defined default url options in your environments files. Here 
-     is an example of default_url_options appropriate for a development environment 
+  1. Ensure you have defined default url options in your environments files. Here
+     is an example of default_url_options appropriate for a development environment
     in config/environments/development.rb:

       config.action_mailer.default_url_options = { :host => 'localhost:3000' }
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -4,7 +4,11 @@ Devise.setup do |config|
  # The secret key used by Devise. Devise uses this key to generate
  # random tokens. Changing this key will render invalid all existing
  # confirmation, reset password and unlock tokens in the database.
+<% if  rails_4? -%>
+  # config.secret_key = '<%= SecureRandom.hex(64) %>'
+<% else -%>
  config.secret_key = '<%= SecureRandom.hex(64) %>'
+<% end -%>

  # ==> Mailer Configuration
  # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -56,12 +60,9 @@ Devise.setup do |config|

  # Tell if authentication through HTTP Auth is enabled. False by default.
  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication. The supported strategies are:
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
  # :database      = Support basic authentication with authentication key + password
-  # :token         = Support basic authentication with token authentication key
-  # :token_options = Support token authentication with options as defined in
-  #                  http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
  # config.http_authenticatable = false

  # If http headers should be returned for AJAX requests. True by default.
@@ -76,7 +77,7 @@ Devise.setup do |config|
  # config.paranoid = true

  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
+  # particular strategies by setting this option.
  # Notice that if you are skipping storage for all authentication paths, you
  # may want to disable generating routes to Devise's sessions controller by
  # passing :skip => :sessions to `devise_for` in your config/routes.rb
@@ -102,10 +103,10 @@ Devise.setup do |config|

  # ==> Configuration for :confirmable
  # 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,
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their 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.
+  # the user cannot access the website without confirming their account.
  # config.allow_unconfirmed_access_for = 2.days

  # A period that the user is allowed to confirm their account before their
@@ -137,7 +138,7 @@ Devise.setup do |config|
  # config.rememberable_options = {}

  # ==> Configuration for :validatable
-  # Range for password length. Default is 8..128.
+  # Range for password length.
  config.password_length = 8..128

  # Email regex used to validate email formats. It simply asserts that
@@ -176,6 +177,9 @@ Devise.setup do |config|
  # Time interval to unlock the account if :time is enabled as unlock_strategy.
  # config.unlock_in = 1.hour

+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = false
+
  # ==> Configuration for :recoverable
  #
  # Defines which key will be used when recovering the password for an account
@@ -196,10 +200,6 @@ Devise.setup do |config|
  # Require the `devise-encryptable` gem when using anything other than bcrypt
  # config.encryptor = :sha512

-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
  # ==> Scopes configuration
  # Turn scoped views on. Before rendering "sessions/new", it will first check for
  # "users/sessions/new". It's turned off by default because it's slower if you
--- a/lib/generators/templates/markerb/confirmation_instructions.markerb
+++ b/lib/generators/templates/markerb/confirmation_instructions.markerb
@@ -2,4 +2,4 @@ Welcome <%= @email %>!

 You can confirm your account through the link below:

-<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %>
--- a/lib/generators/templates/markerb/reset_password_instructions.markerb
+++ b/lib/generators/templates/markerb/reset_password_instructions.markerb
@@ -2,7 +2,7 @@ Hello <%= @resource.email %>!

 Someone has requested a link to change your password, and you can do this through the link below.

-<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>

 If you didn't request this, please ignore this email.
 Your password won't change until you access the link above and create a new one.
--- a/lib/generators/templates/markerb/unlock_instructions.markerb
+++ b/lib/generators/templates/markerb/unlock_instructions.markerb
@@ -4,4 +4,4 @@ Your account has been locked due to an excessive number of unsuccessful sign in

 Click the link below to unlock your account:

-<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>
+<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>
--- a/test/controllers/helpers_test.rb
+++ b/test/controllers/helpers_test.rb
@@ -187,6 +187,29 @@ class ControllerAuthenticatableTest < ActionController::TestCase
    assert_nil @controller.session[:"user_return_to"]
  end

+  test 'store location for stores a location to redirect back to' do
+    assert_nil @controller.stored_location_for(:user)
+    @controller.store_location_for(:user, "/foo.bar")
+    assert_equal "/foo.bar", @controller.stored_location_for(:user)
+  end
+
+  test 'store location for accepts a resource as argument' do
+    @controller.store_location_for(User.new, "/foo.bar")
+    assert_equal "/foo.bar", @controller.stored_location_for(User.new)
+  end
+
+  test 'store location for stores paths' do
+    @controller.store_location_for(:user, "//host/foo.bar")
+    assert_equal "/foo.bar", @controller.stored_location_for(:user)
+    @controller.store_location_for(:user, "///foo.bar")
+    assert_equal "/foo.bar", @controller.stored_location_for(:user)
+  end
+
+  test 'store location for stores query string' do
+    @controller.store_location_for(:user, "/foo?bar=baz")
+    assert_equal "/foo?bar=baz", @controller.stored_location_for(:user)
+  end
+
  test 'after sign in path defaults to root path if none by was specified for the given scope' do
    assert_equal root_path, @controller.after_sign_in_path_for(:user)
  end
--- a/test/controllers/internal_helpers_test.rb
+++ b/test/controllers/internal_helpers_test.rb
@@ -55,7 +55,7 @@ class HelpersTest < ActionController::TestCase
  end

  test 'require no authentication tests current mapping' do
-    @mock_warden.expects(:authenticate?).with(:rememberable, :token_authenticatable, :scope => :user).returns(true)
+    @mock_warden.expects(:authenticate?).with(:rememberable, :scope => :user).returns(true)
    @mock_warden.expects(:user).with(:user).returns(User.new)
    @controller.expects(:redirect_to).with(root_path)
    @controller.send :require_no_authentication
@@ -71,7 +71,7 @@ class HelpersTest < ActionController::TestCase
  end

  test 'require no authentication sets a flash message' do
-    @mock_warden.expects(:authenticate?).with(:rememberable, :token_authenticatable, :scope => :user).returns(true)
+    @mock_warden.expects(:authenticate?).with(:rememberable, :scope => :user).returns(true)
    @mock_warden.expects(:user).with(:user).returns(User.new)
    @controller.expects(:redirect_to).with(root_path)
    @controller.send :require_no_authentication
@@ -113,8 +113,11 @@ class HelpersTest < ActionController::TestCase

  test 'navigational_formats not returning a wild card' do
    MyController.send(:public, :navigational_formats)
-    Devise.navigational_formats = [:"*/*", :html]
-    assert_not @controller.navigational_formats.include?(:"*/*")
+
+    swap Devise, :navigational_formats => ['*/*', :html] do
+      assert_not @controller.navigational_formats.include?("*/*")
+    end
+
    MyController.send(:protected, :navigational_formats)
  end
 end
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -5,17 +5,21 @@ class SessionsControllerTest < ActionController::TestCase
  include Devise::TestHelpers

  test "#create doesn't raise unpermitted params when sign in fails" do
-    ActiveSupport::Notifications.subscribe /unpermitted_parameters/ do |name, start, finish, id, payload|
-      flunk "Unpermitted params: #{payload}"
+    begin
+      subscriber = ActiveSupport::Notifications.subscribe /unpermitted_parameters/ do |name, start, finish, id, payload|
+        flunk "Unpermitted params: #{payload}"
+      end
+      request.env["devise.mapping"] = Devise.mappings[:user]
+      request.session["user_return_to"] = 'foo.bar'
+      create_user
+      post :create, :user => {
+        :email => "wrong@email.com",
+        :password => "wrongpassword"
+      }
+      assert_equal 200, @response.status
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
    end
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    request.session["user_return_to"] = 'foo.bar'
-    user = create_user
-    post :create, :user => {
-      :email => "wrong@email.com",
-      :password => "wrongpassword"
-    }
-    assert_equal 200, @response.status
  end

  test "#create works even with scoped views" do
--- a/test/devise_test.rb
+++ b/test/devise_test.rb
@@ -11,6 +11,17 @@ module Devise
 end

 class DeviseTest < ActiveSupport::TestCase
+  test 'bcrypt on the class' do
+    password = "super secret"
+    klass    = Struct.new(:pepper, :stretches).new("blahblah", 2)
+    hash     = Devise.bcrypt(klass, password)
+    assert_equal ::BCrypt::Password.create(hash), hash
+
+    klass    = Struct.new(:pepper, :stretches).new("bla", 2)
+    hash     = Devise.bcrypt(klass, password)
+    assert_not_equal ::BCrypt::Password.new(hash), hash
+  end
+
  test 'model options can be configured through Devise' do
    swap Devise, :allow_unconfirmed_access_for => 113, :pepper => "foo" do
      assert_equal 113, Devise.allow_unconfirmed_access_for
@@ -59,7 +70,7 @@ class DeviseTest < ActiveSupport::TestCase
    Devise::ALL.delete(:kivi)
    Devise::CONTROLLERS.delete(:kivi)
  end
-  
+
  test 'should complain when comparing empty or different sized passes' do
    [nil, ""].each do |empty|
      assert_not Devise.secure_compare(empty, "something")
--- a/test/failure_app_test.rb
+++ b/test/failure_app_test.rb
@@ -8,6 +8,12 @@ class FailureTest < ActiveSupport::TestCase
    end
  end

+  class FailureWithI18nOptions < Devise::FailureApp
+    def i18n_options(options)
+      options.merge(:name => 'Steve')
+    end
+  end
+
  def self.context(name, &block)
    instance_eval(&block)
  end
@@ -67,6 +73,11 @@ class FailureTest < ActiveSupport::TestCase
      assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
    end

+    test 'uses custom i18n options' do
+      call_failure('warden' => OpenStruct.new(:message => :does_not_exist), :app => FailureWithI18nOptions)
+      assert_equal 'User Steve does not exist', @request.flash[:alert]
+    end
+
    test 'uses the proxy failure message as string' do
      call_failure('warden' => OpenStruct.new(:message => 'Hello world'))
      assert_equal 'Hello world', @request.flash[:alert]
--- a/test/generators/mongoid_generator_test.rb
+++ b/test/generators/mongoid_generator_test.rb
@@ -7,12 +7,12 @@ if DEVISE_ORM == :mongoid
    tests Mongoid::Generators::DeviseGenerator
    destination File.expand_path("../../tmp", __FILE__)
    setup :prepare_destination
-  
+
    test "all files are properly created" do
      run_generator %w(monster)
      assert_file "app/models/monster.rb", /devise/
    end
-  
+
    test "all files are properly deleted" do
      run_generator %w(monster)
      run_generator %w(monster), :behavior => :revoke
--- a/test/integration/confirmable_test.rb
+++ b/test/integration/confirmable_test.rb
@@ -56,24 +56,12 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
      assert_not user.confirmed?
      visit_user_confirmation_with_token(user.raw_confirmation_token)

-      assert_contain 'Your account was successfully confirmed. Please sign in.'
+      assert_contain 'Your account was successfully confirmed.'
      assert_current_url '/users/sign_in'
      assert user.reload.confirmed?
    end
  end

-  test 'user should be signed in after confirmation if allow_insecure_sign_in_after_confirmation is enabled' do
-    swap Devise, :confirm_within => 3.days, :allow_insecure_sign_in_after_confirmation => true do
-      user = create_user(:confirm => false, :confirmation_sent_at => 2.days.ago)
-      assert_not user.confirmed?
-      visit_user_confirmation_with_token(user.raw_confirmation_token)
-
-      assert_contain 'Your account was successfully confirmed. You are now signed in.'
-      assert_current_url root_url
-      assert user.reload.confirmed?
-    end
-  end
-
  test 'user should be redirected to a custom path after confirmation' do
    Devise::ConfirmationsController.any_instance.stubs(:after_confirmation_path_for).returns("/?custom=1")

@@ -135,6 +123,16 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
    end
  end

+  test 'unconfirmed but signed in user should be redirected to their root path' do
+    swap Devise, :allow_unconfirmed_access_for => 1.day do
+      user = sign_in_as_user(:confirm => false)
+
+      visit_user_confirmation_with_token(user.raw_confirmation_token)
+      assert_contain 'Your account was successfully confirmed.'
+      assert_current_url '/'
+    end
+  end
+
  test 'error message is configurable by resource name' do
    store_translations :en, :devise => {
      :failure => { :user => { :unconfirmed => "Not confirmed user" } }
--- a/test/integration/http_authenticatable_test.rb
+++ b/test/integration/http_authenticatable_test.rb
@@ -88,16 +88,6 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
    end
  end

-  test 'sign in should authenticate with really long token' do
-    token = "token_containing_so_many_characters_that_the_base64_encoding_will_wrap"
-    user = create_user
-    user.update_attribute :authentication_token, token
-    get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{token}:x")}"
-    assert_response :success
-    assert_match "<email>user@test.com</email>", response.body
-    assert warden.authenticated?(:user)
-  end
-
  private

    def sign_in_as_new_user_with_http(username="user@test.com", password="12345678")
--- a/test/integration/recoverable_test.rb
+++ b/test/integration/recoverable_test.rb
@@ -39,7 +39,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    end

    assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
  end

  test 'reset password with email should send an email from a custom mailer' do
@@ -78,7 +78,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    end

    assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
  end

  test 'reset password with email with extra whitespace should fail when email is NOT the list of strip whitespace keys' do
@@ -111,7 +111,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    request_forgot_password

    assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
  end

  test 'not authenticated user with invalid email should receive an error message' do
@@ -139,7 +139,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    assert_redirected_to "/users/sign_in"
  end

-  test 'not authenticated user with invalid reset password token should not be able to change his password' do
+  test 'not authenticated user with invalid reset password token should not be able to change their password' do
    user = create_user
    reset_password :reset_password_token => 'invalid_reset_password'

@@ -150,7 +150,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    assert_not user.reload.valid_password?('987654321')
  end

-  test 'not authenticated user with valid reset password token but invalid password should not be able to change his password' do
+  test 'not authenticated user with valid reset password token but invalid password should not be able to change their password' do
    user = create_user
    request_forgot_password
    reset_password do
@@ -165,7 +165,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    assert_not user.reload.valid_password?('987654321')
  end

-  test 'not authenticated user with valid data should be able to change his password' do
+  test 'not authenticated user with valid data should be able to change their password' do
    user = create_user
    request_forgot_password
    reset_password
@@ -175,7 +175,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
    assert user.reload.valid_password?('987654321')
  end

-  test 'after entering invalid data user should still be able to change his password' do
+  test 'after entering invalid data user should still be able to change their password' do
    user = create_user
    request_forgot_password

@@ -190,7 +190,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
  end

  test 'sign in user automatically after changing its password' do
-    user = create_user
+    create_user
    request_forgot_password
    reset_password

@@ -260,7 +260,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
  end

  test 'change password with valid parameters in XML format should return valid response' do
-    user = create_user
+    create_user
    request_forgot_password
    put user_password_path(:format => 'xml'), :user => {
      :reset_password_token => 'abcdef', :password => '987654321', :password_confirmation => '987654321'
--- a/test/integration/registerable_test.rb
+++ b/test/integration/registerable_test.rb
@@ -140,7 +140,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert_redirected_to root_path
  end

-  test 'a signed in user should be able to edit his account' do
+  test 'a signed in user should be able to edit their account' do
    sign_in_as_user
    get edit_user_registration_path

@@ -154,7 +154,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert_equal "user.new@example.com", User.first.email
  end

-  test 'a signed in user should still be able to use the website after changing his password' do
+  test 'a signed in user should still be able to use the website after changing their password' do
    sign_in_as_user
    get edit_user_registration_path

@@ -168,7 +168,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert warden.authenticated?(:user)
  end

-  test 'a signed in user should not change his current user with invalid password' do
+  test 'a signed in user should not change their current user with invalid password' do
    sign_in_as_user
    get edit_user_registration_path

@@ -183,7 +183,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert_equal "user@test.com", User.first.email
  end

-  test 'a signed in user should be able to edit his password' do
+  test 'a signed in user should be able to edit their password' do
    sign_in_as_user
    get edit_user_registration_path

@@ -198,7 +198,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert User.first.valid_password?('pass1234')
  end

-  test 'a signed in user should not be able to edit his password with invalid confirmation' do
+  test 'a signed in user should not be able to edit their password with invalid confirmation' do
    sign_in_as_user
    get edit_user_registration_path

@@ -212,7 +212,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert_not User.first.valid_password?('pas123')
  end

-  test 'a signed in user should be able to cancel his account' do
+  test 'a signed in user should be able to cancel their account' do
    sign_in_as_user
    get edit_user_registration_path

@@ -286,7 +286,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
    assert_equal user.reload.email, 'user@test.com'
  end

-  test 'a user cancel his account in XML format should return valid response' do
+  test 'a user cancel their account in XML format should return valid response' do
    sign_in_as_user
    delete user_registration_path(:format => 'xml')
    assert_response :success
@@ -295,7 +295,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
 end

 class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
-  test 'a signed in admin should see a more appropriate flash message when editing his account if reconfirmable is enabled' do
+  test 'a signed in admin should see a more appropriate flash message when editing their account if reconfirmable is enabled' do
    sign_in_as_admin
    get edit_admin_registration_path

@@ -326,7 +326,7 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
    assert Admin.first.valid_password?('pas123')
  end

-  test 'a signed in admin should not see a reconfirmation message if he did not change his email, despite having an unconfirmed email' do
+  test 'a signed in admin should not see a reconfirmation message if they did not change their email, despite having an unconfirmed email' do
    sign_in_as_admin

    get edit_admin_registration_path
--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -25,7 +25,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
    Time.parse(expires).utc
  end

-  test 'do not remember the user if he has not checked remember me option' do
+  test 'do not remember the user if they have not checked remember me option' do
    sign_in_as_user
    assert_nil request.cookies["remember_user_cookie"]
  end
@@ -64,14 +64,14 @@ class RememberMeTest < ActionDispatch::IntegrationTest
    # since we changed the domain. This is the only difference with the
    # previous test.
    swap Devise, :rememberable_options => { :domain => "omg.somewhere.com" } do
-      user = sign_in_as_user :remember_me => true
+      sign_in_as_user :remember_me => true
      assert_nil request.cookies["remember_user_token"]
    end
  end

  test 'generate remember token with a custom key' do
    swap Devise, :rememberable_options => { :key => "v1lat_token" } do
-      user = sign_in_as_user :remember_me => true
+      sign_in_as_user :remember_me => true
      assert request.cookies["v1lat_token"]
    end
  end
@@ -79,7 +79,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
  test 'generate remember token after sign in setting session options' do
    begin
      Rails.configuration.session_options[:domain] = "omg.somewhere.com"
-      user = sign_in_as_user :remember_me => true
+      sign_in_as_user :remember_me => true
      assert_nil request.cookies["remember_user_token"]
    ensure
      Rails.configuration.session_options.delete(:domain)
@@ -95,7 +95,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
    assert_match /remember_user_token[^\n]*HttpOnly/, response.headers["Set-Cookie"], "Expected Set-Cookie header in response to set HttpOnly flag on remember_user_token cookie."
  end

-  test 'remember the user before sign up and redirect him to his home' do
+  test 'remember the user before sign up and redirect them to their home' do
    create_user_and_remember
    get new_user_registration_path
    assert warden.authenticated?(:user)
--- a/test/integration/timeoutable_test.rb
+++ b/test/integration/timeoutable_test.rb
@@ -35,14 +35,33 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
    assert warden.authenticated?(:user)
  end

-  test 'time out user session after default limit time' do
-    user = sign_in_as_user
-    get expire_user_path(user)
-    assert_not_nil last_request_at
+  test 'time out user session after default limit time when sign_out_all_scopes is false' do
+    swap Devise, sign_out_all_scopes: false do
+      sign_in_as_admin

-    get users_path
-    assert_redirected_to users_path
-    assert_not warden.authenticated?(:user)
+      user = sign_in_as_user
+      get expire_user_path(user)
+      assert_not_nil last_request_at
+
+      get users_path
+      assert_redirected_to users_path
+      assert_not warden.authenticated?(:user)
+      assert warden.authenticated?(:admin)
+    end
+  end
+
+  test 'time out all sessions after default limit time when sign_out_all_scopes is true' do
+    swap Devise, sign_out_all_scopes: true do
+      sign_in_as_admin
+
+      user = sign_in_as_user
+      get expire_user_path(user)
+      assert_not_nil last_request_at
+
+      get root_path
+      assert_not warden.authenticated?(:user)
+      assert_not warden.authenticated?(:admin)
+    end
  end

  test 'time out user session after deault limit time and redirect to latest get request' do
@@ -67,6 +86,20 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
    assert_contain 'Signed out successfully'
  end

+  test 'expired session is not extended by sign in page' do
+    user = sign_in_as_user
+    get expire_user_path(user)
+    assert warden.authenticated?(:user)
+
+    get "/users/sign_in"
+    assert_redirected_to "/users/sign_in"
+    follow_redirect!
+
+    assert_response :success
+    assert_contain 'Sign in'
+    assert_not warden.authenticated?(:user)
+  end
+
  test 'time out is not triggered on sign in' do
    user = sign_in_as_user
    get expire_user_path(user)
--- a/test/integration/token_authenticatable_test.rb
+++ b/test/integration/token_authenticatable_test.rb
@@ -1,205 +0,0 @@
-require 'test_helper'
-
-class TokenAuthenticationTest < ActionDispatch::IntegrationTest
-
-  test 'authenticate with valid authentication token key and value through params' do
-    swap Devise, :token_authentication_key => :secret_token do
-      sign_in_as_new_user_with_token
-
-      assert_response :success
-      assert_current_url "/users?secret_token=#{VALID_AUTHENTICATION_TOKEN}"
-      assert_contain 'Welcome'
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through params, when params with the same key as scope exist' do
-    swap Devise, :token_authentication_key => :secret_token do
-      user = create_user_with_authentication_token
-      post exhibit_user_path(user), Devise.token_authentication_key => user.authentication_token, :user => { :some => "data" }
-
-      assert_response :success
-      assert_contain 'User is authenticated'
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key but does not store if stateless' do
-    swap Devise, :token_authentication_key => :secret_token, :skip_session_storage => [:token_auth] do
-      sign_in_as_new_user_with_token
-      assert warden.authenticated?(:user)
-
-      get users_path
-      assert_redirected_to new_user_session_path
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http' do
-    swap Devise, :token_authentication_key => :secret_token do
-      sign_in_as_new_user_with_token(:http_auth => true)
-
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'does authenticate with valid authentication token key and value through params if not configured' do
-    swap Devise, :token_authentication_key => :secret_token, :params_authenticatable => [:database] do
-      sign_in_as_new_user_with_token
-
-      assert_contain 'You need to sign in or sign up before continuing'
-      assert_contain 'Sign in'
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'does authenticate with valid authentication token key and value through http if not configured' do
-    swap Devise, :token_authentication_key => :secret_token, :http_authenticatable => [:database] do
-      sign_in_as_new_user_with_token(:http_auth => true)
-
-      assert_response 401
-      assert_contain 'Invalid email or password.'
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'does not authenticate with improper authentication token key' do
-    swap Devise, :token_authentication_key => :donald_duck_token do
-      sign_in_as_new_user_with_token(:auth_token_key => :secret_token)
-      assert_equal new_user_session_path, @request.path
-
-      assert_contain 'You need to sign in or sign up before continuing'
-      assert_contain 'Sign in'
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'does not authenticate with improper authentication token value' do
-    store_translations :en, :devise => {:failure => {:invalid_token => 'LOL, that was not a single character correct.'}} do
-      sign_in_as_new_user_with_token(:auth_token => '*** INVALID TOKEN ***')
-      assert_equal new_user_session_path, @request.path
-
-      assert_contain 'LOL, that was not a single character correct.'
-      assert_contain 'Sign in'
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and do not store if stateless and timeoutable are enabled' do
-    swap Devise, :token_authentication_key => :secret_token, :skip_session_storage => [:token_auth], :timeout_in => (0.1).second do
-      user = sign_in_as_new_user_with_token
-      assert warden.authenticated?(:user)
-
-      # Expiring does not work because we are setting the session value when accessing it
-      sleep 0.3
-
-      get_users_path_as_existing_user(user)
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'should reset token and not authenticate when expire_auth_token_on_timeout is set to true, timeoutable is enabled and we have a timed out session' do
-    swap Devise, :token_authentication_key => :secret_token, :expire_auth_token_on_timeout => true, :timeout_in => (-1).minute do
-      user = sign_in_as_new_user_with_token
-      assert warden.authenticated?(:user)
-      token = user.authentication_token
-
-      get_users_path_as_existing_user(user)
-      assert_not warden.authenticated?(:user)
-      user.reload
-      assert_not_equal token, user.authentication_token
-    end
-  end
-
-  test 'should not be subject to injection' do
-    swap Devise, :token_authentication_key => :secret_token do
-      user1 = create_user_with_authentication_token()
-
-      # Clean up user cache
-      @user = nil
-
-      user2 = create_user_with_authentication_token(:email => "another@test.com")
-      user2.update_attribute(:authentication_token, "ANOTHERTOKEN")
-
-      assert_not_equal user1, user2
-      visit users_path(Devise.token_authentication_key.to_s + '[$ne]' => user1.authentication_token)
-      assert_nil warden.user(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http header' do
-    swap Devise, :token_authentication_key => :secret_token do
-      sign_in_as_new_user_with_token(:token_auth => true)
-
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert_equal request.env['devise.token_options'], {}
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http header, with options' do
-    swap Devise, :token_authentication_key => :secret_token, :http_authenticatable => [:token_options] do
-      signature = "**TESTSIGNATURE**"
-      sign_in_as_new_user_with_token(:token_auth => true, :token_options => {:signature => signature, :nonce => 'def'})
-
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert_equal request.env['devise.token_options'][:signature], signature
-      assert_equal request.env['devise.token_options'][:nonce], 'def'
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http header without allowing token authorization setting is denied' do
-    swap Devise, :token_authentication_key => :secret_token, :http_authenticatable => false do
-      sign_in_as_new_user_with_token(:token_auth => true)
-
-      assert_response :unauthorized
-      assert_nil warden.user(:user)
-    end
-  end
-
-  test 'does not authenticate with improper authentication token value in header' do
-    sign_in_as_new_user_with_token(:token_auth => true, :auth_token => '*** INVALID TOKEN ***')
-
-    assert_response :unauthorized
-    assert_nil warden.user(:user)
-  end
-
-  private
-
-    def sign_in_as_new_user_with_token(options = {})
-      user = options.delete(:user) || create_user_with_authentication_token(options)
-
-      options[:auth_token_key] ||= Devise.token_authentication_key
-      options[:auth_token]     ||= user.authentication_token
-
-      if options[:http_auth]
-        header = "Basic #{Base64.encode64("#{VALID_AUTHENTICATION_TOKEN}:X")}"
-        get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => header
-      elsif options[:token_auth]
-        token_options = options[:token_options] || {}
-        header = ActionController::HttpAuthentication::Token.encode_credentials(options[:auth_token], token_options)
-        get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => header
-      else
-        visit users_path(options[:auth_token_key].to_sym => options[:auth_token])
-      end
-
-      user
-    end
-
-    def create_user_with_authentication_token(options={})
-      user = create_user(options)
-      user.authentication_token = VALID_AUTHENTICATION_TOKEN
-      user.save
-      user
-    end
-
-    def get_users_path_as_existing_user(user)
-      sign_in_as_new_user_with_token(:user => user)
-    end
-
-end
--- a/test/integration/trackable_test.rb
+++ b/test/integration/trackable_test.rb
@@ -63,7 +63,7 @@ class TrackableHooksTest < ActionDispatch::IntegrationTest
  end

  test "does not update anything if user has signed out along the way" do
-    swap Devise, :allow_unconfirmed_access_for => 0 do
+    swap Devise, :allow_unconfirmed_access_for => 0.days do
      user = create_user(:confirm => false)
      sign_in_as_user

--- a/test/mapping_test.rb
+++ b/test/mapping_test.rb
@@ -50,12 +50,12 @@ class MappingTest < ActiveSupport::TestCase
  end

  test 'has strategies depending on the model declaration' do
-    assert_equal [:rememberable, :token_authenticatable, :database_authenticatable], Devise.mappings[:user].strategies
+    assert_equal [:rememberable, :database_authenticatable], Devise.mappings[:user].strategies
    assert_equal [:database_authenticatable], Devise.mappings[:admin].strategies
  end

  test 'has no input strategies depending on the model declaration' do
-    assert_equal [:rememberable, :token_authenticatable], Devise.mappings[:user].no_input_strategies
+    assert_equal [:rememberable], Devise.mappings[:user].no_input_strategies
    assert_equal [], Devise.mappings[:admin].no_input_strategies
  end

@@ -110,12 +110,12 @@ class MappingTest < ActiveSupport::TestCase
    assert mapping.lockable?
    assert_not mapping.omniauthable?
  end
-  
+
  test 'find mapping by path' do
    assert_raise RuntimeError do
      Devise::Mapping.find_by_path!('/accounts/facebook/callback')
    end
-    
+
    assert_nothing_raised do
      Devise::Mapping.find_by_path!('/:locale/accounts/login')
    end
@@ -123,5 +123,5 @@ class MappingTest < ActiveSupport::TestCase
    assert_nothing_raised do
      Devise::Mapping.find_by_path!('/accounts/facebook/callback', :path)
    end
-  end  
+  end
 end
--- a/test/models/confirmable_test.rb
+++ b/test/models/confirmable_test.rb
@@ -51,15 +51,6 @@ class ConfirmableTest < ActiveSupport::TestCase
    assert_equal "was already confirmed, please try signing in", user.errors[:email].join
  end

-  test 'DEPRECATED: should find and confirm a user automatically' do
-    swap Devise, allow_insecure_token_lookup: true do
-      user = create_user
-      confirmed_user = User.confirm_by_token(user.confirmation_token)
-      assert_equal confirmed_user, user
-      assert user.reload.confirmed?
-    end
-  end
-
  test 'should find and confirm a user automatically based on the raw token' do
    user = create_user
    raw  = user.raw_confirmation_token
@@ -164,7 +155,7 @@ class ConfirmableTest < ActiveSupport::TestCase
    assert_not_nil user.reload.confirmation_token
  end

-  test 'should not resend email instructions if the user change his email' do
+  test 'should not resend email instructions if the user change their email' do
    user = create_user
    user.email = 'new_test@example.com'
    assert_email_not_sent do
--- a/test/models/database_authenticatable_test.rb
+++ b/test/models/database_authenticatable_test.rb
@@ -24,6 +24,15 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
    assert_equal confirmation.downcase, user.email_confirmation
  end

+  test 'should not mutate value assigned to case insensitive key' do
+    email          = 'Foo@Bar.com'
+    original_email = email.dup
+    user           = new_user(:email => email)
+
+    user.save!
+    assert_equal original_email, email
+  end
+
  test 'should remove whitespace from strip whitespace keys when saving' do
    # strip_whitespace_keys is set to :email by default.
    email = ' foo@bar.com '
@@ -34,6 +43,15 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
    assert_equal email.strip, user.email
  end

+  test 'should not mutate value assigned to string whitespace key' do
+    email          = ' foo@bar.com '
+    original_email = email.dup
+    user           = new_user(:email => email)
+
+    user.save!
+    assert_equal original_email, email
+  end
+
  test "doesn't throw exception when globally configured strip_whitespace_keys are not present on a model" do
    swap Devise, :strip_whitespace_keys => [:fake_key] do
      assert_nothing_raised { create_user }
@@ -75,6 +93,11 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
    assert_present user.encrypted_password
  end

+  test 'should support custom encryption methods' do
+    user = UserWithCustomEncryption.new(:password => '654321')
+    assert_equal user.encrypted_password, '123456'
+  end
+
  test 'allow authenticatable_salt to work even with nil encrypted password' do
    user = User.new
    user.encrypted_password = nil
@@ -203,12 +226,12 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
  end

  test 'downcase_keys with validation' do
-    user = User.create(:email => "HEllO@example.com", :password => "123456")
+    User.create(:email => "HEllO@example.com", :password => "123456")
    user = User.create(:email => "HEllO@example.com", :password => "123456")
    assert !user.valid?
  end

-  test 'required_fiels should be encryptable_password and the email field by default' do
+  test 'required_fields should be encryptable_password and the email field by default' do
    assert_same_content Devise::Models::DatabaseAuthenticatable.required_fields(User), [
      :email,
      :encrypted_password
--- a/test/models/lockable_test.rb
+++ b/test/models/lockable_test.rb
@@ -9,7 +9,7 @@ class LockableTest < ActiveSupport::TestCase
    user = create_user
    user.confirm!
    swap Devise, :maximum_attempts => 2 do
-      3.times { user.valid_for_authentication?{ false } }
+      2.times { user.valid_for_authentication?{ false } }
      assert user.reload.access_locked?
    end
  end
@@ -19,12 +19,12 @@ class LockableTest < ActiveSupport::TestCase
    user.confirm!

    swap Devise, :maximum_attempts => 2 do
-      3.times { user.valid_for_authentication?{ false } }
+      2.times { user.valid_for_authentication?{ false } }
      assert user.reload.access_locked?
    end

    user.valid_for_authentication?{ true }
-    assert_equal 4, user.reload.failed_attempts
+    assert_equal 3, user.reload.failed_attempts
  end

  test "should not touch failed_attempts if lock_strategy is none" do
@@ -130,6 +130,24 @@ class LockableTest < ActiveSupport::TestCase
    end
  end

+  test "doesn't send email when you pass option send_instructions to false" do
+    swap Devise, :unlock_strategy => :email do
+      user = create_user
+      assert_email_not_sent do
+        user.lock_access! send_instructions: false
+      end
+    end
+  end
+
+  test "sends email when you pass options other than send_instructions" do
+    swap Devise, :unlock_strategy => :email do
+      user = create_user
+      assert_email_sent do
+        user.lock_access! foo: :bar, bar: :foo
+      end
+    end
+  end
+
  test "should not send email with unlock instructions when :email is not an unlock strategy" do
    swap Devise, :unlock_strategy => :time do
      user = create_user
@@ -139,16 +157,6 @@ class LockableTest < ActiveSupport::TestCase
    end
  end

-  test 'DEPRECATED: should find and unlock a user automatically' do
-    swap Devise, allow_insecure_token_lookup: true do
-      user = create_user
-      user.lock_access!
-      locked_user = User.unlock_access_by_token(user.unlock_token)
-      assert_equal locked_user, user
-      assert_not user.reload.access_locked?
-    end
-  end
-
  test 'should find and unlock a user automatically based on raw token' do
    user = create_user
    raw  = user.send_unlock_instructions
@@ -289,4 +297,20 @@ class LockableTest < ActiveSupport::TestCase
      assert_equal :invalid, user.unauthenticated_message
    end
  end
+
+  test 'should return last attempt message if user made next-to-last attempt of password entering' do
+    swap Devise, :last_attempt_warning => :true do
+      swap Devise, :lock_strategy => :failed_attempts do
+        user = create_user
+        user.failed_attempts = Devise.maximum_attempts - 2
+        assert_equal :invalid, user.unauthenticated_message
+
+        user.failed_attempts = Devise.maximum_attempts - 1
+        assert_equal :last_attempt, user.unauthenticated_message
+
+        user.failed_attempts = Devise.maximum_attempts
+        assert_equal :locked, user.unauthenticated_message
+      end
+    end
+  end
 end
--- a/test/models/recoverable_test.rb
+++ b/test/models/recoverable_test.rb
@@ -101,24 +101,14 @@ class RecoverableTest < ActiveSupport::TestCase
    assert_not_equal token, user.reload.reset_password_token
  end

-  test 'should send email instructions to the user reset his password' do
+  test 'should send email instructions to the user reset their password' do
    user = create_user
    assert_email_sent do
      User.send_reset_password_instructions(:email => user.email)
    end
  end

-  test 'DEPRECATED: should find a user to reset his password based on reset_password_token' do
-    swap Devise, allow_insecure_token_lookup: true do
-      user = create_user
-      user.send_reset_password_instructions
-
-      reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token)
-      assert_equal reset_password_user, user
-    end
-  end
-
-  test 'should find a user to reset his password based on the raw token' do
+  test 'should find a user to reset their password based on the raw token' do
    user = create_user
    raw  = user.send_reset_password_instructions

@@ -190,5 +180,5 @@ class RecoverableTest < ActiveSupport::TestCase
      :reset_password_sent_at,
      :reset_password_token
    ]
-  end  
+  end
 end
--- a/test/models/token_authenticatable_test.rb
+++ b/test/models/token_authenticatable_test.rb
@@ -1,55 +0,0 @@
-require 'test_helper'
-
-class TokenAuthenticatableTest < ActiveSupport::TestCase
-
-  test 'should reset authentication token' do
-    user = new_user
-    user.reset_authentication_token
-    previous_token = user.authentication_token
-    user.reset_authentication_token
-    assert_not_equal previous_token, user.authentication_token
-  end
-
-  test 'should ensure authentication token' do
-    user = new_user
-    user.ensure_authentication_token
-    previous_token = user.authentication_token
-    user.ensure_authentication_token
-    assert_equal previous_token, user.authentication_token
-  end
-
-  test 'should authenticate a valid user with authentication token and return it' do
-    user = create_user
-    user.ensure_authentication_token!
-    user.confirm!
-    authenticated_user = User.find_for_token_authentication(:auth_token => user.authentication_token)
-    assert_equal authenticated_user, user
-  end
-
-  test 'should return nil when authenticating an invalid user by authentication token' do
-    user = create_user
-    user.ensure_authentication_token!
-    user.confirm!
-    authenticated_user = User.find_for_token_authentication(:auth_token => user.authentication_token.reverse)
-    assert_nil authenticated_user
-  end
-
-  test 'should not be subject to injection' do
-    user1 = create_user
-    user1.ensure_authentication_token!
-    user1.confirm!
-
-    user2 = create_user
-    user2.ensure_authentication_token!
-    user2.confirm!
-
-    user = User.find_for_token_authentication(:auth_token => {'$ne' => user1.authentication_token})
-    assert_nil user
-  end
-
-  test 'required_fields should contain the fields that Devise uses' do
-    assert_same_content Devise::Models::TokenAuthenticatable.required_fields(User), [
-      :authentication_token
-    ]
-  end
-end
--- a/test/omniauth/config_test.rb
+++ b/test/omniauth/config_test.rb
@@ -54,4 +54,4 @@ class OmniAuthConfigTest < ActiveSupport::TestCase
    config_class = config.strategy_class
    assert_equal MyStrategy, config_class
  end
-end
+end
--- a/test/orm/mongoid.rb
+++ b/test/orm/mongoid.rb
@@ -1,7 +1,7 @@
 require 'mongoid/version'

 Mongoid.configure do |config|
-  config.connect_to("devise-test-suite")
+  config.load!('test/support/mongoid.yml')
  config.use_utc = true
  config.include_root_in_json = true
 end
--- a/test/parameter_sanitizer_test.rb
+++ b/test/parameter_sanitizer_test.rb
@@ -68,5 +68,14 @@ if defined?(ActionController::StrongParameters)
        sanitizer.sanitize(:unknown)
      end
    end
+
+    test 'passes parameters to filter as arguments to sanitizer' do
+      params = {user: stub}
+      sanitizer = Devise::ParameterSanitizer.new(User, :user, params)
+
+      params[:user].expects(:permit).with(kind_of(Symbol), kind_of(Symbol), kind_of(Symbol))
+
+      sanitizer.sanitize(:sign_in)
+    end
  end
 end
--- a/test/rails_app/app/active_record/shim.rb
+++ b/test/rails_app/app/active_record/shim.rb
@@ -1,2 +1,2 @@
 module Shim
-end
+end
--- a/test/rails_app/app/controllers/admins/sessions_controller.rb
+++ b/test/rails_app/app/controllers/admins/sessions_controller.rb
@@ -3,4 +3,4 @@ class Admins::SessionsController < Devise::SessionsController
    flash[:special] = "Welcome to #{controller_path.inspect} controller!"
    super
  end
-end
+end
--- a/test/rails_app/app/controllers/publisher/registrations_controller.rb
+++ b/test/rails_app/app/controllers/publisher/registrations_controller.rb
@@ -1,2 +1,2 @@
 class Publisher::RegistrationsController < ApplicationController
-end
+end
--- a/test/rails_app/app/controllers/publisher/sessions_controller.rb
+++ b/test/rails_app/app/controllers/publisher/sessions_controller.rb
@@ -1,2 +1,2 @@
 class Publisher::SessionsController < ApplicationController
-end
+end
--- a/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
@@ -11,4 +11,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
    sign_in user
    render :text => ""
  end
-end
+end
--- a/test/rails_app/app/mongoid/user.rb
+++ b/test/rails_app/app/mongoid/user.rb
@@ -36,7 +36,4 @@ class User
  field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
  field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
  field :locked_at,       :type => Time
-
-  ## Token authenticatable
-  field :authentication_token, :type => String
 end
--- a/test/rails_app/app/views/admins/sessions/new.html.erb
+++ b/test/rails_app/app/views/admins/sessions/new.html.erb
@@ -1,2 +1,2 @@
 Welcome to "sessions/new" view!
-<%= render :file => "devise/sessions/new" %>
+<%= render :file => "devise/sessions/new" %>
--- a/test/rails_app/app/views/home/admin_dashboard.html.erb
+++ b/test/rails_app/app/views/home/admin_dashboard.html.erb
@@ -1 +1 @@
-Admin dashboard
+Admin dashboard
--- a/test/rails_app/app/views/home/index.html.erb
+++ b/test/rails_app/app/views/home/index.html.erb
@@ -1 +1 @@
-Home!
+Home!
--- a/test/rails_app/app/views/home/join.html.erb
+++ b/test/rails_app/app/views/home/join.html.erb
@@ -1 +1 @@
-Join
+Join
--- a/test/rails_app/app/views/home/user_dashboard.html.erb
+++ b/test/rails_app/app/views/home/user_dashboard.html.erb
@@ -1 +1 @@
-User dashboard
+User dashboard
--- a/test/rails_app/config/boot.rb
+++ b/test/rails_app/config/boot.rb
@@ -2,7 +2,13 @@ unless defined?(DEVISE_ORM)
  DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 end

+module Devise
+  # Detection for minor differences between Rails 3.2 and 4 in tests.
+  def self.rails4?
+    Rails.version.start_with? '4'
+  end
+end
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lucas Mazza	b8f1d0d0c6	Release v3.2.3	2014-02-20 15:30:48 -03:00
José Valim	60b6a80764	Merge pull request #2868 from rmm5t/patch-1 Update password_length docs in config template	2014-02-16 14:45:05 +01:00
Ryan McGeary	5f9838950a	Remove password_length default docs in config template The default specified in the docs does not match up with the default specified in the config. See `cc8636cfed/lib/devise.rb (L127)` Changing the docs to read 6..128 with the config setting to 8..128 is feared to cause confusion, so removing the default clause instead.	2014-02-16 08:19:47 -05:00
José Valim	0ece5d5190	Merge pull request #2869 from leriksen/master Additional documentation on permitted scalars and nested parameter configuration	2014-02-16 10:04:26 +01:00
leriksen	058eac640f	Additional documentation on simple scalars and nested types	2014-02-16 12:06:55 +11:00
José Valim	cc8636cfed	Merge pull request #2866 from guilhermesimoes/readme-update Readme update	2014-02-15 00:09:44 +01:00
Guilherme Simoes	e18b822567	Update README.md The updates are: * Indicate that it is possible to pass a block to `super` to add custom behaviour to some Devise controller actions without completely overriding them. * Move mailer configuration out of the section "Controller filters and helpers". * Consistently use Ruby 1.9's hash syntax, highlight code and capitalize "Devise". * Wording improvements	2014-02-14 22:54:30 +00:00
Lucas Mazza	93bdee2640	Merge branch 'lm-migration-extension'	2014-02-11 11:00:16 -02:00
Lucas Mazza	e57b672e90	Ensure that migrations are created with the `.rb` extension. Since rails/rails#13612 the generator won't always add the `.rb` extension when creating migrations with the `migration_template` method.	2014-02-11 10:19:05 -02:00
Lucas Mazza	e9351b7c15	Merge pull request #2857 from albertodotcom/patch-2 Update README.md	2014-02-10 23:57:45 -02:00
Alberto Forni	7c3e08d92d	Update README.md Substitute ; with .	2014-02-11 10:47:51 +11:00
Rafael Mendonça França	2aedb1bf79	Merge pull request #2843 from willnet/patch-1 Fix homepage's schema	2014-01-25 21:37:43 -08:00
Shinichi Maeshima	9d87aa55bd	Fix homepage's schema	2014-01-26 14:31:26 +09:00
José Valim	791657f3ef	Merge pull request #2842 from slant/patch-1 Correct misspelling	2014-01-22 23:48:12 -08:00
Ryan L. Cross	8981c3ef9b	Correct misspelling	2014-01-23 00:44:32 -07:00
José Valim	7a9ae13baa	Merge pull request #2835 from plataformatec/secrets Add support for Rails 4.1 secrets.	2014-01-22 05:33:11 -08:00
Lucas Mazza	eba91e6580	Read the `secret_key` value from Rails `secret_key_base`. It is possible to override this by setting the `secret_key` manually on the `devise.rb` initializer on your application.	2014-01-22 11:13:25 -02:00
José Valim	d5e0171cb4	Merge pull request #2832 from jwworth/master Fix typos	2014-01-09 08:03:25 -08:00
Jake Worth	61e87be580	Fix typos	2014-01-09 10:00:27 -06:00
José Valim	e16278966f	Merge pull request #2826 from tobinibot/fix-maximum-attempts Fix off-by-one error in Lockable module	2014-01-06 23:43:55 -08:00
Tobin Juday	2ba8275dcc	Fix off-by-one error in Lockable module When using the maximum_attempts config, Devise actually let you fail n + 1 times, not n times. See https://github.com/plataformatec/devise/issues/2825 for details.	2014-01-06 23:51:45 -05:00
Vasiliy Ermolovich	72a0d9e350	Merge pull request #2822 from plataformatec/rails-4.1 Fix specs on Rails 4.1	2014-01-04 10:14:57 -08:00
Vasiliy Ermolovich	6d51e67fac	properly change devise config in specs	2014-01-04 19:19:13 +03:00
Lucas Mazza	7b66133861	Remove subscriber block so it won't leak across the test suite.	2014-01-04 19:01:05 +03:00
Vasiliy Ermolovich	49086d0294	remove warnings regarding number extensions	2014-01-04 18:54:19 +03:00
Vasiliy Ermolovich	1b1be514c8	make webrat compatible with rails 4.1	2014-01-04 18:53:40 +03:00
Vasiliy Ermolovich	9dbc60d36d	update mocha	2014-01-04 18:52:54 +03:00
José Valim	3db4444da8	Update CHANGELOG.md The described change was actually introduced in 2.2.4, closes #2804	2014-01-04 09:48:04 +01:00
José Valim	7a654cdd04	Merge pull request #2809 from moisesweb/mv_access_lock_without_email lock_access! without sending email	2014-01-04 00:37:38 -08:00
Lucas Mazza	02c2ec69dd	Remove platform constraints from the extra gemfiles.	2014-01-03 11:53:13 -02:00
Lucas Mazza	dd95f3f3f7	Support custom port for MongoDB config	2014-01-03 11:23:34 -02:00
Lucas Mazza	0cb74efd79	Remove platform constraint from Gemfile since we do not support 1.8 anymore.	2014-01-03 11:23:01 -02:00
Lucas Mazza	517bde86d2	Update bundler on Travis.	2014-01-03 10:12:30 -02:00
Lucas Mazza	2665afa36f	2014, folks.	2014-01-03 10:12:23 -02:00
Lucas Mazza	0b84a0e7c6	Merge pull request #2819 from salimane/pr_ruby_2_1_0 Add Ruby 2.1.0 to .travis.yml	2014-01-03 03:50:11 -08:00
Salimane Adjao Moustapha	db204f33e0	Add Ruby 2.1.0 to .travis.yml	2014-01-03 11:39:16 +01:00
Rafael Mendonça França	89ce9c922c	Merge pull request #2818 from jrmyward/issue-2770 Edit is now configurable for devise registrations via path_name.	2014-01-02 19:13:03 -08:00
Jeremy Ward	9d0d15b814	Updated documentation to use 1.9 hash syntax.	2014-01-02 19:02:36 -08:00
Jeremy Ward	b50fa74596	Edit is now configurable for devise registrations via path_name.	2014-01-02 17:49:37 -08:00
Moises Vargas M	be236fa6dd	lock_access! without sending email	2013-12-24 11:51:24 -05:00
José Valim	01e029fd9b	Merge pull request #2806 from keating/master revise readme	2013-12-21 03:21:03 -08:00
keating	4652b3efa0	revise readme	2013-12-21 19:09:09 +08:00
José Valim	29da146c07	Merge pull request #2802 from schneems/schneems/raise_controller_omniauthable [close #2755] Raise incompatible route error	2013-12-20 00:53:23 -08:00
schneems	a00921f417	[close #2755 ] Raise incompatible route error Right now if you try to use a route that you have defined in your `omniauth_callbacks` but you have not declared that resource to be `omniauthable` you will get a weird route missing error which causes the user to look in the routes for the fix: ```ruby devise_for :users, controllers: {omniauth_callbacks: "users/omniauth_callbacks"} ``` This PR checks to see if the mapping of `:user` has the module `omniauthable` included in it when `omniauth_callbacks` is specified in the route. If it does not, an instructional error is raised: ``` Mapping omniauth_callbacks on a resource that is not omniauthable Please add `devise :omniauthable` to the `User` model ```	2013-12-18 19:19:25 -06:00
Rafael Mendonça França	71c43926e0	Add security related email address	2013-12-16 17:49:21 -02:00
Erich Kist	380ab682c5	Update travis to run with Rails 3.2-stable, 4.0-stable and master	2013-12-10 19:09:49 -02:00
José Valim	714176994b	Merge pull request #2784 from yokomizor/remove_authentication_token_stuffs Remove authentication some authentication token stuffs	2013-12-10 06:44:46 -08:00
Rogério Yokomizo	8ca34aa41e	Remove authentication some authentication token stuffs Since we don't have authentication token, we don't have to check if password is "X". :authentication_token don't have to be in the blacklist for serialization too.	2013-12-10 12:30:28 -02:00
José Valim	3adeba38f5	Merge pull request #2763 from paulanunda/master Fixed small grammatical error in en.yml	2013-12-09 21:50:20 -08:00
Luiz H. D. Costa	5b6f1e8f80	Merge pull request #2774 from yokomizor/fix_typo Fix typo	2013-12-05 04:45:29 -08:00
Rogério Yokomizo	16ec143228	fix typo and some clarification	2013-12-05 10:39:42 -02:00
José Valim	c67de7e91c	Merge pull request #2772 from sferik/gender_neutral_pronouns Remove a couple more gendered pronouns	2013-12-05 00:09:48 -08:00
Erik Michaels-Ober	3f03ec02ad	Cleanup trailing whitespace	2013-12-05 09:03:32 +01:00
Erik Michaels-Ober	4e7cd18a04	Remove a couple more gendered pronouns	2013-12-05 09:03:28 +01:00
Rafael Mendonça França	01f4a8f441	Merge pull request #2767 from bartoszkopinski/master Removing regexp anchors in routing constraints	2013-12-02 12:39:27 -08:00
Bartosz Kopiński	53893edec8	Removing regexp anchors in routing constraints They're not allowed according to: http://guides.rubyonrails.org/routing.html#segment-constraints	2013-12-02 21:27:23 +01:00
José Valim	7d11427116	Merge pull request #2766 from sferik/gender_neutral_pronouns Removed use of gendered pronouns	2013-12-02 01:22:46 -08:00
Erik Michaels-Ober	26e85c44e2	Removed use of gendered pronouns	2013-12-02 10:02:17 +01:00
Paul Anunda	43282f738e	Fixed small grammatical error in en.yml	2013-11-28 10:29:50 -06:00
Vasiliy Ermolovich	c2718806a7	Merge pull request #2761 from reu/patch-1 Small typo. [ci skip]	2013-11-28 03:01:49 -08:00
Rodrigo Navarro	3e3a3ad102	Small typo.	2013-11-28 09:00:59 -02:00
José Valim	65947b6696	Release v3.2.2	2013-11-25 12:00:21 +01:00
Vasiliy Ermolovich	0028dc6a4f	Merge pull request #2751 from fgo/patch-1 Fix spelling in README [ci skip]	2013-11-22 00:57:03 -08:00
Francis Go	f438209669	Fix spelling in README	2013-11-22 19:55:16 +11:00
José Valim	c85ecbb9ac	Merge pull request #2750 from louman/master Timeoutable - fixes missing caller	2013-11-21 08:38:12 -08:00
Marcus Mansur	b16899f7bf	fixes timeoutable specs to cover sign_out_all_scopes false	2013-11-21 14:02:45 -02:00
Marcus Mansur	bd83483ba6	fixes missing caller	2013-11-21 13:26:34 -02:00
José Valim	0514e60bc4	Merge pull request #2749 from csexton/master Keep the query string and path in store_location_for	2013-11-20 13:13:12 -08:00
Christopher Sexton	7afc096fa4	Keep the query string and path in store_location_for Persist the URI's query when saving to the session. Fixes #2742	2013-11-20 15:47:20 -05:00
Vasiliy Ermolovich	bb2ff3553b	require rails generator base class in devise generators closes #2743	2013-11-15 15:56:09 +03:00
José Valim	1390945e5c	Improve default omniauth sample	2013-11-14 09:09:05 +01:00
José Valim	f36efc0cc9	Ensure multiple leading / are also removed, thanks @homakov	2013-11-13 15:01:23 +01:00
José Valim	3b598ec235	Release v3.2.1	2013-11-13 14:15:13 +01:00
José Valim	95ec62ea76	Ensure encryption on authentication	2013-11-13 13:45:34 +01:00
José Valim	9a412c139f	Update CHANGELOG	2013-11-13 13:32:59 +01:00
José Valim	0582467032	Ensure we only store paths in store_location_for (thanks to @homakov for the tip)	2013-11-13 13:30:24 +01:00
José Valim	221be6d6ef	Update bundled rails app	2013-11-13 13:29:25 +01:00
José Valim	ed86361b92	Merge pull request #2728 from edelpero/master Adds yield around resource on devise controllers	2013-11-08 23:22:53 -08:00
José Valim	e303de9756	Merge pull request #2729 from matthewrudy/store-location-helper Add store_location_for helper	2013-11-08 23:22:39 -08:00
Matthew Rudy Jacobs	268e486dbb	Add store_location_for helper This is used as a complement to `stored_location_for`. Example: Before authorizing with Omniauth; store_location_for(:user, dashboard_path) redirect_to user_omniauth_authorize_path(:facebook) In our Omniauth callback sign_in(user) redirect_to stored_location_for(:user) \|\| root_path	2013-11-09 00:59:00 +00:00
Ezequiel Delpero	989071144e	Adds yield around resource on devise controllers If you want to add a new behavior to your devise controllers but you don't want to override devise's default workflow, just pass a block around resource. This would give you for example, the ability to trigger background jobs after user signs in.	2013-11-08 20:43:08 -03:00
Rafael Mendonça França	25726becdd	Merge pull request #2731 from plataformatec/lm-password-digest Bring `password_digest` back.	2013-11-08 10:28:11 -08:00
Lucas Mazza	bf5bcd52cb	Bring `password_digest` back. This method is part of the protected API and is used by custom encryption engines (like `devise-encryptable`) to hook the custom encryption logic in the models. Fixes #2730	2013-11-08 16:22:31 -02:00
José Valim	e26ea51fe5	Improve error message for wrongly nested omniauth callback	2013-11-07 14:30:32 +01:00
José Valim	c840fc419f	Update Rails 3.2 lock too	2013-11-06 21:50:04 +01:00
José Valim	9d872709c0	Release Devise 3.2.0	2013-11-06 21:39:16 +01:00
José Valim	27bcefcf54	Ensure timeoutable hook respects `Devise.sign_out_all_scopes` configuration Closes #2606	2013-11-06 21:07:38 +01:00
José Valim	4f1bf8f3f9	Split out sign_in/out functionality so it can be reused in hooks	2013-11-06 20:55:26 +01:00
José Valim	d49f0a1184	Update CHANGELOG	2013-11-06 20:34:57 +01:00
José Valim	a7624c8f51	Merge pull request #2227 from AlexanderZaytsev/master Use mapping.fullpath in omniauth callbacks	2013-11-06 11:32:21 -08:00
andrew morton	52a3768451	A GET to sign in shouldn't extend the session.	2013-11-06 20:20:22 +01:00
José Valim	f5f7e97d8b	Merge pull request #2718 from ssendev/flashing_formats Separate redirects and flash messages in navigational_formats and flashing_formats	2013-11-06 00:10:23 -08:00
José Valim	13117f01be	Merge pull request #2562 from devolute/master passes headers through test helpers' response	2013-11-05 23:59:11 -08:00
Kaworu	fe1fb1f7a2	Don't use config option for flashing_formats	2013-11-01 22:25:15 +01:00
Kaworu	c87809a0f5	Separate redirects and flash messages in navigational_formats and flashing_formats	2013-11-01 21:47:40 +01:00
José Valim	9eb0768cb9	Add Rails 4 related todo	2013-10-31 14:40:44 +01:00
José Valim	e445039716	Merge pull request #2717 from memberful/2716-splat-sanitize-params Splat the arguments to strong_parameters#permit, fixes #2716	2013-10-31 14:40:28 +01:00
José Valim	69d28f9b0e	Add config.last_attempt_warning to default config	2013-10-26 11:56:31 +02:00
José Valim	5cb575bd48	Merge pull request #2705 from 13k/master Fix configuration option name in CHANGELOG.	2013-10-24 14:43:37 -07:00
Kiyoshi '13k' Murata	88de877f8b	Fix configuration option name in CHANGELOG. [ci skip]	2013-10-24 19:37:47 -02:00
José Valim	5a363f5fcb	Merge pull request #2703 from bbenezech/master Add options for FailureApp's i18n_message. Similar #1633	2013-10-24 09:10:19 -07:00
Benoit Bénézech	04e47687b2	remove respond_to in favor of an implementation that returns options	2013-10-24 17:29:53 +02:00
Benoit Bénézech	d5514bf916	Add options for FailureApp's i18n_message. Similar #1633	2013-10-24 16:49:13 +02:00
José Valim	93649e21d0	Merge pull request #2700 from obiwanchinobi/task/document-after-db-auth-hook Add documentation to the 'after_database_authentication' method.	2013-10-23 23:35:47 -07:00
Dave Tong	8bef8b87f1	Add documentation to the 'after_database_authentication' method.	2013-10-24 08:25:00 +11:00
José Valim	fb530110c7	Merge pull request #2697 from Lightpower/feature/last_attempt_message Show last attempt message for last attempt, not for one-before-last one	2013-10-22 01:33:37 -07:00
Vitaly Bezkrovny	bb810cfb8f	* show message for last attempt, not for one-before-last one; * update test to check the message :invalid, :last_attempt, :locked	2013-10-22 00:43:56 +03:00
José Valim	a8069be4c8	Improve devise_for docs to be make routes integration more explicit	2013-10-21 13:28:20 +02:00
Jay Hayes	2296d14803	Add entry to changelog [#2691] [ci skip] Signed-off-by: José Valim <jose.valim@plataformatec.com.br> Conflicts: CHANGELOG.md	2013-10-21 13:21:43 +02:00
Jay Hayes	21583cbf95	Update code comment to keep it up to date [#2691] [ci skip]	2013-10-21 13:21:11 +02:00
Jay Hayes	4861436298	Prevent mutation of orig values during case and wspace sanitizations	2013-10-21 13:21:05 +02:00
Vasiliy Ermolovich	844d467ab9	Update CHANGELOG [ci skip]	2013-10-20 17:55:51 +03:00
Vasiliy Ermolovich	520e2845ae	Merge pull request #2689 from Lightpower/master * typo	2013-10-16 14:53:38 -07:00
Vitaly Bezkrovny	aba19c1ca4	* typo	2013-10-16 23:57:11 +03:00
José Valim	986f52df2b	Merge pull request #2687 from Lightpower/master Warning of the last attempt password entering	2013-10-16 01:33:41 -07:00
Vitaly Bezkrovny	e20e446cf4	+ last_attempt + @@last_attempt_warning + last_attempt? method; * send :last_attempt key if it is the last attempt + test for last attempt * update test to make two asserts * update message	2013-10-15 01:53:56 +03:00
José Valim	e947a9cbec	Merge pull request #2674 from jessy/master Fix #2673 email templates generated with the good @token	2013-10-08 02:28:30 -07:00
Jessy Bernal	fa06b33dd3	Fix #2673 email templates generated with the good @token	2013-10-08 11:25:04 +02:00
José Valim	31971e69e6	Merge pull request #2669 from plataformatec/pr-2598-fixed Fixed version of PR #2598	2013-10-06 04:22:45 -07:00
Vasiliy Ermolovich	fa16afd90a	add CHANGELOG entry	2013-10-06 14:19:19 +03:00
Vasiliy Ermolovich	0d6493a9a5	proper hash comparing in Devise.bcrypt test	2013-10-06 14:19:08 +03:00
Aaron Patterson	5300bdabc8	add a class method so you can encrypt passwords from fixtures	2013-10-06 13:53:12 +03:00
José Valim	93f59dd63a	Update CHANGELOG.md	2013-10-04 20:04:23 +02:00
José Valim	9281ac3958	Merge pull request #2663 from scaryzet/fix_expire_session_data_after_sign_in Fix expire_session_data_after_sign_in!	2013-10-03 08:40:04 -07:00
Vasiliy Ermolovich	52300c033d	Merge pull request #2662 from plataformatec/issue-2659 do not define mailer if ActionMailer is not defined	2013-10-03 08:17:18 -07:00
Vasiliy Ermolovich	036715facc	do not define mailer if ActionMailer is not defined closes #2659	2013-10-03 17:39:04 +03:00
Ivan Zhidkov	2351d0215a	Fix expire_session_data_after_sign_in!	2013-10-03 18:34:39 +04:00
José Valim	eaad61b2da	Make it clear a restart is required when setting the secret key	2013-10-01 17:12:08 +02:00
José Valim	c323065b57	Merge pull request #2634 from gregates/bug/confirmation_workflow Tweaks confirmation flow for signed_in users	2013-09-16 07:17:46 -07:00
Greg Gates	989d7192fa	Tweaks confirmation flow for signed_in users For #2627 When allow_unconfirmed_access_for > 0, users may be already signed in at the time they confirm their account. Consequently, the default confirmation should be compatible with this possibility. Additionally, they should not be redirected to the sign in form after confirmation in this case. So I've changed ConfirmationsController#after_confirmation_path_for to send the user to the root path when signed in, or the sign in form otherwise.	2013-09-16 10:12:15 -04:00
Vasiliy Ermolovich	acefa2f761	Merge pull request #2631 from vipulnsward/cleanup_tests Cleanup tests for unused variables	2013-09-14 14:53:23 -07:00
Vipul A M	ae6a37f796	Cleanup tests for unused variables	2013-09-15 01:52:53 +05:30
Vasiliy Ermolovich	d75fd56f15	remove unused reset_password_token method closes #2621	2013-09-14 12:30:23 +03:00
Vasiliy Ermolovich	4216c34538	fix markdown in CHANGELOG [ci skip] closes #2626	2013-09-13 22:29:34 +03:00
José Valim	b24d178b21	Merge pull request #2628 from ricardohsd/master Update wiki link on README.md	2013-09-13 04:53:58 -07:00
Ricardo Henrique	fc5522a8ed	Update wiki link on README.md	2013-09-13 08:47:27 -03:00
Rafael Mendonça França	041fcf9080	Merge pull request #2608 from benmanns/patch-1 Update link to new contributors page	2013-09-04 11:46:07 -07:00
Benjamin Manns	f45d874ed9	Update link to new contributors page [ci skip]	2013-09-04 14:43:45 -04:00
Carlos Antonio da Silva	47d9f1b959	Fix changelog [ci skip]	2013-09-03 08:47:57 -03:00
José Valim	9464416c3e	Bring back test removed by accident	2013-09-02 19:25:05 -03:00
José Valim	6b3b0c5e8c	Remove deprecated token lookups	2013-09-02 19:23:15 -03:00
José Valim	dff7891b97	Get rid of token authentication	2013-09-02 19:15:47 -03:00
José Valim	07f0ee75ee	Link to update gist on CHANGELOG for 3.0 update	2013-09-02 19:04:51 -03:00
chris	a1d83d5d4e	passes headers through test helpers' response	2013-08-09 09:51:05 +02:00
Alexander Zaytsev	01bb721c33	Use mapping.fullpath in omniauth callbacks	2013-01-21 19:51:06 +05:00