Release v3.1.2

Add Rails 4 related todo
Merge pull request #2717 from memberful/2716-splat-sanitize-params
2026-01-11 16:48:04 -05:00 · 2013-11-13 14:08:08 +01:00 · 2013-10-31 14:39:52 +01:00 · 2013-10-31 06:38:30 -07:00 · 2013-10-31 13:02:50 +00:00 · 2013-10-01 17:11:42 +02:00
264 changed files with 5250 additions and 8768 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,25 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
-{
-	"name": "Ruby",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/ruby:0-3-bullseye",
-	"features": {
-		"ghcr.io/devcontainers/features/github-cli:1": {}
-	},
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "bundle install",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,63 +0,0 @@
-name: Test
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        gemfile:
-          - Gemfile
-          - gemfiles/Gemfile-rails-main
-          - gemfiles/Gemfile-rails-7-0
-          - gemfiles/Gemfile-rails-7-1
-          - gemfiles/Gemfile-rails-7-2
-          - gemfiles/Gemfile-rails-8-0
-        ruby:
-          - '4.0'
-          - '3.4'
-          - '3.3'
-          - '3.2'
-          - '3.1'
-          - '3.0'
-          - '2.7'
-        orm:
-          - active_record
-          - mongoid
-        exclude:
-          - gemfile: Gemfile
-            ruby: '3.1'
-          - gemfile: Gemfile
-            ruby: '3.0'
-          - gemfile: Gemfile
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '3.2'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-8-0
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-8-0
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-8-0
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-7-2
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-7-2
-            ruby: '2.7'
-    runs-on: ubuntu-latest
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-      DEVISE_ORM: ${{ matrix.orm }}
-    steps:
-      - uses: actions/checkout@v6
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # runs bundle install and caches installed gems automatically
-      - uses: supercharge/mongodb-github-action@1.12.1
-        if: ${{ matrix.orm == 'mongoid' }}
-      - run: bundle exec rake
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ rdoc/*
 pkg
 log
 test/tmp/*
-gemfiles/*.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,20 @@
+language: ruby
+script: "bundle exec rake test"
+rvm:
+  - 1.9.3
+  - 2.0.0
+env:
+  - DEVISE_ORM=mongoid
+  - DEVISE_ORM=active_record
+gemfile:
+  - gemfiles/Gemfile.rails-3.2.x
+  - Gemfile
+services:
+  - mongodb
+notifications:
+  email: false
+  campfire:
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "TRiqvuM4i/QmRDWjUSNitE5/P91BOzDkNl53+bZjjtxcISCswZtmECWBR7n9\n3xwqCOU1o2lfohxZ32OHOj/Nj7o+90zWJfWxcv+if0hIXRiil62M5pg0lZUd\nyJ4M5VQ0lSWo5he1OUrXhSabPJeaK3B8yT/tdh+qO5yzR+vb/jc="
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,22 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [heartcombo.oss@gmail.com](heartcombo.oss@gmail.com) or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,79 +1,14 @@
-# How to contribute to Devise
+### Please read before contributing

-Thanks for your interest on contributing to Devise! Here are a few general
-guidelines on contributing and reporting bugs to Devise that we ask you to
-take a look first. Notice that all of your interactions in the project are
-expected to follow our [Code of Conduct](CODE_OF_CONDUCT.md).
+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). 

-## Reporting Issues
+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.

-Before reporting a new issue, please be sure that the issue wasn't already
-reported or fixed by searching on GitHub through our [issues](https://github.com/heartcombo/devise/issues).
+3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.

-When creating a new issue, be sure to include a **title and clear description**,
-as much relevant information as possible, and either a test case example or
-even better a **sample Rails app that replicates the issue** - Devise has a lot
-of moving parts and it's functionality can be affected by third party gems, so
-we need as much context and details as possible to identify what might be broken
-for you. We have a [test case template](guides/bug_report_templates/integration_test.rb)
-that can be used to replicate issues with minimal setup.
+4) When reporting an issue, include Rails, Devise and Warden versions. If you are getting exceptions, please include the full backtrace.

-Please do not attempt to translate Devise built in views. The views are meant
-to be a starting point for fresh apps and not production material - eventually
-all applications will require custom views where you can write your own copy and
-translate it if the application requires it . For historical references, please look into closed
-[Issues/Pull Requests](https://github.com/heartcombo/devise/issues?q=i18n) regarding
-internationalization.
+That's it! The more information you give, the easier it becomes for us to track it down and fix it.
+Ideally, you should provide an application that reproduces the error or a test case to Devise's suite.

-Avoid opening new issues to ask questions in our issues tracker. Please go through
-the project wiki, documentation and source code first, or try to ask your question
-on [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).
-
-**If you find a security bug, do not report it through GitHub. Please send an
-e-mail to [heartcombo.oss@gmail.com](mailto:heartcombo.oss@gmail.com)
-instead.**
-
-## Sending Pull Requests
-
-Before sending a new Pull Request, take a look on existing Pull Requests and Issues
-to see if the proposed change or fix has been discussed in the past, or if the
-change was already implemented but not yet released.
-
-We expect new Pull Requests to include enough tests for new or changed behavior,
-and we aim to maintain everything as most backwards compatible as possible,
-reserving breaking changes to be ship in major releases when necessary - you
-can wrap the new code path with a setting toggle from the `Devise` module defined
-as `false` by default to require developers to opt-in for the new behavior.
-
-If your Pull Request includes new or changed behavior, be sure that the changes
-are beneficial to a wide range of use cases or it's an application specific change
-that might not be so valuable to other applications. Some changes can be introduced
-as a new `devise-something` gem instead of belonging to the main codebase.
-
-When adding new settings, you can take advantage of the [`Devise::Models.config`](https://github.com/heartcombo/devise/blob/245b1f9de0b3386b7913e14b60ea24f43b77feb0/lib/devise/models.rb#L13-L50) method to add class and instance level fallbacks
-to the new setting.
-
-We also welcome Pull Requests that improve our existing documentation (both our
-`README.md` and the RDoc sections in the source code) or improve existing rough
-edges in our API that might be blocking existing integrations or 3rd party gems.
-
-## Other ways to contribute
-
-We welcome anyone that wants to contribute to Devise to triage and reply to
-open issues to help troubleshoot and fix existing bugs on Devise. Here is what
-you can do:
-
-* Help ensure that existing issues follows the recommendations from the
-_[Reporting Issues](#reporting-issues)_ section, providing feedback to the issue's
-author on what might be missing.
-* Review and update the existing content of our [Wiki](https://github.com/heartcombo/devise/wiki)
-with up to date instructions and code samples - the wiki was grown with several
-different tutorials and references that we can't keep track of everything, so if
-there is a page that showcases an integration or customization that you are
-familiar with feel free to update it as necessary.
-* Review existing Pull Requests, and testing patches against real existing
-applications that use Devise.
-
-Thanks again for your interest on contributing to the project!
-
-:heart:
+Thanks!
--- a/34
+++ b/34
@@ -1,33 +1,31 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"

 gemspec

-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rails", "~> 8.1.0"
+gem "rails", "~> 4.0.0"
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"

-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
 group :test do
-  gem "minitest", "< 6"
-  gem "mocha", "~> 2.1", require: false
  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat"
-  gem "ostruct"
+  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", "~> 9.0", github: "mongodb/mongoid", branch: "9.0-stable"
+platforms :mri_19, :mri_20 do
+  group :mongoid do
+    gem "mongoid", github: "mongoid/mongoid", branch: "master"
+  end
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,312 +1,160 @@
 GIT
-  remote: https://github.com/mongodb/mongoid.git
-  revision: 4dcdaddea5d88a819c7c0d98ea0e994e13f515fe
-  branch: 9.0-stable
+  remote: git://github.com/mongoid/mongoid.git
+  revision: 346a79a7d01aa194de80e649916239a18d38ce13
+  branch: master
  specs:
-    mongoid (9.0.9)
-      activemodel (>= 5.1, < 8.2, != 7.0.0)
-      concurrent-ruby (>= 1.0.5, < 2.0)
-      mongo (>= 2.18.0, < 3.0.0)
+    mongoid (4.0.0)
+      activemodel (~> 4.0.0)
+      moped (~> 1.5)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)

 PATH
  remote: .
  specs:
-    devise (5.0.0.rc)
-      bcrypt (~> 3.0)
+    devise (3.1.2)
+      bcrypt-ruby (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 7.0)
-      responders
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    action_text-trix (2.1.15)
-      railties
-    actioncable (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
-    actionmailer (8.1.1)
-      actionpack (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (8.1.1)
-      actionview (= 8.1.1)
-      activesupport (= 8.1.1)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.1.1)
-      action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (8.1.1)
-      activesupport (= 8.1.1)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (8.1.1)
-      activesupport (= 8.1.1)
-      globalid (>= 0.3.6)
-    activemodel (8.1.1)
-      activesupport (= 8.1.1)
-    activerecord (8.1.1)
-      activemodel (= 8.1.1)
-      activesupport (= 8.1.1)
-      timeout (>= 0.4.0)
-    activestorage (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activesupport (= 8.1.1)
-      marcel (~> 1.0)
-    activesupport (8.1.1)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      json
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    base64 (0.3.0)
-    bcrypt (3.1.20)
-    bigdecimal (4.0.1)
-    bson (5.2.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.6)
-    connection_pool (3.0.2)
-    crass (1.0.6)
-    date (3.5.1)
-    drb (2.2.3)
-    erb (6.0.1)
-    erubi (1.13.1)
-    faraday (2.14.0)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    globalid (1.3.0)
-      activesupport (>= 6.1)
-    hashie (5.1.0)
-      logger
-    i18n (1.14.8)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.2)
-    irb (1.16.0)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.18.0)
-    jwt (3.1.2)
-      base64
-    logger (1.7.0)
-    loofah (2.25.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.9.0)
-      logger
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.1.0)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
-    minitest (5.27.0)
-    mocha (2.8.2)
-      ruby2_keywords (>= 0.0.5)
-    mongo (2.22.0)
-      base64
-      bson (>= 4.14.1, < 6.0.0)
-    multi_xml (0.8.0)
-      bigdecimal (>= 3.1, < 5)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
-    net-imap (0.6.2)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.5)
-    nokogiri (1.19.0)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    oauth2 (2.0.18)
-      faraday (>= 0.17.3, < 4.0)
-      jwt (>= 1.0, < 4.0)
-      logger (~> 1.2)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (~> 1.1, >= 1.1.9)
-    omniauth (2.1.4)
-      hashie (>= 3.4.6)
-      logger
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-facebook (10.0.0)
-      bigdecimal
-      omniauth-oauth2 (>= 1.2, < 3)
-    omniauth-oauth2 (1.9.0)
-      oauth2 (>= 2.0.2, < 3)
-      omniauth (~> 2.0)
-    omniauth-openid (2.0.2)
-      omniauth (>= 1.1)
-      rack-openid (~> 1.4)
-      ruby-openid (~> 2.1, >= 2.1.8)
-      version_gem (~> 1.1, >= 1.1.8)
-    orm_adapter (0.5.0)
-    ostruct (0.6.3)
-    pp (0.6.3)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.3.1)
-      date
-      stringio
-    racc (1.8.1)
-    rack (3.2.4)
-    rack-openid (1.4.2)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.12)
+    bcrypt-ruby (3.1.2)
+    builder (3.1.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)
+    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)
+    minitest (4.7.5)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    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.5.2)
+    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
-    rack-protection (4.2.1)
-      base64 (>= 0.1.0)
-      logger (>= 1.6.0)
-      rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (2.3.1)
-      rack (>= 3)
-    rails (8.1.1)
-      actioncable (= 8.1.1)
-      actionmailbox (= 8.1.1)
-      actionmailer (= 8.1.1)
-      actionpack (= 8.1.1)
-      actiontext (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activemodel (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      bundler (>= 1.15.0)
-      railties (= 8.1.1)
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
-      zeitwerk (~> 2.6)
-    rake (13.3.1)
-    rdoc (7.0.3)
-      erb
-      psych (>= 4.0.0)
-      tsort
-    reline (0.6.3)
-      io-console (~> 0.5)
-    responders (3.2.0)
-      actionpack (>= 7.0)
-      railties (>= 7.0)
-    rexml (3.4.4)
-    ruby-openid (2.9.2)
-    ruby2_keywords (0.0.5)
-    securerandom (0.4.1)
-    snaky_hash (2.0.3)
-      hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
-    sqlite3 (2.9.0)
-      mini_portile2 (~> 2.8.0)
-    stringio (3.2.0)
-    thor (1.4.0)
-    timecop (0.9.10)
-    timeout (0.6.0)
-    tsort (0.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    uri (1.1.1)
-    useragent (0.16.11)
-    version_gem (1.1.9)
-    warden (1.2.9)
-      rack (>= 2.0.9)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    ruby-openid (2.2.3)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    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)
-    websocket-driver (0.8.0)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.7.4)

 PLATFORMS
  ruby

 DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
  devise!
-  minitest (< 6)
-  mocha (~> 2.1)
-  mongoid (~> 9.0)!
-  omniauth
+  jruby-openssl
+  mocha (~> 0.13.1)
+  mongoid!
+  omniauth (~> 1.0.0)
  omniauth-facebook
-  omniauth-oauth2
-  omniauth-openid
-  ostruct
-  rails (~> 8.1.0)
-  rails-controller-testing
+  omniauth-oauth2 (~> 1.0.0)
+  omniauth-openid (~> 1.0.1)
+  rails (~> 4.0.0)
  rdoc
-  responders (~> 3.1)
-  rexml
  sqlite3
-  timecop
-  webrat
-
-BUNDLED WITH
-  4.0.3
+  webrat (= 0.7.3)
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,20 +0,0 @@
-## Pre-check
-
- Do not use the issues tracker for help or support, try Stack Overflow.
- For bugs, do a quick search and make sure the bug has not yet been reported
- If you found a security bug, do not report it through GitHub. Please send an e-mail to heartcombo.oss@gmail.com instead.
- Finally, be nice and have fun!
-
-## Environment
-
- Ruby **[version]**
- Rails **[version]**
- Devise **[version]**
-
-## Current behavior
-
-Include code samples, errors, steps to reproduce the error and stack traces if appropriate.
-
-Will be even more helpful if you provide a sample application or a test case that reproduces the error.
-
-## Expected behavior
--- a/3
+++ b/3
@@ -1,5 +1,4 @@
-Copyright (c) 2020-CURRENT Rafael França, Carlos Antonio da Silva
-Copyright (c) 2009-2019 Plataformatec
+Copyright 2009-2013 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
@@ -1,63 +1,33 @@
-![Devise Logo](https://raw.github.com/heartcombo/devise/main/devise.png)
+![Devise Logo](https://raw.github.com/plataformatec/devise/master/devise.png)
+
+By [Plataformatec](http://plataformatec.com.br/).
+
+[![Build Status](https://api.travis-ci.org/plataformatec/devise.png?branch=master)](http://travis-ci.org/plataformatec/devise)
+[![Code Climate](https://codeclimate.com/github/plataformatec/devise.png)](https://codeclimate.com/github/plataformatec/devise)
+
+This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).

 Devise is a flexible authentication solution for Rails based on Warden. It:

 * Is Rack based;
 * Is a complete MVC solution based on Rails engines;
 * Allows you to have multiple models signed in at the same time;
-* Is based on a modularity concept: use only what you really need.
+* Is based on a modularity concept: use just what you really need.

 It's composed of 10 modules:

-* [Database Authenticatable](https://www.rubydoc.info/gems/devise/Devise/Models/DatabaseAuthenticatable): hashes 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](https://www.rubydoc.info/gems/devise/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
-* [Confirmable](https://www.rubydoc.info/gems/devise/Devise/Models/Confirmable): sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
-* [Recoverable](https://www.rubydoc.info/gems/devise/Devise/Models/Recoverable): resets the user password and sends reset instructions.
-* [Registerable](https://www.rubydoc.info/gems/devise/Devise/Models/Registerable): handles signing up users through a registration process, also allowing them to edit and destroy their account.
-* [Rememberable](https://www.rubydoc.info/gems/devise/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
-* [Trackable](https://www.rubydoc.info/gems/devise/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
-* [Timeoutable](https://www.rubydoc.info/gems/devise/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
-* [Validatable](https://www.rubydoc.info/gems/devise/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
-* [Lockable](https://www.rubydoc.info/gems/devise/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
-
-## Table of Contents
-
-<!-- TOC depthFrom:1 depthTo:6 withLinks:1 orderedList:0 -->
-
- [Information](#information)
-	- [The Devise wiki](#the-devise-wiki)
-	- [Bug reports](#bug-reports)
-	- [StackOverflow and Mailing List](#stackoverflow-and-mailing-list)
-	- [RDocs](#rdocs)
-	- [Example applications](#example-applications)
-	- [Extensions](#extensions)
-	- [Supported Ruby / Rails versions](#supported-ruby--rails-versions)
-	- [Contributing](#contributing)
- [Starting with Rails?](#starting-with-rails)
- [Getting started](#getting-started)
-	- [Controller filters and helpers](#controller-filters-and-helpers)
-	- [Configuring Models](#configuring-models)
-	- [Strong Parameters](#strong-parameters)
-	- [Configuring views](#configuring-views)
-	- [Configuring controllers](#configuring-controllers)
-	- [Configuring routes](#configuring-routes)
-	- [I18n](#i18n)
-	- [Test helpers](#test-helpers)
-	- [Controller tests](#controller-tests)
-	- [Integration tests](#integration-tests)
-	- [OmniAuth](#omniauth)
-	- [Configuring multiple models](#configuring-multiple-models)
-	- [Active Job Integration](#active-job-integration)
-	- [Password reset tokens and Rails logs](#password-reset-tokens-and-rails-logs)
-	- [Other ORMs](#other-orms)
-	- [Rails API mode](#rails-api-mode)
- [Additional information](#additional-information)
-	- [Warden](#warden)
- [License](#license)
-
-<!-- /TOC -->
-
+* [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;
+* [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.
+* [Rememberable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
+* [Trackable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
+* [Timeoutable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Timeoutable): expires sessions that have no activity in a specified period of time.
+* [Validatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
+* [Lockable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.

+Devise is guaranteed to be thread-safe on YARV. Thread-safety support on JRuby is on progress.

 ## Information

@@ -65,32 +35,27 @@ It's composed of 10 modules:

 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://github.com/heartcombo/devise/wiki
+https://wiki.github.com/plataformatec/devise

 ### Bug reports

 If you discover a problem with Devise, we would like to know about it. However, we ask that you please review these guidelines before submitting a bug report:

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

-If you have discovered a security related bug, please do *NOT* use the GitHub issue tracker. Send an email to heartcombo.oss@gmail.com.
+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.

-### StackOverflow and Mailing List
+### Mailing list

-If you have any questions, comments, or concerns, please use StackOverflow instead of the GitHub issue tracker:
-
-http://stackoverflow.com/questions/tagged/devise
-
-The deprecated mailing lists can still be read on:
+If you have any questions, comments, or concerns, please use the Google Group instead of the GitHub issue tracker:

 https://groups.google.com/group/plataformatec-devise
-https://groups.google.com/group/heartcombo

 ### RDocs

 You can view the Devise documentation in RDoc format here:

-http://rubydoc.info/github/heartcombo/devise/main/frames
+http://rubydoc.info/github/plataformatec/devise/master/frames

 If you need to use Devise with previous versions of Rails, you can always run "gem server" from the command line after you install the gem to access the old documentation.

@@ -98,134 +63,65 @@ If you need to use Devise with previous versions of Rails, you can always run "g

 There are a few example applications available on GitHub that demonstrate various features of Devise with different versions of Rails. You can view them here:

-https://github.com/heartcombo/devise/wiki/Example-Applications
+https://github.com/plataformatec/devise/wiki/Example-Applications

 ### Extensions

 Our community has created a number of extensions that add functionality above and beyond what is included with Devise. You can view a list of available extensions and add your own here:

-https://github.com/heartcombo/devise/wiki/Extensions
-
-### Supported Ruby / Rails versions
-
-We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
-
-For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
-and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
+https://github.com/plataformatec/devise/wiki/Extensions

 ### Contributing

 We hope that you will consider contributing to Devise. Please read this short overview for some information about how to get started:

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

-You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run `bundle install` and `bin/test`.
-Devise works with multiple Ruby and Rails versions, and ActiveRecord and Mongoid ORMs, which means you can run the test suite with some modifiers: `DEVISE_ORM` and `BUNDLE_GEMFILE`.
-
-#### DEVISE_ORM
-Since Devise supports both Mongoid and ActiveRecord, we rely on this variable to run specific code for each ORM.
-The default value of `DEVISE_ORM` is `active_record`. To run the tests for Mongoid, you can pass `mongoid`:
-```
-DEVISE_ORM=mongoid bin/test
-
-==> Devise.orm = :mongoid
-```
-When running the tests for Mongoid, you will need to have a MongoDB server (version 2.0 or newer) running on your system.
-
-Please note that the command output will show the variable value being used.
-
-#### BUNDLE_GEMFILE
-We can use this variable to tell bundler what Gemfile it should use (instead of the one in the current directory).
-Inside the [gemfiles](https://github.com/heartcombo/devise/tree/main/gemfiles) directory, we have one for each version of Rails we support. When you send us a pull request, it may happen that the test suite breaks using some of them. If that's the case, you can simulate the same environment using the `BUNDLE_GEMFILE` variable.
-For example, if the tests broke using Ruby 3.4 and Rails 8.0, you can do the following:
-```bash
-chruby 3.4.0 # or rbenv shell 3.4.0, or rvm use 3.4.0, etc.
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bin/test
-```
-
-You can also combine both of them if the tests broke for Mongoid:
-```bash
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 DEVISE_ORM=mongoid bin/test
-```
-
-### Running tests
-Devise uses [Mini Test](https://github.com/seattlerb/minitest) as test framework.
-
-* Running all tests:
-```bash
-bin/test
-```
-
-* Running tests for an specific file:
-```bash
-bin/test test/models/trackable_test.rb
-```
-
-* Running a specific test given a line number or a regex:
-```bash
-bin/test test/models/trackable_test.rb:16
-bin/test test/models/trackable_test.rb -n '/update.*record/'
-```
+You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run "bundle install" and "rake".  For the tests to pass, you will need to have a MongoDB server (version 2.0 or newer) running on your system.

 ## Starting with Rails?

-If you are building your first Rails application, we recommend you *do not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch. Here's a few resources that should help you get started:
+If you are building your first Rails application, we recommend you to *not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch, today we have two resources:

-* Michael Hartl's online book: https://www.railstutorial.org/book/modeling_users
-* Ryan Bates' Railscasts: http://railscasts.com/episodes/250-authentication-from-scratch and http://railscasts.com/episodes/250-authentication-from-scratch-revised
-* Codecademy's Ruby on Rails: Authentication and Authorization: https://www.codecademy.com/learn/rails-auth
+* Michael Hartl's online book: http://railstutorial.org/chapters/modeling-and-viewing-users-two#top
+* Ryan Bates' Railscast: http://railscasts.com/episodes/250-authentication-from-scratch

-Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :smiley:
+Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :)

 ## Getting started

-Devise 5 works with Rails 7 onwards. Run:
+Devise 3.0 works with Rails 3.2 onwards. You can add it to your Gemfile with:

-```sh
-bundle add devise
+```ruby
+gem 'devise'
 ```

-Next, you need to run the generator:
+Run the bundle command to install it.
+
+After you install Devise and add it to your Gemfile, you need to run the generator:

 ```console
 rails generate devise:install
 ```

-At this point, a number of instructions will appear in the console. Among these instructions, you'll 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', port: 3000 }
-```
-
-The generator will install an initializer which describes ALL of Devise's configuration options. It is *imperative* that you take a look at it. When you are done, you are ready to add Devise to any of your models using the generator.
-
-
-In the following command you will replace `MODEL` with the class name used for the application’s users (it’s frequently `User` but could also be `Admin`). This will create a model (if one does not exist) and configure it with the default Devise modules. The generator also configures your `config/routes.rb` file to point to the Devise controller.
+The generator will install an initializer which describes ALL Devise's configuration options and you MUST take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:

 ```console
 rails generate devise MODEL
 ```

-Next, check the MODEL for any additional configuration options you might want to add, such as confirmable or lockable. If you add an option, be sure to inspect the migration file (created by the generator if your ORM supports them) and uncomment the appropriate section.  For example, if you add the confirmable option in the model, you'll need to uncomment the Confirmable section in the migration.
+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.

-Then run `rails db:migrate`
-
-You should restart your application after changing Devise's configuration options (this includes stopping spring). Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.
+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.

 ### Controller filters and helpers

-Devise will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_action (assuming your devise model is 'User'):
+Devise will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_filter:

 ```ruby
-before_action :authenticate_user!
+before_filter :authenticate_user!
 ```

-For Rails 5, note that `protect_from_forgery` is no longer prepended to the `before_action` chain, so if you have set `authenticate_user` before `protect_from_forgery`, your request will result in "Can't verify CSRF token authenticity." To resolve this, either change the order in which you call them, or use `protect_from_forgery prepend: true`.
-
-If your devise model is something other than User, replace "_user" with "_yourmodel". The same logic applies to the instructions below.
-
 To verify if a user is signed in, use the following helper:

 ```ruby
@@ -244,18 +140,24 @@ 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 to. For instance, when using 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:
+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:

 ```ruby
-root to: 'home#index'
+root to: "home#index"
 ```

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

-Notice that if your Devise model is called `Member` instead of `User`, for example, then the helpers available are:
+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
-before_action :authenticate_member!
+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:
+
+```ruby
+before_filter :authenticate_member!

 member_signed_in?

@@ -266,88 +168,52 @@ 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 hashing 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: 13
+devise :database_authenticatable, :registerable, :confirmable, :recoverable, :stretches => 20
 ```

-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. This file is usually located at `/config/initializers/devise.rb`.
+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.

 ### Strong Parameters

-The Parameter Sanitizer API has changed for Devise 4 :warning:
-
-*For previous Devise versions see https://github.com/heartcombo/devise/tree/3-stable#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 allow any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and default permitted parameters 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 permited parameters by default are:

-* `sign_in` (`Devise::SessionsController#create`) - Permits only the authentication keys (like `email`)
+* `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`
 * `account_update` (`Devise::RegistrationsController#update`) - Permits authentication keys plus `password`, `password_confirmation` and `current_password`

-In case you want to permit additional parameters (the lazy way™), you can do so using a simple before action in your `ApplicationController`:
+In case you want to permit additional parameters (the lazy way™) you can do with a simple before filter in your `ApplicationController`:

 ```ruby
 class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_filter :configure_permitted_parameters, if: :devise_controller?

  protected

  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:username])
+    devise_parameter_sanitizer.for(:sign_up) << :username
  end
 end
 ```

-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_attributes_for`), then you will need to tell devise about those nestings and types:
-
-```ruby
-class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
-
-  protected
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:first_name, :last_name, address_attributes: [:country, :state, :city, :area, :postal_code]])
-  end
-end
-```
-
-Devise allows you to completely change Devise defaults or invoke custom behavior by passing a block:
-
-To permit simple scalar values for username and email, use this
+To completely change Devise defaults or invoke custom behaviour, you can also pass a block:

 ```ruby
 def configure_permitted_parameters
-  devise_parameter_sanitizer.permit(:sign_in) do |user_params|
-    user_params.permit(:username, :email)
-  end
+  devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email) }
 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 in the following way:
-
-```ruby
-def configure_permitted_parameters
-  devise_parameter_sanitizer.permit(:sign_up) do |user_params|
-    user_params.permit({ roles: [] }, :email, :password, :password_confirmation)
-  end
-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 a different parameter sanitizer per model. In this case, we recommend inheriting from `Devise::ParameterSanitizer` and adding your own logic:
+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
 class User::ParameterSanitizer < Devise::ParameterSanitizer
-  def initialize(*)
-    super
-    permit(:sign_up, keys: [:username, :email])
+  def sign_in
+    default_params.permit(:username, :email)
  end
 end
 ```
@@ -380,141 +246,60 @@ 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 the `config/initializers/devise.rb` file.
+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".

-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
 ```

-If you would like to generate only a few sets of views, like the ones for the `registerable` and `confirmable` module,
-you can pass a list of views to the generator with the `-v` flag.
-
-```console
-rails generate devise:views -v registrations confirmations
-```
-
 ### Configuring controllers

 If the customization at the views level is not enough, you can customize each controller by following these steps:

-1. Create your custom controllers using the generator which requires a scope:
-
-    ```console
-    rails generate devise:controllers [scope]
-    ```
-
-    If you specify `users` as the scope, controllers will be created in `app/controllers/users/`.
-    And the sessions controller will look like this:
+1. Create your custom controller, for example a `Admins::SessionsController`:

    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      # GET /resource/sign_in
-      # def new
-      #   super
-      # end
-      ...
+    class Admins::SessionsController < Devise::SessionsController
    end
    ```
-    Use the `-c` flag to specify one or more controllers, for example: `rails generate devise:controllers users -c sessions`
+
+    Note that in the above example, the controller needs to be created in the `app/controller/admins/` directory.

 2. Tell the router to use this controller:

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

-3. Recommended but not required: copy (or move) the views from `devise/sessions` to `users/sessions`. Rails will continue using the views from `devise/sessions` due to inheritance if you skip this step, but having the views matching the controller(s) keeps things consistent.
+3. And since we changed the controller, it won't use the `"devise/sessions"` views, so remember to copy `"devise/sessions"` to `"admin/sessions"`.

-4. Finally, change or extend the desired controller actions.
-
-    You can completely override a controller action:
-
-    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      def create
-        # custom sign-in code
-      end
-    end
-    ```
-
-    Or you can simply add new behavior to it:
-
-    ```ruby
-    class Users::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 unsuccessful. 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.
+    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.

 ### 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](https://www.rubydoc.info/gems/devise/ActionDispatch/Routing/Mapper#devise_for-instance_method) for details.
+Be sure to check `devise_for` documentation for details.

-If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is create your routes normally and wrap them in a `devise_scope` block in the router:
+If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is to create your routes normally and wrap them in a `devise_scope` block in the router:

 ```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.
-
-Please note: You will still need to add `devise_for` in your routes in order to use helper methods such as `current_user`.
-
-```ruby
-devise_for :users, skip: :all
-```
-
-### Hotwire/Turbo
-
-Devise integrates with Hotwire/Turbo by treating such requests as navigational, and configuring certain responses for errors and redirects to match the expected behavior. New apps are generated with the following response configuration by default, and existing apps may opt-in by adding the config to their Devise initializers:
-
-```ruby
-Devise.setup do |config|
-  # ...
-  # When using Devise with Hotwire/Turbo, the http status for error responses
-  # and some redirects must match the following. The default in Devise for existing
-  # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
-  # these new defaults that match Hotwire/Turbo behavior.
-  # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = :unprocessable_content # for Rack 3.1 or higher
-  # config.responder.error_status = :unprocessable_entity # for Rack 3.0 or lower
-  config.responder.redirect_status = :see_other
-end
-```
-
-**Important**: these custom responses require the `responders` gem version to be `3.1.0` or higher, please make sure you update it if you're going to use this configuration. Check [this upgrade guide](https://github.com/heartcombo/devise/wiki/How-To:-Upgrade-to-Devise-4.9.0-[Hotwire-Turbo-integration]) for more info.
-
-_Note_: the above statuses configuration may become the default for Devise in a future release.
-
-There are a couple other changes you might need to make in your app to work with Hotwire/Turbo, if you're migrating from rails-ujs:
-
-* The `data-confirm` option that adds a confirmation modal to buttons/forms before submission needs to change to `data-turbo-confirm`, so that Turbo handles those appropriately.
-* The `data-method` option that sets the request method for link submissions needs to change to `data-turbo-method`. This is not necessary for `button_to` or `form`s since Turbo can handle those.
-
-If you're setting up Devise to sign out via `:delete`, and you're using links (instead of buttons wrapped in a form) to sign out with the `method: :delete` option, they will need to be updated as described above. (Devise does not provide sign out links/buttons in its shared views.)
-
-Make sure to inspect your views looking for those, and change appropriately.
+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

-Devise uses flash messages with I18n, in conjunction with the flash keys :notice and :alert. To customize your app, you can set up your locale file:
+Devise uses flash messages with I18n with the flash keys :notice and :alert. To customize your app, you can set up your locale file:

 ```yaml
 en:
@@ -550,125 +335,58 @@ en:

 Take a look at our locale file to check all available messages. You may also be interested in one of the many translations that are available on our wiki:

-https://github.com/heartcombo/devise/wiki/I18n
-
-Caution: Devise Controllers inherit from ApplicationController. If your app uses multiple locales, you should be sure to set I18n.locale in ApplicationController.
+https://github.com/plataformatec/devise/wiki/I18n

 ### Test helpers

-Devise includes some test helpers for controller and integration tests.
-In order to use them, you need to include the respective module in your test
-cases/specs.
-
-### Controller tests
-
-Controller tests require that you include `Devise::Test::IntegrationHelpers` on
-your test case or its parent `ActionController::TestCase` superclass.
-For Rails versions prior to 5, include `Devise::Test::ControllerHelpers` instead, since the superclass
-for controller tests was changed to ActionDispatch::IntegrationTest
-(for more details, see the [Integration tests](#integration-tests) section).
+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:

 ```ruby
-class PostsControllerTest < ActionController::TestCase
-  include Devise::Test::IntegrationHelpers # Rails >= 5
+class ActionController::TestCase
+  include Devise::TestHelpers
 end
 ```

-```ruby
-class PostsControllerTest < ActionController::TestCase
-  include Devise::Test::ControllerHelpers # Rails < 5
-end
-```
-
-If you're using RSpec, you can put the following inside a file named
-`spec/support/devise.rb` or in your `spec/spec_helper.rb` (or
-`spec/rails_helper.rb` if you are using `rspec-rails`):
+If you're using RSpec, you can put the following inside a file named `spec/support/devise.rb`:

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

-Just be sure that this inclusion is made *after* the `require 'rspec/rails'` directive.
-
-Now you are ready to use the `sign_in` and `sign_out` methods on your controller
-tests:
+Now you are ready to use the `sign_in` and `sign_out` methods. Such methods have the same signature as in controllers:

 ```ruby
-sign_in @user
-sign_in @user, scope: :admin
+sign_in :user, @user   # sign_in(scope, resource)
+sign_in @user          # sign_in(resource)
+
+sign_out :user         # sign_out(scope)
+sign_out @user         # sign_out(resource)
 ```

-If you are testing Devise internal controllers or a controller that inherits
-from Devise's, you need to tell Devise which mapping should be used before a
-request. This is necessary because Devise gets this information from the router,
-but since controller tests do not pass through the router, it needs to be stated
-explicitly. For example, if you are testing the user scope, simply use:
+There are two things that is important to keep in mind:
+
+1. These helpers are not going to work for integration tests driven by Capybara or Webrat. They are meant to be used with functional tests only. Instead, fill in the form or explicitly set the user in session;
+
+2. If you are testing Devise internal controllers or a controller that inherits from Devise's, you need to tell Devise which mapping should be used before a request. This is necessary because Devise gets this information from router, but since functional tests do not pass through the router, it needs to be told explicitly. For example, if you are testing the user scope, simply do:
+
+    ```ruby
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+    get :new
+    ```
+
+### Omniauth
+
+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
-test 'GET new' do
-  # Mimic the router behavior of setting the Devise scope through the env.
-  @request.env['devise.mapping'] = Devise.mappings[:user]
-
-  # Use the sign_in helper to sign in a fixture `User` record.
-  sign_in users(:alice)
-
-  get :new
-
-  # assert something
-end
+config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
 ```

-### Integration tests
+You can read more about Omniauth support in the wiki:

-Integration test helpers are available by including the
-`Devise::Test::IntegrationHelpers` module.
-
-```ruby
-class PostsTests < ActionDispatch::IntegrationTest
-  include Devise::Test::IntegrationHelpers
-end
-```
-
-Now you can use the following `sign_in` and `sign_out` methods in your integration
-tests:
-
-```ruby
-sign_in users(:bob)
-sign_in users(:bob), scope: :admin
-
-sign_out :user
-```
-
-RSpec users can include the `IntegrationHelpers` module on their `:feature` specs.
-
-```ruby
-RSpec.configure do |config|
-  config.include Devise::Test::IntegrationHelpers, type: :feature
-end
-```
-
-Unlike controller tests, integration tests do not need to supply the
-`devise.mapping` `env` value, as the mapping can be inferred by the routes that
-are executed in your tests.
-
-You can read more about testing your Rails controllers with RSpec in the wiki:
-
-* https://github.com/heartcombo/devise/wiki/How-To:-Test-controllers-with-Rails-(and-RSpec)
-
-### OmniAuth
-
-Devise comes with OmniAuth support out of the box to authenticate with other providers. To use it, simply specify your OmniAuth configuration in `config/initializers/devise.rb`:
-
-```ruby
-config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
-```
-
-You can read more about OmniAuth support in the wiki:
-
-* https://github.com/heartcombo/devise/wiki/OmniAuth:-Overview
+* https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview

 ### Configuring multiple models

@@ -679,7 +397,7 @@ Devise allows you to set up as many Devise models as you want. If you want to ha
 create_table :admins do |t|
  t.string :email
  t.string :encrypted_password
-  t.timestamps null: false
+  t.timestamps
 end

 # Inside your Admin model
@@ -689,7 +407,7 @@ devise :database_authenticatable, :timeoutable
 devise_for :admins

 # Inside your protected controller
-before_action :authenticate_admin!
+before_filter :authenticate_admin!

 # Inside your controllers and views
 admin_signed_in?
@@ -699,78 +417,38 @@ admin_session

 Alternatively, you can simply run the Devise generator.

-Keep in mind that those models will have completely different routes. They **do not** and **cannot** share the same controller for sign in, sign out and so on. In case you want to have different roles sharing the same actions, we recommend that you use a role-based approach, by either providing a role column or using a dedicated gem for authorization.
-
-### Active Job Integration
-
-If you are using Active Job to deliver Action Mailer messages in the
-background through a queuing back-end, you can send Devise emails through your
-existing queue by overriding the `send_devise_notification` method in your model.
-
-```ruby
-def send_devise_notification(notification, *args)
-  devise_mailer.send(notification, self, *args).deliver_later
-end
-```
-
-### Password reset tokens and Rails logs
-
-If you enable the [Recoverable](https://www.rubydoc.info/gems/devise/Devise/Models/Recoverable) module, note that a stolen password reset token could give an attacker access to your application. Devise takes effort to generate random, secure tokens, and stores only token digests in the database, never plaintext. However the default logging behavior in Rails can cause plaintext tokens to leak into log files:
-
-1. Action Mailer logs the entire contents of all outgoing emails to the DEBUG level. Password reset tokens delivered to users in email will be leaked.
-2. Active Job logs all arguments to every enqueued job at the INFO level. If you configure Devise to use `deliver_later` to send password reset emails, password reset tokens will be leaked.
-
-Rails sets the production logger level to INFO by default. Consider changing your production logger level to WARN if you wish to prevent tokens from being leaked into your logs. In `config/environments/production.rb`:
-
-```ruby
-config.log_level = :warn
-```
-
+Keep in mind that those models will have completely different routes. They **do not** and **cannot** share the same controller for sign in, sign out and so on. In case you want to have different roles sharing the same actions, we recommend you to use a role-based approach, by either providing a role column or using [CanCan](https://github.com/ryanb/cancan).

 ### Other ORMs

-Devise supports ActiveRecord (default) and Mongoid. To select another ORM, simply require it in the initializer file.
-
-### Rails API Mode
-
-Rails 5+ has a built-in [API Mode](https://edgeguides.rubyonrails.org/api_app.html) which optimizes Rails for use as an API (only). Devise is _somewhat_ able to handle applications that are built in this mode without additional modifications in the sense that it should not raise exceptions and the like. But some issues may still arise during `development`/`testing`, as we still don't know the full extent of this compatibility. (For more information, see [issue #4947](https://github.com/heartcombo/devise/issues/4947/))
-
-#### Supported Authentication Strategies
-API-only applications don't support browser-based authentication via cookies, which is devise's default. Yet, devise can still provide authentication out of the box in those cases with the `http_authenticatable` strategy, which uses HTTP Basic Auth and authenticates the user on each request. (For more info, see this wiki article for [How To: Use HTTP Basic Authentication](https://github.com/heartcombo/devise/wiki/How-To:-Use-HTTP-Basic-Authentication))
-
-The devise default for HTTP Auth is disabled, so it will need to be enabled in the devise initializer for the database strategy:
-
-```ruby
-config.http_authenticatable = [:database]
-```
-
-This restriction does not limit you from implementing custom warden strategies, either in your application or via gem-based extensions for devise.
-A common authentication strategy for APIs is token-based authentication. For more information on extending devise to support this type of authentication and others, see the wiki article for [Simple Token Authentication Examples and alternatives](https://github.com/heartcombo/devise/wiki/How-To:-Simple-Token-Authentication-Example#alternatives) or this blog post on [Custom authentication methods with Devise](http://blog.plataformatec.com.br/2019/01/custom-authentication-methods-with-devise/).
-
-#### Testing
-API Mode changes the order of the middleware stack, and this can cause problems for `Devise::Test::IntegrationHelpers`. This problem usually surfaces as an ```undefined method `[]=' for nil:NilClass``` error when using integration test helpers, such as `#sign_in`. The solution is simply to reorder the middlewares by adding the following to test.rb:
-
-```ruby
-Rails.application.config.middleware.insert_before Warden::Manager, ActionDispatch::Cookies
-Rails.application.config.middleware.insert_before Warden::Manager, ActionDispatch::Session::CookieStore
-```
-
-For a deeper understanding of this, review [this issue](https://github.com/heartcombo/devise/issues/4696).
-
-Additionally be mindful that without views supported, some email-based flows from Confirmable, Recoverable and Lockable are not supported directly at this time.
+Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you just need to require it in the initializer file.

 ## Additional information

+### Heroku
+
+Using devise on Heroku with Ruby on Rails 3.1 requires setting:
+
+```ruby
+config.assets.initialize_on_precompile = false
+```
+
+Read more about the potential issues at http://guides.rubyonrails.org/asset_pipeline.html
+
 ### Warden

 Devise is based on Warden, which is a general Rack authentication framework created by Daniel Neighman. We encourage you to read more about Warden here:

-https://github.com/wardencommunity/warden
+https://github.com/hassox/warden
+
+### Contributors
+
+We have a long list of valued contributors. Check them all at:
+
+https://github.com/plataformatec/devise/contributors

 ## License

-MIT License.
-Copyright 2020-CURRENT Rafael França, Carlos Antonio da Silva.
-Copyright 2009-2019 Plataformatec.
+MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br

-The Devise logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/).
+You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Devise name or logo.
--- a/6
+++ b/6
@@ -1,12 +1,10 @@
 # encoding: UTF-8
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'rdoc/task'

 desc 'Default: run tests for all ORMs.'
-task default: :test
+task :default => :test

 desc 'Run Devise tests for all ORMs.'
 task :pre_commit do
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation/new
  def new
@@ -9,10 +7,9 @@ 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))
+      respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
    else
      respond_with(resource)
    end
@@ -21,14 +18,17 @@ 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?
-      set_flash_message!(:notice, :confirmed)
+      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
      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
    else
-      # TODO: use `error_status` when the default changes to `:unprocessable_entity` / `:unprocessable_content`.
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end

@@ -36,19 +36,17 @@ class Devise::ConfirmationsController < DeviseController

    # The path used after resending confirmation instructions.
    def after_resending_confirmation_instructions_path_for(resource_name)
-      is_navigational_format? ? new_session_path(resource_name) : '/'
+      new_session_path(resource_name) if is_navigational_format?
    end

    # The path used after confirmation.
    def after_confirmation_path_for(resource_name, resource)
-      if signed_in?(resource_name)
+      if Devise.allow_insecure_sign_in_after_confirmation
+        after_sign_in_path_for(resource)
+      elsif signed_in?
        signed_in_root_path(resource)
      else
        new_session_path(resource_name)
      end
    end
-
-    def translation_scope
-      'devise.confirmations'
-    end
 end
--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -1,36 +1,30 @@
-# frozen_string_literal: true
-
 class Devise::OmniauthCallbacksController < DeviseController
-  prepend_before_action { request.env["devise.skip_timeout"] = true }
+  prepend_before_filter { request.env["devise.skip_timeout"] = true }

  def passthru
-    render status: 404, plain: "Not found. Authentication passthru."
+    render :status => 404, :text => "Not found. Authentication passthru."
  end

  def failure
-    set_flash_message! :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
+    set_flash_message :alert, :failure, :kind => OmniAuth::Utils.camelize(failed_strategy.name), :reason => failure_message
    redirect_to after_omniauth_failure_path_for(resource_name)
  end

  protected

  def failed_strategy
-    request.respond_to?(:get_header) ? request.get_header("omniauth.error.strategy") : request.env["omniauth.error.strategy"]
+    env["omniauth.error.strategy"]
  end

  def failure_message
-    exception = request.respond_to?(:get_header) ? request.get_header("omniauth.error") : request.env["omniauth.error"]
+    exception = env["omniauth.error"]
    error   = exception.error_reason if exception.respond_to?(:error_reason)
    error ||= exception.error        if exception.respond_to?(:error)
-    error ||= (request.respond_to?(:get_header) ? request.get_header("omniauth.error.type") : request.env["omniauth.error.type"]).to_s
+    error ||= env["omniauth.error.type"].to_s
    error.to_s.humanize if error
  end

  def after_omniauth_failure_path_for(scope)
    new_session_path(scope)
  end
-
-  def translation_scope
-    'devise.omniauth_callbacks'
-  end
 end
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 class Devise::PasswordsController < DeviseController
-  prepend_before_action :require_no_authentication
+  prepend_before_filter :require_no_authentication
  # Render the #edit only if coming from a reset password email link
-  append_before_action :assert_reset_token_passed, only: :edit
+  append_before_filter :assert_reset_token_passed, :only => :edit

  # GET /resource/password/new
  def new
@@ -13,10 +11,9 @@ 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))
+      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
    else
      respond_with(resource)
    end
@@ -25,35 +22,27 @@ class Devise::PasswordsController < DeviseController
  # GET /resource/password/edit?reset_password_token=abcdef
  def edit
    self.resource = resource_class.new
-    set_minimum_password_length
    resource.reset_password_token = params[:reset_password_token]
  end

  # 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)
-      if resource_class.sign_in_after_reset_password
-        flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
-        set_flash_message!(:notice, flash_message)
-        resource.after_database_authentication
-        sign_in(resource_name, resource)
-      else
-        set_flash_message!(:notice, :updated_not_active)
-      end
-      respond_with resource, location: after_resetting_password_path_for(resource)
+      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
+      set_flash_message(:notice, flash_message) if is_navigational_format?
+      sign_in(resource_name, resource)
+      respond_with resource, :location => after_resetting_password_path_for(resource)
    else
-      set_minimum_password_length
      respond_with resource
    end
  end

  protected
    def after_resetting_password_path_for(resource)
-      resource_class.sign_in_after_reset_password ? after_sign_in_path_for(resource) : new_session_path(resource_name)
+      after_sign_in_path_for(resource)
    end

    # The path used after sending reset password instructions
@@ -76,8 +65,4 @@ class Devise::PasswordsController < DeviseController
        resource.respond_to?(:unlock_strategy_enabled?) &&
        resource.unlock_strategy_enabled?(:email)
    end
-
-    def translation_scope
-      'devise.passwords'
-    end
 end
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,36 +1,29 @@
-# frozen_string_literal: true
-
 class Devise::RegistrationsController < DeviseController
-  prepend_before_action :require_no_authentication, only: [:new, :create, :cancel]
-  prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy]
-  prepend_before_action :set_minimum_password_length, only: [:new, :edit]
+  prepend_before_filter :require_no_authentication, :only => [ :new, :create, :cancel ]
+  prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]

  # GET /resource/sign_up
  def new
-    build_resource
-    yield resource if block_given?
-    respond_with resource
+    build_resource({})
+    respond_with self.resource
  end

  # POST /resource
  def create
    build_resource(sign_up_params)

-    resource.save
-    yield resource if block_given?
-    if resource.persisted?
+    if resource.save
      if resource.active_for_authentication?
-        set_flash_message! :notice, :signed_up
+        set_flash_message :notice, :signed_up if is_navigational_format?
        sign_up(resource_name, resource)
-        respond_with resource, location: after_sign_up_path_for(resource)
+        respond_with resource, :location => after_sign_up_path_for(resource)
      else
-        set_flash_message! :notice, :"signed_up_but_#{resource.inactive_message}"
-        expire_data_after_sign_in!
-        respond_with resource, location: after_inactive_sign_up_path_for(resource)
+        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
+        expire_session_data_after_sign_in!
+        respond_with resource, :location => after_inactive_sign_up_path_for(resource)
      end
    else
      clean_up_passwords resource
-      set_minimum_password_length
      respond_with resource
    end
  end
@@ -47,16 +40,16 @@ class Devise::RegistrationsController < DeviseController
    self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
    prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)

-    resource_updated = update_resource(resource, account_update_params)
-    yield resource if block_given?
-    if resource_updated
-      set_flash_message_for_update(resource, prev_unconfirmed_email)
-      bypass_sign_in resource, scope: resource_name if sign_in_after_change_password?
-
-      respond_with resource, location: after_update_path_for(resource)
+    if update_resource(resource, account_update_params)
+      if is_navigational_format?
+        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
+          :update_needs_confirmation : :updated
+        set_flash_message :notice, flash_key
+      end
+      sign_in resource_name, resource, :bypass => true
+      respond_with resource, :location => after_update_path_for(resource)
    else
      clean_up_passwords resource
-      set_minimum_password_length
      respond_with resource
    end
  end
@@ -65,9 +58,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
-    yield resource if block_given?
-    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name), status: Devise.responder.redirect_status }
+    set_flash_message :notice, :destroyed if is_navigational_format?
+    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name) }
  end

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

@@ -96,8 +88,8 @@ class Devise::RegistrationsController < DeviseController

  # Build a devise resource passing in the session. Useful to move
  # temporary session data to the newly created user.
-  def build_resource(hash = {})
-    self.resource = resource_class.new_with_session(hash, session)
+  def build_resource(hash=nil)
+    self.resource = resource_class.new_with_session(hash || {}, session)
  end

  # Signs in a user on sign up. You can overwrite this method in your own
@@ -109,27 +101,24 @@ class Devise::RegistrationsController < DeviseController
  # The path used after sign up. You need to overwrite this method
  # in your own RegistrationsController.
  def after_sign_up_path_for(resource)
-    after_sign_in_path_for(resource) if is_navigational_format?
+    after_sign_in_path_for(resource)
  end

  # The path used after sign up for inactive accounts. You need to overwrite
  # this method in your own RegistrationsController.
  def after_inactive_sign_up_path_for(resource)
-    scope = Devise::Mapping.find_scope!(resource)
-    router_name = Devise.mappings[scope].router_name
-    context = router_name ? send(router_name) : self
-    context.respond_to?(:root_path) ? context.root_path : "/"
+    respond_to?(:root_path) ? root_path : "/"
  end

  # The default url to be used after updating a resource. You need to overwrite
  # this method in your own RegistrationsController.
  def after_update_path_for(resource)
-    sign_in_after_change_password? ? signed_in_root_path(resource) : new_session_path(resource_name)
+    signed_in_root_path(resource)
  end

  # Authenticates the current scope and gets the current resource from the session.
  def authenticate_scope!
-    send(:"authenticate_#{resource_name}!", force: true)
+    send(:"authenticate_#{resource_name}!", :force => true)
    self.resource = send(:"current_#{resource_name}")
  end

@@ -140,29 +129,4 @@ class Devise::RegistrationsController < DeviseController
  def account_update_params
    devise_parameter_sanitizer.sanitize(:account_update)
  end
-
-  def translation_scope
-    'devise.registrations'
-  end
-
-  private
-
-  def set_flash_message_for_update(resource, prev_unconfirmed_email)
-    return unless is_flashing_format?
-
-    flash_key = if update_needs_confirmation?(resource, prev_unconfirmed_email)
-                  :update_needs_confirmation
-                elsif sign_in_after_change_password?
-                  :updated
-                else
-                  :updated_but_not_signed_in
-                end
-    set_flash_message :notice, flash_key
-  end
-
-  def sign_in_after_change_password?
-    return true if account_update_params[:password].blank?
-
-    Devise.sign_in_after_change_password
-  end
 end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,34 +1,35 @@
-# frozen_string_literal: true
-
 class Devise::SessionsController < DeviseController
-  prepend_before_action :require_no_authentication, only: [:new, :create]
-  prepend_before_action :allow_params_authentication!, only: :create
-  prepend_before_action :verify_signed_out_user, only: :destroy
-  prepend_before_action(only: [:create, :destroy]) { request.env["devise.skip_timeout"] = true }
+  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 }

  # GET /resource/sign_in
  def new
    self.resource = resource_class.new(sign_in_params)
    clean_up_passwords(resource)
-    yield resource if block_given?
    respond_with(resource, serialize_options(resource))
  end

  # POST /resource/sign_in
  def create
    self.resource = warden.authenticate!(auth_options)
-    set_flash_message!(:notice, :signed_in)
+    set_flash_message(:notice, :signed_in) if is_navigational_format?
    sign_in(resource_name, resource)
-    yield resource if block_given?
-    respond_with resource, location: after_sign_in_path_for(resource)
+    respond_with resource, :location => after_sign_in_path_for(resource)
  end

  # DELETE /resource/sign_out
  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
-    yield if block_given?
-    respond_to_on_destroy(non_navigational_status: :no_content)
+    set_flash_message :notice, :signed_out if signed_out && is_navigational_format?
+
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.all { head :no_content }
+      format.any(*navigational_formats) { redirect_to redirect_path }
+    end
  end

  protected
@@ -41,43 +42,10 @@ class Devise::SessionsController < DeviseController
    methods = resource_class.authentication_keys.dup
    methods = methods.keys if methods.is_a?(Hash)
    methods << :password if resource.respond_to?(:password)
-    { methods: methods, only: [:password] }
+    { :methods => methods, :only => [:password] }
  end

  def auth_options
-    { scope: resource_name, recall: "#{controller_path}#new", locale: I18n.locale }
-  end
-
-  def translation_scope
-    'devise.sessions'
-  end
-
-  private
-
-  # Check if there is no signed in user before doing the sign out.
-  #
-  # If there is no signed in user, it will set the flash message and redirect
-  # to the after_sign_out path.
-  def verify_signed_out_user
-    if all_signed_out?
-      set_flash_message! :notice, :already_signed_out
-
-      respond_to_on_destroy(non_navigational_status: :unauthorized)
-    end
-  end
-
-  def all_signed_out?
-    users = Devise.mappings.keys.map { |s| warden.user(scope: s, run_callbacks: false) }
-
-    users.all?(&:blank?)
-  end
-
-  def respond_to_on_destroy(non_navigational_status: :no_content)
-    # We actually need to hardcode this as Rails default responder doesn't
-    # support returning empty response on GET request
-    respond_to do |format|
-      format.all { head non_navigational_status }
-      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name), status: Devise.responder.redirect_status }
-    end
+    { :scope => resource_name, :recall => "#{controller_path}#new" }
  end
 end
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 class Devise::UnlocksController < DeviseController
-  prepend_before_action :require_no_authentication
+  prepend_before_filter :require_no_authentication

  # GET /resource/unlock/new
  def new
@@ -11,10 +9,9 @@ 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))
+      respond_with({}, :location => after_sending_unlock_instructions_path_for(resource))
    else
      respond_with(resource)
    end
@@ -23,14 +20,12 @@ 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
+      set_flash_message :notice, :unlocked if is_navigational_format?
      respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
    else
-      # TODO: use `error_status` when the default changes to `:unprocessable_entity` / `:unprocessable_content`.
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end

@@ -46,7 +41,4 @@ class Devise::UnlocksController < DeviseController
      new_session_path(resource)  if is_navigational_format?
    end

-    def translation_scope
-      'devise.unlocks'
-    end
 end
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -1,53 +1,17 @@
-# frozen_string_literal: true
-
 # All Devise controllers are inherited from here.
 class DeviseController < Devise.parent_controller.constantize
  include Devise::Controllers::ScopedViews

-  if respond_to?(:helper)
-    helper DeviseHelper
-  end
+  helper DeviseHelper

-  if respond_to?(:helper_method)
-    helpers = %w(resource scope_name resource_name signed_in_resource
-                 resource_class resource_params devise_mapping)
-    helper_method(*helpers)
-  end
+  helpers = %w(resource scope_name resource_name signed_in_resource
+               resource_class resource_params devise_mapping)
+  hide_action *helpers
+  helper_method *helpers

-  prepend_before_action :assert_is_devise_resource!
-  self.responder = Devise.responder
+  prepend_before_filter :assert_is_devise_resource!
  respond_to :html if mimes_for_respond_to.empty?

-  # Override prefixes to consider the scoped view.
-  # Notice we need to check for the request due to a bug in
-  # Action Controller tests that forces _prefixes to be
-  # loaded before even having a request object.
-  #
-  # This method should be public as it is in ActionPack
-  # itself. Changing its visibility may break other gems.
-  def _prefixes #:nodoc:
-    @_prefixes ||= if self.class.scoped_views? && request && devise_mapping
-      ["#{devise_mapping.scoped_path}/#{controller_name}"] + super
-    else
-      super
-    end
-  end
-
-  # Override internal methods to exclude `_prefixes` from action methods since
-  # we override it above.
-  #
-  # There was an intentional change in Rails 7.1 that will allow it to become
-  # an action method because it's a public method of a non-abstract controller,
-  # but we also can't make this abstract because it can affect potential actions
-  # defined in the parent controller, so instead we ensure `_prefixes` is going
-  # to be considered internal. (and thus, won't become an action method.)
-  # Ref: https://github.com/rails/rails/pull/48699
-  def self.internal_methods #:nodoc:
-    super << :_prefixes
-  end
-
-  protected
-
  # Gets the actual resource stored in the instance variable
  def resource
    instance_variable_get(:"@#{resource_name}")
@@ -66,7 +30,7 @@ class DeviseController < Devise.parent_controller.constantize

  # Returns a signed in resource from session (if one exists)
  def signed_in_resource
-    warden.authenticate(scope: resource_name)
+    warden.authenticate(:scope => resource_name)
  end

  # Attempt to find the mapped route for devise based on request path
@@ -74,6 +38,22 @@ class DeviseController < Devise.parent_controller.constantize
    @devise_mapping ||= request.env["devise.mapping"]
  end

+  # Override prefixes to consider the scoped view.
+  # Notice we need to check for the request due to a bug in
+  # Action Controller tests that forces _prefixes to be
+  # loaded before even having a request object.
+  def _prefixes #:nodoc:
+    @_prefixes ||= if self.class.scoped_views? && request && devise_mapping
+      super.unshift("#{devise_mapping.scoped_path}/#{controller_name}")
+    else
+      super
+    end
+  end
+
+  hide_action :_prefixes
+
+  protected
+
  # Checks whether it's a devise mapped resource or not.
  def assert_is_devise_resource! #:nodoc:
    unknown_action! <<-MESSAGE unless devise_mapping
@@ -109,24 +89,24 @@ MESSAGE
    instance_variable_set(:"@#{resource_name}", new_resource)
  end

-  # Helper for use in before_actions where no authentication is required.
+  # Helper for use in before_filters where no authentication is required.
  #
  # Example:
-  #   before_action :require_no_authentication, only: :new
+  #   before_filter :require_no_authentication, :only => :new
  def require_no_authentication
    assert_is_devise_resource!
    return unless is_navigational_format?
    no_input = devise_mapping.no_input_strategies

    authenticated = if no_input.present?
-      args = no_input.dup.push scope: resource_name
+      args = no_input.dup.push :scope => resource_name
      warden.authenticate?(*args)
    else
      warden.authenticated?(resource_name)
    end

    if authenticated && resource = warden.user(resource_name)
-      set_flash_message(:alert, 'already_authenticated', scope: 'devise.failure')
+      flash[:alert] = I18n.t("devise.failure.already_authenticated")
      redirect_to after_sign_in_path_for(resource)
    end
  end
@@ -143,17 +123,14 @@ MESSAGE
    end

    if notice
-      set_flash_message! :notice, notice
+      set_flash_message :notice, notice if is_navigational_format?
      true
    end
  end

  # Sets the flash message with :key, using I18n. By default you are able
-  # to set up your messages using specific resource scope, and if no message is
-  # found we look to the default scope. Set the "now" options key to a true
-  # value to populate the flash.now hash in lieu of the default flash hash (so
-  # the flash message will be available to the current action instead of the
-  # next action).
+  # to setup your messages using specific resource scope, and if no one is
+  # found we look to default scope.
  # Example (i18n locale file):
  #
  #   en:
@@ -167,45 +144,16 @@ MESSAGE
  # available.
  def set_flash_message(key, kind, options = {})
    message = find_message(kind, options)
-    if options[:now]
-      flash.now[key] = message if message.present?
-    else
-      flash[key] = message if message.present?
-    end
-  end
-
-  # Sets flash message if is_flashing_format? equals true
-  def set_flash_message!(key, kind, options = {})
-    if is_flashing_format?
-      set_flash_message(key, kind, options)
-    end
-  end
-
-  # Sets minimum password length to show to user
-  def set_minimum_password_length
-    if devise_mapping.validatable?
-      @minimum_password_length = resource_class.password_length.min
-    end
-  end
-
-  def devise_i18n_options(options)
-    options
+    flash[key] = message if message.present?
  end

  # Get message for given
  def find_message(kind, options = {})
-    options[:scope] ||= translation_scope
+    options[:scope] = "devise.#{controller_name}"
    options[:default] = Array(options[:default]).unshift(kind.to_sym)
    options[:resource_name] = resource_name
-    options = devise_i18n_options(options)
-    I18n.t("#{options[:resource_name]}.#{kind}", **options)
-  end
-
-  # Controllers inheriting DeviseController are advised to override this
-  # method so that other controllers inheriting from them would use
-  # existing translations.
-  def translation_scope
-    "devise.#{controller_name}"
+    options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
+    I18n.t("#{options[:resource_name]}.#{kind}", options)
  end

  def clean_up_passwords(object)
@@ -221,6 +169,4 @@ MESSAGE
  def resource_params
    params.fetch(resource_name, {})
  end
-
-  ActiveSupport.run_load_hooks(:devise_controller, self)
 end
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -1,5 +1,25 @@
-# frozen_string_literal: true
-
-# Keeping the helper around for backward compatibility.
 module DeviseHelper
+  # A simple way to show error messages for the current devise resource. If you need
+  # to customize this method, you can either overwrite it in your application helpers or
+  # copy the views to your application.
+  #
+  # This method is intended to stay simple and it is unlikely that we are going to change
+  # it to add more behavior or options.
+  def devise_error_messages!
+    return "" if resource.errors.empty?
+
+    messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
+    sentence = I18n.t("errors.messages.not_saved",
+                      :count => resource.errors.count,
+                      :resource => resource.class.model_name.human.downcase)
+
+    html = <<-HTML
+    <div id="error_explanation">
+      <h2>#{sentence}</h2>
+      <ul>#{messages}</ul>
+    </div>
+    HTML
+
+    html.html_safe
+  end
 end
--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -1,30 +1,18 @@
-# frozen_string_literal: true
+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)
-    end
-
-    def email_changed(record, opts = {})
-      devise_mail(record, :email_changed, opts)
-    end
-
-    def password_change(record, opts = {})
-      devise_mail(record, :password_change, opts)
-    end
+  def unlock_instructions(record, token, opts={})
+    @token = token
+    devise_mail(record, :unlock_instructions, opts)
  end
 end
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Resend confirmation instructions</h2>

-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>

-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %></p>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Resend confirmation instructions" %>
-  </div>
+  <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -2,4 +2,4 @@

 <p>You can confirm your account email through the link below:</p>

-<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>
--- a/app/views/devise/mailer/email_changed.html.erb
+++ b/app/views/devise/mailer/email_changed.html.erb
@@ -1,7 +0,0 @@
-<p>Hello <%= @email %>!</p>
-
-<% if @resource.try(:unconfirmed_email?) %>
-  <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
-<% else %>
-  <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
-<% end %>
--- a/app/views/devise/mailer/password_change.html.erb
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -1,3 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>We're contacting you to notify you that your password has been changed.</p>
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -2,7 +2,7 @@

 <p>Someone has requested a link to change your password. You can do this through the link below.</p>

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

 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -4,4 +4,4 @@

 <p>Click the link below to unlock your account:</p>

-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,25 +1,16 @@
 <h2>Change your password</h2>

-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
  <%= f.hidden_field :reset_password_token %>

-  <div class="field">
-    <p><%= f.label :password, "New password" %></p>
-    <% if @minimum_password_length %>
-      <p><em>(<%= @minimum_password_length %> characters minimum)</em></p>
-    <% end %>
-    <p><%= f.password_field :password, autofocus: true, autocomplete: "new-password" %></p>
-  </div>
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password, :autofocus => true %></div>

-  <div class="field">
-    <p><%= f.label :password_confirmation, "Confirm new password" %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
-  </div>
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="actions">
-    <%= f.submit "Change my password" %>
-  </div>
+  <div><%= f.submit "Change my password" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Forgot your password?</h2>

-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>

-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Send me password reset instructions" %>
-  </div>
+  <div><%= f.submit "Send me reset password instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,42 +1,29 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>

-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
  <% end %>

-  <div class="field">
-    <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i></p>
-    <p><%= f.password_field :password, autocomplete: "new-password" %></p>
-    <% if @minimum_password_length %>
-      <p><em><%= @minimum_password_length %> characters minimum</em></p>
-    <% end %>
-  </div>
+  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password, :autocomplete => "off" %></div>

-  <div class="field">
-    <p><%= f.label :password_confirmation %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
-  </div>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="field">
-    <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i></p>
-    <p><%= f.password_field :current_password, autocomplete: "current-password" %></p>
-  </div>
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></div>

-  <div class="actions">
-    <%= f.submit "Update" %>
-  </div>
+  <div><%= f.submit "Update" %></div>
 <% end %>

 <h3>Cancel my account</h3>

-<div>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %></div>
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>

 <%= link_to "Back", :back %>
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,29 +1,18 @@
 <h2>Sign up</h2>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>

-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="field">
-    <p><%= f.label :password %></p>
-    <% if @minimum_password_length %>
-      <p><em>(<%= @minimum_password_length %> characters minimum)</em></p>
-    <% end %>
-    <p><%= f.password_field :password, autocomplete: "new-password" %></p>
-  </div>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>

-  <div class="field">
-    <p><%= f.label :password_confirmation %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
-  </div>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="actions">
-    <%= f.submit "Sign up" %>
-  </div>
+  <div><%= f.submit "Sign up" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,26 +1,17 @@
-<h2>Log in</h2>
+<h2>Sign in</h2>

-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-  </div>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="field">
-    <p><%= f.label :password %></p>
-    <p><%= f.password_field :password, autocomplete: "current-password" %></p>
-  </div>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>

-  <% if devise_mapping.rememberable? %>
-    <div class="field">
-      <p><%= f.check_box :remember_me %></p>
-      <p><%= f.label :remember_me %></p>
-    </div>
-  <% end %>
+  <% if devise_mapping.rememberable? -%>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+  <% end -%>

-  <div class="actions">
-    <%= f.submit "Log in" %>
-  </div>
+  <div><%= f.submit "Sign in" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -1,15 +0,0 @@
-<% if resource.errors.any? %>
-  <div id="error_explanation" data-turbo-temporary>
-    <h2>
-      <%= I18n.t("errors.messages.not_saved",
-                 count: resource.errors.count,
-                 resource: resource.class.model_name.human.downcase)
-       %>
-    </h2>
-    <ul>
-      <% resource.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
-  <p><%= link_to "Log in", new_session_path(resource_name) %></p>
-<% end %>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <p><%= link_to "Sign up", new_registration_path(resource_name) %></p>
-<% end %>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <p><%= link_to "Forgot your password?", new_password_path(resource_name) %></p>
-<% end %>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <p><%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %></p>
-<% end %>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <p><%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %></p>
-<% end %>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <p><%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %></p>
-  <% end %>
-<% end %>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Resend unlock instructions</h2>

-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>

-  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Resend unlock instructions" %>
-  </div>
+  <div><%= f.submit "Resend unlock instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/bin/test
+++ b/bin/test
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path(File.expand_path('../../test', __FILE__))
-
-require 'bundler/setup'
-require 'rails/test_unit/runner'
-require 'rails/test_unit/reporter'
-require 'rails/test_unit/line_filtering'
-
-Rails::TestUnitReporter.executable = 'bin/test'
-
-Rails::TestUnit::Runner.parse_options(ARGV)
-Rails::TestUnit::Runner.run(ARGV)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,57 +1,52 @@
-# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n

 en:
  devise:
    confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+      confirmed: "Your account was successfully confirmed."
+      confirmed_and_signed_in: "Your account was successfully confirmed. You are now signed in."
+      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 %{authentication_keys} or password."
+      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 is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
+      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."
-      unconfirmed: "You have to confirm your email address before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
    mailer:
      confirmation_instructions:
        subject: "Confirmation instructions"
      reset_password_instructions:
        subject: "Reset password instructions"
      unlock_instructions:
-        subject: "Unlock instructions"
-      email_changed:
-        subject: "Email Changed"
-      password_change:
-        subject: "Password Changed"
+        subject: "Unlock Instructions"
    omniauth_callbacks:
      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
      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 on how to reset your password in a few minutes."
+      send_instructions: "You will receive an email with instructions about 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 has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
    registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
      signed_up: "Welcome! You have signed up successfully."
      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
-      updated: "Your account has been updated successfully."
-      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
    sessions:
      signed_in: "Signed in successfully."
      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
    unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
  errors:
    messages:
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-
 $:.push File.expand_path("../lib", __FILE__)
 require "devise/version"

@@ -10,26 +8,20 @@ Gem::Specification.new do |s|
  s.platform    = Gem::Platform::RUBY
  s.licenses    = ["MIT"]
  s.summary     = "Flexible authentication solution for Rails with Warden"
-  s.email       = "heartcombo.oss@gmail.com"
-  s.homepage    = "https://github.com/heartcombo/devise"
+  s.email       = "contact@plataformatec.com.br"
+  s.homepage    = "http://github.com/plataformatec/devise"
  s.description = "Flexible authentication solution for Rails with Warden"
  s.authors     = ['José Valim', 'Carlos Antônio']
-  s.metadata    = {
-    "homepage_uri"      => "https://github.com/heartcombo/devise",
-    "documentation_uri" => "https://rubydoc.info/github/heartcombo/devise",
-    "changelog_uri"     => "https://github.com/heartcombo/devise/blob/main/CHANGELOG.md",
-    "source_code_uri"   => "https://github.com/heartcombo/devise",
-    "bug_tracker_uri"   => "https://github.com/heartcombo/devise/issues",
-    "wiki_uri"          => "https://github.com/heartcombo/devise/wiki"
-  }

-  s.files         = Dir["{app,config,lib}/**/*", "CHANGELOG.md", "MIT-LICENSE", "README.md"]
+  s.rubyforge_project = "devise"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
  s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.7.0'

  s.add_dependency("warden", "~> 1.2.3")
  s.add_dependency("orm_adapter", "~> 0.1")
-  s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("railties", ">= 7.0")
-  s.add_dependency("responders")
+  s.add_dependency("bcrypt-ruby", "~> 3.0")
+  s.add_dependency("thread_safe", "~> 0.1")
+  s.add_dependency("railties", ">= 3.2.6", "< 5")
 end
--- a/gemfiles/Gemfile-rails-7-0
+++ b/gemfiles/Gemfile-rails-7-0
@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 7.0.0"
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
-end
-
-platforms :ruby do
-  gem "sqlite3", "~> 1.4"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 7.5"
-end
--- a/gemfiles/Gemfile-rails-7-1
+++ b/gemfiles/Gemfile-rails-7-1
@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 7.1.0"
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat"
-  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
-end
-
-platforms :ruby do
-  gem "sqlite3", "~> 1.4"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 8.1"
-end
--- a/gemfiles/Gemfile-rails-7-2
+++ b/gemfiles/Gemfile-rails-7-2
@@ -1,32 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 7.1.0"
-
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat", require: false
-  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 8.1"
-end
--- a/gemfiles/Gemfile-rails-8-0
+++ b/gemfiles/Gemfile-rails-8-0
@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 8.0.0"
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem 'webrat'
-  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 8.1"
-end
--- a/gemfiles/Gemfile-rails-main
+++ b/gemfiles/Gemfile-rails-main
@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", github: "rails/rails", branch: "main"
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", github: "mongodb/mongoid", branch: "master"
-end
--- a/gemfiles/Gemfile.rails-3.2.x
+++ b/gemfiles/Gemfile.rails-3.2.x
@@ -0,0 +1,31 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "rails", "~> 3.2.6"
+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
+
+platforms :mri_19, :mri_20 do
+  group :mongoid do
+    gem "mongoid", "~> 3.0"
+  end
+end
--- a/gemfiles/Gemfile.rails-3.2.x.lock
+++ b/gemfiles/Gemfile.rails-3.2.x.lock
@@ -0,0 +1,159 @@
+PATH
+  remote: ..
+  specs:
+    devise (3.1.2)
+      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.14)
+    bcrypt-ruby (3.1.2)
+    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.3)
+      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/guides/bug_report_templates/integration_test.rb
+++ b/guides/bug_report_templates/integration_test.rb
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-begin
-  require 'bundler/inline'
-rescue LoadError => e
-  $stderr.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
-  raise e
-end
-
-gemfile(true) do
-  source 'https://rubygems.org'
-  # Activate the gem you are reporting the issue against.
-  gem 'rails', '~> 4.2.0'
-  gem 'devise', '~> 4.0'
-  gem 'sqlite3'
-  gem 'byebug'
-end
-
-require 'rack/test'
-require 'action_controller/railtie'
-require 'active_record'
-require 'devise/rails/routes'
-require 'devise/rails/warden_compat'
-
-ActiveRecord::Base.establish_connection( adapter: :sqlite3, database:  ':memory:')
-
-class DeviseCreateUsers < ActiveRecord::Migration
-  def change
-    create_table(:users) do |t|
-      t.string :email,              null: false
-      t.string :encrypted_password, null: true
-      t.timestamps null: false
-    end
-
-  end
-end
-
-Devise.setup do |config|
-  require 'devise/orm/active_record'
-  config.secret_key = 'secret_key_base'
-end
-
-class TestApp < Rails::Application
-  config.root = File.dirname(__FILE__)
-  config.session_store :cookie_store, key: 'cookie_store_key'
-  secrets.secret_token    = 'secret_token'
-  secrets.secret_key_base = 'secret_key_base'
-  config.eager_load = false
-
-  config.middleware.use Warden::Manager do |config|
-    Devise.warden_config = config
-  end
-
-  config.logger = Logger.new($stdout)
-  Rails.logger  = config.logger
-
-end
-
-Rails.application.initialize!
-
-DeviseCreateUsers.migrate(:up)
-
-class User < ActiveRecord::Base
-  devise :database_authenticatable
-end
-
-Rails.application.routes.draw do
-  devise_for :users
-
-  get '/' => 'test#index'
-end
-
-class ApplicationController < ActionController::Base
-end
-
-class TestController < ApplicationController
-  include Rails.application.routes.url_helpers
-
-  before_action :authenticate_user!
-
-  def index
-    render plain: 'Home'
-  end
-end
-
-require 'minitest/autorun'
-
-class BugTest < ActionDispatch::IntegrationTest
-  include Rack::Test::Methods
-  include Warden::Test::Helpers
-
-  def test_returns_success
-    Warden.test_mode!
-
-    login_as User.create!(email: 'test@test.com', password: 'test123456', password_confirmation: 'test123456')
-
-    get '/'
-    assert last_response.ok?
-  end
-
-  private
-
-  def app
-    Rails.application
-  end
-end
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,36 +1,26 @@
-# frozen_string_literal: true
-
 require 'rails'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
 require 'securerandom'
-require 'responders'

 module Devise
  autoload :Delegator,          'devise/delegator'
-  autoload :Encryptor,          'devise/encryptor'
  autoload :FailureApp,         'devise/failure_app'
  autoload :OmniAuth,           'devise/omniauth'
-  autoload :Orm,                'devise/orm'
  autoload :ParameterFilter,    'devise/parameter_filter'
+  autoload :BaseSanitizer,      'devise/parameter_sanitizer'
  autoload :ParameterSanitizer, 'devise/parameter_sanitizer'
+  autoload :TestHelpers,        'devise/test_helpers'
  autoload :TimeInflector,      'devise/time_inflector'
  autoload :TokenGenerator,     'devise/token_generator'

  module Controllers
-    autoload :Helpers,        'devise/controllers/helpers'
-    autoload :Rememberable,   'devise/controllers/rememberable'
-    autoload :Responder,      'devise/controllers/responder'
-    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'
+    autoload :Helpers, 'devise/controllers/helpers'
+    autoload :Rememberable, 'devise/controllers/rememberable'
+    autoload :ScopedViews, 'devise/controllers/scoped_views'
+    autoload :UrlHelpers, 'devise/controllers/url_helpers'
  end

  module Mailers
@@ -38,40 +28,45 @@ module Devise
  end

  module Strategies
-    autoload :Base,            'devise/strategies/base'
+    autoload :Base, 'devise/strategies/base'
    autoload :Authenticatable, 'devise/strategies/authenticatable'
  end

-  module Test
-    autoload :ControllerHelpers,  'devise/test/controller_helpers'
-    autoload :IntegrationHelpers, 'devise/test/integration_helpers'
-  end
-
  # Constants which holds devise configuration for extensions. Those should
  # not be modified by the "end user" (this is why they are constants).
  ALL         = []
-  CONTROLLERS = {}
-  ROUTES      = {}
-  STRATEGIES  = {}
-  URL_HELPERS = {}
+  CONTROLLERS = ActiveSupport::OrderedHash.new
+  ROUTES      = ActiveSupport::OrderedHash.new
+  STRATEGIES  = ActiveSupport::OrderedHash.new
+  URL_HELPERS = ActiveSupport::OrderedHash.new

  # Strategies that do not require user input.
  NO_INPUT = []

  # True values used to check params
-  TRUE_VALUES = [true, 1, '1', 'on', 'ON', 't', 'T', 'true', 'TRUE']
+  TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']

  # Secret key used by the key generator
  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 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
+
  # Custom domain or key for cookies. Not set by default
  mattr_accessor :rememberable_options
  @@rememberable_options = {}

-  # The number of times to hash the password.
+  # The number of times to encrypt password.
  mattr_accessor :stretches
-  @@stretches = 12
+  @@stretches = 10

  # The default key used when authenticating over http auth.
  mattr_accessor :http_authentication_key
@@ -79,7 +74,7 @@ module Devise

  # Keys used when authenticating a user.
  mattr_accessor :authentication_keys
-  @@authentication_keys = [:email]
+  @@authentication_keys = [ :email ]

  # Request keys used when authenticating a user.
  mattr_accessor :request_keys
@@ -87,11 +82,11 @@ module Devise

  # Keys that should be case-insensitive.
  mattr_accessor :case_insensitive_keys
-  @@case_insensitive_keys = [:email]
+  @@case_insensitive_keys = [ :email ]

  # Keys that should have whitespace stripped.
  mattr_accessor :strip_whitespace_keys
-  @@strip_whitespace_keys = [:email]
+  @@strip_whitespace_keys = []

  # If http authentication is enabled by default.
  mattr_accessor :http_authenticatable
@@ -109,11 +104,11 @@ module Devise
  mattr_accessor :http_authentication_realm
  @@http_authentication_realm = "Application"

-  # Email regex used to validate email formats. It asserts that there are no
-  # @ symbols or whitespaces in either the localpart or the domain, and that
-  # there is a single @ symbol separating the localpart and the domain.
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
  mattr_accessor :email_regexp
-  @@email_regexp = /\A[^@\s]+@[^@\s]+\z/
+  @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/

  # Range validation for password length
  mattr_accessor :password_length
@@ -127,10 +122,6 @@ module Devise
  mattr_accessor :extend_remember_period
  @@extend_remember_period = false

-  # If true, all the remember me tokens are going to be invalidated when the user signs out.
-  mattr_accessor :expire_all_remember_me_on_sign_out
-  @@expire_all_remember_me_on_sign_out = true
-
  # Time interval you can access your account before confirming your account.
  # nil - allows unconfirmed access for unlimited time
  mattr_accessor :allow_unconfirmed_access_for
@@ -142,28 +133,25 @@ module Devise

  # Defines which key will be used when confirming an account.
  mattr_accessor :confirmation_keys
-  @@confirmation_keys = [:email]
+  @@confirmation_keys = [ :email ]

  # Defines if email should be reconfirmable.
+  # False by default for backwards compatibility.
  mattr_accessor :reconfirmable
-  @@reconfirmable = true
+  @@reconfirmable = false

  # Time interval to timeout the user session without activity.
  mattr_accessor :timeout_in
  @@timeout_in = 30.minutes

-  # Used to hash the password. Please generate one with rails secret.
+  # Authentication token expiration on timeout
+  mattr_accessor :expire_auth_token_on_timeout
+  @@expire_auth_token_on_timeout = false
+
+  # Used to encrypt password. Please generate one with rake secret.
  mattr_accessor :pepper
  @@pepper = nil

-  # Used to send notification to the original user email when their email is changed.
-  mattr_accessor :send_email_changed_notification
-  @@send_email_changed_notification = false
-
-  # Used to enable sending notification to user when their password is changed.
-  mattr_accessor :send_password_change_notification
-  @@send_password_change_notification = false
-
  # Scoped views. Since it relies on fallbacks to render default views, it's
  # turned off by default.
  mattr_accessor :scoped_views
@@ -176,7 +164,7 @@ module Devise

  # Defines which key will be used when locking and unlocking an account
  mattr_accessor :unlock_keys
-  @@unlock_keys = [:email]
+  @@unlock_keys = [ :email ]

  # Defines which strategy can be used to unlock an account.
  # Values: :email, :time, :both
@@ -193,16 +181,12 @@ module Devise

  # Defines which key will be used when recovering the password for an account
  mattr_accessor :reset_password_keys
-  @@reset_password_keys = [:email]
+  @@reset_password_keys = [ :email ]

  # Time interval you can reset your password with a reset password key
  mattr_accessor :reset_password_within
  @@reset_password_within = 6.hours

-  # When set to false, resetting a password does not automatically sign in a user
-  mattr_accessor :sign_in_after_reset_password
-  @@sign_in_after_reset_password = true
-
  # The default scope which is used by warden.
  mattr_accessor :default_scope
  @@default_scope = nil
@@ -211,22 +195,17 @@ 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 = [:http_auth]
+  @@skip_session_storage = []

  # Which formats should be treated as navigational.
  mattr_accessor :navigational_formats
-  @@navigational_formats = ["*/*", :html, :turbo_stream]
-
-  # The default responder used by Devise, used to customize status codes with:
-  #
-  #   `config.responder.error_status`
-  #   `config.responder.redirect_status`
-  #
-  # Can be replaced by a custom application responder.
-  mattr_accessor :responder
-  @@responder = Devise::Controllers::Responder
+  @@navigational_formats = ["*/*", :html]

  # When set to true, signing out a user signs out all other scopes.
  mattr_accessor :sign_out_all_scopes
@@ -234,7 +213,7 @@ module Devise

  # The default method used while signing out
  mattr_accessor :sign_out_via
-  @@sign_out_via = :delete
+  @@sign_out_via = :get

  # The parent controller all Devise controllers inherits from.
  # Defaults to ApplicationController. This should be set early
@@ -249,12 +228,12 @@ module Devise
  @@parent_mailer = "ActionMailer::Base"

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

-  # Set the OmniAuth path prefix so it can be overridden when
+  # Set the omniauth path prefix so it can be overriden when
  # Devise is used in a mountable engine
  mattr_accessor :omniauth_path_prefix
  @@omniauth_path_prefix = nil
@@ -263,28 +242,15 @@ module Devise
  mattr_accessor :clean_up_csrf_token_on_authentication
  @@clean_up_csrf_token_on_authentication = true

-  # When false, Devise will not attempt to reload routes on eager load.
-  # This can reduce the time taken to boot the app but if your application
-  # requires the Devise mappings to be loaded during boot time the application
-  # won't boot properly.
-  mattr_accessor :reload_routes
-  @@reload_routes = true
-
  # PRIVATE CONFIGURATION

  # Store scopes mappings.
-  @@mappings = {}
-  def self.mappings
-    # Starting from Rails 8.0, routes are lazy-loaded by default in test and development environments.
-    # However, Devise's mappings are built during the routes loading phase.
-    # To ensure it works correctly, we need to load the routes first before accessing @@mappings.
-    Rails.application.try(:reload_routes_unless_loaded)
-    @@mappings
-  end
+  mattr_reader :mappings
+  @@mappings = ActiveSupport::OrderedHash.new

-  # OmniAuth configurations.
+  # Omniauth configurations.
  mattr_reader :omniauth_configs
-  @@omniauth_configs = {}
+  @@omniauth_configs = ActiveSupport::OrderedHash.new

  # Define a set of modules that are called when a mapping is added.
  mattr_reader :helpers
@@ -294,51 +260,39 @@ module Devise
  # Private methods to interface with Warden.
  mattr_accessor :warden_config
  @@warden_config = nil
-  @@warden_config_blocks = []
+  @@warden_config_block = nil

  # When true, enter in paranoid mode to avoid user enumeration.
  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 = true
-
  # Stores the token generator
  mattr_accessor :token_generator
  @@token_generator = nil

-  # When set to false, changing a password does not automatically sign in a user
-  mattr_accessor :sign_in_after_change_password
-  @@sign_in_after_change_password = true
-
-  # Default way to set up Devise. Run rails generate devise_install to create
+  # Default way to setup Devise. Run rails generate devise_install to create
  # a fresh initializer with all configuration values.
  def self.setup
    yield self
  end

  class Getter
-    def initialize(name)
+    def initialize name
      @name = name
    end

    def get
-      # TODO: Remove AS::Dependencies usage when dropping support to Rails < 7.
-      if ActiveSupport::Dependencies.respond_to?(:constantize)
-        ActiveSupport::Dependencies.constantize(@name)
-      else
-        @name.constantize
-      end
+      ActiveSupport::Dependencies.constantize(@name)
    end
  end

  def self.ref(arg)
-    # TODO: Remove AS::Dependencies usage when dropping support to Rails < 7.
-    if ActiveSupport::Dependencies.respond_to?(:reference)
-      ActiveSupport::Dependencies.reference(arg)
+    if defined?(ActiveSupport::Dependencies::ClassCache)
+      ActiveSupport::Dependencies::reference(arg)
+      Getter.new(arg)
+    else
+      ActiveSupport::Dependencies.ref(arg)
    end
-    Getter.new(arg)
  end

  def self.available_router_name
@@ -369,12 +323,7 @@ module Devise
    mapping
  end

-  # Register available devise modules. For the standard modules that Devise provides, this method is
-  # called from lib/devise/modules.rb. Third-party modules need to be added explicitly using this method.
-  #
-  # Note that adding a module using this method does not cause it to be used in the authentication
-  # process. That requires that the module be listed in the arguments passed to the 'devise' method
-  # in the model class definition.
+  # Make Devise aware of an 3rd party Devise-module (like invitable). For convenience.
  #
  # == Options:
  #
@@ -382,7 +331,6 @@ module Devise
  #   +controller+ - Symbol representing the name of an existing or custom *controller* for this module.
  #   +route+      - Symbol representing the named *route* helper for this module.
  #   +strategy+   - Symbol representing if this module got a custom *strategy*.
-  #   +insert_at+  - Integer representing the order in which this module's model will be included
  #
  # All values, except :model, accept also a boolean and will have the same name as the given module
  # name.
@@ -390,14 +338,12 @@ module Devise
  # == Examples:
  #
  #   Devise.add_module(:party_module)
-  #   Devise.add_module(:party_module, strategy: true, controller: :sessions)
-  #   Devise.add_module(:party_module, model: 'party_module/model')
-  #   Devise.add_module(:party_module, insert_at: 0)
+  #   Devise.add_module(:party_module, :strategy => true, :controller => :sessions)
+  #   Devise.add_module(:party_module, :model => 'party_module/model')
  #
  def self.add_module(module_name, options = {})
-    options.assert_valid_keys(:strategy, :model, :controller, :route, :no_input, :insert_at)
-
-    ALL.insert (options[:insert_at] || -1), module_name
+    ALL << module_name
+    options.assert_valid_keys(:strategy, :model, :controller, :route, :no_input)

    if strategy = options[:strategy]
      strategy = (strategy == true ? module_name : strategy)
@@ -442,23 +388,24 @@ module Devise
  # Sets warden configuration using a block that will be invoked on warden
  # initialization.
  #
-  #  Devise.setup do |config|
+  #  Devise.initialize do |config|
  #    config.allow_unconfirmed_access_for = 2.days
  #
-  #    config.warden do |warden_config|
+  #    config.warden do |manager|
  #      # Configure warden to use other strategies, like oauth.
-  #      warden_config.oauth(:twitter)
+  #      manager.oauth(:twitter)
  #    end
  #  end
  def self.warden(&block)
-    @@warden_config_blocks << block
+    @@warden_config_block = block
  end

-  # Specify an OmniAuth provider.
+  # Specify an omniauth provider.
  #
  #   config.omniauth :github, APP_ID, APP_SECRET
  #
  def self.omniauth(provider, *args)
+    @@helpers << Devise::OmniAuth::UrlHelpers
    config = Devise::OmniAuth::Config.new(provider, args)
    @@omniauth_configs[config.strategy_name.to_sym] = config
  end
@@ -481,8 +428,8 @@ module Devise
    Devise::Controllers::UrlHelpers.generate_helpers!
  end

-  # A method used internally to complete the setup of warden manager after routes are loaded.
-  # See lib/devise/rails/routes.rb - ActionDispatch::Routing::RouteSet#finalize_with_devise!
+  # A method used internally to setup warden manager from the Rails initialize
+  # block.
  def self.configure_warden! #:nodoc:
    @@warden_configured ||= begin
      warden_config.failure_app   = Devise::Delegator.new
@@ -490,39 +437,38 @@ module Devise
      warden_config.intercept_401 = false

      Devise.mappings.each_value do |mapping|
-        warden_config.scope_defaults mapping.name, strategies: mapping.strategies
+        warden_config.scope_defaults mapping.name, :strategies => mapping.strategies

        warden_config.serialize_into_session(mapping.name) do |record|
          mapping.to.serialize_into_session(record)
        end

-        warden_config.serialize_from_session(mapping.name) do |args|
+        warden_config.serialize_from_session(mapping.name) do |key|
+          # Previous versions contained an additional entry at the beginning of
+          # key with the record's class name.
+          args = key[-2, 2]
          mapping.to.serialize_from_session(*args)
        end
      end

-      @@warden_config_blocks.map { |block| block.call Devise.warden_config }
+      @@warden_config_block.try :call, Devise.warden_config
      true
    end
  end

  # Generate a friendly string randomly to be used as token.
-  # By default, length is 20 characters.
-  def self.friendly_token(length = 20)
-    # To calculate real characters, we must perform this operation.
-    # See SecureRandom.urlsafe_base64
-    rlength = (length * 3) / 4
-    SecureRandom.urlsafe_base64(rlength).tr('lIO0', 'sxyz')
+  def self.friendly_token
+    SecureRandom.urlsafe_base64(15).tr('lIO0', 'sxyz')
  end

  # constant-time comparison algorithm to prevent timing attacks
  def self.secure_compare(a, b)
-    return false if a.nil? || b.nil?
-    ActiveSupport::SecurityUtils.secure_compare(a, b)
-  end
+    return false if a.blank? || b.blank? || a.bytesize != b.bytesize
+    l = a.unpack "C#{a.bytesize}"

-  def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new("5.0", "Devise")
+    res = 0
+    b.each_byte { |byte| res |= byte ^ l.shift }
+    res == 0
  end
 end

--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -1,85 +1,14 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # Those helpers are convenience methods added to ApplicationController.
    module Helpers
      extend ActiveSupport::Concern
-      include Devise::Controllers::SignInOut
-      include Devise::Controllers::StoreLocation

      included do
-        if respond_to?(:helper_method)
-          helper_method :warden, :signed_in?, :devise_controller?
-        end
+        helper_method :warden, :signed_in?, :devise_controller?
      end

      module ClassMethods
-        # Define authentication filters and accessor helpers for a group of mappings.
-        # These methods are useful when you are working with multiple mappings that
-        # share some functionality. They are pretty much the same as the ones
-        # defined for normal mappings.
-        #
-        # Example:
-        #
-        #   inside BlogsController (or any other controller, it doesn't matter which):
-        #     devise_group :blogger, contains: [:user, :admin]
-        #
-        #   Generated methods:
-        #     authenticate_blogger!  # Redirects unless user or admin are signed in
-        #     blogger_signed_in?     # Checks whether there is either a user or an admin signed in
-        #     current_blogger        # Currently signed in user or admin
-        #     current_bloggers       # Currently signed in user and admin
-        #
-        #   Use:
-        #     before_action :authenticate_blogger!              # Redirects unless either a user or an admin are authenticated
-        #     before_action ->{ authenticate_blogger! :admin }  # Redirects to the admin login page
-        #     current_blogger :user                             # Preferably returns a User if one is signed in
-        #
-        def devise_group(group_name, opts = {})
-          mappings = "[#{ opts[:contains].map { |m| ":#{m}" }.join(',') }]"
-
-          class_eval <<-METHODS, __FILE__, __LINE__ + 1
-            def authenticate_#{group_name}!(favorite = nil, opts = {})
-              unless #{group_name}_signed_in?
-                mappings = #{mappings}
-                mappings.unshift mappings.delete(favorite.to_sym) if favorite
-                mappings.each do |mapping|
-                  opts[:scope] = mapping
-                  opts[:locale] = I18n.locale
-                  warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
-                end
-              end
-            end
-
-            def #{group_name}_signed_in?
-              #{mappings}.any? do |mapping|
-                warden.authenticate?(scope: mapping)
-              end
-            end
-
-            def current_#{group_name}(favorite = nil)
-              mappings = #{mappings}
-              mappings.unshift mappings.delete(favorite.to_sym) if favorite
-              mappings.each do |mapping|
-                current = warden.authenticate(scope: mapping)
-                return current if current
-              end
-              nil
-            end
-
-            def current_#{group_name.to_s.pluralize}
-              #{mappings}.map do |mapping|
-                warden.authenticate(scope: mapping)
-              end.compact
-            end
-
-            if respond_to?(:helper_method)
-              helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
-            end
-          METHODS
-        end
-
        def log_process_action(payload)
          payload[:status] ||= 401 unless payload[:exception]
          super
@@ -87,7 +16,7 @@ module Devise
      end

      # Define authentication filters and accessor helpers based on mappings.
-      # These filters should be used inside the controllers as before_actions,
+      # These filters should be used inside the controllers as before_filters,
      # so you can control the scope of the user who should be signed in to
      # access that specific controller/action.
      # Example:
@@ -107,16 +36,15 @@ module Devise
      #     admin_session       # Session data available only to the admin scope
      #
      #   Use:
-      #     before_action :authenticate_user!  # Tell devise to use :user map
-      #     before_action :authenticate_admin! # Tell devise to use :admin map
+      #     before_filter :authenticate_user!  # Tell devise to use :user map
+      #     before_filter :authenticate_admin! # Tell devise to use :admin map
      #
      def self.define_helpers(mapping) #:nodoc:
        mapping = mapping.name

        class_eval <<-METHODS, __FILE__, __LINE__ + 1
-          def authenticate_#{mapping}!(opts = {})
+          def authenticate_#{mapping}!(opts={})
            opts[:scope] = :#{mapping}
-            opts[:locale] = I18n.locale
            warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
          end

@@ -125,7 +53,7 @@ module Devise
          end

          def current_#{mapping}
-            @current_#{mapping} ||= warden.authenticate(scope: :#{mapping})
+            @current_#{mapping} ||= warden.authenticate(:scope => :#{mapping})
          end

          def #{mapping}_session
@@ -134,31 +62,33 @@ module Devise
        METHODS

        ActiveSupport.on_load(:action_controller) do
-          if respond_to?(:helper_method)
-            helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
-          end
+          helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
        end
      end

      # The main accessor for the warden proxy instance
      def warden
-        request.env['warden'] or raise MissingWarden
+        request.env['warden']
      end

      # Return true if it's a devise_controller. false to all controllers unless
      # the controllers defined inside devise. Useful if you want to apply a before
      # filter to all controllers, except the ones in devise:
      #
-      #   before_action :my_filter, unless: :devise_controller?
+      #   before_filter :my_filter, :unless => :devise_controller?
      def devise_controller?
-        is_a?(::DeviseController)
+        is_a?(DeviseController)
      end

-      # Set up a param sanitizer to filter parameters using strong_parameters. See
+      # Setup a param sanitizer to filter parameters using strong_parameters. See
      # lib/devise/parameter_sanitizer.rb for more info. Override this
      # method in your application controller to use your own parameter sanitizer.
      def devise_parameter_sanitizer
-        @devise_parameter_sanitizer ||= Devise::ParameterSanitizer.new(resource_class, resource_name, params)
+        @devise_parameter_sanitizer ||= if defined?(ActionController::StrongParameters)
+          Devise::ParameterSanitizer.new(resource_class, resource_name, params)
+        else
+          Devise::BaseSanitizer.new(resource_class, resource_name, params)
+        end
      end

      # Tell warden that params authentication is allowed for that specific page.
@@ -166,20 +96,108 @@ module Devise
        request.env["devise.allow_params_authentication"] = true
      end

-      # The scope root url to be used when they're signed in. By default, it first
+      # 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
      # 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)
-        router_name = Devise.mappings[scope].router_name
-
        home_path = "#{scope}_root_path"
-
-        context = router_name ? send(router_name) : self
-
-        if context.respond_to?(home_path, true)
-          context.send(home_path)
-        elsif context.respond_to?(:root_path)
-          context.root_path
+        if respond_to?(home_path, true)
+          send(home_path)
        elsif respond_to?(:root_path)
          root_path
        else
@@ -196,10 +214,10 @@ module Devise
      # root path. For a user scope, you can define the default url in
      # the following way:
      #
-      #   get '/users' => 'users#index', as: :user_root # creates user_root_path
+      #   map.user_root '/users', :controller => 'users' # creates user_root_path
      #
-      #   namespace :user do
-      #     root 'users#index' # creates user_root_path
+      #   map.namespace :user do |user|
+      #     user.root :controller => 'users' # creates user_root_path
      #   end
      #
      # If the resource root path is not defined, root_path is used. However,
@@ -225,10 +243,7 @@ module Devise
      #
      # By default it is the root_path.
      def after_sign_out_path_for(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        router_name = Devise.mappings[scope].router_name
-        context = router_name ? send(router_name) : self
-        context.respond_to?(:root_path) ? context.root_path : "/"
+        respond_to?(:root_path) ? root_path : "/"
      end

      # Sign in a user and tries to redirect first to the stored location and
@@ -242,6 +257,10 @@ 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)
@@ -254,9 +273,10 @@ module Devise
      # Overwrite Rails' handle unverified request to sign out all scopes,
      # clear run strategies and remove cached variables.
      def handle_unverified_request
-        super # call the default behavior which resets/nullifies/raises
-        request.env["devise.skip_storage"] = true
        sign_out_all_scopes(false)
+        request.env["devise.skip_storage"] = true
+        expire_devise_cached_variables!
+        super # call the default behaviour which resets the session
      end

      def request_format
@@ -267,29 +287,11 @@ 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?
-        request.respond_to?(:flash) && is_navigational_format?
-      end
-
      private

-      def expire_data_after_sign_out!
+      def expire_devise_cached_variables!
        Devise.mappings.each { |_,m| instance_variable_set("@current_#{m.name}", nil) }
-        super
      end
    end
  end
-
-  class MissingWarden < StandardError
-    def initialize
-      super "Devise could not find the `Warden::Proxy` instance on your request environment.\n" + \
-        "Make sure that your application is loading Devise and Warden as expected and that " + \
-        "the `Warden::Manager` middleware is present in your middleware stack.\n" + \
-        "If you are seeing this on one of your tests, ensure that your tests are either " + \
-        "executing the Rails middleware stack or that your tests are using the `Devise::Test::ControllerHelpers` " + \
-        "module to inject the `request.env['warden']` object for you."
-    end
-  end
 end
--- a/lib/devise/controllers/rememberable.rb
+++ b/lib/devise/controllers/rememberable.rb
@@ -1,28 +1,29 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # A module that may be optionally included in a controller in order
-    # to provide remember me behavior. Useful when signing in is done
-    # through a callback, like in OmniAuth.
+    # to provide remember me behavior.
    module Rememberable
      # Return default cookie values retrieved from session options.
      def self.cookie_values
        Rails.configuration.session_options.slice(:path, :domain, :secure)
      end

-      def remember_me_is_active?(resource)
-        return false unless resource.respond_to?(:remember_me)
-        scope = Devise::Mapping.find_scope!(resource)
-        _, token, generated_at = cookies.signed[remember_key(resource, scope)]
-        resource.remember_me?(token, generated_at)
+      # 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 request.env["devise.skip_storage"]
+        return if env["devise.skip_storage"]
        scope = Devise::Mapping.find_scope!(resource)
-        resource.remember_me!
+        resource.remember_me!(resource.extend_remember_period)
        cookies.signed[remember_key(resource, scope)] = remember_cookie_values(resource)
      end

@@ -40,11 +41,11 @@ module Devise
      end

      def remember_cookie_values(resource)
-        options = { httponly: true }
+        options = { :httponly => true }
        options.merge!(forget_cookie_values(resource))
        options.merge!(
-          value: resource.class.serialize_into_cookie(resource),
-          expires: resource.remember_expires_at
+          :value => resource.class.serialize_into_cookie(resource),
+          :expires => resource.remember_expires_at
        )
      end

--- a/lib/devise/controllers/responder.rb
+++ b/lib/devise/controllers/responder.rb
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Devise
-  module Controllers
-    # Custom Responder to configure default statuses that only apply to Devise,
-    # and allow to integrate more easily with Hotwire/Turbo.
-    class Responder < ActionController::Responder
-      if respond_to?(:error_status=) && respond_to?(:redirect_status=)
-        self.error_status = :ok
-        self.redirect_status = :found
-      else
-        # TODO: remove this support for older Rails versions, which aren't supported by Turbo
-        # and/or responders. It won't allow configuring a custom response, but it allows Devise
-        # to use these methods and defaults across the implementation more easily.
-        def self.error_status
-          :ok
-        end
-
-        def self.redirect_status
-          :found
-        end
-
-        def self.error_status=(*)
-          warn "[DEVISE] Setting the error status on the Devise responder has no effect with this " \
-            "version of `responders`, please make sure you're using a newer version. Check the changelog for more info."
-        end
-
-        def self.redirect_status=(*)
-          warn "[DEVISE] Setting the redirect status on the Devise responder has no effect with this " \
-            "version of `responders`, please make sure you're using a newer version. Check the changelog for more info."
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    module ScopedViews
@@ -16,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
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-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. This will run authentication hooks, which may
-      # cause exceptions to be thrown from this method; if you simply want to check
-      # if a scope has already previously been authenticated without running
-      # authentication hooks, you can directly call `warden.authenticated?(scope: scope)`
-      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.
-      # If you are using a custom warden strategy and the timeoutable module, you have to
-      # set `env["devise.skip_timeout"] = true` in the request to use this method, like we do
-      # in the sessions controller: https://github.com/heartcombo/devise/blob/main/app/controllers/devise/sessions_controller.rb#L7
-      #
-      # 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)
-      #
-      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 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 in a user bypassing the 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:
-      #
-      #   bypass_sign_in @user, scope: :user
-      #   bypass_sign_in @user
-      def bypass_sign_in(resource, scope: nil)
-        scope ||= Devise::Mapping.find_scope!(resource)
-        expire_data_after_sign_in!
-        warden.session_serializer.store(resource, scope)
-      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.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.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.grep(/^devise\./).each { |k| session.delete(k) }
-      end
-
-      alias :expire_data_after_sign_out! :expire_data_after_sign_in!
-    end
-  end
-end
--- a/lib/devise/controllers/store_location.rb
+++ b/lib/devise/controllers/store_location.rb
@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-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_facebook_omniauth_authorize_path
-      #
-      def store_location_for(resource_or_scope, location)
-        session_key = stored_location_key_for(resource_or_scope)
-        
-        path = extract_path_from_location(location)
-        session[session_key] = path if path
-      end
-
-      private
-
-      def parse_uri(location)
-        location && URI.parse(location)
-      rescue URI::InvalidURIError
-        nil
-      end
-
-      def stored_location_key_for(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        "#{scope}_return_to"
-      end
-
-      def extract_path_from_location(location)
-        uri = parse_uri(location)
-
-        if uri 
-          path = remove_domain_from_uri(uri)
-          path = add_fragment_back_to_path(uri, path)
-
-          path
-        end
-      end
-
-      def remove_domain_from_uri(uri)
-        [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
-      end
-
-      def add_fragment_back_to_path(uri, path)
-        [path, uri.fragment].compact.join('#')
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # Create url helpers to be used with resource/scope configuration. Acts as
@@ -34,7 +32,7 @@ module Devise
        end
      end

-      def self.generate_helpers!(routes = nil)
+      def self.generate_helpers!(routes=nil)
        routes ||= begin
          mappings = Devise.mappings.values.map(&:used_helpers).flatten.uniq
          Devise::URL_HELPERS.slice(*mappings)
@@ -44,14 +42,14 @@ module Devise
          [:path, :url].each do |path_or_url|
            actions.each do |action|
              action = action ? "#{action}_" : ""
-              method = :"#{action}#{module_name}_#{path_or_url}"
+              method = "#{action}#{module_name}_#{path_or_url}"

-              define_method method do |resource_or_scope, *args|
-                scope = Devise::Mapping.find_scope!(resource_or_scope)
-                router_name = Devise.mappings[scope].router_name
-                context = router_name ? send(router_name) : _devise_route_context
-                context.send("#{action}#{scope}_#{module_name}_#{path_or_url}", *args)
-              end
+              class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
+                def #{method}(resource_or_scope, *args)
+                  scope = Devise::Mapping.find_scope!(resource_or_scope)
+                  _devise_route_context.send("#{action}\#{scope}_#{module_name}_#{path_or_url}", *args)
+                end
+              URL_HELPERS
            end
          end
        end
--- a/lib/devise/delegator.rb
+++ b/lib/devise/delegator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # Checks the scope in the given environment and returns the associated failure app.
  class Delegator
--- a/lib/devise/encryptor.rb
+++ b/lib/devise/encryptor.rb
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'bcrypt'
-
-module Devise
-  module Encryptor
-    def self.digest(klass, password)
-      if klass.pepper.present?
-        password = "#{password}#{klass.pepper}"
-      end
-      ::BCrypt::Password.create(password, cost: klass.stretches).to_s
-    end
-
-    def self.compare(klass, hashed_password, password)
-      return false if hashed_password.blank?
-      bcrypt   = ::BCrypt::Password.new(hashed_password)
-      if klass.pepper.present?
-        password = "#{password}#{klass.pepper}"
-      end
-      password = ::BCrypt::Engine.hash_secret(password, bcrypt.salt)
-      Devise.secure_compare(password, hashed_password)
-    end
-  end
-end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -1,39 +1,28 @@
-# frozen_string_literal: true
-
 require "action_controller/metal"

 module Devise
  # Failure application that will be called every time :warden is thrown from
-  # any strategy or hook. It is responsible for redirecting the user to the sign
-  # in page based on current scope and mapping. If no scope is given, it
-  # redirects to the default_url.
+  # any strategy or hook. Responsible for redirect the user to the sign in
+  # page based on current scope and mapping. If no scope is given, redirect
+  # to the default_url.
  class FailureApp < ActionController::Metal
+    include ActionController::RackDelegation
    include ActionController::UrlFor
    include ActionController::Redirecting

    include Rails.application.routes.url_helpers
    include Rails.application.routes.mounted_helpers

-    include Devise::Controllers::StoreLocation
-
-    delegate :flash, to: :request
-
-    include AbstractController::Callbacks
-    around_action do |failure_app, action|
-      I18n.with_locale(failure_app.i18n_locale, &action)
-    end
+    delegate :flash, :to => :request

    def self.call(env)
      @respond ||= action(:respond)
      @respond.call(env)
    end

-    # Try retrieving the URL options from the parent controller (usually
-    # ApplicationController). Instance methods are not supported at the moment,
-    # so only the class-level attribute is used.
    def self.default_url_options(*args)
-      if defined?(Devise.parent_controller.constantize)
-        Devise.parent_controller.constantize.try(:default_url_options) || {}
+      if defined?(ApplicationController)
+        ApplicationController.default_url_options(*args)
      else
        {}
      end
@@ -57,82 +46,38 @@ module Devise
    end

    def recall
-      header_info = if relative_url_root?
-        base_path = Pathname.new(relative_url_root)
-        full_path = Pathname.new(attempted_path)
-
-        { "SCRIPT_NAME" => relative_url_root,
-          "PATH_INFO" => '/' + full_path.relative_path_from(base_path).to_s }
-      else
-        { "PATH_INFO" => attempted_path }
-      end
-
-      header_info.each do | var, value|
-        if request.respond_to?(:set_header)
-          request.set_header(var, value)
-        else
-          request.env[var]  = value
-        end
-      end
-
-      flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
-      self.response = recall_app(warden_options[:recall]).call(request.env).tap { |response|
-        status = response[0].in?(300..399) ? Devise.responder.redirect_status : Devise.responder.error_status
-        # Avoid warnings translating status to code using Rails if available (e.g. `unprocessable_entity` => `unprocessable_content`)
-        response[0] = ActionDispatch::Response.try(:rack_status_code, status) || Rack::Utils.status_code(status)
-      }
+      env["PATH_INFO"]  = attempted_path
+      flash.now[:alert] = i18n_message(:invalid)
+      self.response = recall_app(warden_options[:recall]).call(env)
    end

    def redirect
      store_location!
-      if is_flashing_format?
-        if flash[:timedout] && flash[:alert]
-          flash.keep(:timedout)
-          flash.keep(:alert)
-        else
-          flash[:alert] = i18n_message
-        end
+      if flash[:timedout] && flash[:alert]
+        flash.keep(:timedout)
+        flash.keep(:alert)
+      else
+        flash[:alert] = i18n_message
      end
      redirect_to redirect_url
    end

  protected

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

      if message.is_a?(Symbol)
-        options = {}
-        options[:resource_name] = scope
-        options[:scope] = "devise.failure"
-        options[:default] = [message]
-        auth_keys = scope_class.authentication_keys
-        human_keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key|
-          scope_class.human_attribute_name(key).downcase
-        }
-        options[:authentication_keys] = human_keys.join(I18n.t(:"support.array.words_connector"))
-        options = i18n_options(options)
-
-        I18n.t(:"#{scope}.#{message}", **options).then { |msg|
-          # Ensure that auth keys at the start of the translated string are properly cased.
-          msg.start_with?(human_keys.first) ? msg.upcase_first : msg
-        }
+        I18n.t(:"#{scope}.#{message}", :resource_name => scope,
+               :scope => "devise.failure", :default => [message])
      else
        message.to_s
      end
    end

-    def i18n_locale
-      warden_options[:locale]
-    end
-
    def redirect_url
      if warden_message == :timeout
-        flash[:timedout] = true if is_flashing_format?
+        flash[:timedout] = true

        path = if request.get?
          attempted_path
@@ -140,53 +85,41 @@ module Devise
          request.referrer
        end

-        path || scope_url
+        path || scope_path
      else
-        scope_url
+        scope_path
      end
    end

-    def route(scope)
-      :"new_#{scope}_session_url"
-    end
-
-    def scope_url
+    def scope_path
      opts  = {}
-
-      # Initialize script_name with nil to prevent infinite loops in
-      # authenticated mounted engines
-      opts[:script_name] = nil
-
-      route = route(scope)
-
+      route = :"new_#{scope}_session_path"
      opts[:format] = request_format unless skip_format?

-      router_name = Devise.mappings[scope].router_name || Devise.available_router_name
-      context = send(router_name)
+      config = Rails.application.config
+      opts[:script_name] = (config.relative_url_root if config.respond_to?(:relative_url_root))

-      if relative_url_root?
-        opts[:script_name] = relative_url_root
-      end
+      context = send(Devise.available_router_name)

      if context.respond_to?(route)
        context.send(route, opts)
-      elsif respond_to?(:root_url)
-        root_url(opts)
+      elsif respond_to?(:root_path)
+        root_path(opts)
      else
        "/"
      end
    end

    def skip_format?
-      %w(html */* turbo_stream).include? request_format.to_s
+      %w(html */*).include? request_format.to_s
    end

-    # Choose whether we should respond in an HTTP authentication fashion,
+    # Choose whether we should respond in a http authentication fashion,
    # including 401 and optional headers.
    #
-    # This method allows the user to explicitly disable HTTP authentication
-    # on AJAX requests in case they want to redirect on failures instead of
-    # handling the errors on their own. This is useful in case your AJAX API
+    # This method allows the user to explicitly disable http authentication
+    # on ajax requests in case they want to redirect on failures instead of
+    # handling the errors on their own. This is useful in case your ajax API
    # is the same as your public API and uses a format like JSON (so you
    # cannot mark JSON as a navigational format).
    def http_auth?
@@ -197,19 +130,19 @@ module Devise
      end
    end

-    # It doesn't make sense to send authenticate headers in AJAX requests
+    # It does not make sense to send authenticate headers in ajax requests
    # or if the user disabled them.
    def http_auth_header?
-      scope_class.http_authenticatable && !request.xhr?
+      Devise.mappings[scope].to.http_authenticatable && !request.xhr?
    end

    def http_auth_body
      return i18n_message unless request_format
      method = "to_#{request_format}"
      if method == "to_xml"
-        { error: i18n_message }.to_xml(root: "errors")
+        { :error => i18n_message }.to_xml(:root => "errors")
      elsif {}.respond_to?(method)
-        { error: i18n_message }.send(method)
+        { :error => i18n_message }.send(method)
      else
        i18n_message
      end
@@ -223,11 +156,11 @@ module Devise
    end

    def warden
-      request.respond_to?(:get_header) ? request.get_header("warden") : request.env["warden"]
+      env['warden']
    end

    def warden_options
-      request.respond_to?(:get_header) ? request.get_header("warden.options") : request.env["warden.options"]
+      env['warden.options']
    end

    def warden_message
@@ -238,48 +171,24 @@ module Devise
      @scope ||= warden_options[:scope] || Devise.default_scope
    end

-    def scope_class
-      @scope_class ||= Devise.mappings[scope].to
-    end
-
    def attempted_path
      warden_options[:attempted_path]
    end

-    # Stores requested URI to redirect the user after signing in. We can't use
-    # the scoped session provided by warden here, since the user is not
-    # authenticated yet, but we still need to store the URI based on scope, so
-    # different scopes would never use the same URI to redirect.
+    # Stores requested uri to redirect the user after signing in. We cannot use
+    # scoped session provided by warden here, since the user is not authenticated
+    # 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!
-      store_location_for(scope, attempted_path) if request.get? && !http_auth?
+      session["#{scope}_return_to"] = attempted_path if request.get? && !http_auth?
    end

    def is_navigational_format?
      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?
-      request.respond_to?(:flash) && is_navigational_format?
-    end
-
    def request_format
      @request_format ||= request.format.try(:ref)
    end
-
-    def relative_url_root
-      @relative_url_root ||= begin
-        config = Rails.application.config
-
-        config.try(:relative_url_root) || config.action_controller.try(:relative_url_root)
-      end
-    end
-
-    def relative_url_root?
-      relative_url_root.present?
-    end
-
-    ActiveSupport.run_load_hooks(:devise_failure_app, self)
  end
 end
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -1,12 +1,11 @@
-# frozen_string_literal: true
-
-# Deny user access whenever their account is not active yet.
-# We need this as hook to validate the user activity on each request
-# and in case the user is using other strategies beside Devise ones.
+# Deny user access whenever his 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
+# 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?
    scope = options[:scope]
    warden.logout(scope)
-    throw :warden, scope: scope, message: record.inactive_message, locale: options.fetch(:locale, I18n.locale)
+    throw :warden, :scope => scope, :message => record.inactive_message
  end
-end
+end
--- a/lib/devise/hooks/csrf_cleaner.rb
+++ b/lib/devise/hooks/csrf_cleaner.rb
@@ -1,14 +1,5 @@
-# frozen_string_literal: true
-
 Warden::Manager.after_authentication do |record, warden, options|
-  clean_up_for_winning_strategy = !warden.winning_strategy.respond_to?(:clean_up_csrf?) ||
-    warden.winning_strategy.clean_up_csrf?
-  if Devise.clean_up_csrf_token_on_authentication && clean_up_for_winning_strategy
-    if warden.request.respond_to?(:reset_csrf_token)
-      # Rails 7.1+
-      warden.request.reset_csrf_token
-    else
-      warden.request.session.try(:delete, :_csrf_token)
-    end
+  if Devise.clean_up_csrf_token_on_authentication
+    warden.request.session.try(:delete, :_csrf_token)
  end
 end
--- a/lib/devise/hooks/forgetable.rb
+++ b/lib/devise/hooks/forgetable.rb
@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
 # Before logout hook to forget the user in the given scope, if it responds
 # to forget_me! Also clear remember token to ensure the user won't be
 # remembered again. Notice that we forget the user unless the record is not persisted.
 # This avoids forgetting deleted users.
 Warden::Manager.before_logout do |record, warden, options|
  if record.respond_to?(:forget_me!)
-    Devise::Hooks::Proxy.new(warden).forget_me(record)
+    Devise::Controllers::Rememberable::Proxy.new(warden).forget_me(record)
  end
 end
--- a/lib/devise/hooks/lockable.rb
+++ b/lib/devise/hooks/lockable.rb
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 # After each sign in, if resource responds to failed_attempts, sets it to 0
 # This is only triggered when the user is explicitly set (with set_user)
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
-  if record.respond_to?(:reset_failed_attempts!) && warden.authenticated?(options[:scope])
-    record.reset_failed_attempts!
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
+  if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
+    record.update_attribute(:failed_attempts, 0) unless record.failed_attempts.to_i.zero?
  end
 end
--- a/lib/devise/hooks/proxy.rb
+++ b/lib/devise/hooks/proxy.rb
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-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, :request, 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
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+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::Hooks::Proxy.new(warden).remember_me(record)
+    Devise::Controllers::Rememberable::Proxy.new(warden).remember_me(record)
  end
-end
+end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Each time a record is set we check whether its session has already timed out
 # or not, based on last request time. If so, the record is logged out and
 # redirected to the sign in page. Also, each time the request comes and the
@@ -9,27 +7,19 @@ Warden::Manager.after_set_user do |record, warden, options|
  scope = options[:scope]
  env   = warden.request.env

-  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) &&
-     options[:store] != false && !env['devise.skip_timeoutable']
+  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) && options[:store] != false
    last_request_at = warden.session(scope)['last_request_at']

-    if last_request_at.is_a? Integer
-      last_request_at = Time.at(last_request_at).utc
-    elsif last_request_at.is_a? String
-      last_request_at = Time.parse(last_request_at)
-    end
-
-    proxy = Devise::Hooks::Proxy.new(warden)
-
-    if !env['devise.skip_timeout'] &&
-        record.timedout?(last_request_at) &&
-        !proxy.remember_me_is_active?(record)
-      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
-      throw :warden, scope: scope, message: :timeout, locale: options.fetch(:locale, I18n.locale)
+    if record.timedout?(last_request_at) && !env['devise.skip_timeout']
+      warden.logout(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

    unless env['devise.skip_trackable']
-      warden.session(scope)['last_request_at'] = Time.now.utc.to_i
+      warden.session(scope)['last_request_at'] = Time.now.utc
    end
  end
 end
--- a/lib/devise/hooks/trackable.rb
+++ b/lib/devise/hooks/trackable.rb
@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 # After each sign in, update sign in time, sign in count and sign in IP.
 # This is only triggered when the user is explicitly set (with set_user)
 # and on authentication. Retrieving the user from session (:fetch) does
 # not trigger it.
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope]) && !warden.request.env['devise.skip_trackable']
    record.update_tracked_fields!(warden.request)
  end
--- a/lib/devise/mailers/helpers.rb
+++ b/lib/devise/mailers/helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Mailers
    module Helpers
@@ -7,16 +5,15 @@ module Devise

      included do
        include Devise::Controllers::ScopedViews
+        attr_reader :scope_name, :resource
      end

      protected

-      attr_reader :scope_name, :resource
-
      # Configure default email options
-      def devise_mail(record, action, opts = {}, &block)
+      def devise_mail(record, action, opts={})
        initialize_from_record(record)
-        mail headers_for(action, opts), &block
+        mail headers_for(action, opts)
      end

      def initialize_from_record(record)
@@ -30,25 +27,31 @@ module Devise

      def headers_for(action, opts)
        headers = {
-          subject: subject_for(action),
-          to: resource.email,
-          from: mailer_sender(devise_mapping),
-          reply_to: mailer_sender(devise_mapping),
-          template_path: template_paths,
-          template_name: action
-        }
-        # Give priority to the mailer's default if they exists.
-        headers.delete(:from) if default_params[:from]
-        headers.delete(:reply_to) if default_params[:reply_to]
-
-        headers.merge!(opts)
+          :subject       => subject_for(action),
+          :to            => resource.email,
+          :from          => mailer_sender(devise_mapping),
+          :reply_to      => mailer_reply_to(devise_mapping),
+          :template_path => template_paths,
+          :template_name => action
+        }.merge(opts)

        @email = headers[:to]
        headers
      end

-      def mailer_sender(mapping)
-        if Devise.mailer_sender.is_a?(Proc)
+      def mailer_reply_to(mapping)
+        mailer_sender(mapping, :reply_to)
+      end
+
+      def mailer_from(mapping)
+        mailer_sender(mapping, :from)
+      end
+
+      def mailer_sender(mapping, sender = :from)
+        default_sender = default_params[sender]
+        if default_sender.present?
+          default_sender.respond_to?(:to_proc) ? instance_eval(&default_sender) : default_sender
+        elsif Devise.mailer_sender.is_a?(Proc)
          Devise.mailer_sender.call(mapping.name)
        else
          Devise.mailer_sender
@@ -61,7 +64,7 @@ module Devise
        template_path
      end

-      # Set up a subject doing an I18n lookup. At first, it attempts to set a subject
+      # Setup a subject doing an I18n lookup. At first, it attempts to set a subject
      # based on the current mapping:
      #
      #   en:
@@ -79,8 +82,8 @@ module Devise
      #           subject: '...'
      #
      def subject_for(key)
-        I18n.t(:"#{devise_mapping.name}_subject", scope: [:devise, :mailer, key],
-          default: [:subject, key.to_s.humanize])
+        I18n.t(:"#{devise_mapping.name}_subject", :scope => [:devise, :mailer, key],
+          :default => [:subject, key.to_s.humanize])
      end
    end
  end
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # Responsible for handling devise mappings and routes configuration. Each
  # resource configured by devise_for in routes is actually creating a mapping
@@ -25,18 +23,16 @@ module Devise
  #
  class Mapping #:nodoc:
    attr_reader :singular, :scoped_path, :path, :controllers, :path_names,
-                :class_name, :sign_out_via, :format, :used_routes, :used_helpers,
-                :failure_app, :router_name
+                :class_name, :sign_out_via, :format, :used_routes, :used_helpers, :failure_app

    alias :name :singular

-    # Receives an object and finds a scope for it. If a scope cannot be found,
+    # Receives an object and find a scope for it. If a scope cannot be found,
    # raises an error. If a symbol is given, it's considered to be the scope.
    def self.find_scope!(obj)
-      obj = obj.devise_scope if obj.respond_to?(:devise_scope)
      case obj
      when String, Symbol
-        return obj.to_sym
+        return obj
      when Class
        Devise.mappings.each_value { |m| return m.name if obj <= m.to }
      else
@@ -46,7 +42,7 @@ module Devise
      raise "Could not find a valid mapping for #{obj.inspect}"
    end

-    def self.find_by_path!(path, path_type = :fullpath)
+    def self.find_by_path!(path, path_type=:fullpath)
      Devise.mappings.each_value { |m| return m if path.include?(m.send(path_type)) }
      raise "Could not find a valid mapping for path #{path.inspect}"
    end
@@ -64,8 +60,6 @@ module Devise
      @sign_out_via = options[:sign_out_via] || Devise.sign_out_via
      @format = options[:format]

-      @router_name = options[:router_name]
-
      default_failure_app(options)
      default_controllers(options)
      default_path_names(options)
--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    class MissingAttribute < StandardError
@@ -14,7 +12,7 @@ module Devise

    # Creates configuration values for Devise and for the given module.
    #
-    #   Devise::Models.config(Devise::Models::DatabaseAuthenticatable, :stretches)
+    #   Devise::Models.config(Devise::Authenticatable, :stretches, 10)
    #
    # The line above creates:
    #
@@ -84,9 +82,13 @@ module Devise
      end

      devise_modules_hook! do
-        include Devise::Orm
        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
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/activatable'
 require 'devise/hooks/csrf_cleaner'

@@ -9,7 +7,7 @@ module Devise
    #
    # == Options
    #
-    # Authenticatable adds the following options to +devise+:
+    # Authenticatable adds the following options to devise_for:
    #
    #   * +authentication_keys+: parameters used for authentication. By default [:email].
    #
@@ -31,7 +29,9 @@ 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.
-    #     By default is set to skip_session_storage: [:http_auth].
+    #     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].
    #
    # == active_for_authentication?
    #
@@ -39,7 +39,7 @@ module Devise
    # calling model.active_for_authentication?. This method is overwritten by other devise modules. For instance,
    # :confirmable overwrites .active_for_authentication? to only return true if your model was confirmed.
    #
-    # You can overwrite this method yourself, but if you do, don't forget to call super:
+    # You overwrite this method yourself, but if you do, don't forget to call super:
    #
    #   def active_for_authentication?
    #     super && special_condition_is_valid?
@@ -55,13 +55,13 @@ module Devise
    module Authenticatable
      extend ActiveSupport::Concern

-      UNSAFE_ATTRIBUTES_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
+      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]
+        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at, :authentication_token]

      included do
-        class_attribute :devise_modules, instance_writer: false
+        class_attribute :devise_modules, :instance_writer => false
        self.devise_modules ||= []

        before_validation :downcase_keys
@@ -97,31 +97,29 @@ module Devise
      def authenticatable_salt
      end

-      # Redefine serializable_hash in models for more secure defaults.
-      # By default, it removes from the serializable model all attributes that
-      # are *not* accessible. You can remove this default by using :force_except
-      # and passing a new list of attributes you want to exempt. All attributes
-      # given to :except will simply add names to exempt to Devise internal list.
-      def serializable_hash(options = nil)
-        options = options.try(:dup) || {}
-        options[:except] = Array(options[:except]).dup
+      array = %w(serializable_hash)
+      # to_xml does not call serializable_hash on 3.1
+      array << "to_xml" if Rails::VERSION::STRING[0,3] == "3.1"

-        if options[:force_except]
-          options[:except].concat Array(options[:force_except])
-        else
-          options[:except].concat UNSAFE_ATTRIBUTES_FOR_SERIALIZATION
-        end
+      array.each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__
+          # Redefine to_xml and serializable_hash in models for more secure defaults.
+          # By default, it removes from the serializable model all attributes that
+          # are *not* accessible. You can remove this default by using :force_except
+          # and passing a new list of attributes you want to exempt. All attributes
+          # given to :except will simply add names to exempt to Devise internal list.
+          def #{method}(options=nil)
+            options ||= {}
+            options[:except] = Array(options[:except])

-        super(options)
-      end
-
-      # Redefine inspect using serializable_hash, to ensure we don't accidentally
-      # leak passwords into exceptions.
-      def inspect
-        inspection = serializable_hash.collect do |k,v|
-          "#{k}: #{respond_to?(:attribute_for_inspect) ? attribute_for_inspect(k) : v.inspect}"
-        end
-        "#<#{self.class} #{inspection.join(", ")}>"
+            if options[:force_except]
+              options[:except].concat Array(options[:force_except])
+            else
+              options[:except].concat BLACKLIST_FOR_SERIALIZATION
+            end
+            super(options)
+          end
+        RUBY
      end

      protected
@@ -131,20 +129,18 @@ module Devise
      end

      # This is an internal method called every time Devise needs
-      # to send a notification/mail. This can be overridden if you
+      # to send a notification/mail. This can be overriden if you
      # need to customize the e-mail delivery logic. For instance,
-      # if you are using a queue to deliver e-mails (active job, delayed
-      # job, sidekiq, resque, etc), you must add the delivery to the queue
+      # if you are using a queue to deliver e-mails (delayed job,
+      # sidekiq, resque, etc), you must add the delivery to the queue
      # just after the transaction was committed. To achieve this,
      # you can override send_devise_notification to store the
-      # deliveries until the after_commit callback is triggered.
-      #
-      # The following example uses Active Job's `deliver_later` :
+      # deliveries until the after_commit callback is triggered:
      #
      #     class User
      #       devise :database_authenticatable, :confirmable
      #
-      #       after_commit :send_pending_devise_notifications
+      #       after_commit :send_pending_notifications
      #
      #       protected
      #
@@ -152,68 +148,51 @@ module Devise
      #         # If the record is new or changed then delay the
      #         # delivery until the after_commit callback otherwise
      #         # send now because after_commit will not be called.
-      #         # For Rails < 6 use `changed?` instead of `saved_changes?`.
-      #         if new_record? || saved_changes?
-      #           pending_devise_notifications << [notification, args]
+      #         if new_record? || changed?
+      #           pending_notifications << [notification, args]
      #         else
-      #           render_and_send_devise_message(notification, *args)
+      #           devise_mailer.send(notification, self, *args).deliver
      #         end
      #       end
      #
-      #       private
-      #
-      #       def send_pending_devise_notifications
-      #         pending_devise_notifications.each do |notification, args|
-      #           render_and_send_devise_message(notification, *args)
+      #       def send_pending_notifications
+      #         pending_notifications.each do |notification, args|
+      #           devise_mailer.send(notification, self, *args).deliver
      #         end
      #
      #         # Empty the pending notifications array because the
      #         # after_commit hook can be called multiple times which
      #         # could cause multiple emails to be sent.
-      #         pending_devise_notifications.clear
+      #         pending_notifications.clear
      #       end
      #
-      #       def pending_devise_notifications
-      #         @pending_devise_notifications ||= []
+      #       def pending_notifications
+      #         @pending_notifications ||= []
      #       end
-      #
-      #       def render_and_send_devise_message(notification, *args)
-      #         message = devise_mailer.send(notification, self, *args)
-      #
-      #         # Deliver later with Active Job's `deliver_later`
-      #         if message.respond_to?(:deliver_later)
-      #           message.deliver_later
-      #         else
-      #           message.deliver_now
-      #         end
-      #       end
-      #
      #     end
      #
      def send_devise_notification(notification, *args)
-        message = devise_mailer.send(notification, self, *args)
-        message.deliver_now
+        devise_mailer.send(notification, self, *args).deliver
      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] = self[attr].try(method)
+          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) && respond_to?("#{attr}=")
-          new_value = send(attr).try(method)
-          send("#{attr}=", new_value)
+        elsif respond_to?(attr)
+          send(attr).try(method)
        end
      end

@@ -253,42 +232,46 @@ module Devise
        # Example:
        #
        #   def self.find_for_authentication(tainted_conditions)
-        #     find_first_by_auth_conditions(tainted_conditions, active: true)
+        #     find_first_by_auth_conditions(tainted_conditions, :active => true)
        #   end
        #
        # Finally, notice that Devise also queries for users in other scenarios
-        # besides authentication, for example when retrieving a user to send
+        # besides authentication, for example when retrieving an user to send
        # an e-mail for password reset. In such cases, find_for_authentication
        # is not called.
        def find_for_authentication(tainted_conditions)
          find_first_by_auth_conditions(tainted_conditions)
        end

-        def find_first_by_auth_conditions(tainted_conditions, opts = {})
+        def find_first_by_auth_conditions(tainted_conditions, opts={})
          to_adapter.find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
        end

-        # Find or initialize a record setting an error if it can't be found.
-        def find_or_initialize_with_error_by(attribute, value, error = :invalid) #:nodoc:
+        # Find an initialize a record setting an error if it can't be found.
+        def find_or_initialize_with_error_by(attribute, value, error=:invalid) #:nodoc:
          find_or_initialize_with_errors([attribute], { attribute => value }, error)
        end

-        # Find or initialize a record with group of attributes based on a list of required attributes.
-        def find_or_initialize_with_errors(required_attributes, attributes, error = :invalid) #:nodoc:
-          attributes.try(:permit!)
-          attributes = attributes.to_h.with_indifferent_access
-                                 .slice(*required_attributes)
-                                 .delete_if { |key, value| value.blank? }
+        # Find an initialize a group of attributes based on a list of required attributes.
+        def find_or_initialize_with_errors(required_attributes, attributes, error=:invalid) #:nodoc:
+          attributes = attributes.slice(*required_attributes)
+          attributes.delete_if { |key, value| value.blank? }

          if attributes.size == required_attributes.size
-            record = find_first_by_auth_conditions(attributes) and return record
+            record = find_first_by_auth_conditions(attributes)
          end

-          new(devise_parameter_filter.filter(attributes)).tap do |record|
+          unless record
+            record = new
+
            required_attributes.each do |key|
-              record.errors.add(key, attributes[key].blank? ? :blank : error)
+              value = attributes[key]
+              record.send("#{key}=", value)
+              record.errors.add(key, value.present? ? error : :blank)
            end
          end
+
+          record
        end

        protected
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Confirmable is responsible to verify if an account is already confirmed to
@@ -7,60 +5,42 @@ module Devise
    # Confirmation instructions are sent to the user email after creating a
    # record and when manually requested by a new confirmation instruction request.
    #
-    # Confirmable tracks the following columns:
-    #
-    # * confirmation_token   - A unique random token
-    # * confirmed_at         - A timestamp when the user clicked the confirmation link
-    # * confirmation_sent_at - A timestamp when the confirmation_token was generated (not sent)
-    # * unconfirmed_email    - An email address copied from the email attr. After confirmation
-    #                          this value is copied to the email attr then cleared
-    #
    # == Options
    #
    # Confirmable adds the following options to +devise+:
    #
-    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access their account
+    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access his 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).
    #     By default allow_unconfirmed_access_for is zero, it means users always have to confirm to sign in.
    #   * +reconfirmable+: requires any email changes to be confirmed (exactly the same way as
    #     initial account confirmation) to be applied. Requires additional unconfirmed_email
-    #     db field to be set up (t.reconfirmable in migrations). Until confirmed, new email is
+    #     db field to be setup (t.reconfirmable in migrations). Until confirmed new email is
    #     stored in unconfirmed email column, and copied to email column on successful
-    #     confirmation. Also, when used in conjunction with `send_email_changed_notification`,
-    #     the notification is sent to the original email when the change is requested,
-    #     not when the unconfirmed email is confirmed.
+    #     confirmation.
    #   * +confirm_within+: the time before a sent confirmation token becomes invalid.
    #     You can use this to force the user to confirm within a set period of time.
-    #     Confirmable will not generate a new token if a repeat confirmation is requested
-    #     during this time frame, unless the user's email changed too.
    #
    # == Examples
    #
-    #   User.find(1).confirm       # returns true unless it's already confirmed
+    #   User.find(1).confirm!      # returns true unless it's already confirmed
    #   User.find(1).confirmed?    # true/false
    #   User.find(1).send_confirmation_instructions # manually send instructions
    #
    module Confirmable
      extend ActiveSupport::Concern
+      include ActionView::Helpers::DateHelper

      included do
-        before_create :generate_confirmation_token, if: :confirmation_required?
-        after_create :skip_reconfirmation_in_callback!, if: :send_confirmation_notification?
-        if Devise::Orm.active_record?(self) # ActiveRecord
-          after_commit :send_on_create_confirmation_instructions, on: :create, if: :send_confirmation_notification?
-          after_commit :send_reconfirmation_instructions, on: :update, if: :reconfirmation_required?
-        else # Mongoid
-          after_create :send_on_create_confirmation_instructions, if: :send_confirmation_notification?
-          after_update :send_reconfirmation_instructions, if: :reconfirmation_required?
-        end
-        before_update :postpone_email_change_until_confirmation_and_regenerate_confirmation_token, if: :postpone_email_change?
+        before_create :generate_confirmation_token, :if => :confirmation_required?
+        after_create  :send_on_create_confirmation_instructions, :if => :send_confirmation_notification?
+        before_update :postpone_email_change_until_confirmation_and_regenerate_confirmation_token, :if => :postpone_email_change?
+        after_update  :send_reconfirmation_instructions,  :if => :reconfirmation_required?
      end

      def initialize(*args, &block)
        @bypass_confirmation_postpone = false
-        @skip_reconfirmation_in_callback = false
        @reconfirmation_required = false
        @skip_confirmation_notification = false
        @raw_confirmation_token = nil
@@ -76,25 +56,26 @@ module Devise
      # Confirm a user by setting it's confirmed_at to actual time. If the user
      # is already confirmed, add an error to email field. If the user is invalid
      # add errors
-      def confirm(args = {})
+      def confirm!
        pending_any_confirmation do
          if confirmation_period_expired?
            self.errors.add(:email, :confirmation_period_expired,
-              period: Devise::TimeInflector.time_ago_in_words(self.class.confirm_within.ago))
+              :period => Devise::TimeInflector.time_ago_in_words(self.class.confirm_within.ago))
            return false
          end

+          self.confirmation_token = nil
          self.confirmed_at = Time.now.utc

-          saved = if pending_reconfirmation?
+          saved = if self.class.reconfirmable && unconfirmed_email.present?
            skip_reconfirmation!
            self.email = unconfirmed_email
            self.unconfirmed_email = nil

            # We need to validate in such cases to enforce e-mail uniqueness
-            save(validate: true)
+            save(:validate => true)
          else
-            save(validate: args[:ensure_valid] == true)
+            save(:validate => false)
          end

          after_confirmation if saved
@@ -117,7 +98,7 @@ module Devise
          generate_confirmation_token!
        end

-        opts = pending_reconfirmation? ? { to: unconfirmed_email } : { }
+        opts = pending_reconfirmation? ? { :to => unconfirmed_email } : { }
        send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
      end

@@ -170,14 +151,8 @@ module Devise

      protected

-        # To not require reconfirmation after creating with #save called in a
-        # callback call skip_create_confirmation!
-        def skip_reconfirmation_in_callback!
-          @skip_reconfirmation_in_callback = true
-        end
-
        # A callback method used to deliver confirmation
-        # instructions on creation. This can be overridden
+        # instructions on creation. This can be overriden
        # in models to map to a nice sign up e-mail.
        def send_on_create_confirmation_instructions
          send_confirmation_instructions
@@ -191,7 +166,7 @@ module Devise
        # Checks if the confirmation for the user is within the limit time.
        # We do this by calculating if the difference between today and the
        # confirmation sent date does not exceed the confirm in time configured.
-        # allow_unconfirmed_access_for is a model configuration, must always be an integer value.
+        # Confirm_within is a model configuration, must always be an integer value.
        #
        # Example:
        #
@@ -211,10 +186,7 @@ module Devise
        #   confirmation_period_valid?   # will always return true
        #
        def confirmation_period_valid?
-          return true if self.class.allow_unconfirmed_access_for.nil?
-          return false if self.class.allow_unconfirmed_access_for == 0.days
-
-          confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago
+          self.class.allow_unconfirmed_access_for.nil? || (confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago)
        end

        # Checks if the user confirmation happens before the token becomes invalid
@@ -230,7 +202,7 @@ module Devise
        #   confirmation_period_expired?  # will always return false
        #
        def confirmation_period_expired?
-          self.class.confirm_within && self.confirmation_sent_at && (Time.now.utc > self.confirmation_sent_at.utc + self.class.confirm_within)
+          self.class.confirm_within && (Time.now > self.confirmation_sent_at + self.class.confirm_within )
        end

        # Checks whether the record requires any confirmation.
@@ -244,67 +216,39 @@ module Devise
        end

        # Generates a new random token for confirmation, and stores
-        # the time this token is being generated in confirmation_sent_at
+        # the time this token is being generated
        def generate_confirmation_token
-          if self.confirmation_token && !confirmation_period_expired?
-            @raw_confirmation_token = self.confirmation_token
-          else
-            self.confirmation_token = @raw_confirmation_token = Devise.friendly_token
-            self.confirmation_sent_at = Time.now.utc
-          end
+          raw, enc = Devise.token_generator.generate(self.class, :confirmation_token)
+          @raw_confirmation_token   = raw
+          self.confirmation_token   = enc
+          self.confirmation_sent_at = Time.now.utc
        end

        def generate_confirmation_token!
-          generate_confirmation_token && save(validate: false)
+          generate_confirmation_token && save(:validate => false)
        end

-
        def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
          @reconfirmation_required = true
          self.unconfirmed_email = self.email
-          self.email = self.devise_email_in_database
-          self.confirmation_token = nil
+          self.email = self.email_was
          generate_confirmation_token
        end

        def postpone_email_change?
-          postpone = self.class.reconfirmable &&
-            devise_will_save_change_to_email? &&
-            !@bypass_confirmation_postpone &&
-            self.email.present? &&
-            (!@skip_reconfirmation_in_callback || !self.devise_email_in_database.nil?)
+          postpone = self.class.reconfirmable && email_changed? && !@bypass_confirmation_postpone && !self.email.blank?
          @bypass_confirmation_postpone = false
          postpone
        end

        def reconfirmation_required?
-          self.class.reconfirmable && @reconfirmation_required && (self.email.present? || self.unconfirmed_email.present?)
+          self.class.reconfirmable && @reconfirmation_required && !self.email.blank?
        end

        def send_confirmation_notification?
-          confirmation_required? && !@skip_confirmation_notification && self.email.present?
+          confirmation_required? && !@skip_confirmation_notification && !self.email.blank?
        end

-        # With reconfirmable, notify the original email when the user first
-        # requests the email change, instead of when the change is confirmed.
-        def send_email_changed_notification?
-          if self.class.reconfirmable
-            self.class.send_email_changed_notification && reconfirmation_required?
-          else
-            super
-          end
-        end
-
-        # A callback initiated after successfully confirming. This can be
-        # used to insert your own logic that is only run after the user successfully
-        # confirms.
-        #
-        # Example:
-        #
-        #   def after_confirmation
-        #     self.update_attribute(:invite_code, nil)
-        #   end
-        #
        def after_confirmation
        end

@@ -313,7 +257,7 @@ module Devise
        # confirmation instructions to it. If not, try searching for a user by unconfirmed_email
        # field. If no user is found, returns a new user with an email not found error.
        # Options must contain the user email
-        def send_confirmation_instructions(attributes = {})
+        def send_confirmation_instructions(attributes={})
          confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
          unless confirmable.try(:persisted?)
            confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
@@ -327,35 +271,21 @@ module Devise
        # If the user is already confirmed, create an error for the user
        # Options must have the confirmation_token
        def confirm_by_token(confirmation_token)
-          # When the `confirmation_token` parameter is blank, if there are any users with a blank
-          # `confirmation_token` in the database, the first one would be confirmed here.
-          # The error is being manually added here to ensure no users are confirmed by mistake.
-          # This was done in the model for convenience, since validation errors are automatically
-          # displayed in the view.
-          if confirmation_token.blank?
-            confirmable = new
-            confirmable.errors.add(:confirmation_token, :blank)
-            return confirmable
+          original_token     = confirmation_token
+          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 = find_first_by_auth_conditions(confirmation_token: confirmation_token)
-
-          unless confirmable
-            confirmation_digest = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
-            confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_digest)
-          end
-
-          # TODO: replace above lines with
-          # confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          # after enough time has passed that Devise clients do not use digested tokens
-
-          confirmable.confirm if confirmable.persisted?
+          confirmable.confirm! if confirmable.persisted?
+          confirmable.confirmation_token = original_token
          confirmable
        end

        # Find a record for confirmation by unconfirmed email field
        def find_by_unconfirmed_email_with_errors(attributes = {})
-          attributes = attributes.slice(*confirmation_keys).permit!.to_h if attributes.respond_to? :permit
          unconfirmed_required_attributes = confirmation_keys.map { |k| k == :email ? :unconfirmed_email : k }
          unconfirmed_attributes = attributes.symbolize_keys
          unconfirmed_attributes[:unconfirmed_email] = unconfirmed_attributes.delete(:email)
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -1,29 +1,20 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/database_authenticatable'
+require 'bcrypt'

 module Devise
  module Models
-    # Authenticatable Module, responsible for hashing the password and
-    # validating the authenticity of a user while signing in.
-    #
-    # This module defines a `password=` method. This method will hash the argument
-    # and store it in the `encrypted_password` column, bypassing any pre-existing
-    # `password` column if it exists.
+    # Authenticatable Module, responsible for encrypting password and validating
+    # authenticity of a user while signing in.
    #
    # == Options
    #
-    # DatabaseAuthenticatable adds the following options to +devise+:
+    # DatabaseAuthenticable adds the following options to devise_for:
    #
    #   * +pepper+: a random string used to provide a more secure hash. Use
-    #     `rails secret` to generate new keys.
+    #     `rake secret` to generate new keys.
    #
    #   * +stretches+: the cost given to bcrypt.
    #
-    #   * +send_email_changed_notification+: notify original email when it changes.
-    #
-    #   * +send_password_change_notification+: notify email when password changes.
-    #
    # == Examples
    #
    #    User.find(1).valid_password?('password123')         # returns true/false
@@ -32,44 +23,26 @@ module Devise
      extend ActiveSupport::Concern

      included do
-        after_update :send_email_changed_notification, if: :send_email_changed_notification?
-        after_update :send_password_change_notification, if: :send_password_change_notification?
-
        attr_reader :password, :current_password
        attr_accessor :password_confirmation
      end

-      def initialize(*args, &block)
-        @skip_email_changed_notification = false
-        @skip_password_change_notification = false
-        super
-      end
-
-      # Skips sending the email changed notification after_update
-      def skip_email_changed_notification!
-        @skip_email_changed_notification = true
-      end
-
-      # Skips sending the password change notification after_update
-      def skip_password_change_notification!
-        @skip_password_change_notification = true
-      end
-
      def self.required_fields(klass)
        [:encrypted_password] + klass.authentication_keys
      end

-      # Generates a hashed password based on the given value.
-      # For legacy reasons, we use `encrypted_password` to store
-      # the hashed password.
+      # Generates password encryption based on the given value.
      def password=(new_password)
        @password = new_password
        self.encrypted_password = password_digest(@password) if @password.present?
      end

-      # Verifies whether a password (ie from sign in) is the user password.
+      # Verifies whether an password (ie from sign in) is the user password.
      def valid_password?(password)
-        Devise::Encryptor.compare(self.class, encrypted_password, password)
+        return false if encrypted_password.blank?
+        bcrypt   = ::BCrypt::Password.new(encrypted_password)
+        password = ::BCrypt::Engine.hash_secret("#{password}#{self.class.pepper}", bcrypt.salt)
+        Devise.secure_compare(password, encrypted_password)
      end

      # Set password and password confirmation to nil
@@ -77,14 +50,10 @@ module Devise
        self.password = self.password_confirmation = nil
      end

-      # Update record attributes when :current_password matches, otherwise
-      # returns error on :current_password.
-      #
-      # This method also rejects the password field if it is blank (allowing
-      # users to change relevant information like the e-mail without changing
-      # their password). In case the password field is rejected, the confirmation
-      # is also rejected as long as it is also blank.
-      def update_with_password(params)
+      # Update record attributes when :current_password matches, otherwise returns
+      # error on :current_password. It also automatically rejects :password and
+      # :password_confirmation if they are blank.
+      def update_with_password(params, *options)
        current_password = params.delete(:current_password)

        if params[:password].blank?
@@ -93,11 +62,11 @@ module Devise
        end

        result = if valid_password?(current_password)
-          update(params)
+          update_attributes(params, *options)
        else
-          assign_attributes(params)
-          valid?
-          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          self.assign_attributes(params, *options)
+          self.valid?
+          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
        end

@@ -112,45 +81,35 @@ module Devise
      #
      # Example:
      #
-      #   def update_without_password(params)
+      #   def update_without_password(params, *options)
      #     params.delete(:email)
      #     super(params)
      #   end
      #
-      def update_without_password(params)
+      def update_without_password(params, *options)
        params.delete(:password)
        params.delete(:password_confirmation)

-        result = update(params)
+        result = update_attributes(params, *options)
        clean_up_passwords
        result
      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)
          destroy
        else
-          valid?
-          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          self.valid?
+          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
        end

        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

@@ -159,37 +118,15 @@ module Devise
        encrypted_password[0,29] if encrypted_password
      end

-      # Send notification to user when email changes.
-      def send_email_changed_notification
-        send_devise_notification(:email_changed, to: devise_email_before_last_save)
-      end
-
-      # Send notification to user when password changes.
-      def send_password_change_notification
-        send_devise_notification(:password_change)
-      end
-
    protected

-      # Hashes the password using bcrypt. Custom hash functions should override
-      # this method to apply their own algorithm.
-      #
-      # See https://github.com/heartcombo/devise-encryptable for examples
-      # of other hashing engines.
+      # Digests the password using bcrypt.
      def password_digest(password)
-        Devise::Encryptor.digest(self.class, password)
-      end
-
-      def send_email_changed_notification?
-        self.class.send_email_changed_notification && devise_saved_change_to_email? && !@skip_email_changed_notification
-      end
-
-      def send_password_change_notification?
-        self.class.send_password_change_notification && devise_saved_change_to_encrypted_password? && !@skip_password_change_notification
+        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
      end

      module ClassMethods
-        Devise::Models.config(self, :pepper, :stretches, :send_email_changed_notification, :send_password_change_notification)
+        Devise::Models.config(self, :pepper, :stretches)

        # We assume this method already gets the sanitized values from the
        # DatabaseAuthenticatable strategy. If you are using this method on
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "devise/hooks/lockable"

 module Devise
@@ -9,7 +7,7 @@ module Devise
    # blocked: email and time. The former will send an email to the user when
    # the lock happens, containing a link to unlock its account. The second
    # will unlock the user automatically after some configured time (ie 2.hours).
-    # It's also possible to set up lockable to use both email and time strategies.
+    # It's also possible to setup lockable to use both email and time strategies.
    #
    # == Options
    #
@@ -18,13 +16,13 @@ module Devise
    #   * +maximum_attempts+: how many attempts should be accepted before blocking the user.
    #   * +lock_strategy+: lock the user account by :failed_attempts or :none.
    #   * +unlock_strategy+: unlock the user account by :time, :email, :both or :none.
-    #   * +unlock_in+: the time you want to unlock the user after lock happens. Only available when unlock_strategy is :time or :both.
+    #   * +unlock_in+: the time you want to lock the user after to lock happens. Only available when unlock_strategy is :time or :both.
    #   * +unlock_keys+: the keys you want to use when locking and unlocking an account
    #
    module Lockable
      extend  ActiveSupport::Concern

-      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, to: "self.class"
+      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, :to => "self.class"

      def self.required_fields(klass)
        attributes = []
@@ -36,16 +34,13 @@ module Devise
      end

      # Lock a user setting its locked_at to actual time.
-      # * +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 = { })
+      def lock_access!
        self.locked_at = Time.now.utc

-        if unlock_strategy_enabled?(:email) && opts.fetch(:send_instructions, true)
+        if unlock_strategy_enabled?(:email)
          send_unlock_instructions
        else
-          save(validate: false)
+          save(:validate => false)
        end
      end

@@ -54,15 +49,7 @@ module Devise
        self.locked_at = nil
        self.failed_attempts = 0 if respond_to?(:failed_attempts=)
        self.unlock_token = nil  if respond_to?(:unlock_token=)
-        save(validate: false)
-      end
-
-      # Resets failed attempts counter to 0.
-      def reset_failed_attempts!
-        if respond_to?(:failed_attempts) && !failed_attempts.to_i.zero?
-          self.failed_attempts = 0
-          save(validate: false)
-        end
+        save(:validate => false)
      end

      # Verifies whether a user is locked or not.
@@ -74,7 +61,7 @@ module Devise
      def send_unlock_instructions
        raw, enc = Devise.token_generator.generate(self.class, :unlock_token)
        self.unlock_token = enc
-        save(validate: false)
+        self.save(:validate => false)
        send_devise_notification(:unlock_instructions, raw, {})
        raw
      end
@@ -84,7 +71,7 @@ module Devise
        if_access_locked { send_unlock_instructions }
      end

-      # Overwrites active_for_authentication? from Devise::Models::Authenticatable for locking purposes
+      # Overwrites active_for_authentication? from Devise::Models::Activatable for locking purposes
      # by verifying whether a user is active to sign in or not based on locked?
      def active_for_authentication?
        super && !access_locked?
@@ -109,30 +96,24 @@ module Devise
        if super && !access_locked?
          true
        else
-          increment_failed_attempts
+          self.failed_attempts ||= 0
+          self.failed_attempts += 1
          if attempts_exceeded?
            lock_access! unless access_locked?
          else
-            save(validate: false)
+            save(:validate => false)
          end
          false
        end
      end

-      def increment_failed_attempts
-        self.class.increment_counter(:failed_attempts, id)
-        reload
-      end
-
      def unauthenticated_message
        # If set to paranoid mode, do not show the locked message because it
        # leaks the existence of an account.
        if Devise.paranoid
          super
-        elsif access_locked? || (lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?)
+        elsif lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
          :locked
-        elsif lock_strategy_enabled?(:failed_attempts) && last_attempt? && self.class.last_attempt_warning
-          :last_attempt
        else
          super
        end
@@ -141,11 +122,7 @@ module Devise
      protected

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

        # Tells if the lock is expired if :time unlock strategy is active
@@ -169,14 +146,11 @@ module Devise
        end

      module ClassMethods
-        # List of strategies that are enabled/supported if :both is used.
-        BOTH_STRATEGIES = [:time, :email]
-
        # Attempt to find a user by its unlock keys. If a record is found, send new
        # unlock instructions to it. If not user is found, returns a new user
        # with an email not found error.
        # Options must contain the user's unlock keys
-        def send_unlock_instructions(attributes = {})
+        def send_unlock_instructions(attributes={})
          lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
          lockable.resend_unlock_instructions if lockable.persisted?
          lockable
@@ -191,6 +165,10 @@ 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
@@ -198,8 +176,7 @@ module Devise

        # Is the unlock enabled for the given unlock strategy?
        def unlock_strategy_enabled?(strategy)
-          self.unlock_strategy == strategy ||
-            (self.unlock_strategy == :both && BOTH_STRATEGIES.include?(strategy))
+          [:both, strategy].include?(self.unlock_strategy)
        end

        # Is the lock enabled for the given lock strategy?
@@ -207,7 +184,7 @@ module Devise
          self.lock_strategy == strategy
        end

-        Devise::Models.config(self, :maximum_attempts, :lock_strategy, :unlock_strategy, :unlock_in, :unlock_keys, :last_attempt_warning)
+        Devise::Models.config(self, :maximum_attempts, :lock_strategy, :unlock_strategy, :unlock_in, :unlock_keys)
      end
    end
  end
--- a/lib/devise/models/omniauthable.rb
+++ b/lib/devise/models/omniauthable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/omniauth'

 module Devise
@@ -8,11 +6,11 @@ module Devise
    #
    # == Options
    #
-    # Oauthable adds the following options to +devise+:
+    # Oauthable adds the following options to devise_for:
    #
    #   * +omniauth_providers+: Which providers are available to this model. It expects an array:
    #
-    #       devise :database_authenticatable, :omniauthable, omniauth_providers: [:twitter]
+    #       devise_for :database_authenticatable, :omniauthable, :omniauth_providers => [:twitter]
    #
    module Omniauthable
      extend ActiveSupport::Concern
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models

@@ -7,16 +5,18 @@ module Devise
    #
    # ==Options
    #
-    # Recoverable adds the following options to +devise+:
+    # Recoverable adds the following options to devise_for:
    #
    #   * +reset_password_keys+: the keys you want to use when recovering the password for an account
-    #   * +reset_password_within+: the time period within which the password must be reset or the token expires.
-    #   * +sign_in_after_reset_password+: whether or not to sign in the user automatically after a password reset.
    #
    # == Examples
    #
    #   # resets the user password and save the record, true if valid passwords are given, otherwise false
-    #   User.find(1).reset_password('password123', 'password123')
+    #   User.find(1).reset_password!('password123', 'password123')
+    #
+    #   # only resets the user password, without saving the record
+    #   user = User.find(1)
+    #   user.reset_password('password123', 'password123')
    #
    #   # creates a new token and send it with instructions about how to reset the password
    #   User.find(1).send_reset_password_instructions
@@ -28,30 +28,31 @@ module Devise
        [:reset_password_sent_at, :reset_password_token]
      end

-      included do
-        before_update :clear_reset_password_token, if: :clear_reset_password_token?
-      end
-
      # Update password saving the record and clearing token. Returns true if
      # the passwords are valid and the record was saved, false otherwise.
-      def reset_password(new_password, new_password_confirmation)
-        if new_password.present?
-          self.password = new_password
-          self.password_confirmation = new_password_confirmation
-          save
-        else
-          errors.add(:password, :blank)
-          false
+      def reset_password!(new_password, new_password_confirmation)
+        self.password = new_password
+        self.password_confirmation = new_password_confirmation
+
+        if valid?
+          clear_reset_password_token
+          after_password_reset
        end
+
+        save
      end

      # Resets reset password token and send reset password instructions by email.
      # Returns the token sent in the e-mail.
      def send_reset_password_instructions
-        token = set_reset_password_token
-        send_reset_password_instructions_notification(token)
+        raw, enc = Devise.token_generator.generate(self.class, :reset_password_token)

-        token
+        self.reset_password_token   = enc
+        self.reset_password_sent_at = Time.now.utc
+        self.save(:validate => false)
+
+        send_devise_notification(:reset_password_instructions, raw, {})
+        raw
      end

      # Checks if the reset password token sent is within the limit time.
@@ -75,7 +76,7 @@ module Devise
      #   reset_password_period_valid?   # will always return false
      #
      def reset_password_period_valid?
-        reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago.utc
+        reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago
      end

      protected
@@ -86,70 +87,52 @@ module Devise
          self.reset_password_sent_at = nil
        end

-        def set_reset_password_token
-          raw, enc = Devise.token_generator.generate(self.class, :reset_password_token)
-
-          self.reset_password_token   = enc
-          self.reset_password_sent_at = Time.now.utc
-          save(validate: false)
-          raw
-        end
-
-        def send_reset_password_instructions_notification(token)
-          send_devise_notification(:reset_password_instructions, token, {})
-        end
-
-        def clear_reset_password_token?
-          encrypted_password_changed = devise_respond_to_and_will_save_change_to_attribute?(:encrypted_password)
-          authentication_keys_changed = self.class.authentication_keys.any? do |attribute|
-            devise_respond_to_and_will_save_change_to_attribute?(attribute)
-          end
-
-          authentication_keys_changed || encrypted_password_changed
+        def after_password_reset
        end

      module ClassMethods
-        # Attempt to find a user by password reset token. If a user is found, return it
-        # If a user is not found, return nil
-        def with_reset_password_token(token)
-          reset_password_token = Devise.token_generator.digest(self, :reset_password_token, token)
-          to_adapter.find_first(reset_password_token: reset_password_token)
-        end
-
        # Attempt to find a user by its email. If a record is found, send new
        # password instructions to it. If user is not found, returns a new user
        # with an email not found error.
        # Attributes must contain the user's email
-        def send_reset_password_instructions(attributes = {})
+        def send_reset_password_instructions(attributes={})
          recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
          recoverable.send_reset_password_instructions if recoverable.persisted?
          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
        # containing an error in reset_password_token attribute.
        # Attributes must contain reset_password_token, password and confirmation
-        def reset_password_by_token(attributes = {})
+        def reset_password_by_token(attributes={})
          original_token       = attributes[:reset_password_token]
          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?
-              recoverable.reset_password(attributes[:password], attributes[:password_confirmation])
+              recoverable.reset_password!(attributes[:password], attributes[:password_confirmation])
            else
              recoverable.errors.add(:reset_password_token, :expired)
            end
          end

-          recoverable.reset_password_token = original_token if recoverable.reset_password_token.present?
+          recoverable.reset_password_token = original_token
          recoverable
        end

-        Devise::Models.config(self, :reset_password_keys, :reset_password_within, :sign_in_after_reset_password)
+        Devise::Models.config(self, :reset_password_keys, :reset_password_within)
      end
    end
  end
--- a/lib/devise/models/registerable.rb
+++ b/lib/devise/models/registerable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Registerable is responsible for everything related to registering a new
@@ -21,8 +19,6 @@ module Devise
        def new_with_session(params, session)
          new(params)
        end
-
-        Devise::Models.config(self, :sign_in_after_change_password)
      end
    end
  end
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/rememberable'
 require 'devise/hooks/rememberable'
 require 'devise/hooks/forgetable'

 module Devise
  module Models
-    # Rememberable manages generating and clearing token for remembering the user
+    # Rememberable manages generating and clearing token for remember the user
    # from a saved cookie. Rememberable also has utility methods for dealing
    # with serializing the user into the cookie and back from the cookie, trying
    # to lookup the record based on the saved information.
@@ -15,11 +13,11 @@ module Devise
    #
    # == Options
    #
-    # Rememberable adds the following options to +devise+:
+    # Rememberable adds the following options in devise_for:
    #
    #   * +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 their credentials again. This configuration is also
+    #     will have to enter his 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.
    #
@@ -41,42 +39,46 @@ module Devise
    module Rememberable
      extend ActiveSupport::Concern

-      attr_accessor :remember_me
+      attr_accessor :remember_me, :extend_remember_period

      def self.required_fields(klass)
        [:remember_created_at]
      end

-      def remember_me!
-        self.remember_token ||= self.class.remember_token if respond_to?(:remember_token)
-        self.remember_created_at ||= Time.now.utc
-        save(validate: false) if self.changed?
+      # Generate a new remember token and save the record without validations
+      # unless remember_across_browsers is true and the user already has a valid token.
+      def remember_me!(extend_period=false)
+        self.remember_token = self.class.remember_token if generate_remember_token?
+        self.remember_created_at = Time.now.utc if generate_remember_timestamp?(extend_period)
+        save(:validate => false) if self.changed?
      end

      # If the record is persisted, remove the remember token (but only if
      # it exists), and save the record without validations.
      def forget_me!
        return unless persisted?
-        self.remember_token = nil if respond_to?(:remember_token)
-        self.remember_created_at = nil if self.class.expire_all_remember_me_on_sign_out
-        save(validate: false)
+        self.remember_token = nil if respond_to?(:remember_token=)
+        self.remember_created_at = nil
+        save(:validate => false)
      end

+      # Remember token should be expired if expiration time not overpass now.
+      def remember_expired?
+        remember_created_at.nil? || (remember_expires_at <= Time.now.utc)
+      end
+
+      # Remember token expires at created time + remember_for configuration
      def remember_expires_at
-        self.class.remember_for.from_now
-      end
-
-      def extend_remember_period
-        self.class.extend_remember_period
+        remember_created_at + self.class.remember_for
      end

      def rememberable_value
        if respond_to?(:remember_token)
          remember_token
-        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt.presence)
+        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt)
          salt
        else
-          raise "authenticatable_salt returned nil for the #{self.class.name} model. " \
+          raise "authenticable_salt returned nil for the #{self.class.name} model. " \
            "In order to use rememberable, you must ensure a password is always set " \
            "or have a remember_token column in your model or implement your own " \
            "rememberable_value in the model with custom logic."
@@ -87,71 +89,40 @@ module Devise
        self.class.rememberable_options
      end

-      # A callback initiated after successfully being remembered. This can be
-      # used to insert your own logic that is only run after the user is
-      # remembered.
-      #
-      # Example:
-      #
-      #   def after_remembered
-      #     self.update_attribute(:invite_code, nil)
-      #   end
-      #
-      def after_remembered
+    protected
+
+      def generate_remember_token? #:nodoc:
+        respond_to?(:remember_token) && remember_expired?
      end

-      def remember_me?(token, generated_at)
-        # TODO: Normalize the JSON type coercion along with the Timeoutable hook
-        # in a single place https://github.com/heartcombo/devise/blob/ffe9d6d406e79108cf32a2c6a1d0b3828849c40b/lib/devise/hooks/timeoutable.rb#L14-L18
-        if generated_at.is_a?(String)
-          generated_at = time_from_json(generated_at)
-        end
-
-        # The token is only valid if:
-        # 1. we have a date
-        # 2. the current time does not pass the expiry period
-        # 3. the record has a remember_created_at date
-        # 4. the token date is bigger than the remember_created_at
-        # 5. the token matches
-        generated_at.is_a?(Time) &&
-         (self.class.remember_for.ago < generated_at) &&
-         (generated_at > (remember_created_at || Time.now).utc) &&
-         Devise.secure_compare(rememberable_value, token)
-      end
-
-      private
-
-      def time_from_json(value)
-        if value =~ /\A\d+\.\d+\Z/
-          Time.at(value.to_f)
-        else
-          Time.parse(value) rescue nil
-        end
+      # Generate a timestamp if extend_remember_period is true, if no remember_token
+      # exists, or if an existing remember token has expired.
+      def generate_remember_timestamp?(extend_period) #:nodoc:
+        extend_period || remember_created_at.nil? || remember_expired?
      end

      module ClassMethods
        # Create the cookie key using the record id and remember_token
        def serialize_into_cookie(record)
-          [record.to_key, record.rememberable_value, Time.now.utc.to_f.to_s]
+          [record.to_key, record.rememberable_value]
        end

        # Recreate the user based on the stored cookie
-        def serialize_from_cookie(*args)
-          id, token, generated_at = *args
-
+        def serialize_from_cookie(id, remember_token)
          record = to_adapter.get(id)
-          record if record && record.remember_me?(token, generated_at)
+          record if record && !record.remember_expired? &&
+                    Devise.secure_compare(record.rememberable_value, remember_token)
        end

        # Generate a token checking if one does not already exist in the database.
        def remember_token #:nodoc:
          loop do
            token = Devise.friendly_token
-            break token unless to_adapter.find_first({ remember_token: token })
+            break token unless to_adapter.find_first({ :remember_token => token })
          end
        end

-        Devise::Models.config(self, :remember_for, :extend_remember_period, :rememberable_options, :expire_all_remember_me_on_sign_out)
+        Devise::Models.config(self, :remember_for, :extend_remember_period, :rememberable_options)
      end
    end
  end
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -1,17 +1,15 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/timeoutable'

 module Devise
  module Models
-    # Timeoutable takes care of verifying whether a user session has already
+    # Timeoutable takes care of verifyng 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, they will be redirected
+    # will be asked for credentials again, it means, he/she will be redirected
    # to the sign in page.
    #
    # == Options
    #
-    # Timeoutable adds the following options to +devise+:
+    # Timeoutable adds the following options to devise_for:
    #
    #   * +timeout_in+: the interval to timeout the user session without activity.
    #
@@ -28,6 +26,7 @@ module Devise

      # Checks whether the user session has expired based on configured time.
      def timedout?(last_access)
+        return false if remember_exists_and_not_expired?
        !timeout_in.nil? && last_access && last_access <= timeout_in.ago
      end

@@ -37,6 +36,11 @@ module Devise

      private

+      def remember_exists_and_not_expired?
+        return false unless respond_to?(:remember_created_at) && respond_to?(:remember_expired?)
+        remember_created_at && !remember_expired?
+      end
+
      module ClassMethods
        Devise::Models.config(self, :timeout_in)
      end
--- a/lib/devise/models/token_authenticatable.rb
+++ b/lib/devise/models/token_authenticatable.rb
@@ -0,0 +1,92 @@
+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/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/trackable'

 module Devise
@@ -17,35 +15,21 @@ module Devise
        [:current_sign_in_at, :current_sign_in_ip, :last_sign_in_at, :last_sign_in_ip, :sign_in_count]
      end

-      def update_tracked_fields(request)
+      def update_tracked_fields!(request)
        old_current, new_current = self.current_sign_in_at, Time.now.utc
        self.last_sign_in_at     = old_current || new_current
        self.current_sign_in_at  = new_current

-        old_current, new_current = self.current_sign_in_ip, extract_ip_from(request)
+        old_current, new_current = self.current_sign_in_ip, request.remote_ip
        self.last_sign_in_ip     = old_current || new_current
        self.current_sign_in_ip  = new_current

        self.sign_in_count ||= 0
        self.sign_in_count += 1
+
+        save(:validate => false) or raise "Devise trackable could not save #{inspect}." \
+          "Please make sure a model using trackable can be saved at sign in."
      end
-
-      def update_tracked_fields!(request)
-        # We have to check if the user is already persisted before running
-        # `save` here because invalid users can be saved if we don't.
-        # See https://github.com/heartcombo/devise/issues/4673 for more details.
-        return if new_record?
-
-        update_tracked_fields(request)
-        save(validate: false)
-      end
-
-      protected
-
-      def extract_ip_from(request)
-        request.remote_ip
-      end
-
    end
  end
 end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Validatable creates all needed validations for a user email and password.
@@ -9,17 +7,15 @@ module Devise
    #
    # == Options
    #
-    # Validatable adds the following options to +devise+:
+    # Validatable adds the following options to devise_for:
    #
    #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 6..128.
+    #   * +password_length+: a range expressing password length. Defaults to 8..128.
    #
-    # Since +password_length+ is applied in a proc within `validates_length_of` it can be overridden
-    # at runtime.
    module Validatable
      # All validations used by this module.
-      VALIDATIONS = [:validates_presence_of, :validates_uniqueness_of, :validates_format_of,
-                     :validates_confirmation_of, :validates_length_of].freeze
+      VALIDATIONS = [ :validates_presence_of, :validates_uniqueness_of, :validates_format_of,
+                      :validates_confirmation_of, :validates_length_of ].freeze

      def self.required_fields(klass)
        []
@@ -30,13 +26,13 @@ module Devise
        assert_validations_api!(base)

        base.class_eval do
-          validates_presence_of   :email, if: :email_required?
-          validates_uniqueness_of :email, allow_blank: true, case_sensitive: true, if: :devise_will_save_change_to_email?
-          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :devise_will_save_change_to_email?
+          validates_presence_of   :email, :if => :email_required?
+          validates_uniqueness_of :email, :allow_blank => true, :if => :email_changed?
+          validates_format_of     :email, :with  => email_regexp, :allow_blank => true, :if => :email_changed?

-          validates_presence_of     :password, if: :password_required?
-          validates_confirmation_of :password, if: :password_required?
-          validates_length_of       :password, minimum: proc { password_length.min }, maximum: proc { password_length.max }, allow_blank: true
+          validates_presence_of     :password, :if => :password_required?
+          validates_confirmation_of :password, :if => :password_required?
+          validates_length_of       :password, :within => password_length, :allow_blank => true
        end
      end

@@ -44,7 +40,7 @@ module Devise
        unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }

        unless unavailable_validations.empty?
-          raise "Could not use :validatable module since #{base} does not respond " \
+          raise "Could not use :validatable module since #{base} does not respond " <<
                "to the following methods: #{unavailable_validations.to_sentence}."
        end
      end
--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -1,30 +1,29 @@
-# frozen_string_literal: true
-
 require 'active_support/core_ext/object/with_options'

-Devise.with_options model: true do |d|
+Devise.with_options :model => true do |d|
  # Strategies first
-  d.with_options strategy: true do |s|
+  d.with_options :strategy => true do |s|
    routes = [nil, :new, :destroy]
-    s.add_module :database_authenticatable, controller: :sessions, route: { session: routes }
-    s.add_module :rememberable, no_input: true
+    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

  # Other authentications
-  d.add_module :omniauthable, controller: :omniauth_callbacks,  route: :omniauth_callback
+  d.add_module :omniauthable, :controller => :omniauth_callbacks,  :route => :omniauth_callback

  # Misc after
  routes = [nil, :new, :edit]
-  d.add_module :recoverable,  controller: :passwords,     route: { password: routes }
-  d.add_module :registerable, controller: :registrations, route: { registration: (routes << :cancel) }
+  d.add_module :recoverable,  :controller => :passwords,     :route => { :password => routes }
+  d.add_module :registerable, :controller => :registrations, :route => { :registration => (routes << :cancel) }
  d.add_module :validatable

  # The ones which can sign out after
  routes = [nil, :new]
-  d.add_module :confirmable,  controller: :confirmations, route: { confirmation: routes }
-  d.add_module :lockable,     controller: :unlocks,       route: { unlock: routes }
+  d.add_module :confirmable,  :controller => :confirmations, :route => { :confirmation => routes }
+  d.add_module :lockable,     :controller => :unlocks,       :route => { :unlock => routes }
  d.add_module :timeoutable

  # Stats for last, so we make sure the user is really signed in
  d.add_module :trackable
-end
+end
--- a/lib/devise/omniauth.rb
+++ b/lib/devise/omniauth.rb
@@ -1,14 +1,15 @@
-# frozen_string_literal: true
-
 begin
-  gem "omniauth", ">= 1.0.0"
-
  require "omniauth"
+  require "omniauth/version"
 rescue LoadError
  warn "Could not load 'omniauth'. Please ensure you have the omniauth gem >= 1.0.0 installed and listed in your Gemfile."
  raise
 end

+unless OmniAuth::VERSION =~ /^1\./
+  raise "You are using an old OmniAuth version, please ensure you have 1.0.0.pr2 version or later installed."
+end
+
 # Clean up the default path_prefix. It will be automatically set by Devise.
 OmniAuth.config.path_prefix = nil

--- a/lib/devise/omniauth/config.rb
+++ b/lib/devise/omniauth/config.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module OmniAuth
    class StrategyNotFound < NameError
--- a/lib/devise/omniauth/url_helpers.rb
+++ b/lib/devise/omniauth/url_helpers.rb
@@ -1,26 +1,17 @@
-# frozen_string_literal: true
-
 module Devise
  module OmniAuth
    module UrlHelpers
-      def omniauth_authorize_path(resource_or_scope, provider, *args)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_#{provider}_omniauth_authorize_path", *args)
+      def self.define_helpers(mapping)
      end

-      def omniauth_authorize_url(resource_or_scope, provider, *args)
+      def omniauth_authorize_path(resource_or_scope, *args)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_#{provider}_omniauth_authorize_url", *args)
+        send("#{scope}_omniauth_authorize_path", *args)
      end

-      def omniauth_callback_path(resource_or_scope, provider, *args)
+      def omniauth_callback_path(resource_or_scope, *args)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_#{provider}_omniauth_callback_path", *args)
-      end
-
-      def omniauth_callback_url(resource_or_scope, provider, *args)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_#{provider}_omniauth_callback_url", *args)
+        send("#{scope}_omniauth_callback_path", *args)
      end
    end
  end
--- a/lib/devise/orm.rb
+++ b/lib/devise/orm.rb
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module Devise
-  module Orm # :nodoc:
-    def self.active_record?(model)
-      defined?(ActiveRecord) && model < ActiveRecord::Base
-    end
-
-    def self.included(model)
-      if Devise::Orm.active_record?(model)
-        model.include DirtyTrackingActiveRecordMethods
-      else
-        model.include DirtyTrackingMongoidMethods
-      end
-    end
-
-    module DirtyTrackingActiveRecordMethods
-      def devise_email_before_last_save
-        email_before_last_save
-      end
-
-      def devise_email_in_database
-        email_in_database
-      end
-
-      def devise_saved_change_to_email?
-        saved_change_to_email?
-      end
-
-      def devise_saved_change_to_encrypted_password?
-        saved_change_to_encrypted_password?
-      end
-
-      def devise_will_save_change_to_email?
-        will_save_change_to_email?
-      end
-
-      def devise_respond_to_and_will_save_change_to_attribute?(attribute)
-        respond_to?("will_save_change_to_#{attribute}?") && send("will_save_change_to_#{attribute}?")
-      end
-    end
-
-    module DirtyTrackingMongoidMethods
-      def devise_email_before_last_save
-        respond_to?(:email_previously_was) ? email_previously_was : email_was
-      end
-
-      def devise_email_in_database
-        email_was
-      end
-
-      def devise_saved_change_to_email?
-        respond_to?(:email_previously_changed?) ? email_previously_changed? : email_changed?
-      end
-
-      def devise_saved_change_to_encrypted_password?
-        respond_to?(:encrypted_password_previously_changed?) ? encrypted_password_previously_changed? : encrypted_password_changed?
-      end
-
-      def devise_will_save_change_to_email?
-        email_changed?
-      end
-
-      def devise_respond_to_and_will_save_change_to_attribute?(attribute)
-        respond_to?("#{attribute}_changed?") && send("#{attribute}_changed?")
-      end
-    end
-  end
-end
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
 require 'orm_adapter/adapters/active_record'

-ActiveSupport.on_load(:active_record) do
-  extend Devise::Models
-end
+ActiveRecord::Base.extend Devise::Models
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,7 +1,3 @@
-# frozen_string_literal: true
+require 'orm_adapter/adapters/mongoid'

-ActiveSupport.on_load(:mongoid) do
-  require 'orm_adapter/adapters/mongoid'
-
-  Mongoid::Document::ClassMethods.send :include, Devise::Models
-end
+Mongoid::Document::ClassMethods.send :include, Devise::Models
--- a/lib/devise/parameter_filter.rb
+++ b/lib/devise/parameter_filter.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  class ParameterFilter
    def initialize(case_insensitive_keys, strip_whitespace_keys)
@@ -18,8 +16,6 @@ module Devise

    def filtered_hash_by_method_for_given_keys(conditions, method, condition_keys)
      condition_keys.each do |k|
-        next unless conditions.key?(k)
-
        value = conditions[k]
        conditions[k] = value.send(method) if value.respond_to?(method)
      end
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -1,172 +1,99 @@
-# frozen_string_literal: true
-
 module Devise
-  # The +ParameterSanitizer+ deals with permitting specific parameters values
-  # for each +Devise+ scope in the application.
-  #
-  # The sanitizer knows about Devise default parameters (like +password+ and
-  # +password_confirmation+ for the `RegistrationsController`), and you can
-  # extend or change the permitted parameters list on your controllers.
-  #
-  # === Permitting new parameters
-  #
-  # You can add new parameters to the permitted list using the +permit+ method
-  # in a +before_action+ method, for instance.
-  #
-  #    class ApplicationController < ActionController::Base
-  #      before_action :configure_permitted_parameters, if: :devise_controller?
-  #
-  #      protected
-  #
-  #      def configure_permitted_parameters
-  #        # Permit the `subscribe_newsletter` parameter along with the other
-  #        # sign up parameters.
-  #        devise_parameter_sanitizer.permit(:sign_up, keys: [:subscribe_newsletter])
-  #      end
-  #    end
-  #
-  # Using a block yields an +ActionController::Parameters+ object so you can
-  # permit nested parameters and have more control over how the parameters are
-  # permitted in your controller.
-  #
-  #    def configure_permitted_parameters
-  #      devise_parameter_sanitizer.permit(:sign_up) do |user|
-  #        user.permit(newsletter_preferences: [])
-  #      end
-  #    end
-  class ParameterSanitizer
-    DEFAULT_PERMITTED_ATTRIBUTES = {
-      sign_in: [:password, :remember_me],
-      sign_up: [:password, :password_confirmation],
-      account_update: [:password, :password_confirmation, :current_password]
-    }
+  class BaseSanitizer
+    attr_reader :params, :resource_name, :resource_class

    def initialize(resource_class, resource_name, params)
-      @auth_keys      = extract_auth_keys(resource_class)
-      @params         = params
+      @resource_class = resource_class
      @resource_name  = resource_name
-      @permitted      = {}
-
-      DEFAULT_PERMITTED_ATTRIBUTES.each_pair do |action, keys|
-        permit(action, keys: keys)
-      end
+      @params         = params
+      @blocks         = Hash.new
    end

-    # Sanitize the parameters for a specific +action+.
-    #
-    # === Arguments
-    #
-    # * +action+ - A +Symbol+ with the action that the controller is
-    #   performing, like +sign_up+, +sign_in+, etc.
-    #
-    # === Examples
-    #
-    #    # Inside the `RegistrationsController#create` action.
-    #    resource = build_resource(devise_parameter_sanitizer.sanitize(:sign_up))
-    #    resource.save
-    #
-    # Returns an +ActiveSupport::HashWithIndifferentAccess+ with the permitted
-    # attributes.
-    def sanitize(action)
-      permissions = @permitted[action]
-
-      if permissions.respond_to?(:call)
-        cast_to_hash permissions.call(default_params)
-      elsif permissions.present?
-        cast_to_hash permit_keys(default_params, permissions)
-      else
-        unknown_action!(action)
-      end
-    end
-
-    # Add or remove new parameters to the permitted list of an +action+.
-    #
-    # === Arguments
-    #
-    # * +action+ - A +Symbol+ with the action that the controller is
-    #   performing, like +sign_up+, +sign_in+, etc.
-    # * +keys:+     - An +Array+ of keys that also should be permitted.
-    # * +except:+   - An +Array+ of keys that shouldn't be permitted.
-    # * +block+     - A block that should be used to permit the action
-    #   parameters instead of the +Array+ based approach. The block will be
-    #   called with an +ActionController::Parameters+ instance.
-    #
-    # === Examples
-    #
-    #   # Adding new parameters to be permitted in the `sign_up` action.
-    #   devise_parameter_sanitizer.permit(:sign_up, keys: [:subscribe_newsletter])
-    #
-    #   # Removing the `password` parameter from the `account_update` action.
-    #   devise_parameter_sanitizer.permit(:account_update, except: [:password])
-    #
-    #   # Using the block form to completely override how we permit the
-    #   # parameters for the `sign_up` action.
-    #   devise_parameter_sanitizer.permit(:sign_up) do |user|
-    #     user.permit(:email, :password, :password_confirmation)
-    #   end
-    #
-    #
-    # Returns nothing.
-    def permit(action, keys: nil, except: nil, &block)
+    def for(kind, &block)
      if block_given?
-        @permitted[action] = block
+        @blocks[kind] = block
+      else
+        default_for(kind)
      end
+    end

-      if keys.present?
-        @permitted[action] ||= @auth_keys.dup
-        @permitted[action].concat(keys)
-      end
-
-      if except.present?
-        @permitted[action] ||= @auth_keys.dup
-        @permitted[action] = @permitted[action] - except
+    def sanitize(kind)
+      if block = @blocks[kind]
+        block.call(default_params)
+      else
+        default_sanitize(kind)
      end
    end

    private

-    # Cast a sanitized +ActionController::Parameters+ to a +HashWithIndifferentAccess+
-    # that can be used elsewhere.
-    #
-    # Returns an +ActiveSupport::HashWithIndifferentAccess+.
-    def cast_to_hash(params)
-      params && params.to_h
+    def default_for(kind)
+      raise ArgumentError, "a block is expected in Devise base sanitizer"
+    end
+
+    def default_sanitize(kind)
+      default_params
    end

    def default_params
-      if hashable_resource_params?
-        @params.fetch(@resource_name)
+      params.fetch(resource_name, {})
+    end
+  end
+
+  class ParameterSanitizer < BaseSanitizer
+    def initialize(*)
+      super
+      @permitted = Hash.new { |h,k| h[k] = attributes_for(k) }
+    end
+
+    def sign_in
+      permit self.for(:sign_in)
+    end
+
+    def sign_up
+      permit self.for(:sign_up)
+    end
+
+    def 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)
+      @permitted[kind] || raise("No sanitizer provided for #{kind}")
+    end
+
+    def default_sanitize(kind)
+      if respond_to?(kind, true)
+        send(kind)
      else
-        empty_params
+        raise NotImplementedError, "Devise doesn't know how to sanitize parameters for #{kind}"
      end
    end

-    def hashable_resource_params?
-      @params[@resource_name].respond_to?(:permit)
+    def attributes_for(kind)
+      case kind
+      when :sign_in
+        auth_keys + [:password, :remember_me]
+      when :sign_up
+        auth_keys + [:password, :password_confirmation]
+      when :account_update
+        auth_keys + [:password, :password_confirmation, :current_password]
+      end
    end

-    def empty_params
-      ActionController::Parameters.new({})
-    end
-
-    def permit_keys(parameters, keys)
-      parameters.permit(*keys)
-    end
-
-    def extract_auth_keys(klass)
-      auth_keys = klass.authentication_keys
-
-      auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys
-    end
-
-    def unknown_action!(action)
-      raise NotImplementedError, <<-MESSAGE.strip_heredoc
-        "Devise doesn't know how to sanitize parameters for '#{action}'".
-        If you want to define a new set of parameters to be sanitized use the
-        `permit` method first:
-
-          devise_parameter_sanitizer.permit(:#{action}, keys: [:param1, :param2, :param3])
-      MESSAGE
+    def auth_keys
+      @auth_keys ||= @resource_class.authentication_keys.respond_to?(:keys) ?
+                       @resource_class.authentication_keys.keys : @resource_class.authentication_keys
    end
  end
 end
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'

@@ -13,19 +11,13 @@ module Devise
    end

    # Force routes to be loaded if we are doing any eager load.
-    config.before_eager_load do |app|
-      app.reload_routes! if Devise.reload_routes
-    end
-
-    initializer "devise.deprecator" do |app|
-      app.deprecators[:devise] = Devise.deprecator if app.respond_to?(:deprecators)
-    end
+    config.before_eager_load { |app| app.reload_routes! }

    initializer "devise.url_helpers" do
      Devise.include_helpers(Devise::Controllers)
    end

-    initializer "devise.omniauth", after: :load_config_initializers, before: :build_middleware_stack do |app|
+    initializer "devise.omniauth" do |app|
      Devise.omniauth_configs.each do |provider, config|
        app.middleware.use config.strategy_class, *config.args do |strategy|
          config.strategy = strategy
@@ -37,20 +29,21 @@ module Devise
      end
    end

-    initializer "devise.secret_key" do |app|
-      Devise.secret_key ||= app.secret_key_base
-
+    initializer "devise.secret_key" do
      Devise.token_generator ||=
        if secret_key = Devise.secret_key
          Devise::TokenGenerator.new(
-            ActiveSupport::CachingKeyGenerator.new(ActiveSupport::KeyGenerator.new(secret_key))
+            Devise::CachingKeyGenerator.new(Devise::KeyGenerator.new(secret_key))
          )
        end
    end

-    initializer "devise.configure_zeitwerk" do
-      if Rails.autoloaders.zeitwerk_enabled? && !defined?(ActionMailer)
-        Rails.autoloaders.main.ignore("#{root}/app/mailers/devise/mailer.rb")
+    initializer "devise.fix_routes_proxy_missing_respond_to_bug" do
+      # Deprecate: Remove once we move to Rails 4 only.
+      ActionDispatch::Routing::RoutesProxy.class_eval do
+        def respond_to?(method, include_private = false)
+          super || routes.url_helpers.respond_to?(method)
+        end
      end
    end
  end
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -1,12 +1,13 @@
-# frozen_string_literal: true
-
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/hash/slice"

-module Devise
-  module RouteSet
-    def finalize!
-      result = super
+module ActionDispatch::Routing
+  class RouteSet #:nodoc:
+    # Ensure Devise modules are included only after loading routes, because we
+    # need devise_for mappings already declared to create filters and helpers.
+    def finalize_with_devise!
+      result = finalize_without_devise!
+
      @devise_finalized ||= begin
        if Devise.router_name.nil? && defined?(@devise_finalized) && self != Rails.application.try(:routes)
          warn "[DEVISE] We have detected that you are using devise_for inside engine routes. " \
@@ -20,16 +21,10 @@ module Devise
        Devise.regenerate_helpers!
        true
      end
+
      result
    end
-  end
-end
-
-module ActionDispatch::Routing
-  class RouteSet #:nodoc:
-    # Ensure Devise modules are included only after loading routes, because we
-    # need devise_for mappings already declared to create filters and helpers.
-    prepend Devise::RouteSet
+    alias_method_chain :finalize!, :devise
  end

  class Mapper
@@ -48,132 +43,104 @@ module ActionDispatch::Routing
    # needed routes:
    #
    #  # Session routes for Authenticatable (default)
-    #       new_user_session GET    /users/sign_in                    {controller:"devise/sessions", action:"new"}
-    #           user_session POST   /users/sign_in                    {controller:"devise/sessions", action:"create"}
-    #   destroy_user_session DELETE /users/sign_out                   {controller:"devise/sessions", action:"destroy"}
+    #       new_user_session GET    /users/sign_in                    {:controller=>"devise/sessions", :action=>"new"}
+    #           user_session POST   /users/sign_in                    {:controller=>"devise/sessions", :action=>"create"}
+    #   destroy_user_session DELETE /users/sign_out                   {:controller=>"devise/sessions", :action=>"destroy"}
    #
    #  # Password routes for Recoverable, if User model has :recoverable configured
-    #      new_user_password GET    /users/password/new(.:format)     {controller:"devise/passwords", action:"new"}
-    #     edit_user_password GET    /users/password/edit(.:format)    {controller:"devise/passwords", action:"edit"}
-    #          user_password PUT    /users/password(.:format)         {controller:"devise/passwords", action:"update"}
-    #                        POST   /users/password(.:format)         {controller:"devise/passwords", action:"create"}
+    #      new_user_password GET    /users/password/new(.:format)     {:controller=>"devise/passwords", :action=>"new"}
+    #     edit_user_password GET    /users/password/edit(.:format)    {:controller=>"devise/passwords", :action=>"edit"}
+    #          user_password PUT    /users/password(.:format)         {:controller=>"devise/passwords", :action=>"update"}
+    #                        POST   /users/password(.:format)         {:controller=>"devise/passwords", :action=>"create"}
    #
    #  # Confirmation routes for Confirmable, if User model has :confirmable configured
-    #  new_user_confirmation GET    /users/confirmation/new(.:format) {controller:"devise/confirmations", action:"new"}
-    #      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.
+    #  new_user_confirmation GET    /users/confirmation/new(.:format) {:controller=>"devise/confirmations", :action=>"new"}
+    #      user_confirmation GET    /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"show"}
+    #                        POST   /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"create"}
    #
    # ==== Options
    #
    # You can configure your routes with some options:
    #
-    #  * class_name: set up a different class to be looked up by devise, if it cannot be
+    #  * :class_name => setup a different class to be looked up by devise, if it cannot be
    #    properly found by the route name.
    #
-    #      devise_for :users, class_name: 'Account'
+    #      devise_for :users, :class_name => 'Account'
    #
-    #  * path: allows you to set up path name that will be used, as rails routes does.
-    #    The following route configuration would set up your route as /accounts instead of /users:
+    #  * :path => allows you to setup path name that will be used, as rails routes does.
+    #    The following route configuration would setup your route as /accounts instead of /users:
    #
-    #      devise_for :users, path: 'accounts'
+    #      devise_for :users, :path => 'accounts'
    #
-    #  * singular: set up the singular name for the given resource. This is used as the helper methods
-    #    names in controller ("authenticate_#{singular}!", "#{singular}_signed_in?", "current_#{singular}"
-    #    and "#{singular}_session"), as the scope name in routes and as the scope given to warden.
+    #  * :singular => setup the singular name for the given resource. This is used as the instance variable
+    #    name in controller, as the name in routes and the scope given to warden.
    #
-    #      devise_for :admins, singular: :manager
+    #      devise_for :users, :singular => :user
    #
-    #      devise_scope :manager do
-    #        ...
-    #      end
-    #
-    #      class ManagerController < ApplicationController
-    #        before_action authenticate_manager!
-    #
-    #        def show
-    #          @manager = current_manager
-    #          ...
-    #        end
-    #      end
-    #
-    #  * path_names: configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
+    #  * :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', edit: 'edit/profile'
-    #      }
+    #      devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout',
+    #        :password => 'secret', :confirmation => 'verification', registration: 'register }
    #
-    #  * controllers: the controller which should be used. All routes by default points to Devise controllers.
+    #  * :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:
    #
-    #      devise_for :users, controllers: { sessions: "users/sessions" }
+    #      devise_for :users, :controllers => { :sessions => "users/sessions" }
    #
-    #  * failure_app: a rack app which is invoked whenever there is a failure. Strings representing a given
+    #  * :failure_app => a rack app which is invoked whenever there is a failure. Strings representing a given
    #    are also allowed as parameter.
    #
-    #  * sign_out_via: the HTTP method(s) accepted for the :sign_out action (default: :delete),
+    #  * :sign_out_via => the HTTP method(s) accepted for the :sign_out action (default: :get),
    #    if you wish to restrict this to accept only :post or :delete requests you should do:
    #
-    #      devise_for :users, sign_out_via: [:get, :post]
+    #      devise_for :users, :sign_out_via => [ :post, :delete ]
    #
    #    You need to make sure that your sign_out controls trigger a request with a matching HTTP method.
    #
-    #  * module: the namespace to find controllers (default: "devise", thus
+    #  * :module => the namespace to find controllers (default: "devise", thus
    #    accessing devise/sessions, devise/registrations, and so on). If you want
    #    to namespace all at once, use module:
    #
-    #      devise_for :users, module: "users"
+    #      devise_for :users, :module => "users"
    #
-    #  * skip: tell which controller you want to skip routes from being created.
-    #    It accepts :all as an option, meaning it will not generate any route at all:
+    #    Notice that whenever you use namespace in the router DSL, it automatically sets the module.
+    #    So the following setup:
    #
-    #      devise_for :users, skip: :sessions
+    #      namespace :publisher do
+    #        devise_for :account
+    #      end
    #
-    #  * only: the opposite of :skip, tell which controllers only to generate routes to:
+    #    Will use publisher/sessions controller instead of devise/sessions controller. You can revert
+    #    this by providing the :module option to devise_for.
    #
-    #      devise_for :users, only: :sessions
+    #    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_helpers: skip generating Devise url helpers like new_session_path(@user).
+    #  * :skip => tell which controller you want to skip routes from being created:
+    #
+    #      devise_for :users, :skip => :sessions
+    #
+    #  * :only => the opposite of :skip, tell which controllers only to generate routes to:
+    #
+    #      devise_for :users, :only => :sessions
+    #
+    #  * :skip_helpers => skip generating Devise url helpers like new_session_path(@user).
    #    This is useful to avoid conflicts with previous routes and is false by default.
    #    It accepts true as option, meaning it will skip all the helpers for the controllers
    #    given in :skip but it also accepts specific helpers to be skipped:
    #
-    #      devise_for :users, skip: [:registrations, :confirmations], skip_helpers: true
-    #      devise_for :users, skip_helpers: [:registrations, :confirmations]
+    #      devise_for :users, :skip => [:registrations, :confirmations], :skip_helpers => true
+    #      devise_for :users, :skip_helpers => [:registrations, :confirmations]
    #
-    #  * format: include "(.:format)" in the generated routes? true by default, set to false to disable:
+    #  * :format => include "(.:format)" in the generated routes? true by default, set to false to disable:
    #
-    #      devise_for :users, format: false
+    #      devise_for :users, :format => false
    #
-    #  * constraints: works the same as Rails' constraints
+    #  * :constraints => works the same as Rails' constraints
    #
-    #  * defaults: works the same as Rails' defaults
-    #
-    #  * router_name: allows application level router name to be overwritten for the current scope
+    #  * :defaults => works the same as Rails' defaults
    #
    # ==== Scoping
    #
@@ -195,7 +162,7 @@ module ActionDispatch::Routing
    #
    #   class ApplicationController < ActionController::Base
    #     def self.default_url_options
-    #       { locale: I18n.locale }
+    #       { :locale => I18n.locale }
    #     end
    #   end
    #
@@ -220,7 +187,7 @@ module ActionDispatch::Routing
    # In order to get Devise to recognize the deactivate action, your devise_scope entry should look like this:
    #
    #     devise_scope :owner do
-    #       post "deactivate", to: "registrations#deactivate", as: "deactivate_registration"
+    #       post "deactivate", :to => "registrations#deactivate", :as => "deactivate_registration"
    #     end
    #
    def devise_for(*resources)
@@ -235,6 +202,7 @@ module ActionDispatch::Routing
      options[:constraints]   = (@scope[:constraints] || {}).merge(options[:constraints] || {})
      options[:defaults]      = (@scope[:defaults] || {}).merge(options[:defaults] || {})
      options[:options]       = @scope[:options] || {}
+      options[:options][:format] = false if options[:format] == false

      resources.map!(&:to_sym)

@@ -245,7 +213,7 @@ module ActionDispatch::Routing
          raise_no_devise_method_error!(mapping.class_name) unless mapping.to.respond_to?(:devise)
        rescue NameError => e
          raise unless mapping.class_name == resource.to_s.classify
-          warn "[WARNING] You provided devise_for #{resource.inspect} but there is " \
+          warn "[WARNING] You provided devise_for #{resource.inspect} but there is " <<
            "no model #{mapping.class_name} defined in your application"
          next
        rescue NoMethodError => e
@@ -253,14 +221,7 @@ module ActionDispatch::Routing
          raise_no_devise_method_error!(mapping.class_name)
        end

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

        devise_scope mapping.name do
          with_devise_exclusive_scope mapping.fullpath, mapping.name, options do
@@ -283,10 +244,10 @@ module ActionDispatch::Routing
    #   end
    #
    #   authenticate :user, lambda {|u| u.role == "admin"} do
-    #     root to: "admin/dashboard#show", as: :user_root
+    #     root :to => "admin/dashboard#show", :as => :user_root
    #   end
    #
-    def authenticate(scope = nil, block = nil)
+    def authenticate(scope=nil, block=nil)
      constraints_for(:authenticate!, scope, block) do
        yield
      end
@@ -297,20 +258,20 @@ module ActionDispatch::Routing
    # a model and allows extra constraints to be done on the instance.
    #
    #   authenticated :admin do
-    #     root to: 'admin/dashboard#show', as: :admin_root
+    #     root :to => 'admin/dashboard#show', :as => :admin_root
    #   end
    #
    #   authenticated do
-    #     root to: 'dashboard#show', as: :authenticated_root
+    #     root :to => 'dashboard#show', :as => :authenticated_root
    #   end
    #
    #   authenticated :user, lambda {|u| u.role == "admin"} do
-    #     root to: "admin/dashboard#show", as: :user_root
+    #     root :to => "admin/dashboard#show", :as => :user_root
    #   end
    #
-    #   root to: 'landing#show'
+    #   root :to => 'landing#show'
    #
-    def authenticated(scope = nil, block = nil)
+    def authenticated(scope=nil, block=nil)
      constraints_for(:authenticate?, scope, block) do
        yield
      end
@@ -321,15 +282,15 @@ module ActionDispatch::Routing
    #
    #   unauthenticated do
    #     as :user do
-    #       root to: 'devise/registrations#new'
+    #       root :to => 'devise/registrations#new'
    #     end
    #   end
    #
-    #   root to: 'dashboard#show'
+    #   root :to => 'dashboard#show'
    #
-    def unauthenticated(scope = nil)
+    def unauthenticated(scope=nil)
      constraint = lambda do |request|
-        not request.env["warden"].authenticate? scope: scope
+        not request.env["warden"].authenticate? :scope => scope
      end

      constraints(constraint) do
@@ -339,10 +300,10 @@ module ActionDispatch::Routing

    # Sets the devise scope to be used in the controller. If you have custom routes,
    # you are required to call this method (also aliased as :as) in order to specify
-    # to which controller it is targeted.
+    # to which controller it is targetted.
    #
    #   as :user do
-    #     get "sign_in", to: "devise/sessions#new"
+    #     get "sign_in", :to => "devise/sessions#new"
    #   end
    #
    # Notice you cannot have two scopes mapping to the same URL. And remember, if
@@ -374,108 +335,88 @@ module ActionDispatch::Routing
    protected

      def devise_session(mapping, controllers) #:nodoc:
-        resource :session, only: [], controller: controllers[:sessions], path: "" do
-          get   :new,     path: mapping.path_names[:sign_in],  as: "new"
-          post  :create,  path: mapping.path_names[:sign_in]
-          match :destroy, path: mapping.path_names[:sign_out], as: "destroy", via: mapping.sign_out_via
+        resource :session, :only => [], :controller => controllers[:sessions], :path => "" do
+          get   :new,     :path => mapping.path_names[:sign_in],  :as => "new"
+          post  :create,  :path => mapping.path_names[:sign_in]
+          match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy", :via => mapping.sign_out_via
        end
      end

      def devise_password(mapping, controllers) #:nodoc:
-        resource :password, only: [:new, :create, :edit, :update],
-          path: mapping.path_names[:password], controller: controllers[:passwords]
+        resource :password, :only => [:new, :create, :edit, :update],
+          :path => mapping.path_names[:password], :controller => controllers[:passwords]
      end

      def devise_confirmation(mapping, controllers) #:nodoc:
-        resource :confirmation, only: [:new, :create, :show],
-          path: mapping.path_names[:confirmation], controller: controllers[:confirmations]
+        resource :confirmation, :only => [:new, :create, :show],
+          :path => mapping.path_names[:confirmation], :controller => controllers[:confirmations]
      end

      def devise_unlock(mapping, controllers) #:nodoc:
        if mapping.to.unlock_strategy_enabled?(:email)
-          resource :unlock, only: [:new, :create, :show],
-            path: mapping.path_names[:unlock], controller: controllers[:unlocks]
+          resource :unlock, :only => [:new, :create, :show],
+            :path => mapping.path_names[:unlock], :controller => controllers[:unlocks]
        end
      end

      def devise_registration(mapping, controllers) #:nodoc:
        path_names = {
-          new: mapping.path_names[:sign_up],
-          edit: mapping.path_names[:edit],
-          cancel: mapping.path_names[:cancel]
+          :new => mapping.path_names[:sign_up],
+          :cancel => mapping.path_names[:cancel]
        }

        options = {
-          only: [:new, :create, :edit, :update, :destroy],
-          path: mapping.path_names[:registration],
-          path_names: path_names,
-          controller: controllers[:registrations]
+          :only => [:new, :create, :edit, :update, :destroy],
+          :path => mapping.path_names[:registration],
+          :path_names => path_names,
+          :controller => controllers[:registrations]
        }

-        resource :registration, **options do
+        resource :registration, options do
          get :cancel
        end
      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` to the `devise_for` call and extract omniauth
-options to another `devise_for` call outside the scope. Here is an example:
-
-    devise_for :users, only: :omniauth_callbacks, controllers: {omniauth_callbacks: 'users/omniauth_callbacks'}
-
-    scope '/(:locale)', locale: /ru|en/ do
-      devise_for :users, skip: :omniauth_callbacks
-    end
-ERROR
-        end
-        current_scope = @scope.dup
-        if @scope.respond_to? :new
-          @scope = @scope.new path: nil
-        else
-          @scope[:path] = nil
-        end
-        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.fullpath}/auth".squeeze("/")
-
+        path, @scope[:path] = @scope[:path], nil
+        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.path}/auth".squeeze("/")
        set_omniauth_path_prefix!(path_prefix)

-        mapping.to.omniauth_providers.each do |provider|
-          match "#{path_prefix}/#{provider}",
-            to: "#{controllers[:omniauth_callbacks]}#passthru",
-            as: "#{provider}_omniauth_authorize",
-            via: OmniAuth.config.allowed_request_methods
+        providers = Regexp.union(mapping.to.omniauth_providers.map(&:to_s))

-          match "#{path_prefix}/#{provider}/callback",
-            to: "#{controllers[:omniauth_callbacks]}##{provider}",
-            as: "#{provider}_omniauth_callback",
-            via: [:get, :post]
-        end
+        match "#{path_prefix}/:provider",
+          :constraints => { :provider => providers },
+          :to => "#{controllers[:omniauth_callbacks]}#passthru",
+          :as => :omniauth_authorize,
+          :via => [:get, :post]
+
+        match "#{path_prefix}/:action/callback",
+          :constraints => { :action => providers },
+          :to => controllers[:omniauth_callbacks],
+          :as => :omniauth_callback,
+          :via => [:get, :post]
      ensure
-        @scope = current_scope
+        @scope[:path] = path
      end

+      DEVISE_SCOPE_KEYS = [:as, :path, :module, :constraints, :defaults, :options]
+
      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
-        current_scope = @scope.dup
+        old = {}
+        DEVISE_SCOPE_KEYS.each { |k| old[k] = @scope[k] }

-        exclusive = { as: new_as, path: new_path, module: nil }
-        exclusive.merge!(options.slice(:constraints, :format, :defaults, :options))
+        new = { :as => new_as, :path => new_path, :module => nil }
+        new.merge!(options.slice(:constraints, :defaults, :options))

-        if @scope.respond_to? :new
-          @scope = @scope.new exclusive
-        else
-          exclusive.each_pair { |key, value| @scope[key] = value }
-        end
+        @scope.merge!(new)
        yield
      ensure
-        @scope = current_scope
+        @scope.merge!(old)
      end

-      def constraints_for(method_to_apply, scope = nil, block = nil)
+      def constraints_for(method_to_apply, scope=nil, block=nil)
        constraint = lambda do |request|
-          request.env['warden'].send(method_to_apply, scope: scope) &&
+          request.env['warden'].send(method_to_apply, :scope => scope) &&
            (block.nil? || block.call(request.env["warden"].user(scope)))
        end

--- a/lib/devise/rails/warden_compat.rb
+++ b/lib/devise/rails/warden_compat.rb
@@ -1,12 +1,19 @@
-# frozen_string_literal: true
-
 module Warden::Mixins::Common
  def request
    @request ||= ActionDispatch::Request.new(env)
  end

+  # Deprecate: Remove this check once we move to Rails 4 only.
+  NULL_STORE =
+    defined?(ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash) ?
+      ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash : nil
+
  def reset_session!
-    request.reset_session
+    # Calling reset_session on NULL_STORE causes it fail.
+    # This is a bug that needs to be fixed in Rails.
+    unless NULL_STORE && request.session.is_a?(NULL_STORE)
+      request.reset_session
+    end
  end

  def cookies
--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/base'

 module Devise
@@ -18,18 +16,11 @@ module Devise
        valid_for_params_auth? || valid_for_http_auth?
      end

-      # Override and set to false for things like OmniAuth that technically
-      # run through Authentication (user_set) very often, which would normally
-      # reset CSRF data in the session
-      def clean_up_csrf?
-        true
-      end
-
    private

      # Receives a resource and check if it is valid by calling valid_for_authentication?
-      # A block that will be triggered while validating can be optionally
-      # given as parameter. Check Devise::Models::Authenticatable.valid_for_authentication?
+      # An optional block that will be triggered while validating can be optionally
+      # given as parameter. Check Devise::Models::Authenticable.valid_for_authentication?
      # for more information.
      #
      # In case the resource can't be validated, it will fail with the given
@@ -38,6 +29,7 @@ module Devise
        result = resource && resource.valid_for_authentication?(&block)

        if result
+          decorate(resource)
          true
        else
          if resource
@@ -48,7 +40,7 @@ module Devise
      end

      # Get values from params and set in the resource.
-      def remember_me(resource)
+      def decorate(resource)
        resource.remember_me = remember_me? if resource.respond_to?(:remember_me=)
      end

@@ -57,9 +49,9 @@ module Devise
        valid_params? && Devise::TRUE_VALUES.include?(params_auth_hash[:remember_me])
      end

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

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

-      # Note: unlike `Model.valid_password?`, this method does not actually
-      # ensure that the password in the params matches the password stored in
-      # the database. It only checks if the password is *present*. Do not rely
-      # on this method for validating that a given password is correct.
+      # Check if password is present and is not equal to "X" (default value for token).
      def valid_password?
-        password.present?
+        password.present? && password != "X"
      end

      # Helper to decode credentials from HTTP.
      def decode_credentials
-        return [] unless request.authorization && request.authorization =~ /^Basic (.*)/mi
+        return [] unless request.authorization && request.authorization =~ /^Basic (.*)/m
        Base64.decode64($1).split(/:/, 2)
      end

--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Strategies
    # Base strategy for Devise. Responsible for verifying correct scope and mapping.
@@ -19,4 +17,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -1,28 +1,20 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'

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

-        if validate(resource){ hashed = true; resource.valid_password?(password) }
-          remember_me(resource)
+        if validate(resource){ encrypted = true; resource.valid_password?(password) }
          resource.after_database_authentication
          success!(resource)
        end

-        # In paranoid mode, hash the password even when a resource doesn't exist for the given authentication key.
-        # This is necessary to prevent enumeration attacks - e.g. the request is faster when a resource doesn't
-        # exist in the database if the password hashing algorithm is not called.
-        mapping.to.new.password = password if !hashed && Devise.paranoid
-        unless resource
-          Devise.paranoid ? fail(:invalid) : fail(:not_found_in_database)
-        end
+        mapping.to.new.password = password if !encrypted && Devise.paranoid
+        fail(:not_found_in_database) unless resource
      end
    end
  end
--- a/lib/devise/strategies/rememberable.rb
+++ b/lib/devise/strategies/rememberable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'

 module Devise
@@ -27,25 +25,15 @@ module Devise
        end

        if validate(resource)
-          remember_me(resource) if extend_remember_me?(resource)
-          resource.after_remembered
          success!(resource)
        end
      end

-      # No need to clean up the CSRF when using rememberable.
-      # In fact, cleaning it up here would be a bug because
-      # rememberable is triggered on GET requests which means
-      # we would render a page on first access with all csrf
-      # tokens expired.
-      def clean_up_csrf?
-        false
-      end
-
    private

-      def extend_remember_me?(resource)
-        resource.respond_to?(:extend_remember_period) && resource.extend_remember_period
+      def decorate(resource)
+        super
+        resource.extend_remember_period = mapping.to.extend_remember_period if resource.respond_to?(:extend_remember_period=)
      end

      def remember_me?
--- a/lib/devise/strategies/token_authenticatable.rb
+++ b/lib/devise/strategies/token_authenticatable.rb
@@ -0,0 +1,91 @@
+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/Show More
+++ b/Show More
Author	SHA1	Message	Date
José Valim	0a0681c663	Release v3.1.2	2013-11-13 14:08:08 +01:00
José Valim	96c456a72f	Add Rails 4 related todo	2013-10-31 14:39:52 +01:00
José Valim	6a7011e84b	Merge pull request #2717 from memberful/2716-splat-sanitize-params Splat the arguments to strong_parameters#permit, fixes #2716	2013-10-31 06:38:30 -07:00
Matt Button	ceda14210d	Splat the arguments to strong_parameters#permit, fixes #2716 There is a discrepancy between rails' strong_parameter implementation, and the strong_parameter gem's[0]. While this is obviously a problem with the other gem, it doesn't hurt to explicitly splat the parameters. [0]: https://github.com/rails/strong_parameters/pull/170	2013-10-31 13:02:50 +00:00
José Valim	0efcba3627	Release v3.1.1	2013-10-01 17:11:42 +02:00
José Valim	07e77eb4b3	Make it clear a restart is required when setting the secret key	2013-10-01 17:10:42 +02:00
Greg Gates	e3d0a2ba45	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. Conflicts: app/controllers/devise/confirmations_controller.rb config/locales/en.yml	2013-10-01 17:00:27 +02:00