@webbio/strapi-plugin-page-builder 0.9.17-authentication → 0.9.18-authentication

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webbio/strapi-plugin-page-builder",
-    "version": "0.9.17-authentication",
+    "version": "0.9.18-authentication",
     "description": "This is the description of the plugin.",
     "scripts": {
         "develop": "tsc -p tsconfig.server.json -w",

package/dist/server/services/email.js

@@ -28,14 +28,8 @@ const txtMail_email_template_text_1 = require("./private-content/mail-template/t
 const constants_1 = require("../../shared/utils/constants");
 exports.default = {
     async sendMail(options) {
-        const { from, to, subject, text, firstName, lastName, confirmationUrl } = options;
-        const emailData = (0, txtMail_email_template_text_1.txtEmail)({
-            email: to,
-            firstName: firstName,
-            lastName: lastName,
-            text: text,
-            confirmationUrl: confirmationUrl
-        });
+        const { from, to, subject, text, variables } = options;
+        const emailData = (0, txtMail_email_template_text_1.txtEmail)(text, variables);
         try {
             const client = new AWS.SES();
             await client.sendEmail({
@@ -68,8 +62,10 @@ exports.default = {
             subject: foundUser.platform.platformEmails.adminEmail.subject,
             // @ts-ignore
             text: foundUser.platform.platformEmails.adminEmail.message,
-            firstName: user.firstName,
-            lastName: user.lastName
+            variables: {
+                firstName: user.firstName,
+                lastName: user.lastName
+            }
         });
     },
     async sendConfirmationEmail(user) {
@@ -86,7 +82,7 @@ exports.default = {
                 data: { confirmationToken: confirmationToken }
             });
             // @ts-ignore
-            const activateUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
+            const confirmEmailUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
             await this.sendMail({
                 // @ts-ignore
                 from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
@@ -95,9 +91,11 @@ exports.default = {
                 subject: foundUser.platform.platformEmails.accountCreatedMail.subject,
                 // @ts-ignore
                 text: foundUser.platform.platformEmails.accountCreatedMail.message,
-                firstName: user.firstName,
-                lastName: user.lastName,
-                confirmationUrl: activateUrl
+                variables: {
+                    firstName: user.firstName,
+                    lastName: user.lastName,
+                    confirmEmailUrl
+                }
             });
         }
     },
@@ -109,8 +107,9 @@ exports.default = {
                 // @ts-ignore
                 data: { resetPasswordToken }
             });
-            // @ts-ignore
-            const activateUrl = `${user.platform.domain}/api/page-builder/reset/${resetPasswordToken}`;
+            // @ts-ignore // TODO: remove hardcoded path
+            const searchParams = new URLSearchParams({ token: resetPasswordToken });
+            const resetPasswordUrl = `${user.platform.domain}/ketenafspraken/reset-password/?${searchParams.toString()}`;
             await this.sendMail({
                 // @ts-ignore
                 from: user.platform.platformEmails.resetPasswordMail.fromEmail,
@@ -119,9 +118,11 @@ exports.default = {
                 subject: user.platform.platformEmails.resetPasswordMail.subject,
                 // @ts-ignore
                 text: user.platform.platformEmails.resetPasswordMail.message,
-                firstName: user.firstName,
-                lastName: user.lastName,
-                confirmationUrl: activateUrl
+                variables: {
+                    firstName: user.firstName,
+                    lastName: user.lastName,
+                    resetPasswordUrl
+                }
             });
         }
     }

package/dist/server/services/private-content/mail-template/txtMail.email.template.text.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.txtEmail = void 0;
 const handlebars_1 = __importDefault(require("handlebars"));
-const txtEmail = (mailData) => {
-    const template = handlebars_1.default.compile(mailData.text);
-    return template(mailData);
+const txtEmail = (text, variables) => {
+    const template = handlebars_1.default.compile(text);
+    return template(variables);
 };
 exports.txtEmail = txtEmail;