rodauth-rails 0.17.1 → 0.18.0

data/lib/generators/rodauth/views_generator.rb

@@ -7,12 +7,8 @@ module Rodauth
         source_root "#{__dir__}/templates"
         namespace "rodauth:views"
 
-        argument :features, optional: true, type: :array,
-          desc: "Rodauth features to generate views for (login, create_account, reset_password, verify_account etc.)",
-          default: %w[login logout create_account verify_account reset_password change_password change_login verify_login_change close_account]
-
-        class_option :features, type: :array,
-          desc: "[DEPRECATED] Rodauth features to generate views for (login, create_account, reset_password, verify_account etc.)"
+        argument :selected_features, optional: true, type: :array,
+          desc: "Rodauth features to generate views for (login, create_account, reset_password, verify_account etc.)"
 
         class_option :all, aliases: "-a", type: :boolean,
           desc: "Generates views for all Rodauth features",
@@ -23,99 +19,57 @@ module Rodauth
           default: nil
 
         VIEWS = {
-          login: %w[
-            _field _field_error _login_field _login_display _password_field
-            _submit _login_form _login_form_footer _login_form_header login
-            multi_phase_login
-          ],
-          create_account: %w[
-            _field _field_error _login_field _login_confirm_field
-            _password_field _password_confirm_field _submit create_account
-          ],
-          logout: %w[
-            _submit logout
-          ],
-          reset_password: %w[
-            _field _field_error _login_field _login_hidden_field
-            _password_field _password_confirm_field _submit
-            reset_password_request reset_password
-          ],
-          remember: %w[
-            _submit remember
-          ],
-          change_login: %w[
-            _field _field_error _login_field _login_confirm_field
-            _password_field _submit change_login
-          ],
-          change_password: %w[
-            _field _field_error _password_field _new_password_field
-            _password_confirm_field _submit change_password
-          ],
-          close_account: %w[
-            _field _field_error _password_field _submit close_account
-          ],
-          email_auth: %w[
-            _login_hidden_field _submit _email_auth_request_form email_auth
-          ],
-          verify_account: %w[
-            _field _field_error _login_hidden_field _login_field _submit
-            verify_account_resend verify_account
-          ],
-          verify_login_change: %w[
-            _submit verify_login_change
-          ],
-          lockout: %w[
-            _login_hidden_field _submit unlock_account_request unlock_account
-          ],
-          active_sessions: %w[
-            _global_logout_field
-          ],
-          two_factor_base: %w[
-            _field _field_error _password_field _submit
-            two_factor_manage two_factor_auth two_factor_disable
-          ],
-          otp: %w[
-            _field _field_error _otp_auth_code_field _password_field _submit
-            otp_setup otp_auth otp_disable
-          ],
-          sms_codes: %w[
-            _field _field_error _sms_code_field _sms_phone_field
-            _password_field _submit
-            sms_setup sms_confirm sms_auth sms_request sms_disable
-          ],
-          recovery_codes: %w[
-            _field _field_error _recovery_code_field _recovery_codes_form
-            recovery_codes add_recovery_codes recovery_auth
-          ],
-          webauthn: %w[
-            _field _field_error _login_hidden_field _password_field _submit
-            webauthn_setup webauthn_auth webauthn_remove
-          ]
+          login:               %w[_login_form _login_form_footer _login_form_header login multi_phase_login],
+          create_account:      %w[create_account],
+          logout:              %w[logout],
+          reset_password:      %w[reset_password_request reset_password],
+          remember:            %w[remember],
+          change_login:        %w[change_login],
+          change_password:     %w[change_password],
+          close_account:       %w[close_account],
+          email_auth:          %w[_email_auth_request_form email_auth],
+          verify_account:      %w[verify_account_resend verify_account],
+          verify_login_change: %w[verify_login_change],
+          lockout:             %w[unlock_account_request unlock_account],
+          two_factor_base:     %w[two_factor_manage two_factor_auth two_factor_disable],
+          otp:                 %w[otp_setup otp_auth otp_disable],
+          sms_codes:           %w[sms_setup sms_confirm sms_auth sms_request sms_disable],
+          recovery_codes:      %w[recovery_codes add_recovery_codes recovery_auth],
+          webauthn:            %w[webauthn_setup webauthn_auth webauthn_remove],
         }
 
         DEPENDENCIES = {
-          active_sessions: :logout,
-          otp:             :two_factor_base,
-          sms_codes:       :two_factor_base,
-          recovery_codes:  :two_factor_base,
-          webauthn:        :two_factor_base,
+          otp:            :two_factor_base,
+          sms_codes:      :two_factor_base,
+          recovery_codes: :two_factor_base,
+          webauthn:       :two_factor_base,
         }
 
         def create_views
-          if options[:all]
-            features = VIEWS.keys
-          else
-            features = (options[:features] || self.features).map(&:to_sym)
-          end
-
           views = features.inject([]) do |list, feature|
             list |= VIEWS[feature] || []
             list |= VIEWS[DEPENDENCIES[feature]] || []
           end
 
           views.each do |view|
-            template "app/views/rodauth/#{view}.html.erb",
-              "app/views/#{directory}/#{view}.html.erb"
+            copy_file "app/views/rodauth/#{view}.html.erb", "app/views/#{directory}/#{view}.html.erb" do |content|
+              content = content.gsub("rodauth.", "rodauth(:#{configuration_name}).") if configuration_name
+              content = content.gsub("rodauth/", "#{directory}/")
+              content = form_helpers_compatibility(content) if ActionView.version < Gem::Version.new("5.1")
+              content
+            end
+          end
+        end
+
+        private
+
+        def features
+          if options[:all]
+            VIEWS.keys
+          elsif selected_features
+            selected_features.map(&:to_sym)
+          else
+            rodauth_configuration.features
           end
         end
 
@@ -127,19 +81,27 @@ module Rodauth
           controller.controller_path
         end
 
-        def rodauth
-          "rodauth#{"(:#{configuration_name})" if configuration_name}"
+        def controller
+          rodauth_configuration.allocate.rails_controller
         end
 
-        def controller
-          rodauth = Rodauth::Rails.app.rodauth(configuration_name)
-          fail ArgumentError, "unknown rodauth configuration: #{configuration_name.inspect}" unless rodauth
-          rodauth.allocate.rails_controller
+        def rodauth_configuration
+          Rodauth::Rails.app.rodauth!(configuration_name)
         end
 
         def configuration_name
           options[:name]&.to_sym
         end
+
+        # We need to use the *_tag helpers on versions lower than Rails 5.1.
+        def form_helpers_compatibility(content)
+          content
+            .gsub(/form_with url: (.+) do \|form\|/, 'form_tag \1 do')
+            .gsub(/form\.(label|submit)/, '\1_tag')
+            .gsub(/form\.(email|password|text|telephone|hidden)_field (\S+), value:/, '\1_field_tag \2,')
+            .gsub(/form\.radio_button (\S+), (\S+),/, 'radio_button_tag \1, \2, false,')
+            .gsub(/form\.check_box (\S+), (.+) /, 'check_box_tag \1, "t", false, \2 ')
+        end
       end
     end
   end

data/lib/rodauth/rails/app.rb

@@ -43,6 +43,10 @@ module Rodauth
       def rails_request
         ActionDispatch::Request.new(env)
       end
+
+      def self.rodauth!(name)
+        rodauth(name) or fail ArgumentError, "unknown rodauth configuration: #{name.inspect}"
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Rodauth
         # template, otherwise falls back to Rodauth's template.
         def view(page, *)
           rails_render(action: page.tr("-", "_"), layout: true) ||
-            rails_render(html: super.html_safe, layout: true)
+            rails_render(html: super.html_safe, layout: true, formats: :html)
         end
 
         # Renders templates without layout. First tries to render a user-defined

data/lib/rodauth/rails/railtie.rb

@@ -6,8 +6,10 @@ require "rails"
 module Rodauth
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer "rodauth.middleware" do |app|
-        app.middleware.use Rodauth::Rails::Middleware if Rodauth::Rails.middleware?
+      initializer "rodauth.middleware", after: :load_config_initializers do |app|
+        if Rodauth::Rails.middleware?
+          app.middleware.use Rodauth::Rails::Middleware
+        end
       end
 
       initializer "rodauth.controller" do

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "0.17.1"
+    VERSION = "0.18.0"
   end
 end

data/lib/rodauth/rails.rb

@@ -18,11 +18,7 @@ module Rodauth
 
     class << self
       def rodauth(name = nil, query: nil, form: nil, account: nil, **options)
-        auth_class = app.rodauth(name)
-
-        unless auth_class
-          fail ArgumentError, "undefined rodauth configuration: #{name.inspect}"
-        end
+        auth_class = app.rodauth!(name)
 
         LOCK.synchronize do
           unless auth_class.features.include?(:internal_request)
@@ -41,13 +37,18 @@ module Rodauth
         end
 
         auth_class.internal_request_eval(options) do
-          @account = account.attributes.symbolize_keys if account
+          if defined?(ActiveRecord::Base) && account.is_a?(ActiveRecord::Base)
+            @account = account.attributes.symbolize_keys
+          elsif defined?(Sequel::Model) && account.is_a?(Sequel::Model)
+            @account = account.values
+          end
+
           self
         end
       end
 
       def model(name = nil, **options)
-        Rodauth::Rails::Model.new(app.rodauth(name), **options)
+        Rodauth::Rails::Model.new(app.rodauth!(name), **options)
       end
 
       # routing constraint that requires authentication

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -178,25 +178,9 @@ files:
 - lib/generators/rodauth/templates/app/mailers/rodauth_mailer.rb
 - lib/generators/rodauth/templates/app/models/account.rb
 - lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_field_error.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_global_logout_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_login_confirm_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_login_display.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_login_field.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form_header.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_login_hidden_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_new_password_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_otp_auth_code_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_password_confirm_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_password_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_recovery_code_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_recovery_codes_form.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_sms_code_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_sms_phone_field.html.erb
-- lib/generators/rodauth/templates/app/views/rodauth/_submit.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/add_recovery_codes.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/change_login.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/change_password.html.erb

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

@@ -1,10 +0,0 @@
-<%%= text_field_tag name, local_assigns[:value] || params[name],
-  type: local_assigns[:type] || "text",
-  id: local_assigns[:id],
-  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)) %>
-
-<%%= 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 +0,0 @@
-<%% 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 +0,0 @@
-<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" %>
-    <%%= 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 +0,0 @@
-<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" %>
-</div>

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

@@ -1,4 +0,0 @@
-<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" %>
-</div>

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

@@ -1,4 +0,0 @@
-<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" %>
-</div>

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

@@ -1 +0,0 @@
-<%%= 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 +0,0 @@
-<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" %>
-</div>

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

@@ -1,8 +0,0 @@
-<div class="form-group mb-3">
-  <%%= 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" %>
-    </div>
-  </div>
-</div>

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

@@ -1,4 +0,0 @@
-<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" %>
-</div>

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

@@ -1,4 +0,0 @@
-<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 %>
-</div>

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

@@ -1,4 +0,0 @@
-<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" %>
-</div>

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

@@ -1,6 +0,0 @@
-<%%= form_tag <%= rodauth %>.recovery_codes_path, method: :post, data: { turbo: false } 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) %>
-<%% end %>

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

@@ -1,8 +0,0 @@
-<div class="form-group mb-3">
-  <%%= 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" %>
-    </div>
-  </div>
-</div>

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

@@ -1,8 +0,0 @@
-<div class="form-group mb-3">
-  <%%= 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" %>
-    </div>
-  </div>
-</div>

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

@@ -1,3 +0,0 @@
-<div class="form-group mb-3">
-  <%%= submit_tag local_assigns[:value], name: local_assigns[:name], class: local_assigns[:class] || "btn btn-primary" %>
-</div>