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

package/dist/package.json

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

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,22 @@ 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()
+            }
+        });
+        console.log(platform);
+        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 +31,11 @@ exports.platformRegister = {
             where: {
                 $and: [
                     {
-                        email
+                        email: email.toLowerCase()
                     },
                     {
                         platform: {
-                            id: platformId
+                            id: platform.id
                         }
                     }
                 ]
@@ -39,7 +48,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/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(),