rodauth-rails 1.5.5 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9640fa912cb535846cd94b3df3361e9763f2267107205287783885e587e774b
-  data.tar.gz: d135e8e958f0210b22fe694ba2a77e6d4fde74df339b8ec06440ac0f83771c90
+  metadata.gz: 5ff93d3c4aca14c931fdf919c2eae17371105b3c4ca6cf584d699892cb705c7b
+  data.tar.gz: 6bb909fe804de850bd1db16c4b0c0099f8755e1f17e874ab8973cfb1563cc88e
 SHA512:
-  metadata.gz: 1067a2467e0f7dacbfe3a703d6f1e4ad561c9dc7a72fbe3942a20b43b8892211c2509ec3b71c47ba30bf16bea0f7163f8ecb82a5aceaabb23f01a5705d256d12
-  data.tar.gz: ce2464227d1c0a5e5bc3452f05c392787b61fd6b3c530a89c99047c69a4bcceabf08778aaa169c57fa39dbae80efdb455b334881f04b069099fab7b666dc1cfe
+  metadata.gz: d49446ff0285df582268de3c4dc03eef155d3dea86a3887442412ed7a84469bb4af99781e0771c98edc895ea5c5b614ab549a3042c472108a24567676592fe2e
+  data.tar.gz: c40379f9ec9c15152018fb7e6b0be8cf880ff4b59726615ccb3954ee7bfe529122258fc1f838e4b67581b8cfeff285ff2ad60dcfbb06fc0773eefa3c3ab9ba54

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.6.1 (2022-09-19)
+
+* Fix argument error when calling `RodauthMailer` in default configuration (@janko)
+
+## 1.6.0 (2022-09-14)
+
+* Avoid creating IDENTITY columns for primary foreign keys on SQL Server with Active Record (@janko)
+
+* Make configuration name argument required in generated `RodauthMailer` (@janko)
+
+* Make the Rails integration work without Action Mailer loaded (@janko)
+
+* Don't redirect to login page when account is missing in `current_account` method (@janko)
+
 ## 1.5.5 (2022-08-04)
 
 * Don't raise `ArgumentError` when calling `#current_account` without being logged in (@benkoshy)

data/README.md

@@ -194,7 +194,7 @@ class RodauthApp < Rodauth::Rails::App
 
     # require authentication for /dashboard/* and /account/* routes
     if r.path.start_with?("/dashboard") || r.path.start_with?("/account")
-      rodauth.require_authentication # redirect to login page if not authenticated
+      rodauth.require_account # redirect to login page if not authenticated
     end
   end
 end
@@ -208,7 +208,7 @@ class ApplicationController < ActionController::Base
   private
 
   def authenticate
-    rodauth.require_authentication # redirect to login page if not authenticated
+    rodauth.require_account # redirect to login page if not authenticated
   end
 end
 ```
@@ -727,7 +727,7 @@ For controller tests, you can log in accounts by modifying the session:
 ```rb
 # app/controllers/articles_controller.rb
 class ArticlesController < ApplicationController
-  before_action -> { rodauth.require_authentication }
+  before_action -> { rodauth.require_account }
 
   def index
     # ...
@@ -951,7 +951,7 @@ end
 
 In addition to Zeitwerk compatibility, this extra layer catches Rodauth redirects
 that happen on the controller level (e.g. when calling
-`rodauth.require_authentication` in a `before_action` filter).
+`rodauth.require_account` in a `before_action` filter).
 
 ### Roda app
 

data/lib/generators/rodauth/install_generator.rb

@@ -63,6 +63,8 @@ module Rodauth
         end
 
         def create_mailer
+          return unless defined?(ActionMailer)
+
           template "app/mailers/rodauth_mailer.rb"
 
           MAILER_VIEWS.each do |view|

data/lib/generators/rodauth/migration/active_record/account_expiration.erb

@@ -1,5 +1,6 @@
 # Used by the account expiration feature
-create_table :account_activity_times<%= primary_key_type %> do |t|
+create_table :account_activity_times, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.datetime :last_activity_at, null: false
   t.datetime :last_login_at, null: false

data/lib/generators/rodauth/migration/active_record/email_auth.erb

@@ -1,6 +1,6 @@
 # Used by the email auth feature
-create_table :account_email_auth_keys<%= primary_key_type %> do |t|
-  t.foreign_key :accounts, column: :id
+create_table :account_email_auth_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.string :key, null: false
   t.datetime :deadline, null: false
   t.datetime :email_last_sent, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/lockout.erb

@@ -1,9 +1,11 @@
 # Used by the lockout feature
-create_table :account_login_failures<%= primary_key_type %> do |t|
+create_table :account_login_failures, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.integer :number, null: false, default: 1
 end
-create_table :account_lockouts<%= primary_key_type %> do |t|
+create_table :account_lockouts, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false

data/lib/generators/rodauth/migration/active_record/otp.erb

@@ -1,5 +1,6 @@
 # Used by the otp feature
-create_table :account_otp_keys<%= primary_key_type %> do |t|
+create_table :account_otp_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.integer :num_failures, null: false, default: 0

data/lib/generators/rodauth/migration/active_record/password_expiration.erb

@@ -1,5 +1,6 @@
 # Used by the password expiration feature
-create_table :account_password_change_times<%= primary_key_type %> do |t|
+create_table :account_password_change_times, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.datetime :changed_at, null: false, default: <%= current_timestamp %>
 end

data/lib/generators/rodauth/migration/active_record/recovery_codes.erb

@@ -1,6 +1,6 @@
 # Used by the recovery codes feature
 create_table :account_recovery_codes, primary_key: [:id, :code] do |t|
-  t.column :id, :<%= primary_key_type(nil) || :bigint %>
+  t.<%= primary_key_type(nil) %> :id
   t.foreign_key :accounts, column: :id
   t.string :code
 end

data/lib/generators/rodauth/migration/active_record/remember.erb

@@ -1,5 +1,6 @@
 # Used by the remember me feature
-create_table :account_remember_keys<%= primary_key_type %> do |t|
+create_table :account_remember_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false

data/lib/generators/rodauth/migration/active_record/reset_password.erb

@@ -1,5 +1,6 @@
 # Used by the password reset feature
-create_table :account_password_reset_keys<%= primary_key_type %> do |t|
+create_table :account_password_reset_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.datetime :deadline, null: false

data/lib/generators/rodauth/migration/active_record/single_session.erb

@@ -1,5 +1,6 @@
 # Used by the single session feature
-create_table :account_session_keys<%= primary_key_type %> do |t|
+create_table :account_session_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
 end

data/lib/generators/rodauth/migration/active_record/sms_codes.erb

@@ -1,5 +1,6 @@
 # Used by the sms codes feature
-create_table :account_sms_codes<%= primary_key_type %> do |t|
+create_table :account_sms_codes, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :phone_number, null: false
   t.integer :num_failures

data/lib/generators/rodauth/migration/active_record/verify_account.erb

@@ -1,5 +1,6 @@
 # Used by the account verification feature
-create_table :account_verification_keys<%= primary_key_type %> do |t|
+create_table :account_verification_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.datetime :requested_at, null: false, default: <%= current_timestamp %>

data/lib/generators/rodauth/migration/active_record/verify_login_change.erb

@@ -1,5 +1,6 @@
 # Used by the verify login change feature
-create_table :account_login_change_keys<%= primary_key_type %> do |t|
+create_table :account_login_change_keys, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :key, null: false
   t.string :login, null: false

data/lib/generators/rodauth/migration/active_record/webauthn.erb

@@ -1,5 +1,6 @@
 # Used by the webauthn feature
-create_table :account_webauthn_user_ids<%= primary_key_type %> do |t|
+create_table :account_webauthn_user_ids, id: false do |t|
+  t.<%= primary_key_type(nil) %> :id, primary_key: true
   t.foreign_key :accounts, column: :id
   t.string :webauthn_id, null: false
 end

data/lib/generators/rodauth/migration_generator.rb

@@ -93,12 +93,18 @@ module Rodauth
             generators  = ::Rails.application.config.generators
             column_type = generators.options[:active_record][:primary_key_type]
 
-            return unless column_type
-
             if key
-              ", #{key}: :#{column_type}"
+              ", #{key}: :#{column_type}" if column_type
+            else
+              column_type || default_primary_key_type
+            end
+          end
+
+          def default_primary_key_type
+            if ActiveRecord.version >= Gem::Version.new("5.1") && activerecord_adapter != "sqlite3"
+              :bigint
             else
-              column_type
+              :integer
             end
           end
 

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

@@ -1,19 +1,19 @@
 class RodauthMailer < ApplicationMailer
-  def verify_account(name = nil, account_id, key)
+  def verify_account(name, 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(name).verify_account_email_subject
   end
 
-  def reset_password(name = nil, account_id, key)
+  def reset_password(name, 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(name).reset_password_email_subject
   end
 
-  def verify_login_change(name = nil, account_id, key)
+  def verify_login_change(name, 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
@@ -21,20 +21,20 @@ class RodauthMailer < ApplicationMailer
     mail to: @new_email, subject: rodauth(name).verify_login_change_email_subject
   end
 
-  def password_changed(name = nil, account_id)
+  def password_changed(name, account_id)
     @account = find_account(name, account_id)
 
     mail to: @account.email, subject: rodauth(name).password_changed_email_subject
   end
 
-  # def email_auth(name = nil, account_id, key)
+  # def email_auth(name, 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(name).email_auth_email_subject
   # end
 
-  # def unlock_account(name = nil, account_id, key)
+  # def unlock_account(name, account_id, key)
   #   @email_link = email_link(name, :unlock_account, account_id, key)
   #   @account = find_account(name, account_id)
 

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

@@ -13,12 +13,12 @@ class RodauthApp < Rodauth::Rails::App
     r.rodauth # route rodauth requests
 
     # ==> Authenticating requests
-    # Call `rodauth.require_authentication` for requests that you want to
+    # Call `rodauth.require_account` for requests that you want to
     # require authentication for. For example:
     #
     # # authenticate /dashboard/* and /account/* requests
     # if r.path.start_with?("/dashboard") || r.path.start_with?("/account")
-    #   rodauth.require_authentication
+    #   rodauth.require_account
     # end
 
     # ==> Secondary configurations

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

@@ -56,31 +56,33 @@ class RodauthMain < Rodauth::Rails::Auth
     # Redirect to the app from login and registration pages if already logged in.
     # already_logged_in { redirect login_redirect }
 
+<% if defined?(ActionMailer) -%>
     # ==> Emails
     # Use a custom mailer for delivering authentication emails.
     create_reset_password_email do
-      RodauthMailer.reset_password(*self.class.configuration_name, 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(*self.class.configuration_name, 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(*self.class.configuration_name, account_id, 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(*self.class.configuration_name, account_id)
+      RodauthMailer.password_changed(self.class.configuration_name, account_id)
     end
     # create_email_auth_email do
-    #   RodauthMailer.email_auth(*self.class.configuration_name, 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(*self.class.configuration_name, 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
       db.after_commit { email.deliver_later }
     end
 
+<% end -%>
     # ==> Flash
 <% unless json? || jwt? -%>
     # Match flash keys with ones already used in the Rails app.

data/lib/rodauth/rails/controller_methods.rb

@@ -9,7 +9,7 @@ module Rodauth
       end
 
       def current_account(name = nil)
-        rodauth(name).rails_account || rodauth(name).login_required
+        rodauth(name).rails_account
       end
 
       def rodauth(name = nil)

data/lib/rodauth/rails/feature/internal_request.rb

@@ -3,13 +3,13 @@ module Rodauth
     module Feature
       module InternalRequest
         def domain
-          return super unless missing_host?
+          return super unless missing_host? && rails_url_options
 
           rails_url_options.fetch(:host)
         end
 
         def base_url
-          return super unless missing_host? && domain
+          return super unless missing_host? && domain && rails_url_options
 
           scheme = rails_url_options[:protocol] || "http"
           port = rails_url_options[:port]
@@ -43,6 +43,8 @@ module Rodauth
         end
 
         def rails_url_options
+          return nil unless defined?(ActionMailer)
+
           ::Rails.application.config.action_mailer.default_url_options or
             fail Error, "There is no information to set the URL host from. Please set config.action_mailer.default_url_options in your Rails application, or configure #domain and #base_url in your Rodauth configuration."
         end

data/lib/rodauth/rails/feature.rb

@@ -8,7 +8,7 @@ module Rodauth
     require "rodauth/rails/feature/callbacks"
     require "rodauth/rails/feature/csrf"
     require "rodauth/rails/feature/render"
-    require "rodauth/rails/feature/email"
+    require "rodauth/rails/feature/email" if defined?(ActionMailer)
     require "rodauth/rails/feature/instrumentation"
     require "rodauth/rails/feature/internal_request"
 
@@ -16,7 +16,7 @@ module Rodauth
     include Rodauth::Rails::Feature::Callbacks
     include Rodauth::Rails::Feature::Csrf
     include Rodauth::Rails::Feature::Render
-    include Rodauth::Rails::Feature::Email
+    include Rodauth::Rails::Feature::Email if defined?(ActionMailer)
     include Rodauth::Rails::Feature::Instrumentation
     include Rodauth::Rails::Feature::InternalRequest
   end

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.5.5"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties