rodauth-rails 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458a4a5552c124a1e7587837bbd57eed020857ae691bcc4b1f2e2639df774bb8
-  data.tar.gz: b19da17830585641950d026dff75ebd32ded19ad16dd5fb5c3b8a33c34b0a8f6
+  metadata.gz: de49a82bc699c6aff9764e277e9d03171d5808b907e53f4668c195c744ac05fc
+  data.tar.gz: 8f921485a7ebb8fdbdc810eb8900480aae8b11ba9c3cdc3540e82a581951e270
 SHA512:
-  metadata.gz: 01d5c774269d260e2805e0a2e4a509d9db81a3a966e94176cd6c5df6d808356feee48c5009b9692e0647034ae1c4d6ea3dc29627fa2000d05821a4402080601a
-  data.tar.gz: 1dde8d0ffb4605d3abf7893628a804eca7c0fbc94f2418176651dce81fac14eb4dfe1d165e315288a2a46373b818c795e15e9d58b5ad77f15b1fb5c3d9efc4be
+  metadata.gz: e8ef59ddc0de0a5f0a9197597195701f0f37f9fffba4112309603279af151f7d9c6d9b50453f8217b3c93db2228b095d369f0c399716f4114dbafb8244f94718
+  data.tar.gz: d1ac36ce1fc3c647e740c18a90fde1302d3ba3476a89bf55e78be6d4e7998dced276504c11f721fa14016688ec3d14fb2e7556c327f1fdf0571a9dbade82d6a4

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 0.18.0 (2021-11-05)
+
+* Disable Turbo on the generated login form (@janko)
+
+* Generate controller views with `form_with` helper on Rails 5.1+ (@janko)
+
+* Fix missing layout error when rendering Rodauth's built-in templates when using Turbo on Rails 6.0+ (@janko)
+
+* Fix `Rodauth::Rails.middleware` config not actually affecting middleware insertion (@janko)
+
+* Set page titles in generated view templates (@janko)
+
+* Merge field and button partials into view templates (@janko)
+
+* Raise error for unknown configuration in `Rodauth::Rails.model` (@janko)
+
+* Generate views for all enabled features by default in `rodauth:views` generator (@janko)
+
+* Add `Rodauth::Rails::App.rodauth!` which raises an error for unknown configuration (@janko)
+
+* Remove deprecated `--features` option from `rodauth:views` generator (@janko)
+
+* Inline `_recovery_codes_form.html.erb` partial into `recovery_codes.html.erb` (@janko)
+
+* Use Rodauth helper methods for texts in generated views, for easier i18n (@janko)
+
+* Allow setting passing a `Sequel::Model` to `:account` in `Rodauth::Rails.rodauth` (@janko)
+
 ## 0.17.1 (2021-10-20)
 
 * Skip checking CSRF when request forgery protection wasn't loaded on the controller (@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.17"
+gem "rodauth-rails", "~> 0.18"
 
 # gem "jwt",      require: false # for JWT feature
 # gem "rotp",     require: false # for OTP feature
@@ -282,12 +282,12 @@ copy Rodauth templates into your Rails app:
 $ rails generate rodauth:views
 ```
 
-This will generate views for the default set of Rodauth features into the
-`app/views/rodauth` directory, provided that `RodauthController` is set for the
-main configuration.
+This will generate views for Rodauth features you have currently enabled into
+the `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):
+these features (this will not remove any existing views):
 
 ```sh
 $ rails generate rodauth:views login create_account lockout otp
@@ -302,7 +302,7 @@ $ rails generate rodauth:views --all
 Use `--name` to generate views for a different Rodauth configuration:
 
 ```sh
-$ rails generate rodauth:views --name admin
+$ rails generate rodauth:views webauthn --name admin
 ```
 
 #### Layout
@@ -1034,7 +1034,24 @@ end
 While Rodauth doesn't yet come with [OmniAuth] integration, we can build one
 ourselves using the existing Rodauth API.
 
-In order to allow the user to login via multiple external providers, let's
+Let's assume we're building Facebook login. We'll start by installing the
+necessary gems, and loading the Facebook OmniAuth strategy:
+
+```rb
+# Gemfile
+gem "omniauth", "~> 2.0"
+gem "omniauth-rails_csrf_protection" # https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284
+gem "omniauth-facebook"
+```
+```rb
+# config/initializers/omniauth.rb
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :facebook, ENV["FACEBOOK_APP_ID"], ENV["FACEBOOK_APP_SECRET"],
+    scope: "email", callback_path: "/auth/facebook/callback"
+end
+```
+
+Since users might potentially want to login with multiple external providers, let's
 create an `account_identities` table that will have a many-to-one relationship
 with the `accounts` table:
 
@@ -1071,18 +1088,11 @@ class Account < ApplicationRecord
 end
 ```
 
-Let's assume we want to implement Facebook login, and have added the
-corresponding OmniAuth strategy to the middleware stack, together with an
-authorization link on the login form:
+Next, let's add a POST button pointing to the request URL to our login form:
 
-```rb
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :facebook, ENV["FACEBOOK_APP_ID"], ENV["FACEBOOK_APP_SECRET"],
-    scope: "email", callback_path: "/auth/facebook/callback"
-end
-```
 ```erb
-<%= link_to "Login via Facebook", "/auth/facebook" %>
+<%= button_to "Login via Facebook", "/auth/facebook",
+  method: :post, data: { turbo: false }, class: "btn btn-link p-0" %>
 ```
 
 Finally, let's implement the OmniAuth callback endpoint on our Rodauth

data/lib/generators/rodauth/install_generator.rb

@@ -60,7 +60,7 @@ module Rodauth
           template "app/mailers/rodauth_mailer.rb"
 
           MAILER_VIEWS.each do |view|
-            template "app/views/rodauth_mailer/#{view}.text.erb"
+            copy_file "app/views/rodauth_mailer/#{view}.text.erb"
           end
         end
 

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

@@ -1,4 +1,7 @@
-<%%= form_tag <%= rodauth %>.email_auth_request_path, method: :post do %>
-  <%%= render "login_hidden_field" %>
-  <%%= render "submit", value: "Send Login Link Via Email" %>
-<%% end %>
+<%= form_with url: rodauth.email_auth_request_path, method: :post do |form| %>
+  <%= form.hidden_field rodauth.login_param, value: params[rodauth.login_param] %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.email_auth_request_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,9 +1,26 @@
-<%%= 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 "submit", value: "Login" %>
-<%% end %>
+<%= form_with url: rodauth.login_path, method: :post, data: { turbo: false } do |form| %>
+  <% if rodauth.skip_login_field_on_login? %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", readonly: true, class: "form-control-plaintext" %>
+    </div>
+  <% else %>
+    <div class="form-group mb-3">
+      <%= form.label "login", rodauth.login_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+    </div>
+  <% end %>
+
+  <% unless rodauth.skip_password_field_on_login? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.login_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

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

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: "<%= directory %>/reset_password_request", layout: false %>
-<%% end %>
+<% if rodauth.field_error(rodauth.password_param) && rodauth.features.include?(:reset_password) %>
+  <%= render template: "rodauth/reset_password_request", layout: false %>
+<% end %>

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

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

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

@@ -1,6 +1,29 @@
-<%%= 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 "submit", value: "Change Login" %>
-<%% end %>
+<% content_for :title, rodauth.change_login_page_title %>
+
+<%= form_with url: rodauth.change_login_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "login", rodauth.login_label, class: "form-label" %>
+    <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+  </div>
+
+  <% if rodauth.require_login_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "login-confirm", rodauth.login_confirm_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_confirm_param, value: params[rodauth.login_confirm_param], id: "login-confirm", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_confirm_param)}", aria: ({ invalid: true, describedby: "login-confirm_error_message" } if rodauth.field_error(rodauth.login_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_confirm_param), class: "invalid-feedback", id: "login-confirm_error_message") if rodauth.field_error(rodauth.login_confirm_param) %>
+    </div>
+  <% end %>
+
+  <% if rodauth.change_login_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.change_login_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,6 +1,29 @@
-<%%= 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 "submit", value: "Change Password" %>
-<%% end %>
+<% content_for :title, rodauth.change_password_page_title %>
+
+<%= form_with url: rodauth.change_password_path, method: :post do |form| %>
+  <% if rodauth.change_password_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.label "new-password", rodauth.new_password_label, class: "form-label" %>
+    <%= form.password_field rodauth.new_password_param, value: "", id: "new-password", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.new_password_param)}", aria: ({ invalid: true, describedby: "new-password_error_message" } if rodauth.field_error(rodauth.new_password_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.new_password_param), class: "invalid-feedback", id: "new-password_error_message") if rodauth.field_error(rodauth.new_password_param) %>
+  </div>
+
+  <% if rodauth.require_password_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "password-confirm", rodauth.password_confirm_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_confirm_param, value: "", id: "password-confirm", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_confirm_param)}", aria: ({ invalid: true, describedby: "password-confirm_error_message" } if rodauth.field_error(rodauth.password_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_confirm_param), class: "invalid-feedback", id: "password-confirm_error_message") if rodauth.field_error(rodauth.password_confirm_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.change_password_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,4 +1,15 @@
-<%%= 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 %>
+<% content_for :title, rodauth.close_account_page_title %>
+
+<%= form_with url: rodauth.close_account_path, method: :post do |form| %>
+  <% if rodauth.close_account_requires_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.close_account_button, class: "btn btn-danger" %>
+  </div>
+<% end %>

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

@@ -1,4 +1,13 @@
-<%%= form_tag <%= rodauth %>.confirm_password_path, method: :post do %>
-  <%%= render "password_field" %>
-  <%%= render "submit", value: "Confirm Password" %>
-<%% end %>
+<% content_for :title, rodauth.confirm_password_page_title %>
+
+<%= form_with url: rodauth.confirm_password_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "password", rodauth.password_label, class: "form-label" %>
+    <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.confirm_password_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,7 +1,37 @@
-<%%= 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 "submit", value: "Create Account" %>
-<%% end %>
+<% content_for :title, rodauth.create_account_page_title %>
+
+<%= form_with url: rodauth.create_account_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "login", rodauth.login_label, class: "form-label" %>
+    <%= form.email_field rodauth.login_param, value: params[rodauth.login_param], id: "login", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_param)}", aria: ({ invalid: true, describedby: "login_error_message" } if rodauth.field_error(rodauth.login_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.login_param), class: "invalid-feedback", id: "login_error_message") if rodauth.field_error(rodauth.login_param) %>
+  </div>
+
+  <% if rodauth.require_login_confirmation? %>
+    <div class="form-group mb-3">
+      <%= form.label "login-confirm", rodauth.login_confirm_label, class: "form-label" %>
+      <%= form.email_field rodauth.login_confirm_param, value: params[rodauth.login_confirm_param], id: "login-confirm", autocomplete: "email", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.login_confirm_param)}", aria: ({ invalid: true, describedby: "login-confirm_error_message" } if rodauth.field_error(rodauth.login_confirm_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.login_confirm_param), class: "invalid-feedback", id: "login-confirm_error_message") if rodauth.field_error(rodauth.login_confirm_param) %>
+    </div>
+  <% end %>
+
+  <% if rodauth.create_account_set_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+
+    <% if rodauth.require_password_confirmation? %>
+      <div class="form-group mb-3">
+        <%= form.label "password-confirm", rodauth.password_confirm_label, class: "form-label" %>
+        <%= form.password_field rodauth.password_confirm_param, value: "", id: "password-confirm", autocomplete: "new-password", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_confirm_param)}", aria: ({ invalid: true, describedby: "password-confirm_error_message" } if rodauth.field_error(rodauth.password_confirm_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.password_confirm_param), class: "invalid-feedback", id: "password-confirm_error_message") if rodauth.field_error(rodauth.password_confirm_param) %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.create_account_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,3 +1,7 @@
-<%%= form_tag <%= rodauth %>.email_auth_path, method: :post do %>
-  <%%= render "submit", value: "Login" %>
-<%% end %>
+<% content_for :title, rodauth.email_auth_page_title %>
+
+<%= form_with url: rodauth.email_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.login_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,3 +1,5 @@
-<%%= render "login_form_header" %>
-<%%= render "login_form" %>
-<%%= render "login_form_footer" %>
+<% content_for :title, rodauth.login_page_title %>
+
+<%= render "login_form_header" %>
+<%= render "login_form" %>
+<%= render "login_form_footer" %>

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

@@ -1,4 +1,16 @@
-<%%= 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 %>
+<% content_for :title, rodauth.logout_page_title %>
+
+<%= form_with url: rodauth.logout_path, method: :post do |form| %>
+  <% if rodauth.features.include?(:active_sessions) %>
+    <div class="form-group mb-3">
+      <div class="form-check">
+        <%= form.check_box rodauth.global_logout_param, id: "global-logout", class: "form-check-input" %>
+        <%= form.label "global-logout", rodauth.global_logout_label, class: "form-check-label" %>
+      </div>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.logout_button, class: "btn btn-warning" %>
+  </div>
+<% end %>

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

@@ -1,3 +1,5 @@
-<%%= render "login_form_header" %>
-<%%= <%= rodauth %>.render_multi_phase_login_forms.html_safe %>
-<%%= render "login_form_footer" %>
+<% content_for :title, rodauth.multi_phase_login_page_title %>
+
+<%= render "login_form_header" %>
+<%== rodauth.render_multi_phase_login_forms %>
+<%= render "login_form_footer" %>

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

@@ -1,4 +1,17 @@
-<%%= form_tag <%= rodauth %>.otp_auth_path, method: :post do %>
-  <%%= render "otp_auth_code_field" %>
-  <%%= render "submit", value: "Authenticate Using TOTP" %>
-<%% end %>
+<% content_for :title, rodauth.otp_auth_page_title %>
+
+<%= form_with url: rodauth.otp_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "otp-auth-code", rodauth.otp_auth_label, class: "form-label" %>
+    <div class="row">
+      <div class="col-sm-3">
+        <%= form.text_field rodauth.otp_auth_param, value: "", id: "otp-auth-code", autocomplete: "off", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.otp_auth_param)}", aria: ({ invalid: true, describedby: "otp-auth-code_error_message" } if rodauth.field_error(rodauth.otp_auth_param)) %>
+        <%= content_tag(:span, rodauth.field_error(rodauth.otp_auth_param), class: "invalid-feedback", id: "otp-auth-code_error_message") if rodauth.field_error(rodauth.otp_auth_param) %>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.otp_auth_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1,4 +1,15 @@
-<%%= 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 %>
+<% content_for :title, rodauth.otp_disable_page_title %>
+
+<%= form_with url: rodauth.otp_disable_path, method: :post do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.otp_disable_button, class: "btn btn-warning" %>
+  </div>
+<% end %>

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

@@ -1,23 +1,43 @@
-<%%= 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? %>
+<% content_for :title, rodauth.otp_setup_page_title %>
+
+<%= form_with url: rodauth.otp_setup_path, method: :post do |form| %>
+  <%= form.hidden_field rodauth.otp_setup_param, value: rodauth.otp_user_key, id: "otp-key" %>
+  <%= form.hidden_field rodauth.otp_setup_raw_param, value: 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><%= rodauth.otp_secret_label %>: <%= rodauth.otp_user_key %></p>
+    <p><%= rodauth.otp_provisioning_uri_label %>: <%= 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 %></p>
       </div>
     </div>
 
     <div class="col-lg-6 col-lg">
-      <%%= render "password_field" if <%= rodauth %>.two_factor_modifications_require_password? %>
-      <%%= render "otp_auth_code_field" %>
-      <%%= render "submit", value: "Setup TOTP Authentication" %>
+      <% if rodauth.two_factor_modifications_require_password? %>
+        <div class="form-group mb-3">
+          <%= form.label "password", rodauth.password_label, class: "form-label" %>
+          <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+          <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+        </div>
+      <% end %>
+
+      <div class="form-group mb-3">
+        <%= form.label "otp-auth-code", rodauth.otp_auth_label, class: "form-label" %>
+        <div class="row">
+          <div class="col-sm-3">
+            <%= form.text_field rodauth.otp_auth_param, value: "", id: "otp-auth-code", autocomplete: "off", inputmode: "numeric", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.otp_auth_param)}", aria: ({ invalid: true, describedby: "otp-auth-code_error_message" } if rodauth.field_error(rodauth.otp_auth_param)) %>
+            <%= content_tag(:span, rodauth.field_error(rodauth.otp_auth_param), class: "invalid-feedback", id: "otp-auth-code_error_message") if rodauth.field_error(rodauth.otp_auth_param) %>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group mb-3">
+        <%= form.submit rodauth.otp_setup_button, class: "btn btn-primary" %>
+      </div>
     </div>
   </div>
-<%% end %>
+<% end %>

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

@@ -1,4 +1,13 @@
-<%%= form_tag <%= rodauth %>.recovery_auth_path, method: :post do %>
-  <%%= render "recovery_code_field" %>
-  <%%= render "submit", value: "Authenticate via Recovery Code" %>
-<%% end %>
+<% content_for :title, rodauth.recovery_auth_page_title %>
+
+<%= form_with url: rodauth.recovery_auth_path, method: :post do |form| %>
+  <div class="form-group mb-3">
+    <%= form.label "recovery-code", rodauth.recovery_codes_label, class: "form-label" %>
+    <%= form.text_field rodauth.recovery_codes_param, value: "", id: "recovery-code", autocomplete: "off", required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.recovery_codes_param)}", aria: ({ invalid: true, describedby: "recovery-code_error_message" } if rodauth.field_error(rodauth.recovery_codes_param)) %>
+    <%= content_tag(:span, rodauth.field_error(rodauth.recovery_codes_param), class: "invalid-feedback", id: "recovery-code_error_message") if rodauth.field_error(rodauth.recovery_codes_param) %>
+  </div>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.recovery_auth_button, class: "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -1 +1,15 @@
-<%%= render "recovery_codes_form" %>
+<% content_for :title, rodauth.recovery_codes_page_title %>
+
+<%= form_with url: rodauth.recovery_codes_path, method: :post, data: { turbo: false } do |form| %>
+  <% if rodauth.two_factor_modifications_require_password? %>
+    <div class="form-group mb-3">
+      <%= form.label "password", rodauth.password_label, class: "form-label" %>
+      <%= form.password_field rodauth.password_param, value: "", id: "password", autocomplete: rodauth.password_field_autocomplete_value, required: true, class: "form-control #{"is-invalid" if rodauth.field_error(rodauth.password_param)}", aria: ({ invalid: true, describedby: "password_error_message" } if rodauth.field_error(rodauth.password_param)) %>
+      <%= content_tag(:span, rodauth.field_error(rodauth.password_param), class: "invalid-feedback", id: "password_error_message") if rodauth.field_error(rodauth.password_param) %>
+    </div>
+  <% end %>
+
+  <div class="form-group mb-3">
+    <%= form.submit rodauth.recovery_codes_button || rodauth.view_recovery_codes_button, name: (rodauth.add_recovery_codes_param if rodauth.recovery_codes_button), class: "btn btn-primary" %>
+  </div>
+<% end %>