devise-otp 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd51a7a5178b6da891987b166c3f838833ec6c6c506ceb457c49c743b925244
-  data.tar.gz: 20e043c52ed71c4d6e8c5b9dd309badbf656d6d0d386cdae1269d8440a91d09e
+  metadata.gz: d19fbc8b7c55dd43387e81ac13a7f1807f1a5c700b987c97d99f37985984831c
+  data.tar.gz: 8a396782dc0fd10ab4fe45a246f5a7460af6144de7b92834dc6ff755fb5afe43
 SHA512:
-  metadata.gz: faee3c01bdf932a07843ea991f87cffa40081a1339647960382e7ad6532302aeb02cd0ac39de8a643a5b3a33f87a134a3bf11a30969b3c5a3d64c6bea3cb0a6f
-  data.tar.gz: f08c0a495128b23816751a3386082bf250d3791ce2dc25c0f4e4facd6e911053900aad3664f75938d3ab67c3757811f189f9a22f5b535c8095a679de3f901c60
+  metadata.gz: 5e92163f98f4ffbf5ee3f649991df5fc40df6f2531fdf7d3d1081d7174e36598e4751de6b258ed10287da5853ff02ea87170c11c9b62122cc6fd5ffec35cd59d
+  data.tar.gz: f2640e640e6c72a299c78bf87e7ae6dea9137f2d0fdf9a0a9e0345edac6c4858418f6e4285357ae6266ac3bbeeb1c1c0c65fd23b3554d7b19369d2232f58b58b

data/.github/workflows/ci.yml

@@ -12,17 +12,19 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '4.0'
           - '3.4'
           - '3.3'
           - '3.2'
           - 'head'
         rails:
+          - rails_8.1
           - rails_8.0
-          - rails_7.2
-          - rails_7.1
         exclude:
           - ruby: '3.1'
             rails: 'rails_8.0'
+          - ruby: '3.1'
+            rails: 'rails_8.1'
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails }}.gemfile

data/Appraisals

@@ -1,22 +1,9 @@
 # frozen_string_literal: true
 
-appraise 'rails_7.1' do
-  gem 'rails', '~> 7.1.0'
-  gem 'sqlite3', '~> 1.5.0'
-
-  # Fix:
-  # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0.
-  # Add logger to your Gemfile or gemspec.
-  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
-    gem 'logger'
-  end
-end
-
-appraise 'rails_7.2' do
-  gem 'rails', '~> 7.2.0'
-  gem 'sqlite3', '~> 1.5.0'
-end
-
 appraise 'rails_8.0' do
   gem 'rails', '~> 8.0.0'
 end
+
+appraise 'rails_8.1' do
+  gem 'rails', '~> 8.1.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v2.1.0
+
+Bug fixes
+- Fix issue with refreshing credentials when enabling browser persistence;
+- Add back link from "View recovery codes" page;
+
+Improvements
+- Simplify "View recovery codes" verbiage;
+- Move locale file to devise-otp.en.yml;
+
+Maintenance
+- Disable tests for Rails 7.1 (EOL on 10/2025) and 7.2 (EOL on 8/9/2026)
+
+Documentation
+- Switch to native CSS import in README for Propshaft compatibility;
+- Add Getting Started section to README with sample link to OTP Token page;
+
 ## v2.0.0
 
 Bug fixes:

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
 
 gem "capybara"
+gem "debug"
 gem "minitest-reporters", ">= 0.5.0"
 gem "puma"
 gem "rake"
@@ -13,10 +14,9 @@ gem "rdoc"
 gem "shoulda"
 gem "sprockets-rails"
 gem "sqlite3", "~> 2.1"
+gem "timecop", "~> 0.9.10"
 
 # Formatting gems
-gem "standardrb", require: false
+gem "erb_lint",              require: false
+gem "standardrb",            require: false
 gem "rubocop-rails-omakase", require: false
-gem "erb_lint", require: false
-
-gem "debug"

data/README.md

@@ -50,23 +50,31 @@ Run the following generator to add the necessary configuration options to Devise
 
     rails g devise_otp:install
 
-After you've created your Devise user models (which is usually done with a `rails g devise MODEL`), set up your Devise OTP additions:
+## Getting Started
+
+Create your Devise user model if you have not done so
+
+    rails g devise MODEL
+
+Add Devise OTP to the model
 
     rails g devise_otp MODEL
 
-Don't forget to migrate:
+Add a link to the OTP Token settings to your navigation menu (or equivalent) for the user model
 
-    rake db:migrate
+    <%= link_to "OTP Token", user_otp_token_path %>
 
-### Default CSS
+NOTE: replace "user" with the lowercase name of the model (same as the main devise gem)
 
-To use the default CSS for devise-otp, just require the devise-otp.css file as usual in your application.css file (or equivalent):
+## Default CSS
 
-    *= require devise-otp
+To use the default CSS for devise-otp, just import the devise-otp.css file into your application.css file (or equivalent):
 
-It might be even easier to just copy the styles to your project.
+    @import url("devise-otp.css");
 
-### Custom views
+NOTE: You can also copy/paste the styles from [devise-otp.css](https://github.com/wmlele/devise-otp/blob/master/app/assets/stylesheets/devise-otp.css) into your stylesheet.
+
+## Custom views
 
 If you want to customise your views, you can use the following generator to eject the default view files:
 
@@ -74,11 +82,11 @@ If you want to customise your views, you can use the following generator to ejec
 
 By default, the files live within the Devise namespace (`app/views/devise`, but if you want to move them or want to match the Devise configuration, set `config.otp_controller_path` in your initializers. 
 
-### I18n
+## I18n
 
 The install generator also installs an english copy of a Devise OTP i18n file. This can be modified (or used to create other language versions) and is located at: _config/locales/devise.otp.en.yml_
 
-### QR codes
+## QR codes
 
 Devise OTP generates QR Codes directly as SVG's via the [rqrcode](https://github.com/whomwah/rqrcode), so there are no JavaScript (or Sprockets) dependencies.
 
@@ -110,10 +118,21 @@ To run the devise-otp dummy application in the development environment:
 - Run the rails console or server (e.g. "rails c")
 
 To run the tests for devise-otp against your current Ruby/Rails configuration:
-- Navigate to the dummy app directory ("cd test/dummy")
-- Create and migrate the database for the test environment ("RAILS\_ENV=test rails db:drop db:create db:migrate")
+- Navigate to the dummy app directory
+
+    cd test/dummy
+
+- Create and migrate the database for the test environment
+
+    RAILS\_ENV=test rails db:drop
+    RAILS\_ENV=test rails db:create
+    RAILS\_ENV=test rails db:migrate
+
 - Return to the root directory of devise-otp
-- Run "rake test"
+
+- Execute the tests
+
+    rake test
 
 To check Ruby syntax and formatting:
 - Rubocop: "./bin/rubocop"

data/app/controllers/devise_otp/devise/otp_persistence_controller.rb

@@ -6,6 +6,13 @@ module DeviseOtp
       prepend_before_action :ensure_credentials_refresh
       prepend_before_action :authenticate_scope!
 
+      #
+      # fallback in case of redirect after authentication
+      #
+      def show
+        redirect_to otp_token_path_for(resource)
+      end
+
       #
       # makes the current browser persistent
       #

data/app/views/devise/otp_tokens/recovery.html.erb

@@ -19,3 +19,5 @@
     </tbody>
   </caption>
 </table>
+
+<%= link_to "Back", otp_token_path_for(resource) %>

data/bin/appraisal

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("appraisal", "appraisal")

data/bin/erb_lint

@@ -10,17 +10,6 @@
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
 require "rubygems"
 require "bundler/setup"
 

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rubocop

@@ -10,17 +10,6 @@
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
 require "rubygems"
 require "bundler/setup"
 

data/config/locales/{en.yml → devise-otp.en.yml}

@@ -43,7 +43,7 @@ en:
           explain: 'Take note or print these recovery codes. They will allow you to log in if your token device is lost, stolen, or unavailable.'
           sequence: 'Sequence'
           code: 'Recovery Code'
-          codes_list: 'Here is the list of your recovery codes'
+          codes_list: 'View recovery codes'
           download_codes: 'Download recovery codes'
       otp_persistence:
         successfully_set_persistence: 'Your device is now trusted.'

data/devise-otp.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 3.2.0"
 
   gem.add_dependency "rails", ">= 7.1"
-  gem.add_dependency "devise", ">= 4.8.0", "< 5.0"
+  gem.add_dependency "devise", ">= 4.8.0", "< 6.0"
   gem.add_dependency "rotp", ">= 2.0.0"
   gem.add_dependency "rqrcode", "~> 3.0"
-
-  gem.add_development_dependency "timecop", "~> 0.9.10"
 end

data/gemfiles/rails_8.0.gemfile

@@ -11,7 +11,11 @@ gem "rdoc"
 gem "shoulda"
 gem "sprockets-rails"
 gem "sqlite3", "~> 2.1"
-gem "standardrb"
+gem "timecop", "~> 0.9.10"
+gem "standardrb", require: false
+gem "rubocop-rails-omakase", require: false
+gem "erb_lint", require: false
+gem "debug"
 gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_7.1.gemfile → rails_8.1.gemfile}

@@ -10,12 +10,12 @@ gem "rake"
 gem "rdoc"
 gem "shoulda"
 gem "sprockets-rails"
-gem "sqlite3", "~> 1.5.0"
-gem "standardrb"
-gem "rails", "~> 7.1.0"
-
-install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
-  gem "logger"
-end
+gem "sqlite3", "~> 2.1"
+gem "timecop", "~> 0.9.10"
+gem "standardrb", require: false
+gem "rubocop-rails-omakase", require: false
+gem "erb_lint", require: false
+gem "debug"
+gem "rails", "~> 8.1.0"
 
 gemspec path: "../"

data/lib/devise-otp/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module OTP
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/devise-otp.rb

@@ -45,7 +45,7 @@ module Devise
   @@otp_trust_persistence = 30.days
 
   mattr_accessor :otp_drift_window
-  @@otp_drift_window = 3 # in minutes
+  @@otp_drift_window = 3
 
   #
   # if the user wants to change Otp settings,

data/lib/devise_otp_authenticatable/routes.rb

@@ -11,7 +11,7 @@ module ActionDispatch::Routing
         end
 
         if Devise.otp_trust_persistence
-          resource :persistence, :only => [:create, :destroy],
+          resource :persistence, only: [:show, :create, :destroy],
             path: mapping.path_names[:persistence], controller: controllers[:otp_persistence] do
             delete :reset
           end

data/test/dummy/app/assets/stylesheets/application.css

@@ -8,7 +8,21 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require devise-otp
  *= require_self
  *= require_tree .
  */
+
+@import url("devise-otp.css");
+
+nav {
+  ul {
+    float: right;
+    margin: 0;
+    display: flex;
+  }
+  li {
+    list-style: none;
+    padding: 0.25rem 0.5rem;;
+    margin: 0;
+  }
+}

data/test/dummy/app/views/shared/_navbar.html.erb

@@ -1,15 +1,23 @@
 <nav>
-  <div style="float: right;">
+  <ul style="float: right;">
+    <li><%= link_to "Home", root_path %></li>
     <% if current_user.present? %>
-      <%= button_to "Sign Out", destroy_user_session_path, method: :delete, data: { turbo_method: :delete } %>
+      <li><%= link_to "Posts", posts_path %></li>
+      <li><%= link_to "OTP Token", user_otp_token_path %></li>
+      <li><%= button_to "Sign Out", destroy_user_session_path, method: :delete, data: { turbo_method: :delete } %></li>
     <% elsif current_admin.present? %>
-      <%= button_to "Sign Out", destroy_admin_session_path, method: :delete, data: { turbo_method: :delete } %>
+      <li><%= link_to "Posts", admin_posts_path %></li>
+      <li><%= link_to "OTP Token", admin_otp_token_path %></li>
+      <li><%= button_to "Sign Out", destroy_admin_session_path, method: :delete, data: { turbo_method: :delete } %></li>
     <% elsif current_lockable_user.present? %>
-      <%= button_to "Sign Out", destroy_lockable_user_session_path, method: :delete, data: { turbo_method: :delete } %>
+      <li><%= link_to "OTP Token", lockable_user_otp_token_path %></li>
+      <li><%= button_to "Sign Out", destroy_lockable_user_session_path, method: :delete, data: { turbo_method: :delete } %></li>
     <% elsif current_non_otp_user.present? %>
-      <%= button_to "Sign Out", destroy_non_otp_user_session_path, method: :delete, data: { turbo_method: :delete } %>
+      <li><%= link_to "Posts", admin_posts_path %></li>
+      <li><%= button_to "Sign Out", destroy_non_otp_user_session_path, method: :delete, data: { turbo_method: :delete } %></li>
     <% elsif current_rememberable_user.present? %>
-      <%= button_to "Sign Out", destroy_rememberable_user_session_path, method: :delete, data: { turbo_method: :delete } %>
+      <li><%= link_to "OTP Token", rememberable_user_otp_token_path %></li>
+      <li><%= button_to "Sign Out", destroy_rememberable_user_session_path, method: :delete, data: { turbo_method: :delete } %></li>
     <% end %>
-  </div>
+  </ul >
 </nav>

data/test/dummy/db/schema.rb

@@ -12,34 +12,34 @@
 
 ActiveRecord::Schema[8.0].define(version: 2025_08_18_030305) do
   create_table "admins", force: :cascade do |t|
-    t.string "name"
+    t.string "authentication_token"
     t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "current_sign_in_at", precision: nil
+    t.string "current_sign_in_ip"
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
-    t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at", precision: nil
+    t.integer "failed_attempts", default: 0
     t.datetime "last_sign_in_at", precision: nil
-    t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
-    t.integer "failed_attempts", default: 0
-    t.string "unlock_token"
     t.datetime "locked_at", precision: nil
-    t.string "authentication_token"
+    t.string "name"
     t.string "otp_auth_secret"
-    t.string "otp_recovery_secret"
+    t.datetime "otp_challenge_expires", precision: nil
     t.boolean "otp_enabled", default: false, null: false
-    t.boolean "otp_mandatory", default: false, null: false
     t.datetime "otp_enabled_on", precision: nil
-    t.integer "otp_time_drift", default: 0, null: false
     t.integer "otp_failed_attempts", default: 0, null: false
-    t.integer "otp_recovery_counter", default: 0, null: false
+    t.boolean "otp_mandatory", default: false, null: false
     t.string "otp_persistence_seed"
+    t.integer "otp_recovery_counter", default: 0, null: false
+    t.string "otp_recovery_secret"
     t.string "otp_session_challenge"
-    t.datetime "otp_challenge_expires", precision: nil
+    t.integer "otp_time_drift", default: 0, null: false
+    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at", precision: nil
+    t.string "reset_password_token"
+    t.integer "sign_in_count", default: 0
+    t.string "unlock_token"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["authentication_token"], name: "index_admins_on_authentication_token", unique: true
     t.index ["email"], name: "index_admins_on_email", unique: true
     t.index ["otp_challenge_expires"], name: "index_admins_on_otp_challenge_expires"
@@ -49,34 +49,34 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_18_030305) do
   end
 
   create_table "lockable_users", force: :cascade do |t|
-    t.string "name"
+    t.string "authentication_token"
     t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "current_sign_in_at", precision: nil
+    t.string "current_sign_in_ip"
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
-    t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at", precision: nil
+    t.integer "failed_attempts", default: 0
     t.datetime "last_sign_in_at", precision: nil
-    t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
-    t.integer "failed_attempts", default: 0
-    t.string "unlock_token"
     t.datetime "locked_at", precision: nil
-    t.string "authentication_token"
+    t.string "name"
     t.string "otp_auth_secret"
-    t.string "otp_recovery_secret"
+    t.datetime "otp_challenge_expires", precision: nil
     t.boolean "otp_enabled", default: false, null: false
-    t.boolean "otp_mandatory", default: false, null: false
     t.datetime "otp_enabled_on", precision: nil
-    t.integer "otp_time_drift", default: 0, null: false
     t.integer "otp_failed_attempts", default: 0, null: false
-    t.integer "otp_recovery_counter", default: 0, null: false
+    t.boolean "otp_mandatory", default: false, null: false
     t.string "otp_persistence_seed"
+    t.integer "otp_recovery_counter", default: 0, null: false
+    t.string "otp_recovery_secret"
     t.string "otp_session_challenge"
-    t.datetime "otp_challenge_expires", precision: nil
+    t.integer "otp_time_drift", default: 0, null: false
+    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at", precision: nil
+    t.string "reset_password_token"
+    t.integer "sign_in_count", default: 0
+    t.string "unlock_token"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["authentication_token"], name: "index_lockable_users_on_authentication_token", unique: true
     t.index ["email"], name: "index_lockable_users_on_email", unique: true
     t.index ["otp_challenge_expires"], name: "index_lockable_users_on_otp_challenge_expires"
@@ -86,23 +86,23 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_18_030305) do
   end
 
   create_table "non_otp_users", force: :cascade do |t|
-    t.string "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.string "authentication_token"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "current_sign_in_at", precision: nil
+    t.string "current_sign_in_ip"
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
+    t.integer "failed_attempts", default: 0
+    t.datetime "last_sign_in_at", precision: nil
+    t.string "last_sign_in_ip"
+    t.datetime "locked_at", precision: nil
+    t.string "name"
+    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at", precision: nil
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
     t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
-    t.integer "failed_attempts", default: 0
     t.string "unlock_token"
-    t.datetime "locked_at"
-    t.string "authentication_token"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["authentication_token"], name: "index_non_otp_users_on_authentication_token", unique: true
     t.index ["email"], name: "index_non_otp_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_non_otp_users_on_reset_password_token", unique: true
@@ -110,35 +110,35 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_18_030305) do
   end
 
   create_table "posts", force: :cascade do |t|
-    t.string "title"
     t.text "body"
     t.datetime "created_at", precision: nil, null: false
+    t.string "title"
     t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "rememberable_users", force: :cascade do |t|
-    t.string "name"
+    t.datetime "current_sign_in_at"
+    t.string "current_sign_in_ip"
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
+    t.string "name"
     t.string "otp_auth_secret"
-    t.string "otp_recovery_secret"
+    t.datetime "otp_challenge_expires"
     t.boolean "otp_enabled", default: false, null: false
-    t.boolean "otp_mandatory", default: false, null: false
     t.datetime "otp_enabled_on"
-    t.integer "otp_time_drift", default: 0, null: false
     t.integer "otp_failed_attempts", default: 0, null: false
-    t.integer "otp_recovery_counter", default: 0, null: false
+    t.boolean "otp_mandatory", default: false, null: false
     t.string "otp_persistence_seed"
+    t.integer "otp_recovery_counter", default: 0, null: false
+    t.string "otp_recovery_secret"
     t.string "otp_session_challenge"
-    t.datetime "otp_challenge_expires"
+    t.integer "otp_time_drift", default: 0, null: false
+    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at"
+    t.string "reset_password_token"
+    t.integer "sign_in_count", default: 0
     t.index ["email"], name: "index_rememberable_users_on_email", unique: true
     t.index ["otp_challenge_expires"], name: "index_rememberable_users_on_otp_challenge_expires"
     t.index ["otp_session_challenge"], name: "index_rememberable_users_on_otp_session_challenge", unique: true
@@ -146,34 +146,34 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_18_030305) do
   end
 
   create_table "users", force: :cascade do |t|
-    t.string "name"
+    t.string "authentication_token"
     t.datetime "created_at", precision: nil, null: false
-    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "current_sign_in_at", precision: nil
+    t.string "current_sign_in_ip"
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at", precision: nil
-    t.datetime "remember_created_at", precision: nil
-    t.integer "sign_in_count", default: 0
-    t.datetime "current_sign_in_at", precision: nil
+    t.integer "failed_attempts", default: 0
     t.datetime "last_sign_in_at", precision: nil
-    t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
-    t.integer "failed_attempts", default: 0
-    t.string "unlock_token"
     t.datetime "locked_at", precision: nil
-    t.string "authentication_token"
+    t.string "name"
     t.string "otp_auth_secret"
-    t.string "otp_recovery_secret"
+    t.datetime "otp_challenge_expires", precision: nil
     t.boolean "otp_enabled", default: false, null: false
-    t.boolean "otp_mandatory", default: false, null: false
     t.datetime "otp_enabled_on", precision: nil
-    t.integer "otp_time_drift", default: 0, null: false
     t.integer "otp_failed_attempts", default: 0, null: false
-    t.integer "otp_recovery_counter", default: 0, null: false
+    t.boolean "otp_mandatory", default: false, null: false
     t.string "otp_persistence_seed"
+    t.integer "otp_recovery_counter", default: 0, null: false
+    t.string "otp_recovery_secret"
     t.string "otp_session_challenge"
-    t.datetime "otp_challenge_expires", precision: nil
+    t.integer "otp_time_drift", default: 0, null: false
+    t.datetime "remember_created_at", precision: nil
+    t.datetime "reset_password_sent_at", precision: nil
+    t.string "reset_password_token"
+    t.integer "sign_in_count", default: 0
+    t.string "unlock_token"
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["otp_challenge_expires"], name: "index_users_on_otp_challenge_expires"

data/test/integration/persistence_test.rb

@@ -4,7 +4,6 @@ require "integration_tests_helper"
 class PersistenceTest < ActionDispatch::IntegrationTest
   def setup
     @old_persistence = User.otp_trust_persistence
-    User.otp_trust_persistence = 3.seconds
   end
 
   def teardown
@@ -101,7 +100,25 @@ class PersistenceTest < ActionDispatch::IntegrationTest
     assert page.body.match?(user.next_otp_recovery_tokens.values.join("\n"))
   end
 
-  test "trusted status should expire" do
+  test "trusted status should last until the expiration date" do
+    # log in 1fa
+    user = enable_otp_and_sign_in
+    otp_challenge_for user
+
+    visit user_otp_token_path
+    assert_equal user_otp_token_path, current_path
+
+    click_button("Trust this browser")
+    assert_text "Your browser is trusted."
+    sign_out
+
+    Timecop.travel(Time.now + 29.days)
+
+    sign_user_in
+    assert_equal root_path, current_path
+  end
+
+  test "trusted status should expire after the expiration date" do
     # log in 1fa
     user = enable_otp_and_sign_in
     otp_challenge_for user
@@ -132,4 +149,23 @@ class PersistenceTest < ActionDispatch::IntegrationTest
     click_button("Trust this browser")
     assert_equal refresh_user_otp_credential_path, current_path
   end
+
+  test "a user should be redirected to the fallback (OTP Token page) after refreshing their credentials for trusting their browser" do
+    # log in 1fa
+    user = enable_otp_and_sign_in
+    otp_challenge_for user
+
+    visit user_otp_token_path
+    assert_equal user_otp_token_path, current_path
+
+    Timecop.travel(Time.now + 15.minutes)
+
+    click_button("Trust this browser")
+    assert_equal refresh_user_otp_credential_path, current_path
+
+    fill_in "user_refresh_password", with: "12345678"
+    click_button "Continue..."
+
+    assert_equal user_otp_token_path, current_path
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-otp
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lele Forzani
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-21 00:00:00.000000000 Z
+date: 2026-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,7 +35,7 @@ dependencies:
         version: 4.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: 4.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
@@ -74,20 +74,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.10
 description: OTP authentication for Devise
 email:
 - lele@windmill.it
@@ -119,13 +105,14 @@ files:
 - app/views/devise/otp_tokens/recovery.html.erb
 - app/views/devise/otp_tokens/recovery_codes.text.erb
 - app/views/devise/otp_tokens/show.html.erb
+- bin/appraisal
 - bin/erb_lint
+- bin/rake
 - bin/rubocop
-- config/locales/en.yml
+- config/locales/devise-otp.en.yml
 - devise-otp.gemspec
-- gemfiles/rails_7.1.gemfile
-- gemfiles/rails_7.2.gemfile
 - gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/devise-otp.rb
 - lib/devise-otp/version.rb
 - lib/devise/strategies/database_authenticatable.rb

data/gemfiles/rails_7.2.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
-gem "capybara"
-gem "minitest-reporters", ">= 0.5.0"
-gem "puma"
-gem "rake"
-gem "rdoc"
-gem "shoulda"
-gem "sprockets-rails"
-gem "sqlite3", "~> 1.5.0"
-gem "standardrb"
-gem "rails", "~> 7.2.0"
-
-gemspec path: "../"