@webbio/strapi-plugin-page-builder 0.12.7-platform → 0.13.0-platform

package/package.json

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

package/server/bootstrap/permissions.ts

@@ -33,27 +33,31 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 								populate: '*'
 							})) as Record<string, any>[];
 
-							// checks which role the user has
-							const foundRole = roles.filter((role) => {
-								return x.roles.find((userRole) => userRole.name === role.name);
-							});
+							// checks which roles the user has
+							const foundRoles = roles.filter((role) => x.roles.find((userRole) => userRole.name === role.name));
+
+							// Get all permissions from the roles the user has
+							const allPermissions = [foundRoles?.[0]]
+								.map((role) => role?.permissions)
+								.flat()
+								.filter(Boolean);
 
 							// get the right platform permissions, and filters out the platform
 							// this is neccesary because of multiple platforms. if you can see Vacancy from platform 1 and collegue from platform 2
 							// it will show both at page level, so this filters out the wrong page
-							const platformPermission = foundRole?.[0]?.permissions.map((permission) => {
-								return {
-									permission: permission.subject,
-									condition: permission.conditions.filter((condition) => condition.includes(platform.title))
-								};
-							});
-
-							// get the right permission for platform
-							const permissions = platformPermission.map((permission) => {
-								if (permission.condition.length > 0) {
-									return permission.permission;
-								}
-							});
+							const platformPermission = allPermissions.map((permission) => ({
+								subject: permission.subject,
+								conditions: permission?.conditions.filter((condition) => condition.includes(platform.title))
+							}));
+
+							// Get the right permission for platform
+							const permissions = platformPermission
+								.map((permission) => {
+									if (permission.conditions.length > 0) {
+										return permission.subject;
+									}
+								})
+								.filter(Boolean);
 
 							const uniquePermissions = uniq(permissions);
 

package/server/bootstrap.ts

@@ -36,23 +36,32 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 		models: [USER_PERMISSION_USER_PLUGIN],
 		async beforeUpdate(event) {
 			if (event.params.data.id) {
-				const userToUpdate = await strapi.entityService?.findOne(USER_PERMISSION_USER_PLUGIN, event.params.data.id, {
-					populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
-				});
-				if (userToUpdate) {
-					if (event.params.data.activateUser && event.params.data.confirmed && !userToUpdate.confirmMailSend) {
-						await strapi.service(PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
-							// @ts-ignore strapi typings
-							from: userToUpdate.platform.platformEmails.accountAcceptedMail.fromEmail,
-							to: event.params.data.email,
-							// @ts-ignore
-							subject: userToUpdate.platform.platformEmails.accountAcceptedMail.subject,
-							// @ts-ignore
-							text: userToUpdate.platform.platformEmails.accountAcceptedMail.message,
-							firstName: event.params.data.firstName,
-							lastName: event.params.data.lastName
-						});
+				const originalUserObject = await strapi.entityService?.findOne(
+					USER_PERMISSION_USER_PLUGIN,
+					event.params.data.id,
+					{
+						populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
 					}
+				);
+
+				if (
+					originalUserObject &&
+					event.params.data.activateUser &&
+					event.params.data.confirmed &&
+					!originalUserObject.confirmMailSend
+				) {
+					await strapi.service(PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
+						// @ts-ignore strapi typings
+						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,
+						firstName: event.params.data.firstName,
+						lastName: event.params.data.lastName
+					});
+					event.params.data.confirmMailSend = true;
 				}
 			}
 		}

package/server/controllers/private-content.ts

@@ -7,7 +7,7 @@ export default {
 			const callbackUrl = `${user.platform.domain}/inloggen`;
 			return ctx.redirect(callbackUrl);
 		} catch (error) {
-			console.log(ctx);
+			console.log('Activate User Error', error, ctx);
 			return ctx.unauthorized('User is already confirmed or token is invalid');
 		}
 	},

package/server/services/email.ts

@@ -1,6 +1,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';
 
 interface SendOptions {
 	from: string;
@@ -32,6 +33,7 @@ export default {
 			});
 		} catch (error) {
 			console.error(error);
+			throw new errors.ApplicationError('Failed to send email', error);
 		}
 	},
 	async sendAdminMail(user) {