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

package/dist/package.json

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

package/dist/server/controllers/private-content.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
-    activateUser(ctx) {
-        return strapi.service('plugin::page-builder.private-content').activateUser(ctx.params.token);
+    async activateUser(ctx) {
+        try {
+            const user = await strapi.service('plugin::page-builder.private-content').activateUser(ctx.params.token);
+            const callbackUrl = `${user.platform.domain}/login`;
+            return ctx.redirect(callbackUrl);
+        }
+        catch (error) {
+            console.log(ctx);
+            return ctx.unauthorized('User is already confirmed or token is invalid');
+        }
     },
     removeInactiveUsers(ctx) {
         return strapi.service('plugin::page-builder.private-content').removeInactiveUsers();

package/dist/server/schema/platform-start.json

@@ -21,9 +21,6 @@
             "type": "component",
             "repeatable": false,
             "component": "internal.platform-email"
-        },
-        "isPrivate": {
-            "type": "boolean"
         }
     }
 }

package/dist/server/services/email.js

@@ -86,7 +86,7 @@ exports.default = {
                 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
                 from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
@@ -109,6 +109,7 @@ exports.default = {
                 // @ts-ignore
                 data: { resetPasswordToken }
             });
+            // @ts-ignore
             const activateUrl = `${user.platform.domain}/api/page-builder/reset/${resetPasswordToken}`;
             await this.sendMail({
                 // @ts-ignore

package/dist/server/services/private-content/graphql/resolvers/register.js

@@ -17,7 +17,6 @@ exports.platformRegister = {
                 domain: domain.toLowerCase()
             }
         });
-        console.log(platform);
         if (!platform) {
             throw new NotFoundError('Platform not found');
         }

package/dist/server/services/private-content/index.js

@@ -22,26 +22,37 @@ exports.default = {
         return (pageBuilderConfig === null || pageBuilderConfig === void 0 ? void 0 : pageBuilderConfig.privateContent) === true;
     },
     async activateUser(token) {
-        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
+        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
+                        }
+                    },
+                    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 === null || user === void 0 ? void 0 : user.confirmed) === false && (user === null || user === void 0 ? void 0 : user.confirmationToken) != null && (user === null || user === void 0 ? void 0 : 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() {