two_step 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eab54d43eb0a7ab7a916218a79582d48dd138715d09d6ac4e161819cdc31e6e
-  data.tar.gz: 1602d5a1307fc85b8e2777844c5afbbb1f82046392f8e3665a40043056da1d6b
+  metadata.gz: 61361b42ca13fa684c90f1f66adba40bb47392bef1121ed9f8340ee0900fd82a
+  data.tar.gz: 9b4389eafe47979a1d2182fc85f13ae223e8d43149cf6b38ff16dd68181d09d5
 SHA512:
-  metadata.gz: b9df3fad7cd3b59172395a3ceb65fbeb9315294cf4eb6e33d45000a80f184bfe7446928d9361e41c8216ab79060a4a3f3f44f7cf6c8ba6499ca5f803fb63bdb7
-  data.tar.gz: 3f2e88dd39177fc3373566b3469c974e9aa8417d1ab8348dd5f07ef28afb17663dc036bac4ebeb4ee2e85e40e30a124335ca77d822916fe43f62d9f67b160945
+  metadata.gz: 564a48da2a552ea7b3dd4ac7c774be6c99ec1bd3dc2767f5b32a587f60e5f98f1d367101b48784026572165d47581c1d4205cd93461e2b39e5e472078eefd9f3
+  data.tar.gz: 68d6546f3299edef59c2d1eba6100b6e1b3db865afbf4e0e870aee42f48cf9e9247c6e01cb119b9043948516a122d035e843f45e3c486a8d1f3e3bde730f750e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.0.2] - 2026-06-07
+
+### Added
+
+- Added a `challenge_skip_allowed` configuration hook for conditionally skipping TwoStep challenges
+
 ## [1.0.1] - 2026-05-24
 
 ### Changed

data/README.md

@@ -125,6 +125,7 @@ TwoStep.configure do |config|
 
   config.login_path = "/login"
   config.after_two_step_login_path = "/"
+  config.challenge_skip_allowed = ->(_resource, _controller) { false }
 
   config.on_authentication_success = ->(resource, session, _controller) {
     session.delete(:two_step_pending_user_id)
@@ -144,6 +145,7 @@ Notes:
 - `resource_finder` and `current_resource_finder` may accept either `session` alone or `session, controller`.
 - `login_path` can be a string or a callable that receives `controller`.
 - `after_two_step_login_path` can be a string or a callable that receives `resource, controller`.
+- `challenge_skip_allowed` can be a boolean-like value or a callable that receives `resource, controller`; it defaults to `false`.
 - `on_authentication_success` can accept `resource, session` or `resource, session, controller`.
 - `layout_title`, `layout_stylesheets`, `layout_html_attributes`, `layout_body_attributes`, and `layout_brand` can be plain values or callables that receive `controller`.
 
@@ -153,6 +155,7 @@ Example using controller-aware hooks:
 TwoStep.configure do |config|
   config.login_path = ->(controller) { controller.main_app.login_path }
   config.after_two_step_login_path = ->(_resource, controller) { controller.main_app.dashboard_path }
+  config.challenge_skip_allowed = ->(resource, _controller) { resource.two_step_skip_granted? }
 
   config.on_authentication_success = lambda do |resource, _session, controller|
     controller.reset_session

data/app/controllers/two_step/two_step_challenges_controller.rb

@@ -3,6 +3,7 @@
 module TwoStep
   class TwoStepChallengesController < ApplicationController
     before_action :require_pending_resource
+    helper_method :challenge_skip_allowed?
 
     def new
     end
@@ -16,6 +17,17 @@ module TwoStep
       end
     end
 
+    def skip
+      resource = pending_resource
+
+      if challenge_skip_allowed?
+        complete_two_step(resource)
+      else
+        flash.now[:alert] = I18n.t("two_step.challenges.skip_unavailable")
+        render :new, status: :forbidden
+      end
+    end
+
     private
 
     def verify_backup(resource)
@@ -44,6 +56,10 @@ module TwoStep
       redirect_to TwoStep.configuration.resolve_login_path(controller: self) unless pending_resource
     end
 
+    def challenge_skip_allowed?
+      TwoStep.configuration.challenge_skip_allowed_for?(pending_resource, controller: self)
+    end
+
     def complete_two_step(resource)
       TwoStep.configuration.run_authentication_success(resource, session, controller: self)
       redirect_to TwoStep.configuration.resolve_after_two_step_login_path(resource, controller: self)

data/app/views/two_step/two_step_challenges/new.html.erb

@@ -25,3 +25,12 @@
     <%= form.submit t("two_step.views.challenge.submit_backup", default: "Verify backup code") %>
   <% end %>
 </details>
+
+<% if challenge_skip_allowed? %>
+  <div class="two_step-actions two_step-actions--skip">
+    <%= button_to t("two_step.views.challenge.skip", default: "Skip"),
+      skip_two_step_challenge_path,
+      method: :post,
+      class: "two_step-skip-button" %>
+  </div>
+<% end %>

data/config/locales/en.yml

@@ -3,6 +3,7 @@ en:
     challenges:
       invalid_otp: "Invalid two-factor code."
       invalid_backup: "Invalid backup code."
+      skip_unavailable: "Skip not allowed."
     setups:
       invalid_otp: "Invalid code. Please try again."
       disabled: "TwoStep disabled."
@@ -18,6 +19,7 @@ en:
         backup_label: "Backup code"
         backup_help: "Backup codes are one-time use. Enter one exactly as saved."
         submit_backup: "Verify backup code"
+        skip: "Skip"
       setup:
         kicker: "Security setup"
         title: "Set Up Two-Factor Authentication"

data/config/locales/ja.yml

@@ -3,6 +3,7 @@ ja:
     challenges:
       invalid_otp: "2段階認証コードが正しくありません。"
       invalid_backup: "バックアップコードが正しくありません。"
+      skip_unavailable: "スキップ不可。"
     setups:
       invalid_otp: "コードが正しくありません。もう一度お試しください。"
       disabled: "2段階認証を無効にしました。"
@@ -18,6 +19,7 @@ ja:
         backup_label: "バックアップコード"
         backup_help: "バックアップコードは1回限り有効です。保存した形式で入力してください。"
         submit_backup: "バックアップコードを確認"
+        skip: "スキップ"
       setup:
         kicker: "セキュリティ設定"
         title: "2段階認証を設定"

data/config/routes.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 TwoStep::Engine.routes.draw do
-  resource :two_step_challenge, only: %i[new create], path: "challenge"
+  resource :two_step_challenge, only: %i[new create], path: "challenge" do
+    post :skip, on: :member
+  end
   resource :two_step_setup, only: %i[new create], path: "setup" do
     post :disable, on: :member
   end

data/lib/two_step/configuration.rb

@@ -13,6 +13,7 @@ module TwoStep
       :current_resource_finder,
       :login_path,
       :after_two_step_login_path,
+      :challenge_skip_allowed,
       :on_authentication_success,
       :backup_code_digest_method,
       :backup_code_verify_method,
@@ -32,6 +33,7 @@ module TwoStep
       @current_resource_finder = ->(*) {}
       @login_path = "/"
       @after_two_step_login_path = "/"
+      @challenge_skip_allowed = ->(*) { false }
       @on_authentication_success = ->(*) {}
       @layout_title = -> { "#{issuer} Security" }
       @layout_stylesheets = ["two_step/application"]
@@ -66,6 +68,10 @@ module TwoStep
       resolve_callable(after_two_step_login_path, resource, controller)
     end
 
+    def challenge_skip_allowed_for?(resource = nil, controller: nil)
+      !!resolve_callable(challenge_skip_allowed, resource, controller)
+    end
+
     def run_authentication_success(resource, session, controller: nil)
       resolve_callable(on_authentication_success, resource, session, controller)
     end

data/lib/two_step/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TwoStep
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_step
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fernand Arioja