@webbio/strapi-plugin-page-builder 0.9.13-authentication → 0.9.15-authentication

package/package.json

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

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

@@ -77,7 +77,7 @@ const getPageByPath = (strapi: Strapi) => {
 							const results: Record<string, any> = await getPage();
 
 							if (Object.values(results)?.filter(Boolean).length > 0) {
-								if (!results?.platform?.isPrivate && !results.isPrivate) {
+								if (!results?.platform?.isPrivate && !results?.isPrivate) {
 									return results;
 								}
 								if (

package/server/services/private-content/graphql/resolvers/findOnePage.ts

@@ -13,7 +13,7 @@ export const page = {
 		const sanitizedQuery = await sanitize.contentAPI.query(populatedArgs, strapi.contentType(PAGE_UID));
 		const value = await strapi.entityService!.findOne(uid, args.id, omit('id', sanitizedQuery));
 		// @ts-ignore Strapi types are the best
-		if (!value?.platform?.isPrivate && !value.isPrivate) {
+		if (!value?.platform?.isPrivate && !value?.isPrivate) {
 			return toEntityResponse(value, { args: transformedArgs, resourceUID: uid });
 		}
 

package/server/services/private-content/graphql/resolvers/findPage.ts

@@ -22,14 +22,14 @@ export const pages = {
 				// @ts-ignore
 				const filteredItems = value.filter((item) => {
 					// @ts-ignore
-					if (item.platform.isPrivate === true && user.platform.id === item.platform.id) {
+					if (item.platform?.isPrivate === true && user.platform.id === item.platform.id) {
 						return item;
 					}
-					if (item.isPrivate === true && user.platform.id === item.platform.id) {
+					if (item?.isPrivate === true && user.platform.id === item.platform.id) {
 						return item;
 					}
 					// @ts-ignore
-					if (item.platform.isPrivate !== true && item.isPrivate !== true) {
+					if (item.platform?.isPrivate !== true && item?.isPrivate !== true) {
 						return item;
 					}
 				});
@@ -38,7 +38,7 @@ export const pages = {
 		}
 
 		// @ts-ignore
-		const filteredItems = value.filter((item) => item.platform.isPrivate !== true && item.isPrivate !== true);
+		const filteredItems = value.filter((item) => item.platform?.isPrivate !== true && item?.isPrivate !== true);
 
 		return toEntityResponseCollection(filteredItems, { args: transformedArgs, resourceUID: uid });
 	}

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

@@ -7,18 +7,26 @@ export const platformForgotPassword = {
 	async resolve(parent, args, context) {
 		await validateForgotPasswordSchema(args.input);
 
-		const { email, platformId } = args.input;
+		const { email, domain } = args.input;
 
 		const user = await strapi.query(USER_MODEL).findOne({
 			populate: { platform: { populate: { platformEmails: { populate: true } } } },
 			where: {
 				email: email.toLowerCase(),
 				platform: {
-					id: platformId
+					domain: domain.toLowerCase()
 				}
 			}
 		});
+
+		if (!user) {
+			{
+				message: 'Email has been sent';
+			}
+		}
+
 		await strapi.service('plugin::page-builder.email').sendForgotPasswordMail(user);
+
 		return {
 			message: 'Email has been sent'
 		};

package/server/services/private-content/graphql/resolvers/login.ts

@@ -7,14 +7,17 @@ export const platformLogin = {
 	async resolve(parent, args, context) {
 		await validateLoginSchema(args.input);
 
-		const { email, password, platformId } = args.input;
+		const { email, password, domain } = args.input;
 
 		const user = await strapi.query(USER_MODEL).findOne({
 			where: {
 				email: email.toLowerCase(),
 				platform: {
-					id: platformId
+					domain: domain.toLowerCase()
 				}
+			},
+			populate: {
+				platform: true
 			}
 		});
 
@@ -41,7 +44,9 @@ export const platformLogin = {
 		const sanitizedUser = sanitize.contentAPI.output(user, strapi.getModel(USER_MODEL), {
 			auth: false
 		});
-		const jwt = await strapi.service('plugin::users-permissions.jwt').issue({ id: user.id, platformId: platformId });
+		const jwt = await strapi
+			.service('plugin::users-permissions.jwt')
+			.issue({ id: user.id, platformId: user.platform.id });
 
 		return {
 			user: sanitizedUser,

package/server/services/private-content/graphql/resolvers/register.ts

@@ -2,7 +2,7 @@ import { sanitize } from '@strapi/utils';
 import { errors } from '@strapi/utils';
 import { USER_MODEL } from '../../constants';
 import { validateRegisterSchema } from '../../schemas';
-const { ApplicationError } = errors;
+const { ApplicationError, NotFoundError } = errors;
 
 export const platformRegister = {
 	async resolve(parent, args, context) {
@@ -11,7 +11,19 @@ export const platformRegister = {
 
 		await validateRegisterSchema(args.input);
 
-		const { email, platformId } = args.input;
+		const { email, domain } = args.input;
+
+		const platform = await strapi.query('api::platform.platform').findOne({
+			where: {
+				domain: domain.toLowerCase()
+			}
+		});
+
+		console.log(platform);
+
+		if (!platform) {
+			throw new NotFoundError('Platform not found');
+		}
 
 		const role = await strapi
 			.query('plugin::users-permissions.role')
@@ -24,11 +36,11 @@ export const platformRegister = {
 			where: {
 				$and: [
 					{
-						email
+						email: email.toLowerCase()
 					},
 					{
 						platform: {
-							id: platformId
+							id: platform.id
 						}
 					}
 				]
@@ -43,7 +55,7 @@ export const platformRegister = {
 			...args.input,
 			role: role.id,
 			categories: args.input.categories,
-			platform: platformId,
+			platform: platform.id,
 			email: email.toLowerCase(),
 			provider: 'local',
 			confirmed: false,

package/server/services/private-content/graphql/types/index.ts

@@ -2,14 +2,14 @@ export const LoginInput = `
 input LoginInput {
   email: String!
   password: String!
-  platformId: ID!
+  domain: String!
 }
 `;
 
 export const ForgotPasswordInput = `
 input ForgotPasswordInput {
   email: String!
-  platformId: ID!
+  domain: String!
 }`;
 
 export const RegisterInput = `
@@ -27,7 +27,7 @@ input RegisterInput {
   phone: String
   subscribeToNewsletter: Boolean
   categories: [ID]
-  platformId: ID!
+  domain: String!
 }
 `;
 
@@ -57,7 +57,6 @@ type User {
   confirmed: Boolean
   blocked: Boolean
   activated: Boolean
-  platformId: ID!
 }
 `;
 

package/server/services/private-content/schemas/index.ts

@@ -3,18 +3,18 @@ import { validateYupSchema, yup } from '@strapi/utils';
 const registerSchema = yup.object({
 	email: yup.string().email().required(),
 	password: yup.string().required(),
-	platformId: yup.number().required()
+	domain: yup.string().required()
 });
 
 export const loginSchema = yup.object({
 	email: yup.string().email().required(),
 	password: yup.string().required(),
-	platformId: yup.number().required()
+	domain: yup.string().required()
 });
 
 export const forgotPasswordSchema = yup.object({
 	email: yup.string().email().required(),
-	platformId: yup.number().required()
+	domain: yup.string().required()
 });
 
 export const resetPasswordSchema = yup.object({