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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webbio/strapi-plugin-page-builder",
-	"version": "0.9.15-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/register.ts

@@ -19,8 +19,6 @@ export const platformRegister = {
 			}
 		});
 
-		console.log(platform);
-
 		if (!platform) {
 			throw new NotFoundError('Platform not found');
 		}

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