@webbio/strapi-plugin-page-builder 0.15.1-platform → 0.15.3-platform
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/admin/src/components/EditView/CollectionTypeSettings/CreatePageButton/index.tsx +1 -1
- package/admin/src/components/EditView/CollectionTypeSettings/index.tsx +1 -1
- package/admin/src/components/EditView/Details/index.tsx +1 -1
- package/dist/package.json +1 -1
- package/dist/server/bootstrap.js +24 -17
- package/dist/server/services/email.js +84 -57
- package/dist/tsconfig.server.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/server/bootstrap.ts +30 -23
- package/server/services/email.ts +93 -70
|
@@ -76,7 +76,7 @@ export const CreatePageButton = ({ selectedPlatform, onCreatedPage }: ICreatePag
|
|
|
76
76
|
hasPage: false
|
|
77
77
|
});
|
|
78
78
|
|
|
79
|
-
history.push(`/content-manager/
|
|
79
|
+
history.push(`/content-manager/collection-types/${PAGE_UID}/${newPage.id}?plugins[i18n][locale]=${locale}`);
|
|
80
80
|
}
|
|
81
81
|
} catch (error) {
|
|
82
82
|
console.error(error);
|
|
@@ -89,5 +89,5 @@ const generateLink = (entityId?: string, locale?: string) => {
|
|
|
89
89
|
if (!entityId) {
|
|
90
90
|
return '';
|
|
91
91
|
}
|
|
92
|
-
return `/content-manager/
|
|
92
|
+
return `/content-manager/collection-types/${PAGE_UID}/${entityId}?plugins[i18n][locale]=${locale}`;
|
|
93
93
|
};
|
|
@@ -44,5 +44,5 @@ const generateLink = ({ locale, pageType, entityId }: Props) => {
|
|
|
44
44
|
return '';
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
return `/content-manager/
|
|
47
|
+
return `/content-manager/collection-types/${pageType.uid}/${entityId}?plugins[i18n][locale]=${locale}`;
|
|
48
48
|
};
|
package/dist/package.json
CHANGED
package/dist/server/bootstrap.js
CHANGED
|
@@ -30,23 +30,30 @@ exports.default = async ({ strapi }) => {
|
|
|
30
30
|
async beforeUpdate(event) {
|
|
31
31
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
32
32
|
if (event.params.data.id) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
33
|
+
try {
|
|
34
|
+
const originalUserObject = (await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, event.params.data.id, {
|
|
35
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
36
|
+
})));
|
|
37
|
+
if (originalUserObject &&
|
|
38
|
+
event.params.data.activateUser &&
|
|
39
|
+
event.params.data.confirmed &&
|
|
40
|
+
!originalUserObject.confirmMailSend) {
|
|
41
|
+
const send = await strapi.service(constants_1.PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
|
|
42
|
+
from: (_d = (_c = (_b = originalUserObject.platform) === null || _b === void 0 ? void 0 : _b.platformEmails) === null || _c === void 0 ? void 0 : _c.accountAcceptedMail) === null || _d === void 0 ? void 0 : _d.fromEmail,
|
|
43
|
+
to: event.params.data.email,
|
|
44
|
+
nameSender: (_g = (_f = (_e = originalUserObject.platform) === null || _e === void 0 ? void 0 : _e.platformEmails) === null || _f === void 0 ? void 0 : _f.accountAcceptedMail) === null || _g === void 0 ? void 0 : _g.nameSender,
|
|
45
|
+
subject: (_k = (_j = (_h = originalUserObject.platform) === null || _h === void 0 ? void 0 : _h.platformEmails) === null || _j === void 0 ? void 0 : _j.accountAcceptedMail) === null || _k === void 0 ? void 0 : _k.subject,
|
|
46
|
+
text: (_o = (_m = (_l = originalUserObject.platform) === null || _l === void 0 ? void 0 : _l.platformEmails) === null || _m === void 0 ? void 0 : _m.accountAcceptedMail) === null || _o === void 0 ? void 0 : _o.message,
|
|
47
|
+
firstName: event.params.data.firstName,
|
|
48
|
+
lastName: event.params.data.lastName
|
|
49
|
+
});
|
|
50
|
+
if (send) {
|
|
51
|
+
event.params.data.confirmMailSend = true;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
console.error('Send Account Approved Mail Error:', e);
|
|
50
57
|
}
|
|
51
58
|
}
|
|
52
59
|
}
|
|
@@ -46,6 +46,7 @@ exports.default = {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
|
+
return true;
|
|
49
50
|
}
|
|
50
51
|
catch (error) {
|
|
51
52
|
console.error(error);
|
|
@@ -53,81 +54,107 @@ exports.default = {
|
|
|
53
54
|
}
|
|
54
55
|
},
|
|
55
56
|
async sendAdminMail(user) {
|
|
56
|
-
var _a, _b, _c;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
to: foundUser.platform.platformEmails.adminEmail.toEmail,
|
|
64
|
-
nameSender: user.platform.platformEmails.adminEmail.nameSender,
|
|
65
|
-
subject: foundUser.platform.platformEmails.adminEmail.subject,
|
|
66
|
-
text: foundUser.platform.platformEmails.adminEmail.message,
|
|
67
|
-
variables: {
|
|
68
|
-
firstName: user.firstName,
|
|
69
|
-
lastName: user.lastName
|
|
57
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
58
|
+
try {
|
|
59
|
+
const foundUser = (await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
60
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
61
|
+
}));
|
|
62
|
+
if (!((_c = (_b = (_a = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _a === void 0 ? void 0 : _a.platformEmails) === null || _b === void 0 ? void 0 : _b.adminEmail) === null || _c === void 0 ? void 0 : _c.fromEmail)) {
|
|
63
|
+
throw new Error('Account Admin Mail is not configured');
|
|
70
64
|
}
|
|
71
|
-
});
|
|
72
|
-
},
|
|
73
|
-
async sendConfirmationEmail(user) {
|
|
74
|
-
const foundUser = (await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
75
|
-
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
76
|
-
}));
|
|
77
|
-
if (foundUser && foundUser.platform) {
|
|
78
|
-
const jwtService = strapi.plugin('users-permissions').service('jwt');
|
|
79
|
-
const confirmationToken = await jwtService.issue({ userId: user.id, platformId: foundUser.platform.id }, { expiresIn: '1d' });
|
|
80
|
-
await strapi.entityService.update(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
81
|
-
data: { confirmationToken: confirmationToken }
|
|
82
|
-
});
|
|
83
|
-
const confirmEmailUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
|
|
84
65
|
await this.sendMail({
|
|
85
|
-
from: foundUser.platform.platformEmails.
|
|
86
|
-
to: foundUser.
|
|
87
|
-
nameSender:
|
|
88
|
-
subject: foundUser.platform.platformEmails.
|
|
89
|
-
text: foundUser.platform.platformEmails.
|
|
66
|
+
from: (_f = (_e = (_d = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _d === void 0 ? void 0 : _d.platformEmails) === null || _e === void 0 ? void 0 : _e.adminEmail) === null || _f === void 0 ? void 0 : _f.fromEmail,
|
|
67
|
+
to: (_j = (_h = (_g = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _g === void 0 ? void 0 : _g.platformEmails) === null || _h === void 0 ? void 0 : _h.adminEmail) === null || _j === void 0 ? void 0 : _j.toEmail,
|
|
68
|
+
nameSender: foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform.platformEmails.adminEmail.nameSender,
|
|
69
|
+
subject: (_m = (_l = (_k = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _k === void 0 ? void 0 : _k.platformEmails) === null || _l === void 0 ? void 0 : _l.adminEmail) === null || _m === void 0 ? void 0 : _m.subject,
|
|
70
|
+
text: (_q = (_p = (_o = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _o === void 0 ? void 0 : _o.platformEmails) === null || _p === void 0 ? void 0 : _p.adminEmail) === null || _q === void 0 ? void 0 : _q.message,
|
|
90
71
|
variables: {
|
|
91
|
-
firstName:
|
|
92
|
-
lastName:
|
|
93
|
-
confirmEmailUrl
|
|
72
|
+
firstName: user.firstName,
|
|
73
|
+
lastName: user.lastName
|
|
94
74
|
}
|
|
95
75
|
});
|
|
96
76
|
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
console.error('Send Admin Mail Error:', e);
|
|
79
|
+
}
|
|
80
|
+
},
|
|
81
|
+
async sendConfirmationEmail(user) {
|
|
82
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
83
|
+
try {
|
|
84
|
+
const foundUser = (await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
85
|
+
populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
|
|
86
|
+
}));
|
|
87
|
+
if (foundUser && foundUser.platform) {
|
|
88
|
+
const jwtService = strapi.plugin('users-permissions').service('jwt');
|
|
89
|
+
const confirmationToken = await jwtService.issue({ userId: user.id, platformId: foundUser.platform.id }, { expiresIn: '1d' });
|
|
90
|
+
await strapi.entityService.update(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
91
|
+
data: { confirmationToken: confirmationToken }
|
|
92
|
+
});
|
|
93
|
+
const confirmEmailUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
|
|
94
|
+
if (!((_c = (_b = (_a = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _a === void 0 ? void 0 : _a.platformEmails) === null || _b === void 0 ? void 0 : _b.accountCreatedMail) === null || _c === void 0 ? void 0 : _c.fromEmail)) {
|
|
95
|
+
throw new Error('Account Confirmation Mail is not configured');
|
|
96
|
+
}
|
|
97
|
+
await this.sendMail({
|
|
98
|
+
from: (_f = (_e = (_d = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _d === void 0 ? void 0 : _d.platformEmails) === null || _e === void 0 ? void 0 : _e.accountCreatedMail) === null || _f === void 0 ? void 0 : _f.fromEmail,
|
|
99
|
+
to: foundUser === null || foundUser === void 0 ? void 0 : foundUser.email,
|
|
100
|
+
nameSender: (_j = (_h = (_g = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _g === void 0 ? void 0 : _g.platformEmails) === null || _h === void 0 ? void 0 : _h.accountCreatedMail) === null || _j === void 0 ? void 0 : _j.nameSender,
|
|
101
|
+
subject: (_m = (_l = (_k = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _k === void 0 ? void 0 : _k.platformEmails) === null || _l === void 0 ? void 0 : _l.accountCreatedMail) === null || _m === void 0 ? void 0 : _m.subject,
|
|
102
|
+
text: (_q = (_p = (_o = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _o === void 0 ? void 0 : _o.platformEmails) === null || _p === void 0 ? void 0 : _p.accountCreatedMail) === null || _q === void 0 ? void 0 : _q.message,
|
|
103
|
+
variables: {
|
|
104
|
+
firstName: foundUser === null || foundUser === void 0 ? void 0 : foundUser.firstName,
|
|
105
|
+
lastName: foundUser === null || foundUser === void 0 ? void 0 : foundUser.lastName,
|
|
106
|
+
confirmEmailUrl
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
console.error('Send Confirmation Mail Error:', e);
|
|
113
|
+
}
|
|
97
114
|
},
|
|
98
115
|
async sendForgotPasswordMail(user) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
nameSender: user.platform.platformEmails.resetPasswordMail.nameSender,
|
|
110
|
-
subject: user.platform.platformEmails.resetPasswordMail.subject,
|
|
111
|
-
text: user.platform.platformEmails.resetPasswordMail.message,
|
|
112
|
-
variables: {
|
|
113
|
-
firstName: user === null || user === void 0 ? void 0 : user.firstName,
|
|
114
|
-
lastName: user === null || user === void 0 ? void 0 : user.lastName,
|
|
115
|
-
resetPasswordUrl
|
|
116
|
+
var _a, _b, _c;
|
|
117
|
+
try {
|
|
118
|
+
if (user && user.platform) {
|
|
119
|
+
const jwtService = strapi.plugin('users-permissions').service('jwt');
|
|
120
|
+
const resetPasswordToken = await jwtService.issue({ userId: user.id, platformId: user.platform.id }, { expiresIn: '1d' });
|
|
121
|
+
await strapi.entityService.update(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
|
|
122
|
+
data: { resetPasswordToken }
|
|
123
|
+
});
|
|
124
|
+
if (!((_c = (_b = (_a = user === null || user === void 0 ? void 0 : user.platform) === null || _a === void 0 ? void 0 : _a.platformEmails) === null || _b === void 0 ? void 0 : _b.resetPasswordMail) === null || _c === void 0 ? void 0 : _c.fromEmail)) {
|
|
125
|
+
throw new Error('Forgot Password Mail is not configured');
|
|
116
126
|
}
|
|
117
|
-
|
|
127
|
+
const resetPasswordUrl = getResetPasswordUrl(user, resetPasswordToken);
|
|
128
|
+
await this.sendMail({
|
|
129
|
+
from: user.platform.platformEmails.resetPasswordMail.fromEmail,
|
|
130
|
+
to: user.email,
|
|
131
|
+
nameSender: user.platform.platformEmails.resetPasswordMail.nameSender,
|
|
132
|
+
subject: user.platform.platformEmails.resetPasswordMail.subject,
|
|
133
|
+
text: user.platform.platformEmails.resetPasswordMail.message,
|
|
134
|
+
variables: {
|
|
135
|
+
firstName: user === null || user === void 0 ? void 0 : user.firstName,
|
|
136
|
+
lastName: user === null || user === void 0 ? void 0 : user.lastName,
|
|
137
|
+
resetPasswordUrl
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
catch (e) {
|
|
143
|
+
console.error('Send Forgot Password Mail Error:', e);
|
|
118
144
|
}
|
|
119
145
|
}
|
|
120
146
|
};
|
|
121
147
|
const getResetPasswordUrl = (user, resetPasswordToken) => {
|
|
148
|
+
var _a, _b, _c, _d, _e, _f;
|
|
122
149
|
if (!user || !(user === null || user === void 0 ? void 0 : user.platform)) {
|
|
123
150
|
return '';
|
|
124
151
|
}
|
|
125
|
-
if (user.platform.platformEmails.resetPasswordUrl &&
|
|
126
|
-
user.platform.platformEmails.resetPasswordUrl.includes('{{resetPasswordToken}}')) {
|
|
152
|
+
if (((_b = (_a = user === null || user === void 0 ? void 0 : user.platform) === null || _a === void 0 ? void 0 : _a.platformEmails) === null || _b === void 0 ? void 0 : _b.resetPasswordUrl) &&
|
|
153
|
+
((_d = (_c = user === null || user === void 0 ? void 0 : user.platform) === null || _c === void 0 ? void 0 : _c.platformEmails) === null || _d === void 0 ? void 0 : _d.resetPasswordUrl.includes('{{resetPasswordToken}}'))) {
|
|
127
154
|
const replacedTokens = user.platform.platformEmails.resetPasswordUrl
|
|
128
|
-
.replace('{{domain}}', user.platform.domain)
|
|
155
|
+
.replace('{{domain}}', (_e = user === null || user === void 0 ? void 0 : user.platform) === null || _e === void 0 ? void 0 : _e.domain)
|
|
129
156
|
.replace('{{resetPasswordToken}}', resetPasswordToken);
|
|
130
157
|
return replacedTokens;
|
|
131
158
|
}
|
|
132
|
-
return `${user.platform.domain}/wachtwoord-resetten/${resetPasswordToken}`;
|
|
159
|
+
return `${(_f = user === null || user === void 0 ? void 0 : user.platform) === null || _f === void 0 ? void 0 : _f.domain}/wachtwoord-resetten/${resetPasswordToken}`;
|
|
133
160
|
};
|