quo_vadis 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b81cb83f9cd0b6bb6e9af4015dba59b5cef0f5c3fccd5a82ee6d7e1bbc5768a
-  data.tar.gz: 8a9f5f0c013ec89de6849e9ddb3393fee46b84a2d08b20e606126cf97bba8032
+  metadata.gz: 707a011642d93c975b94f1c99c157decdec10c8138edf4e3b4dcf884438abac8
+  data.tar.gz: 8b5e4a2396909660b86ff6de1cee25dd574fe6ca1d10ccf1831c51381e61a2e4
 SHA512:
-  metadata.gz: a7b5e766f22e55e5bc269d00e6fb9132cc54ba2523a72996d0d7da478dbf0662764d29265c591f5847d5f2cfaeaca1e78fb4d48fb8fecb24af0bee9e9c2047e2
-  data.tar.gz: 47bf8bba82c90f3b7527be6a316ec8f9a4b229077a6846454abecebd6d2ae29910f7e416635d9cc1d54e3b99fe87d4c7d0ca871741907f1987d1ee42bf79994b
+  metadata.gz: c1aa7cb7ee6c63886f3a8c322f98bb14ea54a4c997d74103e2f4db9f787c65fd3853eb8d771cc7b85c6ea99a1c1a92ee5a7c7db10b29f8d1d1d88f4682f3e8b7
+  data.tar.gz: 88f33eb05eafc2746bc8295f9606f441d99aa24edd422f9a800909008dca1eaded9800d86ec9dbe9b292449b7ec24b8458ec478257885d6f0ea0853ea6e2744c

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 ## HEAD
 
 
+## 2.1.3 (30 September 2021)
+
+* Pass IP and timestamp as paramenters to mailer.
+
+
+## 2.1.2 (30 September 2021)
+
+* Delete existing recovery codes when generating new ones.
+
+
 ## 2.1.1 (8 July 2021)
 
 * Remove unnecessary route names.

data/app/controllers/quo_vadis/password_resets_controller.rb

@@ -17,7 +17,7 @@ module QuoVadis
 
       if account
         token = QuoVadis::PasswordResetToken.generate account
-        QuoVadis.deliver :reset_password, email: account.model.email, url: quo_vadis.password_reset_url(token)
+        QuoVadis.deliver :reset_password, {email: account.model.email, url: quo_vadis.password_reset_url(token)}
       end
 
       redirect_to password_resets_path, notice: QuoVadis.translate('flash.password_reset.create')

data/app/mailers/quo_vadis/mailer.rb

@@ -14,52 +14,52 @@ module QuoVadis
     end
 
     def email_change_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.email_change')
     end
 
     def identifier_change_notification
-      @timestamp = Time.now
+      @timestamp = params[:timestamp]
       @identifier = params[:identifier]
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.identifier_change',
                                                identifier: params[:identifier])
     end
 
     def password_change_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.password_change')
     end
 
     def password_reset_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.password_reset')
     end
 
     def totp_setup_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.totp_setup')
     end
 
     def totp_reuse_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.totp_reuse')
     end
 
     def twofa_deactivated_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.twofa_deactivated')
     end
 
     def recovery_codes_generation_notification
-      @timestamp = Time.now
-      @ip = QuoVadis::CurrentRequestDetails.ip
+      @timestamp = params[:timestamp]
+      @ip = params[:ip]
       _mail params[:email], QuoVadis.translate('mailer.notification.recovery_codes_generation')
     end
 

data/lib/quo_vadis/controller.rb

@@ -87,7 +87,7 @@ module QuoVadis
 
     def request_confirmation(model)
       token = QuoVadis::AccountConfirmationToken.generate model.qv_account
-      QuoVadis.deliver :account_confirmation, email: model.email, url: quo_vadis.confirmation_url(token)
+      QuoVadis.deliver :account_confirmation, {email: model.email, url: quo_vadis.confirmation_url(token)}
       session[:account_pending_confirmation] = model.qv_account.id
 
       flash[:notice] = QuoVadis.translate 'flash.confirmation.create'

data/lib/quo_vadis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QuoVadis
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/lib/quo_vadis.rb

@@ -73,12 +73,14 @@ module QuoVadis
     end
 
     def notify(action, params)
-      QuoVadis::Mailer.with(params).send(action).deliver_later
+      deliver(action, params, later: true)
     end
 
-    def deliver(action, params)
-      mail = QuoVadis::Mailer.with(params).send(action)
-      QuoVadis.enqueue_transactional_emails ?
+    def deliver(action, params, later: QuoVadis.enqueue_transactional_emails)
+      mail = QuoVadis::Mailer
+        .with(params.merge(ip: QuoVadis::CurrentRequestDetails.ip, timestamp: Time.now))
+        .send(action)
+      later ?
         mail.deliver_later :
         mail.deliver_now
     end

data/test/mailers/mailer_test.rb

@@ -44,14 +44,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'email change notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').email_change_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).email_change_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -62,14 +64,17 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'identifier change notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>', identifier: 'email').identifier_change_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      identifier: 'email',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).identifier_change_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -80,14 +85,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'password change notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').password_change_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).password_change_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -98,14 +105,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'password reset notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').password_reset_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).password_reset_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -116,14 +125,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'totp setup notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').totp_setup_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).totp_setup_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -134,14 +145,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'totp reuse notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').totp_reuse_notification
+    email = QuoVadis::Mailer.with(
+      email:     'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).totp_reuse_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -152,14 +165,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test '2fa deactivated notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').twofa_deactivated_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).twofa_deactivated_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to
@@ -170,14 +185,16 @@ class MailerTest < ActionMailer::TestCase
 
 
   test 'recovery codes generation notification' do
-    email = QuoVadis::Mailer.with(email: 'Foo <foo@example.com>').recovery_codes_generation_notification
+    email = QuoVadis::Mailer.with(
+      email: 'Foo <foo@example.com>',
+      ip:        '1.2.3.4',
+      timestamp: Time.now
+    ).recovery_codes_generation_notification
 
     # freeze_time
 
     assert_emails 1 do
-      QuoVadis::CurrentRequestDetails.set(ip: '1.2.3.4') do
-        email.deliver_now
-      end
+      email.deliver_now
     end
 
     assert_equal ['foo@example.com'], email.to

data/test/models/account_test.rb

@@ -13,8 +13,11 @@ class AccountTest < ActiveSupport::TestCase
 
 
   test 'notifies on identifier change when notifier is not email' do
+    freeze_time
     p = Person.create! username: 'bob', email: 'bob@example.com', password: 'secretsecret'
-    assert_enqueued_email_with QuoVadis::Mailer, :identifier_change_notification, args: {email: 'bob@example.com', identifier: 'username'} do
+    assert_enqueued_email_with QuoVadis::Mailer,
+      :identifier_change_notification,
+      args: {email: 'bob@example.com', identifier: 'username', ip: nil, timestamp: Time.now} do
       assert_enqueued_emails 1 do
         p.update username: 'robert@example.com'
       end
@@ -23,8 +26,11 @@ class AccountTest < ActiveSupport::TestCase
 
 
   test 'does not notify on identifier change when notifier is email' do
+    freeze_time
     u = User.create! name: 'bob', email: 'bob@example.com', password: '123456789abc'
-    assert_enqueued_email_with QuoVadis::Mailer, :email_change_notification, args: {email: 'bob@example.com'} do
+    assert_enqueued_email_with QuoVadis::Mailer,
+      :email_change_notification,
+      args: {email: 'bob@example.com', ip: nil, timestamp: Time.now} do
       assert_enqueued_emails 1 do
         u.update email: 'robert@example.com'
       end

data/test/models/model_test.rb

@@ -58,8 +58,11 @@ class ModelTest < ActiveSupport::TestCase
 
 
   test 'notifies on email change' do
+    freeze_time
     u = User.create! name: 'bob', email: 'bob@example.com', password: '123456789abc'
-    assert_enqueued_email_with QuoVadis::Mailer, :email_change_notification, args: {email: 'bob@example.com'} do
+    assert_enqueued_email_with QuoVadis::Mailer,
+      :email_change_notification,
+      args: {email: 'bob@example.com', ip: nil, timestamp: Time.now} do
       u.update email: 'robert@example.com'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quo_vadis
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Andy Stewart
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Multifactor authentication for Rails 6.