rodauth-rails 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4cdb91c64a071bc9cb7895a98e7c07ddc047f1c201b65d255523bda906644dd
-  data.tar.gz: 3b318fc66015b00e437b77fe650c5cf8c2af9c843b3b4e1f4890237ae9df261b
+  metadata.gz: 9a42fbc8522feb0a7d18227ca1cb3d79448c6d5d824befb040699afdb69318ea
+  data.tar.gz: 4d60492cc1ea2acf8176ffb6a05c6f0aba7deda63d1541da42de7f558e55b6e6
 SHA512:
-  metadata.gz: ddee77b54a991b2699ed5bc60fd5b1d07cc79fda56be237628f3cac400d848cbab42feaba49bfa27eb63c5fb9709fa64edea1a6b0b2c2b98123df4965d38455f
-  data.tar.gz: 2b08a11971c028ac6a45110a2265030ed074bbb2d03a46fff58f6ba673476abdae975032d2589dd2121134998e935dcb1ddb4f72056eefd7caa562a34552cd54
+  metadata.gz: 8782debac4a0b3bea9bb1849ab0817966f62c3bcf0cf352c2cf83d68e0fc35bce83a321e8c49f96d027450b87d6c196afd1e451a6e79e53cd35328dd84893d8c
+  data.tar.gz: 24de3dec4d061a9421de53062d75959d67091aff43dc26bf7f7fd749664e2288a4a9c198f24fa4ce8890b0c88f38c294d85a565b09aae330c0bcf7674242f112

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.4.2 (2022-05-15)
+
+* Stop passing email addresses in mailer arguments on verifying login change (@janko)
+
+* Extract finding account into a method in the generated mailer (@janko)
+
+* Make generated Action Mailer integration work with secondary Rodauth configurations (@janko)
+
+* Include `Rodauth::Rails.model` in generated Sequel account model as well (@janko)
+
 ## 1.4.1 (2022-05-08)
 
 * Deprecate `Rodauth::Rails::Model` constant (@janko)

data/README.md

@@ -489,7 +489,7 @@ into the account model, which defines a password attribute and associations for
 tables used by enabled authentication features.
 
 ```rb
-class Account < ApplicationRecord
+class Account < ActiveRecord::Base # Sequel::Model
   include Rodauth::Rails.model # or `Rodauth::Rails.model(:admin)`
 end
 ```

data/lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb

@@ -1,78 +1,64 @@
 class RodauthMailer < ApplicationMailer
-  def verify_account(account_id, key)
-    @email_link = rodauth.verify_account_url(key: email_token(account_id, key))
-<% if defined?(ActiveRecord::Railtie) -%>
-    @account = Account.find(account_id)
-<% else -%>
-    @account = Account.with_pk!(account_id)
-<% end -%>
+  def verify_account(name = nil, account_id, key)
+    @email_link = email_link(name, :verify_account, account_id, key)
+    @account = find_account(name, account_id)
 
-    mail to: @account.email, subject: rodauth.verify_account_email_subject
+    mail to: @account.email, subject: rodauth(name).verify_account_email_subject
   end
 
-  def reset_password(account_id, key)
-    @email_link = rodauth.reset_password_url(key: email_token(account_id, key))
-<% if defined?(ActiveRecord::Railtie) -%>
-    @account = Account.find(account_id)
-<% else -%>
-    @account = Account.with_pk!(account_id)
-<% end -%>
+  def reset_password(name = nil, account_id, key)
+    @email_link = email_link(name, :reset_password, account_id, key)
+    @account = find_account(name, account_id)
 
-    mail to: @account.email, subject: rodauth.reset_password_email_subject
+    mail to: @account.email, subject: rodauth(name).reset_password_email_subject
   end
 
-  def verify_login_change(account_id, old_login, new_login, key)
-    @old_login  = old_login
-    @new_login  = new_login
-    @email_link = rodauth.verify_login_change_url(key: email_token(account_id, key))
-<% if defined?(ActiveRecord::Railtie) -%>
-    @account = Account.find(account_id)
-<% else -%>
-    @account = Account.with_pk!(account_id)
-<% end -%>
+  def verify_login_change(name = nil, account_id, key)
+    @email_link = email_link(name, :verify_login_change, account_id, key)
+    @account = find_account(name, account_id)
+    @new_email = @account.login_change_key.login
 
-    mail to: new_login, subject: rodauth.verify_login_change_email_subject
+    mail to: @new_email, subject: rodauth(name).verify_login_change_email_subject
   end
 
-  def password_changed(account_id)
-<% if defined?(ActiveRecord::Railtie) -%>
-    @account = Account.find(account_id)
-<% else -%>
-    @account = Account.with_pk!(account_id)
-<% end -%>
+  def password_changed(name = nil, account_id)
+    @account = find_account(name, account_id)
 
-    mail to: @account.email, subject: rodauth.password_changed_email_subject
+    mail to: @account.email, subject: rodauth(name).password_changed_email_subject
   end
 
-  # def email_auth(account_id, key)
-  #   @email_link = rodauth.email_auth_url(key: email_token(account_id, key))
-<% if defined?(ActiveRecord::Railtie) -%>
-  #   @account = Account.find(account_id)
-<% else -%>
-  #   @account = Account.with_pk!(account_id)
-<% end -%>
+  # def email_auth(name = nil, account_id, key)
+  #   @email_link = email_link(name, :email_auth, account_id, key)
+  #   @account = find_account(name, account_id)
 
-  #   mail to: @account.email, subject: rodauth.email_auth_email_subject
+  #   mail to: @account.email, subject: rodauth(name).email_auth_email_subject
   # end
 
-  # def unlock_account(account_id, key)
-  #   @email_link = rodauth.unlock_account_url(key: email_token(account_id, key))
-<% if defined?(ActiveRecord::Railtie) -%>
-  #   @account = Account.find(account_id)
-<% else -%>
-  #   @account = Account.with_pk!(account_id)
-<% end -%>
+  # def unlock_account(name = nil, account_id, key)
+  #   @email_link = email_link(name, :unlock_account, account_id, key)
+  #   @account = find_account(name, account_id)
 
-  #   mail to: @account.email, subject: rodauth.unlock_account_email_subject
+  #   mail to: @account.email, subject: rodauth(name).unlock_account_email_subject
   # end
 
   private
 
-  def email_token(account_id, key)
-    "#{account_id}_#{rodauth.compute_hmac(key)}"
+  def find_account(_name, account_id)
+<% if defined?(ActiveRecord::Railtie) -%>
+    Account.find(account_id)
+<% else -%>
+    Account.with_pk!(account_id)
+<% end -%>
+  end
+
+  def email_link(name, action, account_id, key)
+    instance = rodauth(name)
+    instance.instance_variable_set(:@account, { id: account_id })
+    instance.instance_variable_set(:"@#{action}_key_value", key)
+    instance.public_send(:"#{action}_email_link")
   end
 
-  def rodauth(name = nil)
+  def rodauth(name)
     RodauthApp.rodauth(name).allocate
   end
 end

data/lib/generators/rodauth/templates/app/misc/rodauth_main.rb

@@ -56,22 +56,22 @@ class RodauthMain < Rodauth::Rails::Auth
     # ==> Emails
     # Use a custom mailer for delivering authentication emails.
     create_reset_password_email do
-      RodauthMailer.reset_password(account_id, reset_password_key_value)
+      RodauthMailer.reset_password(*self.class.configuration_name, account_id, reset_password_key_value)
     end
     create_verify_account_email do
-      RodauthMailer.verify_account(account_id, verify_account_key_value)
+      RodauthMailer.verify_account(*self.class.configuration_name, account_id, verify_account_key_value)
     end
     create_verify_login_change_email do |_login|
-      RodauthMailer.verify_login_change(account_id, verify_login_change_old_login, verify_login_change_new_login, verify_login_change_key_value)
+      RodauthMailer.verify_login_change(*self.class.configuration_name, account_id, verify_login_change_key_value)
     end
     create_password_changed_email do
-      RodauthMailer.password_changed(account_id)
+      RodauthMailer.password_changed(*self.class.configuration_name, account_id)
     end
     # create_email_auth_email do
-    #   RodauthMailer.email_auth(account_id, email_auth_key_value)
+    #   RodauthMailer.email_auth(*self.class.configuration_name, account_id, email_auth_key_value)
     # end
     # create_unlock_account_email do
-    #   RodauthMailer.unlock_account(account_id, unlock_account_key_value)
+    #   RodauthMailer.unlock_account(*self.class.configuration_name, account_id, unlock_account_key_value)
     # end
     send_email do |email|
       # queue email delivery on the mailer after the transaction commits

data/lib/generators/rodauth/templates/app/models/account.rb

@@ -9,6 +9,7 @@ class Account < ApplicationRecord
 end
 <% else -%>
 class Account < Sequel::Model
+  include Rodauth::Rails.model
   plugin :enum
   enum :status, unverified: 1, verified: 2, closed: 3
 end

data/lib/generators/rodauth/templates/app/views/rodauth_mailer/verify_login_change.text.erb

@@ -1,8 +1,8 @@
 Someone with an account has requested their login be changed to this email address:
 
-Old email: <%= @old_login %>
+Old email: <%= @account.email %>
 
-New email: <%= @new_login %>
+New email: <%= @new_email %>
 
 If you did not request this login change, please ignore this message.  If you
 requested this login change, please go to

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

data/rodauth-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rodauth", "~> 2.23"
   spec.add_dependency "roda", "~> 3.55"
   spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
-  spec.add_dependency "rodauth-model", "~> 0.1"
+  spec.add_dependency "rodauth-model", "~> 0.2"
   spec.add_dependency "tilt"
   spec.add_dependency "bcrypt"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement