@webbio/strapi-plugin-page-builder 0.9.10-authentication → 0.9.12-authentication
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +1 -1
- package/dist/server/bootstrap.js +4 -4
- package/dist/server/graphql/page-by-path.js +3 -0
- package/dist/server/policies/index.js +7 -1
- package/dist/server/policies/isAuthorizedPage.js +11 -0
- package/dist/server/services/email.js +14 -12
- package/dist/server/services/private-content/graphql/resolvers/forgot-password.js +1 -1
- package/dist/server/services/private-content/graphql/resolvers/register.js +3 -0
- package/dist/tsconfig.server.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/server/bootstrap.ts +4 -4
- package/server/content-types/category/schema.json +17 -17
- package/server/graphql/page-by-path.ts +4 -0
- package/server/policies/index.ts +5 -1
- package/server/policies/isAuthorizedPage.ts +11 -0
- package/server/schema/page-end.json +8 -8
- package/server/services/email.ts +14 -12
- package/server/services/private-content/components/admin-email.json +20 -21
- package/server/services/private-content/components/email.json +20 -21
- package/server/services/private-content/components/platform-email.json +28 -28
- package/server/services/private-content/graphql/resolvers/forgot-password.ts +1 -1
- package/server/services/private-content/graphql/resolvers/register.ts +4 -0
- package/dist/server/services/constants/customUserConstants.js +0 -16
- package/dist/server/services/custom-user.js +0 -161
- package/dist/server/services/private-content/auth.js +0 -0
- package/dist/server/services/private-content/email.js +0 -3
- package/dist/server/services/private-content/graphql.js +0 -128
- package/dist/server/services/private-content/hash.js +0 -0
package/dist/package.json
CHANGED
package/dist/server/bootstrap.js
CHANGED
|
@@ -31,18 +31,18 @@ exports.default = async ({ strapi }) => {
|
|
|
31
31
|
var _a;
|
|
32
32
|
if (event.params.data.id) {
|
|
33
33
|
const userToUpdate = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, event.params.data.id, {
|
|
34
|
-
populate: { platform: { populate: {
|
|
34
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
35
35
|
}));
|
|
36
36
|
if (userToUpdate) {
|
|
37
37
|
if (event.params.data.activateUser && event.params.data.confirmed && !userToUpdate.confirmMailSend) {
|
|
38
38
|
await strapi.service(constants_1.PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
|
|
39
39
|
// @ts-ignore strapi typings
|
|
40
|
-
from: userToUpdate.platform.
|
|
40
|
+
from: userToUpdate.platform.platformEmails.accountAcceptedMail.fromEmail,
|
|
41
41
|
to: event.params.data.email,
|
|
42
42
|
// @ts-ignore
|
|
43
|
-
subject: userToUpdate.platform.
|
|
43
|
+
subject: userToUpdate.platform.platformEmails.accountAcceptedMail.subject,
|
|
44
44
|
// @ts-ignore
|
|
45
|
-
text: userToUpdate.platform.
|
|
45
|
+
text: userToUpdate.platform.platformEmails.accountAcceptedMail.message,
|
|
46
46
|
firstName: event.params.data.firstName,
|
|
47
47
|
lastName: event.params.data.lastName
|
|
48
48
|
});
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const constants_1 = require("../../shared/utils/constants");
|
|
4
4
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
5
|
+
const strapi_1 = require("../utils/strapi");
|
|
5
6
|
const getPageByPath = (strapi) => {
|
|
6
7
|
const typeDefs = () => {
|
|
7
8
|
return `
|
|
@@ -93,8 +94,10 @@ const getPageByPath = (strapi) => {
|
|
|
93
94
|
}
|
|
94
95
|
};
|
|
95
96
|
};
|
|
97
|
+
const pageBuilderConfig = (0, strapi_1.getConfig)();
|
|
96
98
|
const resolversConfig = {
|
|
97
99
|
'Query.getPageByPath': {
|
|
100
|
+
policies: (pageBuilderConfig === null || pageBuilderConfig === void 0 ? void 0 : pageBuilderConfig.privateContent) === true ? ['plugin::page-builder.isAuthorizedForPage'] : [],
|
|
98
101
|
auth: false
|
|
99
102
|
}
|
|
100
103
|
};
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
6
|
+
const isAuthorizedPage_1 = __importDefault(require("./isAuthorizedPage"));
|
|
7
|
+
exports.default = {
|
|
8
|
+
isAuthorizedForPage: isAuthorizedPage_1.default
|
|
9
|
+
};
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const isAuthorizedForPage = (policyContext, _config, { strapi }) => {
|
|
4
|
+
const pageToken = policyContext.http.request.headers['x-strapi-page-secret'];
|
|
5
|
+
const pageEnvToken = process.env.STRAPI_PAGE_SECRET;
|
|
6
|
+
if (pageToken && pageEnvToken && pageToken === pageEnvToken) {
|
|
7
|
+
return true;
|
|
8
|
+
}
|
|
9
|
+
return false;
|
|
10
|
+
};
|
|
11
|
+
exports.default = isAuthorizedForPage;
|
|
@@ -57,25 +57,27 @@ exports.default = {
|
|
|
57
57
|
},
|
|
58
58
|
async sendAdminMail(user) {
|
|
59
59
|
const foundUser = await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
60
|
-
populate: { platform: { populate: {
|
|
60
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
61
61
|
});
|
|
62
62
|
await this.sendMail({
|
|
63
63
|
// @ts-ignore we all love strapi typings
|
|
64
|
-
from: foundUser.platform.
|
|
64
|
+
from: foundUser.platform.platformEmails.adminEmail.fromEmail,
|
|
65
65
|
// @ts-ignore
|
|
66
|
-
to: foundUser.platform.
|
|
66
|
+
to: foundUser.platform.platformEmails.adminEmail.toMail,
|
|
67
67
|
// @ts-ignore
|
|
68
|
-
subject: foundUser.platform.
|
|
68
|
+
subject: foundUser.platform.platformEmails.adminEmail.subject,
|
|
69
69
|
// @ts-ignore
|
|
70
|
-
text: foundUser.platform.
|
|
70
|
+
text: foundUser.platform.platformEmails.adminEmail.message,
|
|
71
71
|
firstName: user.firstName,
|
|
72
72
|
lastName: user.lastName
|
|
73
73
|
});
|
|
74
74
|
},
|
|
75
75
|
async sendConfirmationEmail(user) {
|
|
76
|
+
console.log('HALLO');
|
|
76
77
|
const foundUser = await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
77
|
-
populate: { platform: { populate: {
|
|
78
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
78
79
|
});
|
|
80
|
+
console.log({ foundUser });
|
|
79
81
|
if (foundUser && foundUser.platform) {
|
|
80
82
|
const jwtService = strapi.plugin('users-permissions').service('jwt');
|
|
81
83
|
const confirmationToken = await jwtService.issue(
|
|
@@ -89,12 +91,12 @@ exports.default = {
|
|
|
89
91
|
const activateUrl = `${foundUser.platform.domain}/api/page-builder/activate/${confirmationToken}`;
|
|
90
92
|
await this.sendMail({
|
|
91
93
|
// @ts-ignore
|
|
92
|
-
from: foundUser.platform.
|
|
94
|
+
from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
|
|
93
95
|
to: user.email,
|
|
94
96
|
// @ts-ignore
|
|
95
|
-
subject: foundUser.platform.
|
|
97
|
+
subject: foundUser.platform.platformEmails.accountCreatedMail.subject,
|
|
96
98
|
// @ts-ignore
|
|
97
|
-
text: foundUser.platform.
|
|
99
|
+
text: foundUser.platform.platformEmails.accountCreatedMail.message,
|
|
98
100
|
firstName: user.firstName,
|
|
99
101
|
lastName: user.lastName,
|
|
100
102
|
confirmationUrl: activateUrl
|
|
@@ -112,12 +114,12 @@ exports.default = {
|
|
|
112
114
|
const activateUrl = `${user.platform.domain}/api/page-builder/reset/${resetPasswordToken}`;
|
|
113
115
|
await this.sendMail({
|
|
114
116
|
// @ts-ignore
|
|
115
|
-
from: user.platform.
|
|
117
|
+
from: user.platform.platformEmails.resetPasswordMail.fromEmail,
|
|
116
118
|
to: user.email,
|
|
117
119
|
// @ts-ignore
|
|
118
|
-
subject: user.platform.
|
|
120
|
+
subject: user.platform.platformEmails.resetPasswordMail.subject,
|
|
119
121
|
// @ts-ignore
|
|
120
|
-
text: user.platform.
|
|
122
|
+
text: user.platform.platformEmails.resetPasswordMail.message,
|
|
121
123
|
firstName: user.firstName,
|
|
122
124
|
lastName: user.lastName,
|
|
123
125
|
confirmationUrl: activateUrl
|
|
@@ -10,7 +10,7 @@ exports.platformForgotPassword = {
|
|
|
10
10
|
await (0, schemas_1.validateForgotPasswordSchema)(args.input);
|
|
11
11
|
const { email, platformId } = args.input;
|
|
12
12
|
const user = await strapi.query(constants_1.USER_MODEL).findOne({
|
|
13
|
-
populate: { platform: { populate: {
|
|
13
|
+
populate: { platform: { populate: { platformEmails: { populate: true } } } },
|
|
14
14
|
where: {
|
|
15
15
|
email: email.toLowerCase(),
|
|
16
16
|
platform: {
|
|
@@ -8,6 +8,7 @@ const schemas_1 = require("../../schemas");
|
|
|
8
8
|
const { ApplicationError } = utils_2.errors;
|
|
9
9
|
exports.platformRegister = {
|
|
10
10
|
async resolve(parent, args, context) {
|
|
11
|
+
console.log('WAAROM LOG JIJ NIKS');
|
|
11
12
|
const pluginStore = await strapi.store({ type: 'plugin', name: 'users-permissions' });
|
|
12
13
|
const settings = await pluginStore.get({ key: 'advanced' });
|
|
13
14
|
await (0, schemas_1.validateRegisterSchema)(args.input);
|
|
@@ -15,6 +16,7 @@ exports.platformRegister = {
|
|
|
15
16
|
const role = await strapi
|
|
16
17
|
.query('plugin::users-permissions.role')
|
|
17
18
|
.findOne({ where: { type: settings.default_role } });
|
|
19
|
+
console.log('dsfjsdds');
|
|
18
20
|
if (!role) {
|
|
19
21
|
throw new ApplicationError('Impossible to find the default role');
|
|
20
22
|
}
|
|
@@ -52,6 +54,7 @@ exports.platformRegister = {
|
|
|
52
54
|
const sanitizedUser = utils_1.sanitize.contentAPI.output(createdUser, userModel, {
|
|
53
55
|
auth: false
|
|
54
56
|
});
|
|
57
|
+
console.log('HALLO MADDERFACKKER');
|
|
55
58
|
await strapi.service('plugin::page-builder.email').sendConfirmationEmail(createdUser);
|
|
56
59
|
return {
|
|
57
60
|
user: sanitizedUser
|