Merge branch 'main' into feature/localization-again

1 files changed, 7 insertions, 13 deletions

diff --git a/src/routes/magicLink.ts b/src/routes/magicLink.ts
index 14312c1..1e0f87b 100644
--- a/src/routes/magicLink.ts
+++ b/src/routes/magicLink.ts
@@ -1,6 +1,5 @@
 import { Router, Request, Response } from "express";
 import { frontendConfig } from "../lib/config.js";
-import { sendEmailFromTemplate } from "../lib/email.js";
 import { generateMagicLinkToken } from "../util/generator.js";
 import MagicLink from "../models/MagicLink.js";
 import { getConfigMiddleware } from "../lib/middleware.js";
@@ -49,19 +48,14 @@ router.post("/magic-link/event/create", async (req: Request, res: Response) => {
     // Take this opportunity to delete any expired magic links
     await MagicLink.deleteMany({ expiryTime: { $lt: new Date() } });
 
-    sendEmailFromTemplate(
-        email,
-        "",
-        i18next.t("routes.magiclink.mailsubject"),
-        "createEventMagicLink",
-        {
-            token,
-            siteName: res.locals.config?.general.site_name,
-            siteLogo: res.locals.config?.general.email_logo_url,
-            domain: res.locals.config?.general.domain,
+    req.emailService.sendEmailFromTemplate({
+        to: email,
+        subject: i18next.t("routes.magiclink.mailsubject"),
+        templateName: "createEventMagicLink",
+        templateData: {
+            token
         },
-        req,
-    );
+    });
     res.render("createEventMagicLink", {
         ...frontendConfig(res),
         message: {