@webbio/strapi-plugin-page-builder 0.9.14-authentication → 0.9.16-authentication

package/package.json

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

package/server/controllers/private-content.ts

@@ -1,10 +1,18 @@
-import { Strapi } from '@strapi/strapi';
+import { Context } from 'koa';
 
 export default {
-	activateUser(ctx) {
-		return (strapi as Strapi).service('plugin::page-builder.private-content').activateUser(ctx.params.token);
+	async activateUser(ctx: Context): Promise<any> {
+		try {
+			const user = await strapi.service('plugin::page-builder.private-content').activateUser(ctx.params.token);
+			const callbackUrl = user.platform.emailConfirmationCallbackUrl;
+
+			return ctx.redirect('');
+		} catch (error) {
+			console.log(ctx);
+			return ctx.unauthorized('User is already confirmed or token is invalid');
+		}
 	},
-	removeInactiveUsers(ctx) {
-		return (strapi as Strapi).service('plugin::page-builder.private-content').removeInactiveUsers();
+	removeInactiveUsers(ctx: Context) {
+		return strapi.service('plugin::page-builder.private-content').removeInactiveUsers();
 	}
 };

package/server/schema/platform-start.json

@@ -22,8 +22,8 @@
 			"repeatable": false,
 			"component": "internal.platform-email"
 		},
-		"isPrivate": {
-			"type": "boolean"
+		"emailConfirmationCallbackUrl": {
+			"type": "string"
 		}
 	}
 }

package/server/services/email.ts

@@ -73,8 +73,9 @@ export default {
 				// @ts-ignore
 				data: { confirmationToken: confirmationToken }
 			});
+
 			// @ts-ignore
-			const activateUrl = `${foundUser.platform.domain}/api/page-builder/activate/${confirmationToken}`;
+			const activateUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
 
 			await this.sendMail({
 				// @ts-ignore
@@ -103,6 +104,7 @@ export default {
 				data: { resetPasswordToken }
 			});
 
+			// @ts-ignore
 			const activateUrl = `${user.platform.domain}/api/page-builder/reset/${resetPasswordToken}`;
 
 			await this.sendMail({

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,17 @@ 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()
+			}
+		});
+
+		if (!platform) {
+			throw new NotFoundError('Platform not found');
+		}
 
 		const role = await strapi
 			.query('plugin::users-permissions.role')
@@ -24,11 +34,11 @@ export const platformRegister = {
 			where: {
 				$and: [
 					{
-						email
+						email: email.toLowerCase()
 					},
 					{
 						platform: {
-							id: platformId
+							id: platform.id
 						}
 					}
 				]
@@ -43,7 +53,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/index.ts

@@ -19,29 +19,38 @@ export default {
 		const pageBuilderConfig = getConfig();
 		return pageBuilderConfig?.privateContent === true;
 	},
-	async activateUser(token: string) {
-		const jwtService = strapi.plugin('users-permissions').service('jwt');
-		const decodedToken = await jwtService.verify(token);
+	async activateUser(token: string): Promise<void> {
+		try {
+			const jwtService = strapi.plugin('users-permissions').service('jwt');
+			const decodedToken = await jwtService.verify(token);
 
-		if (decodedToken) {
-			const user = await strapi.query('plugin::users-permissions.user').findOne({
-				where: {
-					id: decodedToken.userId,
-					platform: {
-						id: decodedToken.platformId
+			if (decodedToken) {
+				const user = await strapi.query('plugin::users-permissions.user').findOne({
+					where: {
+						id: decodedToken.userId,
+						platform: {
+							id: decodedToken.platformId
+						}
+					},
+					populate: {
+						platform: true
 					}
-				}
-			});
-			if (!user.confirmed && user.confirmationToken && user.confirmationToken === token) {
-				await strapi.entityService.update('plugin::users-permissions.user', user.id, {
-					// @ts-ignore
-					data: { confirmed: true, confirmationToken: null }
 				});
-				await strapi.service('plugin::page-builder.email').sendAdminMail(user);
 
-				return ' User has been created';
+				if (user?.confirmed === false && user?.confirmationToken != null && user?.confirmationToken === token) {
+					await strapi.entityService.update('plugin::users-permissions.user', user.id, {
+						// @ts-ignore
+						data: { confirmed: true, confirmationToken: null }
+					});
+					await strapi.service('plugin::page-builder.email').sendAdminMail(user);
+					return user;
+				} else {
+					throw new Error("Error activating user. User doesn't exist or is already activated.");
+				}
 			}
-			throw new Error('User already activated');
+		} catch (error) {
+			console.error(error);
+			throw error;
 		}
 	},
 	async removeInactiveUsers() {

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({