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

package/dist/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/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.emailConfirmationCallbackUrl;
+            return ctx.redirect('');
+        }
+        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

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

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/forgot-password.js

@@ -8,16 +8,21 @@ const { UnauthorizedError } = utils_1.errors;
 exports.platformForgotPassword = {
     async resolve(parent, args, context) {
         await (0, schemas_1.validateForgotPasswordSchema)(args.input);
-        const { email, platformId } = args.input;
+        const { email, domain } = args.input;
         const user = await strapi.query(constants_1.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/dist/server/services/private-content/graphql/resolvers/login.js

@@ -8,13 +8,16 @@ const { UnauthorizedError } = utils_1.errors;
 exports.platformLogin = {
     async resolve(parent, args, context) {
         await (0, schemas_1.validateLoginSchema)(args.input);
-        const { email, password, platformId } = args.input;
+        const { email, password, domain } = args.input;
         const user = await strapi.query(constants_1.USER_MODEL).findOne({
             where: {
                 email: email.toLowerCase(),
                 platform: {
-                    id: platformId
+                    domain: domain.toLowerCase()
                 }
+            },
+            populate: {
+                platform: true
             }
         });
         if (user == null) {
@@ -35,7 +38,9 @@ exports.platformLogin = {
         const sanitizedUser = utils_1.sanitize.contentAPI.output(user, strapi.getModel(constants_1.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,
             jwt

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

@@ -5,13 +5,21 @@ const utils_1 = require("@strapi/utils");
 const utils_2 = require("@strapi/utils");
 const constants_1 = require("../../constants");
 const schemas_1 = require("../../schemas");
-const { ApplicationError } = utils_2.errors;
+const { ApplicationError, NotFoundError } = utils_2.errors;
 exports.platformRegister = {
     async resolve(parent, args, context) {
         const pluginStore = await strapi.store({ type: 'plugin', name: 'users-permissions' });
         const settings = await pluginStore.get({ key: 'advanced' });
         await (0, schemas_1.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')
             .findOne({ where: { type: settings.default_role } });
@@ -22,11 +30,11 @@ exports.platformRegister = {
             where: {
                 $and: [
                     {
-                        email
+                        email: email.toLowerCase()
                     },
                     {
                         platform: {
-                            id: platformId
+                            id: platform.id
                         }
                     }
                 ]
@@ -39,7 +47,7 @@ exports.platformRegister = {
             ...args.input,
             role: role.id,
             categories: args.input.categories,
-            platform: platformId,
+            platform: platform.id,
             email: email.toLowerCase(),
             provider: 'local',
             confirmed: false,

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

@@ -5,13 +5,13 @@ exports.LoginInput = `
 input LoginInput {
   email: String!
   password: String!
-  platformId: ID!
+  domain: String!
 }
 `;
 exports.ForgotPasswordInput = `
 input ForgotPasswordInput {
   email: String!
-  platformId: ID!
+  domain: String!
 }`;
 exports.RegisterInput = `
 input RegisterInput {
@@ -28,7 +28,7 @@ input RegisterInput {
   phone: String
   subscribeToNewsletter: Boolean
   categories: [ID]
-  platformId: ID!
+  domain: String!
 }
 `;
 exports.LoginResponse = `
@@ -54,7 +54,6 @@ type User {
   confirmed: Boolean
   blocked: Boolean
   activated: Boolean
-  platformId: ID!
 }
 `;
 exports.ResetPassword = `

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

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

@@ -5,16 +5,16 @@ const utils_1 = require("@strapi/utils");
 const registerSchema = utils_1.yup.object({
     email: utils_1.yup.string().email().required(),
     password: utils_1.yup.string().required(),
-    platformId: utils_1.yup.number().required()
+    domain: utils_1.yup.string().required()
 });
 exports.loginSchema = utils_1.yup.object({
     email: utils_1.yup.string().email().required(),
     password: utils_1.yup.string().required(),
-    platformId: utils_1.yup.number().required()
+    domain: utils_1.yup.string().required()
 });
 exports.forgotPasswordSchema = utils_1.yup.object({
     email: utils_1.yup.string().email().required(),
-    platformId: utils_1.yup.number().required()
+    domain: utils_1.yup.string().required()
 });
 exports.resetPasswordSchema = utils_1.yup.object({
     password: utils_1.yup.string().required(),