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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webbio/strapi-plugin-page-builder",
-	"version": "0.12.8-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/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');
 		}
 	},