@webbio/strapi-plugin-page-builder 0.12.2-platform → 0.12.3-platform

package/server/services/private-content/user.ts

@@ -1,197 +1,197 @@
-import toString from 'lodash/toString';
-import has from 'lodash/has';
-import omit from 'lodash/omit';
-import { errors } from '@strapi/utils';
-import {
-	ACTIONS,
-	CONTENT_ENTITY_MANAGER,
-	CREATED_BY_ATTRIBUTE,
-	UPDATED_BY_ATTRIBUTE,
-	USER_CONTENT_MANAGER,
-	USER_MODEL,
-	USER_ROLE
-} from './constants';
-
-const { ApplicationError, ValidationError, NotFoundError, ForbiddenError } = errors;
-
-export const extendUser = () => {
-	const userContentType = strapi.contentType(USER_MODEL);
-	userContentType.attributes = {
-		// Spread previous defined attributes
-		...userContentType.attributes,
-		// Add new, or override attributes
-		platform: {
-			type: 'relation',
-			relation: 'oneToOne',
-			target: 'api::platform.platform',
-			required: true
-		},
-		firstName: {
-			type: 'string'
-		},
-		lastName: {
-			type: 'string'
-		},
-		company: {
-			type: 'string'
-		},
-		jobTitle: {
-			type: 'string'
-		},
-		address: {
-			type: 'string'
-		},
-		postalCode: {
-			type: 'string'
-		},
-		city: {
-			type: 'string'
-		},
-		country: {
-			type: 'string'
-		},
-		phone: {
-			type: 'string'
-		},
-		activateUser: {
-			type: 'boolean',
-			default: false
-		},
-		categories: {
-			type: 'relation',
-			relation: 'oneToMany',
-			target: 'plugin::page-builder.user-category'
-		},
-		filteredCategories: {
-			pluginOptions: {
-				filteredSelect: {
-					targetField: 'categories'
-				}
-			},
-			// @ts-expect-error
-			type: 'customField',
-			customField: 'plugin::page-builder.filtered-select'
-		},
-		confirmMailSend: {
-			type: 'boolean',
-			private: true,
-			writable: false,
-			visible: false,
-			default: false
-		}
-	};
-	delete userContentType.attributes.username;
-};
-
-export const extendControllers = () => {
-	const contentController = strapi.controller(USER_CONTENT_MANAGER);
-	contentController.create = async (ctx: any) => {
-		const { body } = ctx.request;
-		const { user: admin, userAbility } = ctx.state;
-
-		const { email } = body;
-		const platformId = body.platform.connect[0].id;
-
-		const pm = strapi?.admin?.services.permission.createPermissionsManager({
-			ability: userAbility,
-			action: ACTIONS.create,
-			model: USER_MODEL
-		});
-
-		if (!pm.isAllowed) {
-			return ctx.forbidden();
-		}
-
-		const sanitizedBody = await pm.pickPermittedFieldsOf(body, { subject: USER_MODEL });
-
-		const userWithSameEmail = await strapi.query(USER_MODEL).findOne({
-			where: { $and: [{ email: email.toLowerCase() }, { platform: { id: platformId } }] }
-		});
-
-		if (userWithSameEmail) {
-			throw new ApplicationError('Email already taken');
-		}
-
-		const user = {
-			...sanitizedBody,
-			provider: 'local',
-			[CREATED_BY_ATTRIBUTE]: admin.id,
-			[UPDATED_BY_ATTRIBUTE]: admin.id
-		};
-
-		user.email = user.email.toLowerCase();
-
-		const advanced = await strapi?.store({ type: 'plugin', name: 'users-permissions', key: 'advanced' }).get({});
-
-		if (user.role.connect.length === 0) {
-			//@ts-ignore strapi types...
-			const defaultRole = await strapi.query(USER_ROLE).findOne({ where: { type: advanced.default_role } });
-			user.role = defaultRole.id;
-		}
-
-		try {
-			const data = await strapi.service(CONTENT_ENTITY_MANAGER).create(user, USER_MODEL);
-			const sanitizedData = await pm.sanitizeOutput(data, { action: ACTIONS.read });
-
-			ctx.created(sanitizedData);
-		} catch (error) {
-			throw new ApplicationError(error.message);
-		}
-	};
-	contentController.update = async (ctx: any) => {
-		const { id } = ctx.params;
-		const { body } = ctx.request;
-		const { user: admin, userAbility } = ctx.state;
-
-		const { email, password } = body;
-
-		const { pm, entity } = await findEntityAndCheckPermissions(userAbility, ACTIONS.edit, USER_MODEL, id);
-		const user = entity;
-
-		const platformId = body.platform.connect.length > 0 ? body.platform.connect[0].id : entity.platform.id;
-
-		if (has(body, 'password') && !password && user.provider === 'local') {
-			throw new ValidationError('password.notNull');
-		}
-
-		//@ts-ignore
-		if (has(body, 'email')) {
-			const userWithSameEmail = await strapi
-				.query(USER_MODEL)
-				.findOne({ where: { $and: [{ email: email.toLowerCase() }, { platform: { id: platformId } }] } });
-
-			if (userWithSameEmail && toString(userWithSameEmail.id) !== toString(id)) {
-				throw new ApplicationError('Email already taken');
-			}
-			body.email = body.email.toLowerCase();
-		}
-
-		const sanitizedData = await pm.pickPermittedFieldsOf(body, { subject: pm.toSubject(user) });
-		const updateData = omit({ ...sanitizedData, updatedBy: admin.id }, 'createdBy');
-
-		const data = await strapi.service('plugin::content-manager.entity-manager').update({ id }, updateData, USER_MODEL);
-
-		ctx.body = await pm.sanitizeOutput(data, { action: ACTIONS.read });
-	};
-};
-
-const findEntityAndCheckPermissions = async (ability, action, model, id) => {
-	const entity = await strapi.query(USER_MODEL).findOne({
-		where: { id },
-		populate: [`${CREATED_BY_ATTRIBUTE}.roles`, 'platform']
-	});
-
-	if (!entity) {
-		throw new NotFoundError();
-	}
-
-	const pm = strapi.admin.services.permission.createPermissionsManager({ ability, action, model });
-
-	if (pm.ability.cannot(pm.action, pm.toSubject(entity))) {
-		throw new ForbiddenError();
-	}
-
-	const entityWithoutCreatorRoles = omit(entity, `${CREATED_BY_ATTRIBUTE}.roles`);
-
-	return { pm, entity: entityWithoutCreatorRoles };
-};
+import toString from 'lodash/toString';
+import has from 'lodash/has';
+import omit from 'lodash/omit';
+import { errors } from '@strapi/utils';
+import {
+	ACTIONS,
+	CONTENT_ENTITY_MANAGER,
+	CREATED_BY_ATTRIBUTE,
+	UPDATED_BY_ATTRIBUTE,
+	USER_CONTENT_MANAGER,
+	USER_MODEL,
+	USER_ROLE
+} from './constants';
+
+const { ApplicationError, ValidationError, NotFoundError, ForbiddenError } = errors;
+
+export const extendUser = () => {
+	const userContentType = strapi.contentType(USER_MODEL);
+	userContentType.attributes = {
+		// Spread previous defined attributes
+		...userContentType.attributes,
+		// Add new, or override attributes
+		platform: {
+			type: 'relation',
+			relation: 'oneToOne',
+			target: 'api::platform.platform',
+			required: true
+		},
+		firstName: {
+			type: 'string'
+		},
+		lastName: {
+			type: 'string'
+		},
+		company: {
+			type: 'string'
+		},
+		jobTitle: {
+			type: 'string'
+		},
+		address: {
+			type: 'string'
+		},
+		postalCode: {
+			type: 'string'
+		},
+		city: {
+			type: 'string'
+		},
+		country: {
+			type: 'string'
+		},
+		phone: {
+			type: 'string'
+		},
+		activateUser: {
+			type: 'boolean',
+			default: false
+		},
+		categories: {
+			type: 'relation',
+			relation: 'oneToMany',
+			target: 'plugin::page-builder.user-category'
+		},
+		filteredCategories: {
+			pluginOptions: {
+				filteredSelect: {
+					targetField: 'categories'
+				}
+			},
+			// @ts-expect-error
+			type: 'customField',
+			customField: 'plugin::page-builder.filtered-select'
+		},
+		confirmMailSend: {
+			type: 'boolean',
+			private: true,
+			writable: false,
+			visible: false,
+			default: false
+		}
+	};
+	delete userContentType.attributes.username;
+};
+
+export const extendControllers = () => {
+	const contentController = strapi.controller(USER_CONTENT_MANAGER);
+	contentController.create = async (ctx: any) => {
+		const { body } = ctx.request;
+		const { user: admin, userAbility } = ctx.state;
+
+		const { email } = body;
+		const platformId = body.platform.connect[0].id;
+
+		const pm = strapi?.admin?.services.permission.createPermissionsManager({
+			ability: userAbility,
+			action: ACTIONS.create,
+			model: USER_MODEL
+		});
+
+		if (!pm.isAllowed) {
+			return ctx.forbidden();
+		}
+
+		const sanitizedBody = await pm.pickPermittedFieldsOf(body, { subject: USER_MODEL });
+
+		const userWithSameEmail = await strapi.query(USER_MODEL).findOne({
+			where: { $and: [{ email: email.toLowerCase() }, { platform: { id: platformId } }] }
+		});
+
+		if (userWithSameEmail) {
+			throw new ApplicationError('Email already taken');
+		}
+
+		const user = {
+			...sanitizedBody,
+			provider: 'local',
+			[CREATED_BY_ATTRIBUTE]: admin.id,
+			[UPDATED_BY_ATTRIBUTE]: admin.id
+		};
+
+		user.email = user.email.toLowerCase();
+
+		const advanced = await strapi?.store({ type: 'plugin', name: 'users-permissions', key: 'advanced' }).get({});
+
+		if (user.role.connect.length === 0) {
+			//@ts-ignore strapi types...
+			const defaultRole = await strapi.query(USER_ROLE).findOne({ where: { type: advanced.default_role } });
+			user.role = defaultRole.id;
+		}
+
+		try {
+			const data = await strapi.service(CONTENT_ENTITY_MANAGER).create(user, USER_MODEL);
+			const sanitizedData = await pm.sanitizeOutput(data, { action: ACTIONS.read });
+
+			ctx.created(sanitizedData);
+		} catch (error) {
+			throw new ApplicationError(error.message);
+		}
+	};
+	contentController.update = async (ctx: any) => {
+		const { id } = ctx.params;
+		const { body } = ctx.request;
+		const { user: admin, userAbility } = ctx.state;
+
+		const { email, password } = body;
+
+		const { pm, entity } = await findEntityAndCheckPermissions(userAbility, ACTIONS.edit, USER_MODEL, id);
+		const user = entity;
+
+		const platformId = body.platform.connect.length > 0 ? body.platform.connect[0].id : entity.platform.id;
+
+		if (has(body, 'password') && !password && user.provider === 'local') {
+			throw new ValidationError('password.notNull');
+		}
+
+		//@ts-ignore
+		if (has(body, 'email')) {
+			const userWithSameEmail = await strapi
+				.query(USER_MODEL)
+				.findOne({ where: { $and: [{ email: email.toLowerCase() }, { platform: { id: platformId } }] } });
+
+			if (userWithSameEmail && toString(userWithSameEmail.id) !== toString(id)) {
+				throw new ApplicationError('Email already taken');
+			}
+			body.email = body.email.toLowerCase();
+		}
+
+		const sanitizedData = await pm.pickPermittedFieldsOf(body, { subject: pm.toSubject(user) });
+		const updateData = omit({ ...sanitizedData, updatedBy: admin.id }, 'createdBy');
+
+		const data = await strapi.service('plugin::content-manager.entity-manager').update({ id }, updateData, USER_MODEL);
+
+		ctx.body = await pm.sanitizeOutput(data, { action: ACTIONS.read });
+	};
+};
+
+const findEntityAndCheckPermissions = async (ability, action, model, id) => {
+	const entity = await strapi.query(USER_MODEL).findOne({
+		where: { id },
+		populate: [`${CREATED_BY_ATTRIBUTE}.roles`, 'platform']
+	});
+
+	if (!entity) {
+		throw new NotFoundError();
+	}
+
+	const pm = strapi.admin.services.permission.createPermissionsManager({ ability, action, model });
+
+	if (pm.ability.cannot(pm.action, pm.toSubject(entity))) {
+		throw new ForbiddenError();
+	}
+
+	const entityWithoutCreatorRoles = omit(entity, `${CREATED_BY_ATTRIBUTE}.roles`);
+
+	return { pm, entity: entityWithoutCreatorRoles };
+};

package/server/services/sitemap.ts

@@ -1,83 +1,83 @@
-import { SitemapStream, streamToPromise } from 'sitemap';
-import { PAGE_UID } from '../../shared/utils/constants';
-
-export default {
-	async generateSitemap(domain: string): Promise<string> {
-		try {
-			const entities: Array<{ path: string; updatedAt: string }> = await this.fetchPages(domain);
-
-			if (entities.length === 0) {
-				throw new Error('Cannot generate a sitemap with 0 pages');
-			}
-
-			const sitemapStream = new SitemapStream();
-
-			for (const entity of entities) {
-				const { path, updatedAt } = entity;
-				const url = path === '/' ? domain : `${domain}/${path}`;
-				sitemapStream.write({
-					url,
-					changefreq: 'always',
-					lastmod: updatedAt,
-					priority: 1
-				});
-			}
-
-			sitemapStream.end();
-
-			const sitemapPromise = await streamToPromise(sitemapStream);
-			const sitemap = sitemapPromise.toString();
-
-			return sitemap;
-		} catch (error) {
-			console.error(error);
-			throw new Error(`Error generating sitemap for domain ${domain}`);
-		}
-	},
-	async fetchPages(domain: string): Promise<Array<{ path: string; updatedAt: string }>> {
-		const entities: Array<{ path: string; updatedAt: string }> = await strapi.query(PAGE_UID).findMany({
-			select: ['path', 'updatedAt'],
-			where: {
-				$and: [
-					{
-						platform: {
-							domain: {
-								$eq: domain
-							}
-						}
-					},
-					{
-						path: {
-							$notNull: true
-						}
-					},
-					{
-						publishedAt: {
-							$notNull: true
-						}
-					},
-					{
-						$or: [
-							{
-								seo: {
-									metaRobots: {
-										$notContainsi: 'noindex'
-									}
-								}
-							},
-							{
-								seo: {
-									metaRobots: {
-										$null: true
-									}
-								}
-							}
-						]
-					}
-				]
-			}
-		});
-
-		return entities;
-	}
-};
+import { SitemapStream, streamToPromise } from 'sitemap';
+import { PAGE_UID } from '../../shared/utils/constants';
+
+export default {
+	async generateSitemap(domain: string): Promise<string> {
+		try {
+			const entities: Array<{ path: string; updatedAt: string }> = await this.fetchPages(domain);
+
+			if (entities.length === 0) {
+				throw new Error('Cannot generate a sitemap with 0 pages');
+			}
+
+			const sitemapStream = new SitemapStream();
+
+			for (const entity of entities) {
+				const { path, updatedAt } = entity;
+				const url = path === '/' ? domain : `${domain}/${path}`;
+				sitemapStream.write({
+					url,
+					changefreq: 'always',
+					lastmod: updatedAt,
+					priority: 1
+				});
+			}
+
+			sitemapStream.end();
+
+			const sitemapPromise = await streamToPromise(sitemapStream);
+			const sitemap = sitemapPromise.toString();
+
+			return sitemap;
+		} catch (error) {
+			console.error(error);
+			throw new Error(`Error generating sitemap for domain ${domain}`);
+		}
+	},
+	async fetchPages(domain: string): Promise<Array<{ path: string; updatedAt: string }>> {
+		const entities: Array<{ path: string; updatedAt: string }> = await strapi.query(PAGE_UID).findMany({
+			select: ['path', 'updatedAt'],
+			where: {
+				$and: [
+					{
+						platform: {
+							domain: {
+								$eq: domain
+							}
+						}
+					},
+					{
+						path: {
+							$notNull: true
+						}
+					},
+					{
+						publishedAt: {
+							$notNull: true
+						}
+					},
+					{
+						$or: [
+							{
+								seo: {
+									metaRobots: {
+										$notContainsi: 'noindex'
+									}
+								}
+							},
+							{
+								seo: {
+									metaRobots: {
+										$null: true
+									}
+								}
+							}
+						]
+					}
+				]
+			}
+		});
+
+		return entities;
+	}
+};

package/server/services/template.ts

@@ -1,13 +1,13 @@
-import { getPopulatedEntity } from '../utils/strapi';
-import { TEMPLATE_UID } from '../../shared/utils/constants';
-
-export default {
-	async findAll() {
-		const foundTemplates = await strapi.entityService.findMany(TEMPLATE_UID);
-
-		return foundTemplates;
-	},
-	async findOne(id: number) {
-		return await getPopulatedEntity(TEMPLATE_UID, id);
-	}
-};
+import { getPopulatedEntity } from '../utils/strapi';
+import { TEMPLATE_UID } from '../../shared/utils/constants';
+
+export default {
+	async findAll() {
+		const foundTemplates = await strapi.entityService.findMany(TEMPLATE_UID);
+
+		return foundTemplates;
+	},
+	async findOne(id: number) {
+		return await getPopulatedEntity(TEMPLATE_UID, id);
+	}
+};

package/server/services/user-category.ts

@@ -1,3 +1,3 @@
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('plugin::page-builder.user-category');
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('plugin::page-builder.user-category');

package/server/utils/filter-underscore-arguments.ts

@@ -1,12 +1,12 @@
-export const filterUnderscoreArguments = (args: Record<string, any>) => {
-	const newArgs = {};
-	const objectArray = Object.keys(args);
-
-	objectArray.forEach((key) => {
-		if (!key.startsWith('_')) {
-			newArgs[key] = args[key];
-		}
-	});
-
-	return newArgs;
-};
+export const filterUnderscoreArguments = (args: Record<string, any>) => {
+	const newArgs = {};
+	const objectArray = Object.keys(args);
+
+	objectArray.forEach((key) => {
+		if (!key.startsWith('_')) {
+			newArgs[key] = args[key];
+		}
+	});
+
+	return newArgs;
+};

package/server/utils/reload-strapi-on-load.ts

@@ -1,13 +1,13 @@
-const reloadStrapiOnLoad = () => {
-	console.log('[Plugin Page Builder]: Checking if strapi is loaded', strapi.isLoaded);
-
-	if (strapi.isLoaded) {
-		strapi.reload();
-
-		return;
-	}
-
-	setTimeout(reloadStrapiOnLoad, 1000);
-};
-
-export { reloadStrapiOnLoad };
+const reloadStrapiOnLoad = () => {
+	console.log('[Plugin Page Builder]: Checking if strapi is loaded', strapi.isLoaded);
+
+	if (strapi.isLoaded) {
+		strapi.reload();
+
+		return;
+	}
+
+	setTimeout(reloadStrapiOnLoad, 1000);
+};
+
+export { reloadStrapiOnLoad };