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

package/package.json

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

package/server/services/email.ts

@@ -7,21 +7,14 @@ interface SendOptions {
 	to: string;
 	subject: string;
 	text: string;
-	firstName: string;
-	lastName: string;
-	confirmationUrl?: string;
+	variables?: Record<string, string>;
 }
 
 export default {
 	async sendMail(options: SendOptions) {
-		const { from, to, subject, text, firstName, lastName, confirmationUrl } = options;
-		const emailData = txtEmail({
-			email: to,
-			firstName: firstName,
-			lastName: lastName,
-			text: text,
-			confirmationUrl: confirmationUrl
-		});
+		const { from, to, subject, text, variables } = options;
+
+		const emailData = txtEmail(text, variables);
 
 		try {
 			const client = new AWS.SES();
@@ -54,8 +47,10 @@ export 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) {
@@ -75,7 +70,7 @@ export default {
 			});
 
 			// @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
@@ -85,9 +80,11 @@ export 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
+				}
 			});
 		}
 	},
@@ -105,7 +102,8 @@ export default {
 			});
 
 			// @ts-ignore
-			const activateUrl = `${user.platform.domain}/api/page-builder/reset/${resetPasswordToken}`;
+			const searchParams = new URLSearchParams({ token: resetPasswordToken });
+			const resetPasswordUrl = `${user.platform.domain}/reset-password/?${searchParams.toString()}`;
 
 			await this.sendMail({
 				// @ts-ignore
@@ -115,9 +113,11 @@ export 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/server/services/private-content/mail-template/txtMail.email.template.text.ts

@@ -1,7 +1,6 @@
 import Handlebars from 'handlebars';
-import { IMail } from './txtMail.interface';
 
-export const txtEmail = (mailData: IMail) => {
-	const template = Handlebars.compile(mailData.text);
-	return template(mailData);
+export const txtEmail = (text: string, variables?: Record<string, string>) => {
+	const template = Handlebars.compile(text);
+	return template(variables);
 };