@webbio/strapi-plugin-page-builder 0.14.2-platform → 0.15.0-platform

package/package.json

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

package/server/bootstrap.ts

@@ -36,13 +36,13 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 		models: [USER_PERMISSION_USER_PLUGIN],
 		async beforeUpdate(event) {
 			if (event.params.data.id) {
-				const originalUserObject = await strapi.entityService?.findOne(
+				const originalUserObject = (await strapi.entityService?.findOne(
 					USER_PERMISSION_USER_PLUGIN,
 					event.params.data.id,
 					{
 						populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
 					}
-				);
+				)) as Record<string, any>;
 
 				if (
 					originalUserObject &&
@@ -51,13 +51,11 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 					!originalUserObject.confirmMailSend
 				) {
 					await strapi.service(PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
-						// @ts-ignore strapi typings
-						from: originalUserObject.platform.platformEmails.accountAcceptedMail.fromEmail,
+						from: originalUserObject.platform?.platformEmails?.accountAcceptedMail?.fromEmail,
 						to: event.params.data.email,
-						// @ts-ignore
-						subject: originalUserObject.platform.platformEmails.accountAcceptedMail.subject,
-						// @ts-ignore
-						text: originalUserObject.platform.platformEmails.accountAcceptedMail.message,
+						nameSender: originalUserObject.platform?.platformEmails?.accountAcceptedMail?.nameSender,
+						subject: originalUserObject.platform?.platformEmails?.accountAcceptedMail?.subject,
+						text: originalUserObject.platform?.platformEmails?.accountAcceptedMail?.message,
 						firstName: event.params.data.firstName,
 						lastName: event.params.data.lastName
 					});

package/server/services/email.ts

@@ -2,6 +2,7 @@ import * as AWS from '@aws-sdk/client-ses';
 import { txtEmail } from './private-content/mail-template/txtMail.email.template.text';
 import { USER_PERMISSION_USER_PLUGIN } from '../../shared/utils/constants';
 import { errors } from '@strapi/utils';
+import { Strapi } from '@strapi/strapi';
 
 interface SendOptions {
 	from: string;
@@ -9,18 +10,21 @@ interface SendOptions {
 	subject: string;
 	text: string;
 	variables?: Record<string, string>;
+	nameSender?: string;
 }
 
 export default {
 	async sendMail(options: SendOptions) {
-		const { from, to, subject, text, variables } = options;
+		const { from, to, subject, text, variables, nameSender } = options;
 
 		const emailData = txtEmail(text, variables);
 
+		const Source = nameSender ? `${nameSender} <${from}>` : from;
+
 		try {
 			const client = new AWS.SES();
 			await client.sendEmail({
-				Source: from,
+				Source,
 				Destination: {
 					ToAddresses: [to]
 				},
@@ -37,17 +41,17 @@ export default {
 		}
 	},
 	async sendAdminMail(user) {
-		const foundUser = await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
+		const foundUser = (await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
 			populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
-		});
+		})) as Record<string, any>;
+
+		console.log('HI', foundUser?.platform?.platformEmails?.adminEmail?.fromEmail);
+
 		await this.sendMail({
-			// @ts-ignore we all love strapi typings
 			from: foundUser.platform.platformEmails.adminEmail.fromEmail,
-			// @ts-ignore
 			to: foundUser.platform.platformEmails.adminEmail.toEmail,
-			// @ts-ignore
+			nameSender: user.platform.platformEmails.adminEmail.nameSender,
 			subject: foundUser.platform.platformEmails.adminEmail.subject,
-			// @ts-ignore
 			text: foundUser.platform.platformEmails.adminEmail.message,
 			variables: {
 				firstName: user.firstName,
@@ -56,37 +60,31 @@ export default {
 		});
 	},
 	async sendConfirmationEmail(user) {
-		const foundUser = await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
+		const foundUser = (await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
 			populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
-		});
+		})) as Record<string, any>;
+
 		if (foundUser && foundUser.platform) {
 			const jwtService = strapi.plugin('users-permissions').service('jwt');
 			const confirmationToken = await jwtService.issue(
-				// @ts-ignore
 				{ userId: user.id, platformId: foundUser.platform.id },
 				{ expiresIn: '1d' }
 			);
 			await strapi.entityService.update(USER_PERMISSION_USER_PLUGIN, user.id, {
-				// @ts-ignore
-				data: { confirmationToken: confirmationToken }
+				data: { confirmationToken: confirmationToken } as Record<string, any>
 			});
 
-			// @ts-ignore
 			const confirmEmailUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
 
 			await this.sendMail({
-				// @ts-ignore
 				from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
-				// @ts-ignore
 				to: foundUser.email,
-				// @ts-ignore
+				nameSender: user.platform.platformEmails.accountCreatedMail.nameSender,
 				subject: foundUser.platform.platformEmails.accountCreatedMail.subject,
-				// @ts-ignore
 				text: foundUser.platform.platformEmails.accountCreatedMail.message,
 				variables: {
-					// @ts-ignore
 					firstName: foundUser.firstName,
-					// @ts-ignore
+
 					lastName: foundUser.lastName,
 					confirmEmailUrl
 				}
@@ -102,20 +100,16 @@ export default {
 				{ expiresIn: '1d' }
 			);
 			await strapi.entityService.update(USER_PERMISSION_USER_PLUGIN, user.id, {
-				// @ts-ignore
-				data: { resetPasswordToken }
+				data: { resetPasswordToken } as Record<string, any>
 			});
 
-			// @ts-ignore
-			const resetPasswordUrl = `${user.platform.domain}/wachtwoord-resetten/${resetPasswordToken}`;
+			const resetPasswordUrl = getResetPasswordUrl(user, resetPasswordToken);
 
 			await this.sendMail({
-				// @ts-ignore
 				from: user.platform.platformEmails.resetPasswordMail.fromEmail,
 				to: user.email,
-				// @ts-ignore
+				nameSender: user.platform.platformEmails.resetPasswordMail.nameSender,
 				subject: user.platform.platformEmails.resetPasswordMail.subject,
-				// @ts-ignore
 				text: user.platform.platformEmails.resetPasswordMail.message,
 				variables: {
 					firstName: user?.firstName,
@@ -126,3 +120,22 @@ export default {
 		}
 	}
 };
+
+const getResetPasswordUrl = (user?: Record<string, any>, resetPasswordToken?: string) => {
+	if (!user || !user?.platform) {
+		return '';
+	}
+
+	if (
+		user.platform.platformEmails.resetPasswordUrl &&
+		user.platform.platformEmails.resetPasswordUrl.includes('{{resetPasswordToken}}')
+	) {
+		const replacedTokens = user.platform.platformEmails.resetPasswordUrl
+			.replace('{{domain}}', user.platform.domain)
+			.replace('{{resetPasswordToken}}', resetPasswordToken);
+
+		return replacedTokens;
+	}
+
+	return `${user.platform.domain}/wachtwoord-resetten/${resetPasswordToken}`;
+};

package/server/services/private-content/graphql/resolvers/forgot-password.ts

@@ -1,7 +1,5 @@
-import { errors } from '@strapi/utils';
 import { USER_MODEL } from '../../constants';
 import { validateForgotPasswordSchema } from '../../schemas';
-const { UnauthorizedError } = errors;
 
 export const platformForgotPassword = {
 	async resolve(parent, args, context) {