rodauth 1.20.0 → 2.1.0

data/lib/rodauth/features/verify_account.rb

@@ -4,10 +4,6 @@ module Rodauth
   Feature.define(:verify_account, :VerifyAccount) do
     depends :login, :create_account, :email_base
 
-    def_deprecated_alias :attempt_to_create_unverified_account_error_flash, :attempt_to_create_unverified_account_notice_message
-    def_deprecated_alias :attempt_to_login_to_unverified_account_error_flash, :attempt_to_login_to_unverified_account_notice_message
-    def_deprecated_alias :no_matching_verify_account_key_error_flash, :no_matching_verify_account_key_message
-
     error_flash "Unable to verify account"
     error_flash "Unable to resend verify account email", 'verify_account_resend'
     error_flash "An email has recently been sent to you with a link to verify your account", 'verify_account_email_recently_sent'
@@ -31,26 +27,29 @@ module Rodauth
     redirect(:verify_account_email_sent){default_post_email_redirect}
     redirect(:verify_account_email_recently_sent){default_post_email_redirect}
 
-    auth_value_method :verify_account_email_subject, 'Verify Account'
+    translatable_method :verify_account_email_subject, 'Verify Account'
     auth_value_method :verify_account_key_param, 'key'
     auth_value_method :verify_account_autologin?, true
     auth_value_method :verify_account_table, :account_verification_keys
     auth_value_method :verify_account_id_column, :id
-    auth_value_method :verify_account_email_last_sent_column, nil
+    auth_value_method :verify_account_email_last_sent_column, :email_last_sent
     auth_value_method :verify_account_skip_resend_email_within, 300
     auth_value_method :verify_account_key_column, :key
-    auth_value_method :verify_account_resend_explanatory_text, "<p>If you no longer have the email to verify the account, you can request that it be resent to you:</p>"
+    translatable_method :verify_account_resend_explanatory_text, "<p>If you no longer have the email to verify the account, you can request that it be resent to you:</p>"
+    translatable_method :verify_account_resend_link_text, "Resend Verify Account Information"
     session_key :verify_account_session_key, :verify_account_key
-    auth_value_method :verify_account_set_password?, false
+    auth_value_method :verify_account_set_password?, true
 
     auth_methods(
       :allow_resending_verify_account_email?,
       :create_verify_account_key,
       :create_verify_account_email,
       :get_verify_account_key,
+      :get_verify_account_email_last_sent,
       :remove_verify_account_key,
       :resend_verify_account_view,
       :send_verify_account_email,
+      :set_verify_account_email_last_sent,
       :verify_account,
       :verify_account_email_body,
       :verify_account_email_link,
@@ -95,10 +94,11 @@ module Rodauth
     route do |r|
       verify_account_check_already_logged_in
       before_verify_account_route
+      @password_field_autocomplete_value = 'new-password'
 
       r.get do
         if key = param_or_nil(verify_account_key_param)
-          session[verify_account_session_key] = key
+          set_session_value(verify_account_session_key, key)
           redirect(r.path)
         end
 
@@ -106,7 +106,7 @@ module Rodauth
           if account_from_verify_account_key(key)
             verify_account_view
           else
-            session[verify_account_session_key] = nil
+            remove_session_value(verify_account_session_key)
             set_redirect_error_flash no_matching_verify_account_key_error_flash
             redirect require_login_redirect
           end
@@ -145,10 +145,10 @@ module Rodauth
           end
 
           if verify_account_autologin?
-            update_session
+            autologin_session('verify_account')
           end
 
-          session[verify_account_session_key] = nil
+          remove_session_value(verify_account_session_key)
           set_notice_flash verify_account_notice_flash
           redirect verify_account_redirect
         end
@@ -158,6 +158,10 @@ module Rodauth
       end
     end
 
+    def require_login_confirmation?
+      false
+    end
+
     def allow_resending_verify_account_email?
       account[account_status_column] == account_unverified_status_value
     end
@@ -201,7 +205,7 @@ module Rodauth
     end
 
     def send_verify_account_email
-      create_verify_account_email.deliver!
+      send_email(create_verify_account_email)
     end
 
     def verify_account_email_link
@@ -220,14 +224,6 @@ module Rodauth
       false
     end
 
-    def login_form_footer
-      super + verify_account_resend_link
-    end
-
-    def verify_account_resend_link
-      "<p><a href=\"#{prefix}/#{verify_account_resend_route}\">Resend Verify Account Information</a></p>"
-    end
-
     def create_account_set_password?
       return false if verify_account_set_password?
       super
@@ -247,6 +243,14 @@ module Rodauth
 
     private
 
+    def _login_form_footer_links
+      links = super
+      if !param_or_nil(login_param) || ((account || account_from_login(param(login_param))) && allow_resending_verify_account_email?)
+        links << [30, verify_account_resend_path, verify_account_resend_link_text]
+      end
+      links
+    end
+
     def verify_account_email_recently_sent?
       (email_last_sent = get_verify_account_email_last_sent) && (Time.now - email_last_sent < verify_account_skip_resend_email_within)
     end

data/lib/rodauth/features/verify_account_grace_period.rb

@@ -3,7 +3,7 @@
 module Rodauth
   Feature.define(:verify_account_grace_period, :VerifyAccountGracePeriod) do
     depends :verify_account
-    error_flash "Cannot change login for unverified account. Please verify this account before changing the login.", "unverified_change_login"
+    error_flash "Please verify this account before changing the login", "unverified_change_login"
     redirect :unverified_change_login
 
     auth_value_method :verification_requested_at_column, :requested_at
@@ -23,7 +23,18 @@ module Rodauth
     end
 
     def open_account?
-      super || account_in_unverified_grace_period?
+      super || (account_in_unverified_grace_period? && has_password?)
+    end
+
+    def verify_account_set_password?
+      false
+    end
+
+    def update_session
+      super
+      if account_in_unverified_grace_period?
+        set_session_value(unverified_account_session_key, true)
+      end
     end
 
     private
@@ -41,6 +52,13 @@ module Rodauth
       super if defined?(super)
     end
 
+    def allow_email_auth?
+      if defined?(super)
+        return false unless super
+      end
+      !account_in_unverified_grace_period?
+    end
+
     def verify_account_check_already_logged_in
       nil
     end
@@ -56,13 +74,6 @@ module Rodauth
       s
     end
 
-    def update_session
-      super
-      if account_in_unverified_grace_period?
-        session[unverified_account_session_key] = true
-      end
-    end
-
     def account_in_unverified_grace_period?
       account[account_status_column] == account_unverified_status_value &&
         verify_account_grace_period &&

data/lib/rodauth/features/verify_login_change.rb

@@ -4,10 +4,8 @@ module Rodauth
   Feature.define(:verify_login_change, :VerifyLoginChange) do
     depends :change_login, :email_base
 
-    def_deprecated_alias :no_matching_verify_login_change_key_error_flash, :no_matching_verify_login_change_key_message
-
     error_flash "Unable to verify login change"
-    error_flash "Unable to change login as there is already an account with the new login", :verify_login_change_duplicate_account
+    error_flash "Unable to change login as there is already an account with the new login", 'verify_login_change_duplicate_account'
     error_flash "There was an error verifying your login change: invalid verify login change key", 'no_matching_verify_login_change_key'
     notice_flash "Your login change has been verified"
     loaded_templates %w'verify-login-change verify-login-change-email'
@@ -23,8 +21,8 @@ module Rodauth
 
     auth_value_method :verify_login_change_autologin?, false
     auth_value_method :verify_login_change_deadline_column, :deadline
-    auth_value_method :verify_login_change_deadline_interval, {:days=>1}
-    auth_value_method :verify_login_change_email_subject, 'Verify Login Change'
+    auth_value_method :verify_login_change_deadline_interval, {:days=>1}.freeze
+    translatable_method :verify_login_change_email_subject, 'Verify Login Change'
     auth_value_method :verify_login_change_id_column, :id
     auth_value_method :verify_login_change_key_column, :key
     auth_value_method :verify_login_change_key_param, 'key'
@@ -52,12 +50,11 @@ module Rodauth
     )
 
     route do |r|
-      check_already_logged_in
       before_verify_login_change_route
 
       r.get do
         if key = param_or_nil(verify_login_change_key_param)
-          session[verify_login_change_session_key] = key
+          set_session_value(verify_login_change_session_key, key)
           redirect(r.path)
         end
 
@@ -65,7 +62,7 @@ module Rodauth
           if account_from_verify_login_change_key(key)
             verify_login_change_view
           else
-            session[verify_login_change_session_key] = nil
+            remove_session_value(verify_login_change_session_key)
             set_redirect_error_flash no_matching_verify_login_change_key_error_flash
             redirect require_login_redirect
           end
@@ -92,15 +89,19 @@ module Rodauth
         end
 
         if verify_login_change_autologin?
-          update_session
+          autologin_session('verify_login_change')
         end
 
-        session[verify_login_change_session_key] = nil
+        remove_session_value(verify_login_change_session_key)
         set_notice_flash verify_login_change_notice_flash
         redirect verify_login_change_redirect
       end
     end
 
+    def require_login_confirmation?
+      false
+    end
+
     def remove_verify_login_change_key
       verify_login_change_ds.delete
     end
@@ -118,7 +119,7 @@ module Rodauth
     end
 
     def send_verify_login_change_email(login)
-      create_verify_login_change_email(login).deliver!
+      send_email(create_verify_login_change_email(login))
     end
 
     def verify_login_change_email_link

data/lib/rodauth/features/webauthn.rb

@@ -0,0 +1,507 @@
+# frozen-string-literal: true
+
+require 'webauthn'
+
+module Rodauth
+  Feature.define(:webauthn, :Webauthn) do
+    depends :two_factor_base
+
+    loaded_templates %w'webauthn-setup webauthn-auth webauthn-remove'
+
+    view 'webauthn-setup', 'Setup WebAuthn Authentication', 'webauthn_setup'
+    view 'webauthn-auth', 'Authenticate Using WebAuthn', 'webauthn_auth'
+    view 'webauthn-remove', 'Remove WebAuthn Authenticator', 'webauthn_remove'
+
+    additional_form_tags 'webauthn_setup'
+    additional_form_tags 'webauthn_auth'
+    additional_form_tags 'webauthn_remove'
+
+    before :webauthn_setup
+    before :webauthn_auth
+    before :webauthn_remove
+
+    after :webauthn_setup
+    after :webauthn_auth_failure
+    after :webauthn_remove
+
+    button 'Setup WebAuthn Authentication', 'webauthn_setup'
+    button 'Authenticate Using WebAuthn', 'webauthn_auth'
+    button 'Remove WebAuthn Authenticator', 'webauthn_remove'
+
+    redirect :webauthn_setup
+    redirect :webauthn_remove
+
+    notice_flash "WebAuthn authentication is now setup", 'webauthn_setup'
+    notice_flash "WebAuthn authenticator has been removed", 'webauthn_remove'
+
+    error_flash "Error setting up WebAuthn authentication", 'webauthn_setup'
+    error_flash "Error authenticating using WebAuthn", 'webauthn_auth'
+    error_flash 'This account has not been setup for WebAuthn authentication', 'webauthn_not_setup'
+    error_flash "Error removing WebAuthn authenticator", 'webauthn_remove'
+
+    session_key :authenticated_webauthn_id_session_key, :webauthn_id
+
+    translatable_method :webauthn_auth_link_text, "Authenticate Using WebAuthn"
+    translatable_method :webauthn_setup_link_text, "Setup WebAuthn Authentication"
+    translatable_method :webauthn_remove_link_text, "Remove WebAuthn Authenticator"
+
+    auth_value_method :webauthn_setup_param, 'webauthn_setup'
+    auth_value_method :webauthn_auth_param, 'webauthn_auth'
+    auth_value_method :webauthn_remove_param, 'webauthn_remove'
+    auth_value_method :webauthn_setup_challenge_param, 'webauthn_setup_challenge'
+    auth_value_method :webauthn_setup_challenge_hmac_param, 'webauthn_setup_challenge_hmac'
+    auth_value_method :webauthn_auth_challenge_param, 'webauthn_auth_challenge'
+    auth_value_method :webauthn_auth_challenge_hmac_param, 'webauthn_auth_challenge_hmac'
+
+    auth_value_method :webauthn_keys_account_id_column, :account_id
+    auth_value_method :webauthn_keys_webauthn_id_column, :webauthn_id
+    auth_value_method :webauthn_keys_public_key_column, :public_key
+    auth_value_method :webauthn_keys_sign_count_column, :sign_count
+    auth_value_method :webauthn_keys_last_use_column, :last_use
+    auth_value_method :webauthn_keys_table, :account_webauthn_keys
+
+    auth_value_method :webauthn_user_ids_account_id_column, :id
+    auth_value_method :webauthn_user_ids_webauthn_id_column, :webauthn_id
+    auth_value_method :webauthn_user_ids_table, :account_webauthn_user_ids
+
+    auth_value_method :webauthn_setup_js, File.binread(File.expand_path('../../../../javascript/webauthn_setup.js', __FILE__)).freeze
+    auth_value_method :webauthn_auth_js, File.binread(File.expand_path('../../../../javascript/webauthn_auth.js', __FILE__)).freeze
+    auth_value_method :webauthn_js_host, ''
+
+    auth_value_method :webauthn_setup_timeout, 120000
+    auth_value_method :webauthn_auth_timeout, 60000
+    auth_value_method :webauthn_user_verification, 'discouraged'
+    auth_value_method :webauthn_attestation, 'none'
+
+    auth_value_method :webauthn_not_setup_error_status, 403
+
+    translatable_method :webauthn_invalid_setup_param_message, "invalid webauthn setup param"
+    translatable_method :webauthn_duplicate_webauthn_id_message, "attempt to insert duplicate webauthn id"
+    translatable_method :webauthn_invalid_auth_param_message, "invalid webauthn authentication param"
+    translatable_method :webauthn_invalid_sign_count_message, "webauthn credential has invalid sign count"
+    translatable_method :webauthn_invalid_remove_param_message, "must select valid webauthn authenticator to remove"
+
+    auth_value_methods(
+      :webauthn_authenticator_selection,
+      :webauthn_extensions,
+      :webauthn_origin,
+      :webauthn_rp_id,
+      :webauthn_rp_name,
+    )
+
+    auth_methods(
+      :account_webauthn_ids,
+      :account_webauthn_usage,
+      :account_webauthn_user_id,
+      :add_webauthn_credential,
+      :authenticated_webauthn_id,
+      :handle_webauthn_sign_count_verification_error,
+      :new_webauthn_credential,
+      :remove_webauthn_key,
+      :remove_all_webauthn_keys_and_user_ids,
+      :valid_new_webauthn_credential?,
+      :valid_webauthn_credential_auth?,
+      :webauthn_auth_js_path,
+      :webauth_credential_options_for_get,
+      :webauthn_remove_authenticated_session,
+      :webauthn_setup_js_path,
+      :webauthn_update_session,
+      :webauthn_user_name,
+    )
+
+    route(:webauthn_auth_js) do |r|
+      before_webauthn_auth_js_route
+      r.get do
+        response['Content-Type'] = 'text/javascript'
+        webauthn_auth_js
+      end
+    end
+
+    route(:webauthn_auth) do |r|
+      require_login
+      require_account_session
+      require_two_factor_not_authenticated('webauthn')
+      require_webauthn_setup
+      before_webauthn_auth_route
+
+      r.get do
+        webauthn_auth_view
+      end
+
+      r.post do
+        catch_error do
+          webauthn_credential = webauthn_auth_credential_from_form_submission
+          transaction do
+            before_webauthn_auth
+            webauthn_update_session(webauthn_credential.id)
+            two_factor_authenticate('webauthn')
+          end
+        end
+
+        after_webauthn_auth_failure
+        set_error_flash webauthn_auth_error_flash
+        webauthn_auth_view
+      end
+    end
+
+    route(:webauthn_setup_js) do |r|
+      before_webauthn_setup_js_route
+      r.get do
+        response['Content-Type'] = 'text/javascript'
+        webauthn_setup_js
+      end
+    end
+    
+    route(:webauthn_setup) do |r|
+      require_authentication unless two_factor_login_type_match?('webauthn')
+      require_account_session
+      before_webauthn_setup_route
+
+      r.get do
+        webauthn_setup_view
+      end
+
+      r.post do
+        catch_error do
+          webauthn_credential = webauthn_setup_credential_from_form_submission
+          throw_error = false
+
+          transaction do
+            before_webauthn_setup
+
+            if raises_uniqueness_violation?{add_webauthn_credential(webauthn_credential)}
+              throw_error = true
+              raise Sequel::Rollback
+            end
+
+            unless two_factor_authenticated?
+              webauthn_update_session(webauthn_credential.id)
+              two_factor_update_session('webauthn')
+            end
+            after_webauthn_setup
+          end
+
+          if throw_error
+            throw_error_status(invalid_field_error_status, webauthn_setup_param, webauthn_duplicate_webauthn_id_message)
+          end
+
+          set_notice_flash webauthn_setup_notice_flash
+          redirect webauthn_setup_redirect
+        end
+
+        set_error_flash webauthn_setup_error_flash
+        webauthn_setup_view
+      end
+    end
+
+    route(:webauthn_remove) do |r|
+      require_authentication unless two_factor_login_type_match?('webauthn')
+      require_account_session
+      require_webauthn_setup
+      before_webauthn_remove_route
+
+      r.get do
+        webauthn_remove_view
+      end
+
+      r.post do
+        catch_error do
+          unless webauthn_id = param_or_nil(webauthn_remove_param)
+            throw_error_status(invalid_field_error_status, webauthn_remove_param, webauthn_invalid_remove_param_message)
+          end
+
+          unless two_factor_password_match?(param(password_param))
+            throw_error_status(invalid_password_error_status, password_param, invalid_password_message)
+          end
+
+          transaction do
+            before_webauthn_remove
+            unless remove_webauthn_key(webauthn_id)
+              throw_error_status(invalid_field_error_status, webauthn_remove_param, webauthn_invalid_remove_param_message)
+            end
+            if authenticated_webauthn_id == webauthn_id && two_factor_login_type_match?('webauthn')
+              webauthn_remove_authenticated_session
+              two_factor_remove_session('webauthn')
+            end
+            after_webauthn_remove
+          end
+
+          set_notice_flash webauthn_remove_notice_flash
+          redirect webauthn_remove_redirect
+        end
+
+        set_error_flash webauthn_remove_error_flash
+        webauthn_remove_view
+      end
+    end
+
+    def webauthn_auth_form_path
+      webauthn_auth_path
+    end
+
+    def authenticated_webauthn_id
+      session[authenticated_webauthn_id_session_key]
+    end
+
+    def webauthn_remove_authenticated_session
+      remove_session_value(authenticated_webauthn_id_session_key)
+    end
+
+    def webauthn_update_session(webauthn_id)
+      set_session_value(authenticated_webauthn_id_session_key, webauthn_id)
+    end
+
+    def webauthn_authenticator_selection
+      {'requireResidentKey' => false, 'userVerification' => webauthn_user_verification}
+    end
+
+    def webauthn_extensions
+      {}
+    end
+
+    def account_webauthn_ids
+      webauthn_keys_ds.select_map(webauthn_keys_webauthn_id_column)
+    end
+
+    def account_webauthn_usage
+      webauthn_keys_ds.select_hash(webauthn_keys_webauthn_id_column, webauthn_keys_last_use_column)
+    end
+
+    def account_webauthn_user_id
+      unless webauthn_id = webauthn_user_ids_ds.get(webauthn_user_ids_webauthn_id_column)
+        webauthn_id = WebAuthn.generate_user_id
+        if e = raised_uniqueness_violation do
+              webauthn_user_ids_ds.insert(
+                webauthn_user_ids_account_id_column => webauthn_account_id,
+                webauthn_user_ids_webauthn_id_column => webauthn_id
+              )
+            end
+          # If two requests to create a webauthn user id are sent at the same time and an insert
+          # is attempted for both, one will fail with a unique constraint violation.  In that case
+          # it is safe for the second one to use the webauthn user id inserted by the other request.
+          # If there is still no webauthn user id at this point, then we'll just reraise the
+          # exception.
+          # :nocov:
+          raise e unless webauthn_id = webauthn_user_ids_ds.get(webauthn_user_ids_webauthn_id_column)
+          # :nocov:
+        end
+      end
+
+      webauthn_id
+    end
+
+    def new_webauthn_credential
+      WebAuthn::Credential.options_for_create(
+        :timeout => webauthn_setup_timeout,
+        :rp => {:name=>webauthn_rp_name, :id=>webauthn_rp_id},
+        :user => {:id=>account_webauthn_user_id, :name=>webauthn_user_name},
+        :authenticator_selection => webauthn_authenticator_selection,
+        :attestation => webauthn_attestation,
+        :extensions => webauthn_extensions,
+        :exclude => account_webauthn_ids,
+      )
+    end
+
+    def valid_new_webauthn_credential?(webauthn_credential)
+      # Hack around inability to override expected_origin
+      origin = webauthn_origin
+      webauthn_credential.response.define_singleton_method(:verify) do |expected_challenge, expected_origin = nil, **kw|
+        super(expected_challenge, expected_origin || origin, **kw)
+      end
+
+      (challenge = param_or_nil(webauthn_setup_challenge_param)) &&
+        (hmac = param_or_nil(webauthn_setup_challenge_hmac_param)) &&
+        timing_safe_eql?(compute_hmac(challenge), hmac) &&
+        webauthn_credential.verify(challenge)
+    end
+
+    def webauth_credential_options_for_get
+      WebAuthn::Credential.options_for_get(
+        :allow => account_webauthn_ids,
+        :timeout => webauthn_auth_timeout,
+        :rp_id => webauthn_rp_id,
+        :user_verification => webauthn_user_verification,
+        :extensions => webauthn_extensions,
+      )
+    end
+
+    def webauthn_user_name
+      (account || account_from_session)[login_column]
+    end
+
+    def webauthn_origin
+      base_url
+    end
+
+    def webauthn_rp_id
+      webauthn_origin.sub(/\Ahttps?:\/\//, '')
+    end
+
+    def webauthn_rp_name
+      webauthn_rp_id
+    end
+
+    def handle_webauthn_sign_count_verification_error
+      throw_error_status(invalid_field_error_status, webauthn_auth_param, webauthn_invalid_sign_count_message) 
+    end
+
+    def add_webauthn_credential(webauthn_credential)
+      webauthn_keys_ds.insert(
+        webauthn_keys_account_id_column => webauthn_account_id,
+        webauthn_keys_webauthn_id_column => webauthn_credential.id,
+        webauthn_keys_public_key_column => webauthn_credential.public_key,
+        webauthn_keys_sign_count_column => Integer(webauthn_credential.sign_count)
+      )
+      super if defined?(super)
+      nil
+    end
+
+    def valid_webauthn_credential_auth?(webauthn_credential)
+      ds = webauthn_keys_ds.where(webauthn_keys_webauthn_id_column => webauthn_credential.id)
+      pub_key, sign_count = ds.get([webauthn_keys_public_key_column, webauthn_keys_sign_count_column])
+
+      # Hack around inability to override expected_origin
+      origin = webauthn_origin
+      webauthn_credential.response.define_singleton_method(:verify) do |expected_challenge, expected_origin = nil, **kw|
+        super(expected_challenge, expected_origin || origin, **kw)
+      end
+
+      (challenge = param_or_nil(webauthn_auth_challenge_param)) &&
+        (hmac = param_or_nil(webauthn_auth_challenge_hmac_param)) &&
+        timing_safe_eql?(compute_hmac(challenge), hmac) &&
+        webauthn_credential.verify(challenge, public_key: pub_key, sign_count: sign_count) &&
+        ds.update(
+          webauthn_keys_sign_count_column => Integer(webauthn_credential.sign_count),
+          webauthn_keys_last_use_column => Sequel::CURRENT_TIMESTAMP
+        ) == 1
+    end
+
+    def remove_webauthn_key(webauthn_id)
+      ret = webauthn_keys_ds.where(webauthn_keys_webauthn_id_column=>webauthn_id).delete == 1
+      super if defined?(super)
+      ret
+    end
+
+    def remove_all_webauthn_keys_and_user_ids
+      webauthn_user_ids_ds.delete
+      webauthn_keys_ds.delete
+    end
+
+    def webauthn_setup?
+      !webauthn_keys_ds.empty?
+    end
+
+    def require_webauthn_setup
+      unless webauthn_setup?
+        set_redirect_error_status(webauthn_not_setup_error_status)
+        set_redirect_error_flash webauthn_not_setup_error_flash
+        redirect two_factor_need_setup_redirect
+      end
+    end
+
+    def two_factor_remove
+      super
+      remove_all_webauthn_keys_and_user_ids
+    end
+
+    def possible_authentication_methods
+      methods = super
+      methods << 'webauthn' if webauthn_setup?
+      methods
+    end
+
+    private
+
+    def _two_factor_auth_links
+      links = super
+      links << [10, webauthn_auth_path, webauthn_auth_link_text] if webauthn_setup? && !two_factor_login_type_match?('webauthn')
+      links
+    end
+
+    def _two_factor_setup_links
+      super << [10, webauthn_setup_path, webauthn_setup_link_text]
+    end
+
+    def _two_factor_remove_links
+      links = super
+      links << [10, webauthn_remove_path, webauthn_remove_link_text] if webauthn_setup?
+      links
+    end
+
+    def _two_factor_remove_all_from_session
+      two_factor_remove_session('webauthn')
+      remove_session_value(authenticated_webauthn_id_session_key)
+      super
+    end
+
+    def webauthn_account_id
+      session_value
+    end
+
+    def webauthn_user_ids_ds
+      db[webauthn_user_ids_table].where(webauthn_user_ids_account_id_column => webauthn_account_id)
+    end
+
+    def webauthn_keys_ds
+      db[webauthn_keys_table].where(webauthn_keys_account_id_column => webauthn_account_id)
+    end
+
+    def webauthn_auth_credential_from_form_submission
+      case auth_data = raw_param(webauthn_auth_param)
+      when String
+        begin
+          auth_data = JSON.parse(auth_data)
+        rescue
+          throw_error_status(invalid_field_error_status, webauthn_auth_param, webauthn_invalid_auth_param_message) 
+        end
+      when Hash
+        # nothing
+      else
+        throw_error_status(invalid_field_error_status, webauthn_auth_param, webauthn_invalid_auth_param_message)
+      end
+
+      begin
+        webauthn_credential = WebAuthn::Credential.from_get(auth_data)
+        unless valid_webauthn_credential_auth?(webauthn_credential)
+          throw_error_status(invalid_key_error_status, webauthn_auth_param, webauthn_invalid_auth_param_message)
+        end
+      rescue WebAuthn::SignCountVerificationError
+        handle_webauthn_sign_count_verification_error
+      rescue WebAuthn::Error, RuntimeError, NoMethodError
+        throw_error_status(invalid_field_error_status, webauthn_auth_param, webauthn_invalid_auth_param_message) 
+      end
+
+      webauthn_credential
+    end
+
+    def webauthn_setup_credential_from_form_submission
+      case setup_data = raw_param(webauthn_setup_param)
+      when String
+        begin
+          setup_data = JSON.parse(setup_data)
+        rescue
+          throw_error_status(invalid_field_error_status, webauthn_setup_param, webauthn_invalid_setup_param_message) 
+        end
+      when Hash
+        # nothing
+      else
+        throw_error_status(invalid_field_error_status, webauthn_setup_param, webauthn_invalid_setup_param_message)
+      end
+
+      unless two_factor_password_match?(param(password_param))
+        throw_error_status(invalid_password_error_status, password_param, invalid_password_message)
+      end
+
+      begin
+        webauthn_credential = WebAuthn::Credential.from_create(setup_data)
+        unless valid_new_webauthn_credential?(webauthn_credential)
+          throw_error_status(invalid_field_error_status, webauthn_setup_param, webauthn_invalid_setup_param_message) 
+        end
+      rescue WebAuthn::Error, RuntimeError, NoMethodError
+        throw_error_status(invalid_field_error_status, webauthn_setup_param, webauthn_invalid_setup_param_message) 
+      end
+
+      webauthn_credential
+    end
+  end
+end