rodauth 2.45.0 → 2.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dea248f50448b260c6d0007d8bc4054f17794270e857a6310b969ba58105fbf
-  data.tar.gz: 875dbda4ddd85b04041a8e854e0adb09b466269ecef74dd1a73f384519d54553
+  metadata.gz: 5f2f00f0b0ca5043b852e3f544a666c066b5df09445a4d0031351e37d101bdbf
+  data.tar.gz: 387de7af25a3d6f4823cc09818d374ff99f1a35ffe8a0329efe107810667cdd6
 SHA512:
-  metadata.gz: dbf7c82f8b1c93496c59225891c1d747f317eaf46d8283f9c6f2d0562a48aaaec4d6491ed7567011356914fb4498e0f86576c230e183cf53c0ac7a7c5f27d99a
-  data.tar.gz: c8c2a228ce0395e4e14dbd1a69b01f7038b2ac94267b33bc5695d11b3eae6a278846be5100714dc18b0a65010db1693c0621f9ec1f2d0ba0793e92b61a698bf9
+  metadata.gz: 26088c4dc223cdc9f72a07a0de27bff3a3678b29264a46554733d103106443988ac524553f8afa4cb7a457d0cf51c25646adbdf8bd158a7488db449dfc09f7ee
+  data.tar.gz: da69371a181d62e7ebb74274c56503565e64be26a808dede0df3f7b7c1e230efa5442f35d99609c138439703d2f97335968a0ee720c83c9819ae0de363269046

data/lib/rodauth/features/change_password.rb

@@ -55,6 +55,7 @@ module Rodauth
           transaction do
             before_change_password
             set_password(password)
+            clear_tokens(:change_password)
             after_change_password
           end
           change_password_response

data/lib/rodauth/features/close_account_email.rb

@@ -0,0 +1,17 @@
+# frozen-string-literal: true
+
+module Rodauth
+  Feature.define(:close_account_email, :CloseAccountEmail) do
+    depends :close_account, :email_base
+
+    loaded_templates %w'close-account-email'
+    email :close_account, 'Account Closed', :translatable=>true
+
+    private
+
+    def after_close_account
+      super
+      send_close_account_email
+    end
+  end
+end

data/lib/rodauth/features/email_base.rb

@@ -64,8 +64,7 @@ module Rodauth
 
     def account_from_key(token, status_id=nil)
       id, key = split_token(token)
-      id = convert_token_id(id)
-      return unless id && key
+      return unless key && (id = convert_token_id(id))
 
       return unless actual = yield(id)
 

data/lib/rodauth/features/jwt_refresh.rb

@@ -133,12 +133,10 @@ module Rodauth
 
     def _account_refresh_token_split(token)
       id, token = split_token(token)
-      id = convert_token_id(id)
-      return unless id && token
+      return unless token && (id = convert_token_id(id))
 
       token_id, key = split_token(token)
-      token_id = convert_token_id(token_id)
-      return unless token_id && key
+      return unless key && (token_id = convert_token_id(token_id))
 
       [id, token_id, key]
     end

data/lib/rodauth/features/verify_account.rb

@@ -225,7 +225,7 @@ module Rodauth
     end
 
     def set_verify_account_email_last_sent
-       verify_account_ds.update(verify_account_email_last_sent_column=>Sequel::CURRENT_TIMESTAMP) if verify_account_email_last_sent_column
+      verify_account_ds.update(verify_account_email_last_sent_column=>Sequel::CURRENT_TIMESTAMP) if verify_account_email_last_sent_column
     end
 
     def get_verify_account_email_last_sent
@@ -248,7 +248,16 @@ module Rodauth
 
     def clear_tokens(reason)
       super
-      remove_verify_account_key
+      if reason == :close_account
+        remove_verify_account_key
+      else
+        generate_verify_account_key_value
+        hash = {verify_account_key_column=>verify_account_key_value}
+        if verify_account_email_last_sent_column
+          hash[verify_account_email_last_sent_column] = Time.now - verify_account_skip_resend_email_within - 10
+        end
+        verify_account_ds.update(hash)
+      end
     end
 
     private

data/lib/rodauth/features/webauthn_login.rb

@@ -93,7 +93,12 @@ module Rodauth
     end
 
     def webauthn_account_id
-      super || account_id
+      case @current_route
+      when :login, :webauthn_login, nil # nil for internal request
+        account_id
+      else
+        super
+      end
     end
   end
 end

data/lib/rodauth/version.rb

@@ -6,7 +6,7 @@ module Rodauth
   MAJOR = 2
 
   # The minor version of Rodauth, updated for new feature releases of Rodauth.
-  MINOR = 45
+  MINOR = 46
 
   # The patch version of Rodauth, updated only for bug fixes from the last
   # feature release.

data/templates/close-account-email.str

@@ -0,0 +1,2 @@
+Someone (hopefully you) has closed the account associated to this
+email address.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.45.0
+  version: 2.46.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -265,6 +265,7 @@ files:
 - lib/rodauth/features/change_password.rb
 - lib/rodauth/features/change_password_notify.rb
 - lib/rodauth/features/close_account.rb
+- lib/rodauth/features/close_account_email.rb
 - lib/rodauth/features/confirm_password.rb
 - lib/rodauth/features/create_account.rb
 - lib/rodauth/features/disallow_common_passwords.rb
@@ -314,6 +315,7 @@ files:
 - templates/button.str
 - templates/change-login.str
 - templates/change-password.str
+- templates/close-account-email.str
 - templates/close-account.str
 - templates/confirm-password.str
 - templates/create-account.str
@@ -403,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Authentication and Account Management Framework for Rack Applications
 test_files: []