rodauth-rails 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8ee44d094627dcacd9d9b7f5da1eb165cff1af209f079b667e0f04e9540b30
-  data.tar.gz: f179e4eaea99d04ff6ff71c6357cdf75a19991645c9904ab6373c03b5dcd1a16
+  metadata.gz: d447d09fef8c29feb6240523286b8906049e85965f20a6410d1a475f913d9051
+  data.tar.gz: bca9b6eadec6b32f2193291c6922467a554105d290ffd7b34bc2606d62121926
 SHA512:
-  metadata.gz: 78c28c13751abb439179813948bf665cd040444171998e42ecdb4cb42f698097731f4c073b7595d083ba5825a9989940deee052771fb5f76f93bd333e94af500
-  data.tar.gz: eb3a04ae6333dc471fd7fbdb264527a359893fb100d7833bab3545f7d91e213bfc8a2daa562ffc22f531073f39f4bee3de893bffd87201b3e57d1dce99c97320
+  metadata.gz: 1f512f9fe9a3e22dcddf477d8906d1ea63a548241fd93b43bbcaf274ff39e0104e20f64c6a2836e5b243e812ffde654deae55a0beca69f4ba917cd5943da8a3c
+  data.tar.gz: dbbd99959dfd42134cd3374f1f9767cf3e8d49327c195d4c35c4ecf281d0c3dad52db76b7e2fbf030c9e3ea2131bfcb1b6a120cc4a310983d8db564e63b97cda

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.14.0 (2021-07-10)
+
+* Speed up template rendering by only searching formats accepted by the request (@janko)
+
+* Add `--name` option to `rodauth:views` generator for specifying different rodauth configuration (@janko)
+
+* Infer correct template path from configured controller in `rodauth:views` generator (@janko)
+
+* Raise `ArgumentError` if undefined rodauth configuration is passed to `Rodauth::Rails.app` (@janko)
+
+* Make `#rails_controller` method on the rodauth instance public (@janko)
+
+* Remove `--directory` option from `rodauth:views` generator (@janko)
+
+* Remove `#features` and `#routes` writer and `#configuration` reader from `Rodauth::Rails::Auth` (@janko)
+
 ## 0.13.0 (2021-06-10)
 
 * Add `:query`, `:form`, `:session`, `:account`, and `:env` options to `Rodauth::Rails.rodauth` (@janko)

data/README.md

@@ -49,7 +49,7 @@ For instructions on upgrading from previous rodauth-rails versions, see
 Add the gem to your Gemfile:
 
 ```rb
-gem "rodauth-rails", "~> 0.13"
+gem "rodauth-rails", "~> 0.14"
 
 # gem "jwt",      require: false # for JWT feature
 # gem "rotp",     require: false # for OTP feature
@@ -278,8 +278,8 @@ $ rails generate rodauth:views
 ```
 
 This will generate views for the default set of Rodauth features into the
-`app/views/rodauth` directory, which will be automatically picked up by the
-`RodauthController`.
+`app/views/rodauth` directory, provided that `RodauthController` is set for the
+main configuration.
 
 You can pass a list of Rodauth features to the generator to create views for
 these features (this will not remove or overwrite any existing views):
@@ -294,12 +294,10 @@ Or you can generate views for all features:
 $ rails generate rodauth:views --all
 ```
 
-You can also tell the generator to create views into another directory (in this
-case make sure to rename the Rodauth controller accordingly):
+Use `--name` to generate views for a different Rodauth configuration:
 
 ```sh
-# generates views into app/views/authentication
-$ rails generate rodauth:views --name authentication
+$ rails generate rodauth:views --name admin
 ```
 
 #### Layout
@@ -392,14 +390,48 @@ end
 This configuration calls `#deliver_later`, which uses Active Job to deliver
 emails in a background job. It's generally recommended to send emails
 asynchronously for better request throughput and the ability to retry
-deliveries. However, if you want to send emails synchronously, modify the
-configuration to call `#deliver_now` instead.
+deliveries. However, if you want to send emails synchronously, you can modify
+the configuration to call `#deliver_now` instead.
 
 If you're using a background processing library without an Active Job adapter,
 or a 3rd-party service for sending transactional emails, this two-phase API
 might not be suitable. In this case, instead of overriding `#create_*_email`
 and `#send_email`, override the `#send_*_email` methods instead, which are
-required to send the email immediately.
+required to send the email immediately. For example:
+
+```rb
+# app/workers/rodauth_mailer_worker.rb
+class RodauthMailerWorker
+  include Sidekiq::Worker
+
+  def perform(name, *args)
+    email = RodauthMailer.public_send(name, *args)
+    email.deliver_now
+  end
+end
+```
+```rb
+# app/lib/rodauth_app.rb
+class RodauthApp < Rodauth::Rails::App
+  configure do
+    # ...
+    # use `#send_*_email` method to be able to immediately enqueue email delivery
+    send_reset_password_email do
+      enqueue_email(:reset_password, email_to, reset_password_email_link)
+    end
+    # ...
+    auth_class_eval do
+      # custom method for enqueuing email delivery using our worker
+      def enqueue_email(name, *args)
+        db.after_commit do
+          RodauthMailerWorker.perform_async(name, *args)
+        end
+      end
+    end
+    # ...
+  end
+end
+```
 
 ### Migrations
 
@@ -440,10 +472,6 @@ class RodauthApp < Rodauth::Rails::App
     prefix "/admin"
     session_key_prefix "admin_"
     remember_cookie_key "_admin_remember" # if using remember feature
-
-    # if you want separate tables
-    accounts_table :admin_accounts
-    password_hash_table :admin_account_password_hashes
     # ...
   end
 
@@ -466,6 +494,50 @@ Then in your application you can reference the secondary Rodauth instance:
 rodauth(:admin).login_path #=> "/admin/login"
 ```
 
+You'll likely want to save the information of which account belongs to which
+configuration to the database. One way would be to have a separate table that
+stores account types:
+
+```sh
+$ rails generate migration create_account_types
+```
+```rb
+# db/migrate/*_create_account_types.rb
+class CreateAccountTypes < ActiveRecord::Migration
+  def change
+    create_table :account_types do |t|
+      t.references :account, foreign_key: { on_delete: :cascade }, null: false
+      t.string :type, null: false
+    end
+  end
+end
+```
+```sh
+$ rails db:migrate
+```
+
+Then an entry would be inserted after account creation, and optionally whenever
+Rodauth retrieves accounts you could filter only those belonging to the current
+configuration:
+
+```rb
+# app/lib/rodauth_app.rb
+class RodauthApp < Rodauth::Rails::App
+  configure(:admin) do
+    # ...
+    after_create_account do
+      db[:account_types].insert(account_id: account_id, type: "admin")
+    end
+    auth_class_eval do
+      def account_ds(*)
+        super.join(:account_types, account_id: :id).where(type: "admin")
+      end
+    end
+    # ...
+  end
+end
+```
+
 #### Named auth classes
 
 A `configure` block inside `Rodauth::Rails::App` will internally create an

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

@@ -156,9 +156,18 @@ class RodauthApp < Rodauth::Rails::App
 
   # ==> Multiple configurations
   # configure(:admin) do
-  #   enable :http_basic_auth # enable different set of features
+  #   # ... enable features ...
   #   prefix "/admin"
   #   session_key_prefix "admin_"
+  #   # remember_cookie_key "_admin_remember" # if using remember feature
+  #
+  #   # search views in `app/views/admin/rodauth` directory
+  #   rails_controller { Admin::RodauthController }
+  #
+  #   # use separate tables (requires creating the new tables)
+  #   methods.grep(/_table$/) do |table_method|
+  #     public_send(table_method) { :"admin_#{super()}" }
+  #   end
   # end
 
   route do |r|

data/lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.email_auth_request_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.email_auth_request_path, method: :post do %>
   <%%= render "login_hidden_field" %>
   <%%= render "submit", value: "Send Login Link Via Email" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_field.html.erb

@@ -4,7 +4,7 @@
   autocomplete: local_assigns[:autocomplete],
   inputmode: local_assigns[:inputmode],
   required: local_assigns[:required] != false,
-  class: "#{local_assigns[:class] || "form-control"} #{"is-invalid" if rodauth.field_error(name)}",
-  aria: ({ invalid: "true", describedby: "#{name}_error_message" } if rodauth.field_error(name)) %>
+  class: "#{local_assigns[:class] || "form-control"} #{"is-invalid" if <%= rodauth %>.field_error(name)}",
+  aria: ({ invalid: "true", describedby: "#{name}_error_message" } if <%= rodauth %>.field_error(name)) %>
 
 <%%= render "field_error", name: name unless local_assigns[:skip_error_message] %>

data/lib/generators/rodauth/templates/app/views/rodauth/_field_error.html.erb

@@ -1,3 +1,3 @@
-<%% if rodauth.field_error(name) %>
-  <div class="invalid-feedback" id="<%%= name %>_error_message"><%%= rodauth.field_error(name) %></div>
+<%% if <%= rodauth %>.field_error(name) %>
+  <div class="invalid-feedback" id="<%%= name %>_error_message"><%%= <%= rodauth %>.field_error(name) %></div>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_global_logout_field.html.erb

@@ -1,6 +1,6 @@
 <div class="form-group mb-3">
   <div class="form-check">
-    <%%= check_box_tag rodauth.global_logout_param, "t", false, id: "global-logout", class: "form-check-input" %>
+    <%%= check_box_tag <%= rodauth %>.global_logout_param, "t", false, id: "global-logout", class: "form-check-input" %>
     <%%= label_tag "global-logout", "Logout all Logged In Sessons?", class: "form-check-label" %>
   </div>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_confirm_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "login-confirm", "Confirm Login", class: "form-label" %>
-  <%%= render "field", name: rodauth.login_confirm_param, id: "login-confirm", type: :email, autocomplete: "email" %>
+  <%%= render "field", name: <%= rodauth %>.login_confirm_param, id: "login-confirm", type: :email, autocomplete: "email" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_display.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "login", "Login", class: "form-label" %>
-  <%%= email_field_tag rodauth.login_param, params[rodauth.login_param], id: "login", readonly: true, class: "form-control-plaintext" %>
+  <%%= email_field_tag <%= rodauth %>.login_param, params[<%= rodauth %>.login_param], id: "login", readonly: true, class: "form-control-plaintext" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "login", "Login", class: "form-label" %>
-  <%%= render "field", name: rodauth.login_param, id: "login", type: :email, autocomplete: "email" %>
+  <%%= render "field", name: <%= rodauth %>.login_param, id: "login", type: :email, autocomplete: "email" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb

@@ -1,9 +1,9 @@
-<%%= form_tag rodauth.login_path, method: :post do %>
-  <%% if rodauth.skip_login_field_on_login? %>
+<%%= form_tag <%= rodauth %>.login_path, method: :post do %>
+  <%% if <%= rodauth %>.skip_login_field_on_login? %>
     <%%= render "login_display" %>
   <%% else %>
     <%%= render "login_field" %>
   <%% end %>
-  <%%= render "password_field" unless rodauth.skip_password_field_on_login? %>
+  <%%= render "password_field" unless <%= rodauth %>.skip_password_field_on_login? %>
   <%%= render "submit", value: "Login" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb

@@ -1,7 +1,7 @@
-<%% unless rodauth.login_form_footer_links.empty? %>
+<%% unless <%= rodauth %>.login_form_footer_links.empty? %>
   <h2>Other Options</h2>
   <ul>
-    <%% rodauth.login_form_footer_links.sort.each do |_, link, text| %>
+    <%% <%= rodauth %>.login_form_footer_links.sort.each do |_, link, text| %>
       <li><%%= link_to text, link %></li>
     <%% end %>
   </ul>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_form_header.html.erb

@@ -1,3 +1,3 @@
-<%% if rodauth.field_error("password") && rodauth.features.include?(:reset_password) %>
-  <%%= render template: "<%= options[:directory] %>/reset_password_request", layout: false %>
+<%% if <%= rodauth %>.field_error("password") && <%= rodauth %>.features.include?(:reset_password) %>
+  <%%= render template: "<%= directory %>/reset_password_request", layout: false %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_login_hidden_field.html.erb

@@ -1 +1 @@
-<%%= hidden_field_tag rodauth.login_param, params[rodauth.login_param] %>
+<%%= hidden_field_tag <%= rodauth %>.login_param, params[<%= rodauth %>.login_param] %>

data/lib/generators/rodauth/templates/app/views/rodauth/_new_password_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "new-password", "New Password", class: "form-label" %>
-  <%%= render "field", name: rodauth.new_password_param, id: "new-password", type: "password", value: "", autocomplete: "new-password" %>
+  <%%= render "field", name: <%= rodauth %>.new_password_param, id: "new-password", type: "password", value: "", autocomplete: "new-password" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_otp_auth_code_field.html.erb

@@ -2,7 +2,7 @@
   <%%= label_tag "otp-auth-code", "Authentication Code", class: "form-label" %>
   <div class="row">
     <div class="col-sm-3">
-      <%%= render "field", name: rodauth.otp_auth_param, id: "otp-auth-code", value: "", autocomplete: "off", inputmode: "numeric" %>
+      <%%= render "field", name: <%= rodauth %>.otp_auth_param, id: "otp-auth-code", value: "", autocomplete: "off", inputmode: "numeric" %>
     </div>
   </div>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_password_confirm_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "password-confirm", "Confirm Password", class: "form-label" %>
-  <%%= render "field", name: rodauth.password_confirm_param, id: "password-confirm", type: :password, value: "", autocomplete: "new-password" %>
+  <%%= render "field", name: <%= rodauth %>.password_confirm_param, id: "password-confirm", type: :password, value: "", autocomplete: "new-password" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_password_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "password", "Password", class: "form-label" %>
-  <%%= render "field", name: rodauth.password_param, id: "password", type: :password, value: "", autocomplete: rodauth.password_field_autocomplete_value %>
+  <%%= render "field", name: <%= rodauth %>.password_param, id: "password", type: :password, value: "", autocomplete: <%= rodauth %>.password_field_autocomplete_value %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_recovery_code_field.html.erb

@@ -1,4 +1,4 @@
 <div class="form-group mb-3">
   <%%= label_tag "recovery_code", "Recovery Code", class: "form-label" %>
-  <%%= render "field", name: rodauth.recovery_codes_param, id: "recovery_code", value: "", autocomplete: "off" %>
+  <%%= render "field", name: <%= rodauth %>.recovery_codes_param, id: "recovery_code", value: "", autocomplete: "off" %>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_recovery_codes_form.html.erb

@@ -1,6 +1,6 @@
-<%%= form_tag rodauth.recovery_codes_path, method: :post do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.recovery_codes_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <%%= render "submit",
-    value: rodauth.recovery_codes_button || "View Authentication Recovery Codes",
-    name: (rodauth.add_recovery_codes_param if rodauth.recovery_codes_button) %>
+    value: <%= rodauth %>.recovery_codes_button || "View Authentication Recovery Codes",
+    name: (<%= rodauth %>.add_recovery_codes_param if <%= rodauth %>.recovery_codes_button) %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/_sms_code_field.html.erb

@@ -2,7 +2,7 @@
   <%%= label_tag "sms-code", "SMS Code", class: "form-label" %>
   <div class="row">
     <div class="col-sm-3">
-      <%%= render "field", name: rodauth.sms_code_param, id: "sms-code", value: "", autocomplete: "one-time-code", inputmode: "numeric" %>
+      <%%= render "field", name: <%= rodauth %>.sms_code_param, id: "sms-code", value: "", autocomplete: "one-time-code", inputmode: "numeric" %>
     </div>
   </div>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/_sms_phone_field.html.erb

@@ -2,7 +2,7 @@
   <%%= label_tag "sms-phone", "Phone Number", class: "form-label" %>
   <div class="row">
     <div class="col-sm-3">
-      <%%= render "field", name: rodauth.sms_phone_param, id: "sms-phone", type: :tel, autocomplete: "tel" %>
+      <%%= render "field", name: <%= rodauth %>.sms_phone_param, id: "sms-phone", type: :tel, autocomplete: "tel" %>
     </div>
   </div>
 </div>

data/lib/generators/rodauth/templates/app/views/rodauth/add_recovery_codes.html.erb

@@ -1,6 +1,6 @@
-<pre id="recovery-codes"><%%= rodauth.recovery_codes.map { |s| h(s) }.join("\n\n") %></pre>
+<pre id="recovery-codes"><%%= <%= rodauth %>.recovery_codes.map { |s| h(s) }.join("\n\n") %></pre>
 
-<%% if rodauth.can_add_recovery_codes? %>
+<%% if <%= rodauth %>.can_add_recovery_codes? %>
   <h2>Add Additional Recovery Codes</h2>
   <%%= render "recovery_codes_form" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/change_login.html.erb

@@ -1,6 +1,6 @@
-<%%= form_tag rodauth.change_login_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.change_login_path, method: :post do %>
   <%%= render "login_field" %>
-  <%%= render "login_confirm_field" if rodauth.require_login_confirmation? %>
-  <%%= render "password_field" if rodauth.change_login_requires_password? %>
+  <%%= render "login_confirm_field" if <%= rodauth %>.require_login_confirmation? %>
+  <%%= render "password_field" if <%= rodauth %>.change_login_requires_password? %>
   <%%= render "submit", value: "Change Login" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/change_password.html.erb

@@ -1,6 +1,6 @@
-<%%= form_tag rodauth.change_password_path, method: :post do %>
-  <%%= render "password_field" if rodauth.change_password_requires_password? %>
+<%%= form_tag <%= rodauth %>.change_password_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.change_password_requires_password? %>
   <%%= render "new_password_field" %>
-  <%%= render "password_confirm_field" if rodauth.require_password_confirmation? %>
+  <%%= render "password_confirm_field" if <%= rodauth %>.require_password_confirmation? %>
   <%%= render "submit", value: "Change Password" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/close_account.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.close_account_path, method: :post do %>
-  <%%= render "password_field" if rodauth.close_account_requires_password? %>
+<%%= form_tag <%= rodauth %>.close_account_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.close_account_requires_password? %>
   <%%= render "submit", value: "Close Account", class: "btn btn-danger" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/confirm_password.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.confirm_password_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.confirm_password_path, method: :post do %>
   <%%= render "password_field" %>
   <%%= render "submit", value: "Confirm Password" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/create_account.html.erb

@@ -1,7 +1,7 @@
-<%%= form_tag rodauth.create_account_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.create_account_path, method: :post do %>
   <%%= render "login_field" %>
-  <%%= render "login_confirm_field" if rodauth.require_login_confirmation? %>
-  <%%= render "password_field" if rodauth.create_account_set_password? %>
-  <%%= render "password_confirm_field" if rodauth.create_account_set_password? && rodauth.require_password_confirmation? %>
+  <%%= render "login_confirm_field" if <%= rodauth %>.require_login_confirmation? %>
+  <%%= render "password_field" if <%= rodauth %>.create_account_set_password? %>
+  <%%= render "password_confirm_field" if <%= rodauth %>.create_account_set_password? && <%= rodauth %>.require_password_confirmation? %>
   <%%= render "submit", value: "Create Account" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/email_auth.html.erb

@@ -1,3 +1,3 @@
-<%%= form_tag rodauth.email_auth_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.email_auth_path, method: :post do %>
   <%%= render "submit", value: "Login" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/logout.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.logout_path, method: :post do %>
-  <%%= render "global_logout_field" if rodauth.features.include?(:active_sessions) %>
+<%%= form_tag <%= rodauth %>.logout_path, method: :post do %>
+  <%%= render "global_logout_field" if <%= rodauth %>.features.include?(:active_sessions) %>
   <%%= render "submit", value: "Logout", class: "btn btn-warning" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/multi_phase_login.html.erb

@@ -1,3 +1,3 @@
 <%%= render "login_form_header" %>
-<%%= rodauth.render_multi_phase_login_forms.html_safe %>
+<%%= <%= rodauth %>.render_multi_phase_login_forms.html_safe %>
 <%%= render "login_form_footer" %>

data/lib/generators/rodauth/templates/app/views/rodauth/otp_auth.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.otp_auth_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.otp_auth_path, method: :post do %>
   <%%= render "otp_auth_code_field" %>
   <%%= render "submit", value: "Authenticate Using TOTP" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/otp_disable.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.otp_disable_path, method: :post do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.otp_disable_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <%%= render "submit", value: "Disable TOTP Authentication", class: "btn btn-warning" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/otp_setup.html.erb

@@ -1,21 +1,21 @@
-<%%= form_tag rodauth.otp_setup_path, method: :post do %>
-  <%%= hidden_field_tag rodauth.otp_setup_param, rodauth.otp_user_key, id: "otp-key" %>
-  <%%= hidden_field_tag rodauth.otp_setup_raw_param, rodauth.otp_key, id: "otp-hmac-secret" if rodauth.otp_keys_use_hmac? %>
+<%%= form_tag <%= rodauth %>.otp_setup_path, method: :post do %>
+  <%%= hidden_field_tag <%= rodauth %>.otp_setup_param, <%= rodauth %>.otp_user_key, id: "otp-key" %>
+  <%%= hidden_field_tag <%= rodauth %>.otp_setup_raw_param, <%= rodauth %>.otp_key, id: "otp-hmac-secret" if <%= rodauth %>.otp_keys_use_hmac? %>
 
   <div class="form-group mb-3">
-    <p>Secret: <%%= rodauth.otp_user_key %></p>
-    <p>Provisioning URL: <%%= rodauth.otp_provisioning_uri %></p>
+    <p>Secret: <%%= <%= rodauth %>.otp_user_key %></p>
+    <p>Provisioning URL: <%%= <%= rodauth %>.otp_provisioning_uri %></p>
   </div>
 
   <div class="row">
     <div class="col-lg-6 col-lg">
       <div class="form-group mb-3">
-        <p><%%= rodauth.otp_qr_code.html_safe %></p>
+        <p><%%= <%= rodauth %>.otp_qr_code.html_safe %></p>
       </div>
     </div>
 
     <div class="col-lg-6 col-lg">
-      <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+      <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
       <%%= render "otp_auth_code_field" %>
       <%%= render "submit", value: "Setup TOTP Authentication" %>
     </div>

data/lib/generators/rodauth/templates/app/views/rodauth/recovery_auth.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.recovery_auth_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.recovery_auth_path, method: :post do %>
   <%%= render "recovery_code_field" %>
   <%%= render "submit", value: "Authenticate via Recovery Code" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/remember.html.erb

@@ -1,17 +1,17 @@
-<%%= form_tag rodauth.remember_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.remember_path, method: :post do %>
   <fieldset class="form-group mb-3">
     <div class="form-check">
-      <%%= radio_button_tag rodauth.remember_param, rodauth.remember_remember_param_value, false, id: "remember-remember", class: "form-check-input" %>
+      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_remember_param_value, false, id: "remember-remember", class: "form-check-input" %>
       <%%= label_tag "remember-remember", "Remember Me", class: "form-check-label" %>
     </div>
 
     <div class="form-check">
-      <%%= radio_button_tag rodauth.remember_param, rodauth.remember_forget_param_value, false, id: "remember-forget", class: "form-check-input" %>
+      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_forget_param_value, false, id: "remember-forget", class: "form-check-input" %>
       <%%= label_tag "remember-forget", "Forget Me", class: "form-check-label" %>
     </div>
 
     <div class="form-check">
-      <%%= radio_button_tag rodauth.remember_param, rodauth.remember_disable_param_value, false, id: "remember-disable", class: "form-check-input" %>
+      <%%= radio_button_tag <%= rodauth %>.remember_param, <%= rodauth %>.remember_disable_param_value, false, id: "remember-disable", class: "form-check-input" %>
       <%%= label_tag "remember-disable", "Disable Remember Me", class: "form-check-label" %>
     </div>
   </fieldset>

data/lib/generators/rodauth/templates/app/views/rodauth/reset_password.html.erb

@@ -1,5 +1,5 @@
-<%%= form_tag rodauth.reset_password_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.reset_password_path, method: :post do %>
   <%%= render "password_field" %>
-  <%%= render "password_confirm_field" if rodauth.require_password_confirmation? %>
+  <%%= render "password_confirm_field" if <%= rodauth %>.require_password_confirmation? %>
   <%%= render "submit", value: "Reset Password" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/reset_password_request.html.erb

@@ -1,6 +1,6 @@
-<%%= form_tag rodauth.reset_password_request_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.reset_password_request_path, method: :post do %>
   <p>If you have forgotten your password, you can request a password reset:</p>
-  <%% if params[rodauth.login_param] && !rodauth.field_error(rodauth.login_param) %>
+  <%% if params[<%= rodauth %>.login_param] && !<%= rodauth %>.field_error(<%= rodauth %>.login_param) %>
     <%%= render "login_hidden_field" %>
   <%% else %>
     <%%= render "login_field" %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_auth.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.sms_auth_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.sms_auth_path, method: :post do %>
   <%%= render "sms_code_field" %>
   <%%= render "submit", value: "Authenticate via SMS Code" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_confirm.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.sms_confirm_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.sms_confirm_path, method: :post do %>
   <%%= render "sms_code_field" %>
   <%%= render "submit", value: "Confirm SMS Backup Number" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_disable.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.sms_disable_path, method: :post do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.sms_disable_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <%%= render "submit", value: "Disable Backup SMS Authentication" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_request.html.erb

@@ -1,3 +1,3 @@
-<%%= form_tag rodauth.sms_request_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.sms_request_path, method: :post do %>
   <%%= render "submit", value: "Send SMS Code" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/sms_setup.html.erb

@@ -1,5 +1,5 @@
-<%%= form_tag rodauth.sms_setup_path, method: :post do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.sms_setup_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <%%= render "sms_phone_field" %>
   <%%= render "submit", value: "Setup SMS Backup Number" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_auth.html.erb

@@ -1,5 +1,5 @@
 <ul>
-  <%% rodauth.two_factor_auth_links.sort.each do |_, link, text| %>
+  <%% <%= rodauth %>.two_factor_auth_links.sort.each do |_, link, text| %>
     <li><%%= link_to text, link %></li>
   <%% end %>
 </ul>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_disable.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.two_factor_disable_path, method: :post do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.two_factor_disable_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <%%= render "submit", value: "Remove All Multifactor Authentication Methods" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/two_factor_manage.html.erb

@@ -1,22 +1,22 @@
-<%% if rodauth.two_factor_setup_links.any? %>
+<%% if <%= rodauth %>.two_factor_setup_links.any? %>
   <h2>Setup Multifactor Authentication</h2>
 
   <ul>
-    <%% rodauth.two_factor_setup_links.sort.each do |_, link, text| %>
+    <%% <%= rodauth %>.two_factor_setup_links.sort.each do |_, link, text| %>
       <li><%%= link_to text, link %></li>
     <%% end %>
   </ul>
 <%% end %>
 
-<%% if rodauth.two_factor_remove_links.any? %>
+<%% if <%= rodauth %>.two_factor_remove_links.any? %>
   <h2>Remove Multifactor Authentication</h2>
 
   <ul>
-    <%% rodauth.two_factor_remove_links.sort.each do |_, link, text| %>
+    <%% <%= rodauth %>.two_factor_remove_links.sort.each do |_, link, text| %>
       <li><%%= link_to text, link %></li>
     <%% end %>
-    <%% if rodauth.two_factor_remove_links.length > 1 %>
-      <li><%%= link_to "Remove All Multifactor Authentication Methods", rodauth.two_factor_disable_path %></li>
+    <%% if <%= rodauth %>.two_factor_remove_links.length > 1 %>
+      <li><%%= link_to "Remove All Multifactor Authentication Methods", <%= rodauth %>.two_factor_disable_path %></li>
     <%% end %>
   </ul>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/unlock_account.html.erb

@@ -1,5 +1,5 @@
-<%%= form_tag rodauth.unlock_account_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.unlock_account_path, method: :post do %>
   <p>This account is currently locked out.  You can unlock the account:</p>
-  <%%= render "password_field" if rodauth.unlock_account_requires_password? %>
+  <%%= render "password_field" if <%= rodauth %>.unlock_account_requires_password? %>
   <%%= render "submit", value: "Unlock Account" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/unlock_account_request.html.erb

@@ -1,4 +1,4 @@
-<%%= form_tag rodauth.unlock_account_request_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.unlock_account_request_path, method: :post do %>
   <p>This account is currently locked out.  You can request that the account be unlocked:</p>
   <%%= render "login_hidden_field" %>
   <%%= render "submit", value: "Request Account Unlock" %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_account.html.erb

@@ -1,5 +1,5 @@
-<%%= form_tag rodauth.verify_account_path, method: :post do %>
-  <%%= render "password_field" if rodauth.verify_account_set_password? %>
-  <%%= render "password_confirm_field" if rodauth.verify_account_set_password? && rodauth.require_password_confirmation? %>
+<%%= form_tag <%= rodauth %>.verify_account_path, method: :post do %>
+  <%%= render "password_field" if <%= rodauth %>.verify_account_set_password? %>
+  <%%= render "password_confirm_field" if <%= rodauth %>.verify_account_set_password? && <%= rodauth %>.require_password_confirmation? %>
   <%%= render "submit", value: "Verify Account" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_account_resend.html.erb

@@ -1,6 +1,6 @@
-<%%= form_tag rodauth.verify_account_resend_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.verify_account_resend_path, method: :post do %>
   <p>If you no longer have the email to verify the account, you can request that it be resent to you:</p>
-  <%% if params[rodauth.login_param] %>
+  <%% if params[<%= rodauth %>.login_param] %>
     <%%= render "login_hidden_field" %>
   <%% else %>
     <%%= render "login_field" %>

data/lib/generators/rodauth/templates/app/views/rodauth/verify_login_change.html.erb

@@ -1,3 +1,3 @@
-<%%= form_tag rodauth.verify_login_change_path, method: :post do %>
+<%%= form_tag <%= rodauth %>.verify_login_change_path, method: :post do %>
   <%%= render "submit", value: "Verify Login Change" %>
 <%% end %>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_auth.html.erb

@@ -1,13 +1,13 @@
-<%% cred = rodauth.webauth_credential_options_for_get %>
+<%% cred = <%= rodauth %>.webauth_credential_options_for_get %>
 
-<%%= form_tag rodauth.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json } do %>
-  <%%= render "login_hidden_field" if params[rodauth.login_param] %>
-  <%%= hidden_field_tag rodauth.webauthn_auth_challenge_param, cred.challenge %>
-  <%%= hidden_field_tag rodauth.webauthn_auth_challenge_hmac_param, rodauth.compute_hmac(cred.challenge) %>
-  <%%= text_field_tag rodauth.webauthn_auth_param, "", id: "webauthn-auth", aria: { hidden: "true" } %>
+<%%= form_tag <%= rodauth %>.webauthn_auth_form_path, method: :post, id: "webauthn-auth-form", data: { credential_options: cred.as_json.to_json } do %>
+  <%%= render "login_hidden_field" if params[<%= rodauth %>.login_param] %>
+  <%%= hidden_field_tag <%= rodauth %>.webauthn_auth_challenge_param, cred.challenge %>
+  <%%= hidden_field_tag <%= rodauth %>.webauthn_auth_challenge_hmac_param, <%= rodauth %>.compute_hmac(cred.challenge) %>
+  <%%= text_field_tag <%= rodauth %>.webauthn_auth_param, "", id: "webauthn-auth", aria: { hidden: "true" } %>
   <div id="webauthn-auth-button">
     <%%= render "submit", value: "Authenticate Using WebAuthn" %>
   </div>
 <%% end %>
 
-<%%= javascript_include_tag rodauth.webauthn_auth_js_path %>
+<%%= javascript_include_tag <%= rodauth %>.webauthn_auth_js_path %>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_remove.html.erb

@@ -1,11 +1,11 @@
-<%%= form_tag rodauth.webauthn_remove_path, method: :post, id: "webauthn-remove-form" do %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.webauthn_remove_path, method: :post, id: "webauthn-remove-form" do %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <fieldset class="form-group mb-3">
-    <%% (usage = rodauth.account_webauthn_usage).each do |id, last_use| %>
+    <%% (usage = <%= rodauth %>.account_webauthn_usage).each do |id, last_use| %>
       <div class="form-check">
-        <%%= render "field", name: rodauth.webauthn_remove_param, id: "webauthn-remove-#{id}", type: :radio, class: "form-check-input", skip_error_message: true, value: id, required: false %>
+        <%%= render "field", name: <%= rodauth %>.webauthn_remove_param, id: "webauthn-remove-#{id}", type: :radio, class: "form-check-input", skip_error_message: true, value: id, required: false %>
         <%%= label_tag "webauthn-remove-#{id}", "Last use: #{last_use}", class: "form-check-label" %>
-        <%%= render "field_error", name: rodauth.webauthn_remove_param if id == usage.keys.last %>
+        <%%= render "field_error", name: <%= rodauth %>.webauthn_remove_param if id == usage.keys.last %>
       </div>
     <%% end %>
   </fieldset>

data/lib/generators/rodauth/templates/app/views/rodauth/webauthn_setup.html.erb

@@ -1,13 +1,13 @@
-<%% cred = rodauth.new_webauthn_credential %>
+<%% cred = <%= rodauth %>.new_webauthn_credential %>
 
-<%%= form_tag rodauth.webauthn_setup_path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json } do %>
-  <%%= hidden_field_tag rodauth.webauthn_setup_challenge_param, cred.challenge %>
-  <%%= hidden_field_tag rodauth.webauthn_setup_challenge_hmac_param, rodauth.compute_hmac(cred.challenge) %>
-  <%%= text_field_tag rodauth.webauthn_setup_param, "", id: "webauthn-setup", aria: { hidden: "true" } %>
-  <%%= render "password_field" if rodauth.two_factor_modifications_require_password? %>
+<%%= form_tag <%= rodauth %>.webauthn_setup_path, method: :post, id: "webauthn-setup-form", data: { credential_options: cred.as_json.to_json } do %>
+  <%%= hidden_field_tag <%= rodauth %>.webauthn_setup_challenge_param, cred.challenge %>
+  <%%= hidden_field_tag <%= rodauth %>.webauthn_setup_challenge_hmac_param, <%= rodauth %>.compute_hmac(cred.challenge) %>
+  <%%= text_field_tag <%= rodauth %>.webauthn_setup_param, "", id: "webauthn-setup", aria: { hidden: "true" } %>
+  <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
   <div id="webauthn-setup-button"> 
     <%%= render "submit", value: "Setup WebAuthn Authentication" %>
   </div>
 <%% end %>
 
-<%%= javascript_include_tag rodauth.webauthn_setup_js_path %>
+<%%= javascript_include_tag <%= rodauth %>.webauthn_setup_js_path %>

data/lib/generators/rodauth/views_generator.rb

@@ -18,9 +18,9 @@ module Rodauth
           desc: "Generates views for all Rodauth features",
           default: false
 
-        class_option :directory, aliases: "-d", type: :string,
-          desc: "The directory under app/views/* into which to create views",
-          default: "rodauth"
+        class_option :name, aliases: "-n", type: :string,
+          desc: "The configuration name for which to generate views",
+          default: nil
 
         VIEWS = {
           login: %w[
@@ -112,9 +112,30 @@ module Rodauth
 
           views.each do |view|
             template "app/views/rodauth/#{view}.html.erb",
-              "app/views/#{options[:directory].underscore}/#{view}.html.erb"
+              "app/views/#{directory}/#{view}.html.erb"
           end
         end
+
+        def directory
+          if controller.abstract?
+            fail Error, "no controller configured for configuration: #{configuration_name.inspect}"
+          end
+
+          controller.controller_path
+        end
+
+        def rodauth
+          "rodauth#{"(:#{configuration_name})" if configuration_name}"
+        end
+
+        def controller
+          rodauth = Rodauth::Rails.rodauth(configuration_name)
+          rodauth.rails_controller
+        end
+
+        def configuration_name
+          options[:name]&.to_sym
+        end
       end
     end
   end

data/lib/rodauth/rails.rb

@@ -18,6 +18,10 @@ module Rodauth
 
     class << self
       def rodauth(name = nil, query: {}, form: {}, session: {}, account: nil, env: {})
+        unless app.rodauth(name)
+          fail ArgumentError, "undefined rodauth configuration: #{name.inspect}"
+        end
+
         url_options = ActionMailer::Base.default_url_options
 
         scheme   = url_options[:protocol] || "http"

data/lib/rodauth/rails/auth.rb

@@ -6,20 +6,17 @@ module Rodauth
     # Base auth class that applies some default configuration and supports
     # multi-level inheritance.
     class Auth < Rodauth::Auth
-      class << self
-        attr_writer :features
-        attr_writer :routes
-        attr_accessor :configuration
-      end
-
       def self.inherited(auth_class)
         super
-        auth_class.roda_class = Rodauth::Rails.app
-        auth_class.features = features.dup
-        auth_class.routes = routes.dup
-        auth_class.route_hash = route_hash.dup
-        auth_class.configuration = configuration.clone
-        auth_class.configuration.instance_variable_set(:@auth, auth_class)
+        superclass = self
+        auth_class.class_eval do
+          @roda_class = Rodauth::Rails.app
+          @features = superclass.features.clone
+          @routes = superclass.routes.clone
+          @route_hash = superclass.route_hash.clone
+          @configuration = superclass.instance_variable_get(:@configuration).clone
+          @configuration.instance_variable_set(:@auth, self)
+        end
       end
 
       # apply default configuration

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

@@ -22,6 +22,14 @@ module Rodauth
           rails_controller_instance.instance_exec(&block)
         end
 
+        def rails_controller
+          if only_json? && Rodauth::Rails.api_only?
+            ActionController::API
+          else
+            ActionController::Base
+          end
+        end
+
         delegate :rails_routes, :rails_request, to: :scope
 
         private
@@ -48,14 +56,6 @@ module Rodauth
         def rails_api_controller?
           defined?(ActionController::API) && rails_controller <= ActionController::API
         end
-
-        def rails_controller
-          if only_json? && Rodauth::Rails.api_only?
-            ActionController::API
-          else
-            ActionController::Base
-          end
-        end
       end
     end
   end

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

@@ -35,6 +35,13 @@ module Rodauth
         rescue ActionView::MissingTemplate
           nil
         end
+
+        # Only look up template formats that the current request is accepting.
+        def _rails_controller_instance
+          controller = super
+          controller.formats = rails_request.formats.map(&:ref).compact
+          controller
+        end
       end
     end
   end

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties