Save controller names for url helpers

mikker · Nov 9, 2023 · 648ce48 · 648ce48
1 parent a7891a8
commit 648ce48
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/app/controllers/passwordless/sessions_controller.rb b/app/controllers/passwordless/sessions_controller.rb
@@ -36,8 +36,15 @@ def create
           Passwordless.config.after_session_save.call(@session)
         end
 
+        resource = @session.authenticatable.model_name.to_s.tableize.to_sym
+        controller = Passwordless.controllers[resource]
+
         redirect_to(
-          url_for(id: @session.identifier, action: "show"),
+          url_for(
+            id: @session.identifier,
+            action: "show",
+            controller:
+          ),
           flash: {notice: I18n.t("passwordless.sessions.create.email_sent")}
         )
       else

diff --git a/app/mailers/passwordless/mailer.rb b/app/mailers/passwordless/mailer.rb
@@ -12,14 +12,17 @@ class Mailer < Passwordless.config.parent_mailer.constantize
     # is still in memory (optional)
     def sign_in(session, token = nil)
       @token = token || session.token
+
+      resource = session.authenticatable.model_name.to_s.tableize.to_sym
+
       @magic_link = url_for(
         {
-          controller: "passwordless/sessions",
+          controller: Passwordless.controllers[resource],
           action: "confirm",
           id: session.identifier,
           token: token,
-          authenticatable: "user",
-          resource: "users"
+          authenticatable: session.authenticatable.model_name.singular,
+          resource:
         }
       )
       email_field = session.authenticatable.class.passwordless_email_field

diff --git a/lib/passwordless/router_helpers.rb b/lib/passwordless/router_helpers.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Passwordless
+  cattr_accessor(:controllers) { {} }
+
   # Helpers for generating passwordless routes.
   module RouterHelpers
     # Generates passwordless routes for a given Model
@@ -35,6 +37,8 @@ def passwordless_for(resource, at: :na, as: :na, controller: "passwordless/sessi
         resource: resource
       }
 
+      Passwordless.controllers[resource] = controller
+
       scope(defaults: defaults) do
         get("#{at}/sign_in", to: "#{controller}#new", as: :"#{as}sign_in")
         post("#{at}/sign_in", to: "#{controller}#create")