@webbio/strapi-plugin-page-builder 0.9.10-authentication → 0.9.11-authentication

package/package.json

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

package/server/bootstrap.ts

@@ -37,18 +37,18 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 		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: { platformMails: { populate: '*' } } } }
+					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.platformMails.accountAcceptedMail.fromEmail,
+							from: userToUpdate.platform.platformEmails.accountAcceptedMail.fromEmail,
 							to: event.params.data.email,
 							// @ts-ignore
-							subject: userToUpdate.platform.platformMails.accountAcceptedMail.subject,
+							subject: userToUpdate.platform.platformEmails.accountAcceptedMail.subject,
 							// @ts-ignore
-							text: userToUpdate.platform.platformMails.accountAcceptedMail.message,
+							text: userToUpdate.platform.platformEmails.accountAcceptedMail.message,
 							firstName: event.params.data.firstName,
 							lastName: event.params.data.lastName
 						});

package/server/content-types/category/schema.json

@@ -1,18 +1,18 @@
 {
-  "kind": "collectionType",
-  "collectionName": "categories",
-  "info": {
-    "singularName": "category",
-    "pluralName": "categories",
-    "displayName": "category"
-  },
-  "options": {
-    "draftAndPublish": false,
-    "comment": ""
-  },
-  "attributes": {
-    "title": {
-      "type": "string"
-    }
-  }
-}
+	"kind": "collectionType",
+	"collectionName": "categories",
+	"info": {
+		"singularName": "category",
+		"pluralName": "categories",
+		"displayName": "category"
+	},
+	"options": {
+		"draftAndPublish": false,
+		"comment": ""
+	},
+	"attributes": {
+		"title": {
+			"type": "string"
+		}
+	}
+}

package/server/graphql/page-by-path.ts

@@ -3,6 +3,7 @@ import { Strapi } from '@strapi/strapi';
 import { PAGE_UID } from '../../shared/utils/constants';
 
 import { ForbiddenError as ApolloForbiddenError } from 'apollo-server-koa';
+import { getConfig } from '../utils/strapi';
 
 const getPageByPath = (strapi: Strapi) => {
 	const typeDefs = () => {
@@ -112,8 +113,11 @@ const getPageByPath = (strapi: Strapi) => {
 		};
 	};
 
+	const pageBuilderConfig = getConfig();
+
 	const resolversConfig = {
 		'Query.getPageByPath': {
+			policies: pageBuilderConfig?.privateContent === true ? ['plugin::page-builder.isAuthorizedForPage'] : [],
 			auth: false
 		}
 	};

package/server/policies/index.ts

@@ -1 +1,5 @@
-export default {};
+import isAuthorizedForPage from './isAuthorizedPage';
+
+export default {
+	isAuthorizedForPage
+};

package/server/policies/isAuthorizedPage.ts

@@ -0,0 +1,11 @@
+const isAuthorizedForPage = (policyContext, _config, { strapi }) => {
+	const pageToken = policyContext.http.request.headers['x-strapi-page-secret'];
+	const pageEnvToken = process.env.STRAPI_PAGE_SECRET;
+
+	if (pageToken && pageEnvToken && pageToken === pageEnvToken) {
+		return true;
+	}
+	return false;
+};
+
+export default isAuthorizedForPage;

package/server/schema/page-end.json

@@ -92,13 +92,13 @@
 			"relation": "oneToOne",
 			"target": "api::platform.platform"
 		},
-    "isPrivate": {
-      "pluginOptions": {
-        "i18n": {
-          "localized": true
-        }
-      },
-      "type": "boolean"
-    }
+		"isPrivate": {
+			"pluginOptions": {
+				"i18n": {
+					"localized": true
+				}
+			},
+			"type": "boolean"
+		}
 	}
 }

package/server/services/email.ts

@@ -43,24 +43,24 @@ export default {
 	},
 	async sendAdminMail(user) {
 		const foundUser = await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
-			populate: { platform: { populate: { platformMails: { populate: '*' } } } }
+			populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
 		});
 		await this.sendMail({
 			// @ts-ignore we all love strapi typings
-			from: foundUser.platform.platformMails.adminEmail.fromEmail,
+			from: foundUser.platform.platformEmails.adminEmail.fromEmail,
 			// @ts-ignore
-			to: foundUser.platform.platformMails.adminEmail.toMail,
+			to: foundUser.platform.platformEmails.adminEmail.toMail,
 			// @ts-ignore
-			subject: foundUser.platform.platformMails.adminEmail.subject,
+			subject: foundUser.platform.platformEmails.adminEmail.subject,
 			// @ts-ignore
-			text: foundUser.platform.platformMails.adminEmail.message,
+			text: foundUser.platform.platformEmails.adminEmail.message,
 			firstName: user.firstName,
 			lastName: user.lastName
 		});
 	},
 	async sendConfirmationEmail(user) {
 		const foundUser = await strapi.entityService.findOne(USER_PERMISSION_USER_PLUGIN, user.id, {
-			populate: { platform: { populate: { platformMails: { populate: '*' } } } }
+			populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
 		});
 		if (foundUser && foundUser.platform) {
 			const jwtService = strapi.plugin('users-permissions').service('jwt');
@@ -78,12 +78,12 @@ export default {
 
 			await this.sendMail({
 				// @ts-ignore
-				from: foundUser.platform.platformMails.accountCreatedMail.fromEmail,
+				from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
 				to: user.email,
 				// @ts-ignore
-				subject: foundUser.platform.platformMails.accountCreatedMail.subject,
+				subject: foundUser.platform.platformEmails.accountCreatedMail.subject,
 				// @ts-ignore
-				text: foundUser.platform.platformMails.accountCreatedMail.message,
+				text: foundUser.platform.platformEmails.accountCreatedMail.message,
 				firstName: user.firstName,
 				lastName: user.lastName,
 				confirmationUrl: activateUrl
@@ -107,12 +107,12 @@ export default {
 
 			await this.sendMail({
 				// @ts-ignore
-				from: user.platform.platformMails.resetPasswordMail.fromEmail,
+				from: user.platform.platformEmails.resetPasswordMail.fromEmail,
 				to: user.email,
 				// @ts-ignore
-				subject: user.platform.platformMails.resetPasswordMail.subject,
+				subject: user.platform.platformEmails.resetPasswordMail.subject,
 				// @ts-ignore
-				text: user.platform.platformMails.resetPasswordMail.message,
+				text: user.platform.platformEmails.resetPasswordMail.message,
 				firstName: user.firstName,
 				lastName: user.lastName,
 				confirmationUrl: activateUrl

package/server/services/private-content/components/admin-email.json

@@ -1,23 +1,22 @@
 {
-  "collectionName": "components_internal_admin_emails",
-  "info": {
-    "displayName": "AdminEmail",
-    "description": ""
-  },
-  "options": {},
-  "attributes": {
-    "toMail": {
-      "type": "string"
-    },
-    "fromEmail": {
-      "type": "string"
-    },
-    "subject": {
-      "type": "string"
-    },
-    "message": {
-      "type": "text"
-    }
-  }
+	"collectionName": "components_internal_admin_emails",
+	"info": {
+		"displayName": "AdminEmail",
+		"description": ""
+	},
+	"options": {},
+	"attributes": {
+		"toMail": {
+			"type": "string"
+		},
+		"fromEmail": {
+			"type": "string"
+		},
+		"subject": {
+			"type": "string"
+		},
+		"message": {
+			"type": "text"
+		}
+	}
 }
-

package/server/services/private-content/components/email.json

@@ -1,23 +1,22 @@
 {
-  "collectionName": "components_internal_emails",
-  "info": {
-    "displayName": "email",
-    "description": ""
-  },
-  "options": {},
-  "attributes": {
-    "nameSender": {
-      "type": "string"
-    },
-    "fromEmail": {
-      "type": "string"
-    },
-    "subject": {
-      "type": "string"
-    },
-    "message": {
-      "type": "text"
-    }
-  }
+	"collectionName": "components_internal_emails",
+	"info": {
+		"displayName": "email",
+		"description": ""
+	},
+	"options": {},
+	"attributes": {
+		"nameSender": {
+			"type": "string"
+		},
+		"fromEmail": {
+			"type": "string"
+		},
+		"subject": {
+			"type": "string"
+		},
+		"message": {
+			"type": "text"
+		}
+	}
 }
-

package/server/services/private-content/components/platform-email.json

@@ -1,30 +1,30 @@
 {
-  "collectionName": "components_internal_platform_emails",
-  "info": {
-    "displayName": "PlatformEmail"
-  },
-  "options": {},
-  "attributes": {
-    "resetPasswordMail": {
-      "type": "component",
-      "repeatable": false,
-      "component": "internal.email"
-    },
-    "accountCreatedMail": {
-      "type": "component",
-      "repeatable": false,
-      "component": "internal.email"
-    },
-    "accountAcceptedMail": {
-      "type": "component",
-      "repeatable": false,
-      "component": "internal.email"
-    },
-    "adminEmail": {
-      "displayName": "AdminEmail",
-      "type": "component",
-      "repeatable": false,
-      "component": "internal.admin-email"
-    }
-  }
+	"collectionName": "components_internal_platform_emails",
+	"info": {
+		"displayName": "PlatformEmail"
+	},
+	"options": {},
+	"attributes": {
+		"resetPasswordMail": {
+			"type": "component",
+			"repeatable": false,
+			"component": "internal.email"
+		},
+		"accountCreatedMail": {
+			"type": "component",
+			"repeatable": false,
+			"component": "internal.email"
+		},
+		"accountAcceptedMail": {
+			"type": "component",
+			"repeatable": false,
+			"component": "internal.email"
+		},
+		"adminEmail": {
+			"displayName": "AdminEmail",
+			"type": "component",
+			"repeatable": false,
+			"component": "internal.admin-email"
+		}
+	}
 }

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

@@ -10,7 +10,7 @@ export const platformForgotPassword = {
 		const { email, platformId } = args.input;
 
 		const user = await strapi.query(USER_MODEL).findOne({
-			populate: { platform: { populate: { platformMails: { populate: true } } } },
+			populate: { platform: { populate: { platformEmails: { populate: true } } } },
 			where: {
 				email: email.toLowerCase(),
 				platform: {