@nymphjs/tilmeld 1.0.0-alpha.42 → 1.0.0-alpha.43
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/CHANGELOG.md +6 -0
- package/dist/conf/d.d.ts +2 -1
- package/dist/conf/defaults.js +7 -4
- package/dist/conf/defaults.js.map +1 -1
- package/package.json +6 -6
- package/src/conf/d.ts +13 -1
- package/src/conf/defaults.ts +8 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.0.0-alpha.43](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.42...v1.0.0-alpha.43) (2022-03-07)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- allow custom email config on system emails ([b8f22bb](https://github.com/sciactive/nymphjs/commit/b8f22bb4c5420664ccff6bda754d5bd83be9b625))
|
|
11
|
+
|
|
6
12
|
# [1.0.0-alpha.42](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.41...v1.0.0-alpha.42) (2022-03-06)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/dist/conf/d.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EmailOptions } from 'email-templates';
|
|
1
|
+
import { EmailOptions, EmailConfig } from 'email-templates';
|
|
2
2
|
import type Tilmeld from '../Tilmeld';
|
|
3
3
|
import Group, { GroupData } from '../Group';
|
|
4
4
|
import User, { UserData } from '../User';
|
|
@@ -47,6 +47,7 @@ export interface Config {
|
|
|
47
47
|
expire: Date;
|
|
48
48
|
} | null;
|
|
49
49
|
emailTemplateDir: string;
|
|
50
|
+
configEmail: (tilmeld: Tilmeld, options: EmailOptions, user: User & UserData) => Promise<EmailConfig>;
|
|
50
51
|
sendEmail: (tilmeld: Tilmeld, options: EmailOptions, user: User & UserData) => Promise<boolean>;
|
|
51
52
|
userRegisteredRecipient: string | null;
|
|
52
53
|
validatorGroup: (group: Group & GroupData) => void;
|
package/dist/conf/defaults.js
CHANGED
|
@@ -102,17 +102,20 @@ exports.default = {
|
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
104
|
emailTemplateDir: path_1.default.join(__dirname, '..', '..', 'emails'),
|
|
105
|
-
|
|
106
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
105
|
+
configEmail: (tilmeld, _options, _user) => __awaiter(void 0, void 0, void 0, function* () {
|
|
107
106
|
const appUrl = new URL(tilmeld.config.appUrl);
|
|
108
|
-
|
|
107
|
+
return {
|
|
109
108
|
message: {
|
|
110
109
|
from: {
|
|
111
110
|
name: tilmeld.config.appName,
|
|
112
111
|
address: `noreply@${appUrl.hostname}`,
|
|
113
112
|
},
|
|
114
113
|
},
|
|
115
|
-
}
|
|
114
|
+
};
|
|
115
|
+
}),
|
|
116
|
+
sendEmail: (tilmeld, options, user) => __awaiter(void 0, void 0, void 0, function* () {
|
|
117
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
118
|
+
const email = new email_templates_1.default(yield tilmeld.config.configEmail(tilmeld, options, user));
|
|
116
119
|
try {
|
|
117
120
|
const result = yield email.send(Object.assign(Object.assign({}, options), { template: path_1.default.join(tilmeld.config.emailTemplateDir, (_a = options.template) !== null && _a !== void 0 ? _a : '.'), locals: Object.assign(Object.assign({ siteName: tilmeld.config.appName, siteLink: tilmeld.config.appUrl, toUsername: (_b = user.username) !== null && _b !== void 0 ? _b : '', toName: (_c = user.name) !== null && _c !== void 0 ? _c : '', toFirstName: (_d = user.nameFirst) !== null && _d !== void 0 ? _d : '', toLastName: (_e = user.nameLast) !== null && _e !== void 0 ? _e : '', toEmail: (_f = user.email) !== null && _f !== void 0 ? _f : '', toPhone: (_g = user.phone) !== null && _g !== void 0 ? _g : '' }, (tilmeld.User.current()
|
|
118
121
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/tilmeld",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.43",
|
|
4
4
|
"description": "NymphJS - Tilmeld User and Group System",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"license": "Apache-2.0",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nymphjs/nymph": "^1.0.0-alpha.
|
|
34
|
+
"@nymphjs/nymph": "^1.0.0-alpha.43",
|
|
35
35
|
"crypto-js": "^4.1.1",
|
|
36
36
|
"email-templates": "^8.0.8",
|
|
37
37
|
"express": "^4.17.2",
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
"pug": "^3.0.2"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@nymphjs/client": "^1.0.0-alpha.
|
|
48
|
-
"@nymphjs/client-node": "^1.0.0-alpha.
|
|
49
|
-
"@nymphjs/driver-sqlite3": "^1.0.0-alpha.
|
|
47
|
+
"@nymphjs/client": "^1.0.0-alpha.43",
|
|
48
|
+
"@nymphjs/client-node": "^1.0.0-alpha.43",
|
|
49
|
+
"@nymphjs/driver-sqlite3": "^1.0.0-alpha.43",
|
|
50
50
|
"@tsconfig/recommended": "^1.0.1",
|
|
51
51
|
"@types/crypto-js": "^4.1.0",
|
|
52
52
|
"@types/email-templates": "^8.0.4",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"ts-jest": "^27.1.2",
|
|
61
61
|
"typescript": "^4.5.4"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "17f77a713e4afb63fd9315c0f3d8403285e56384"
|
|
64
64
|
}
|
package/src/conf/d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EmailOptions } from 'email-templates';
|
|
1
|
+
import { EmailOptions, EmailConfig } from 'email-templates';
|
|
2
2
|
|
|
3
3
|
import type Tilmeld from '../Tilmeld';
|
|
4
4
|
import Group, { GroupData } from '../Group';
|
|
@@ -245,6 +245,18 @@ export interface Config {
|
|
|
245
245
|
* email sender.
|
|
246
246
|
*/
|
|
247
247
|
emailTemplateDir: string;
|
|
248
|
+
/**
|
|
249
|
+
* Configure an email object to prepare for sending.
|
|
250
|
+
*
|
|
251
|
+
* You can use this, for example, for DKIM signing.
|
|
252
|
+
*
|
|
253
|
+
* See: https://github.com/forwardemail/email-templates/blob/v8.0.9/README.md#Options
|
|
254
|
+
*/
|
|
255
|
+
configEmail: (
|
|
256
|
+
tilmeld: Tilmeld,
|
|
257
|
+
options: EmailOptions,
|
|
258
|
+
user: User & UserData
|
|
259
|
+
) => Promise<EmailConfig>;
|
|
248
260
|
/**
|
|
249
261
|
* Send an email to a user. Uses `email-templates` by default.
|
|
250
262
|
*
|
package/src/conf/defaults.ts
CHANGED
|
@@ -107,16 +107,21 @@ export default {
|
|
|
107
107
|
}
|
|
108
108
|
},
|
|
109
109
|
emailTemplateDir: path.join(__dirname, '..', '..', 'emails'),
|
|
110
|
-
|
|
110
|
+
configEmail: async (tilmeld, _options, _user) => {
|
|
111
111
|
const appUrl = new URL(tilmeld.config.appUrl);
|
|
112
|
-
|
|
112
|
+
return {
|
|
113
113
|
message: {
|
|
114
114
|
from: {
|
|
115
115
|
name: tilmeld.config.appName,
|
|
116
116
|
address: `noreply@${appUrl.hostname}`,
|
|
117
117
|
},
|
|
118
118
|
},
|
|
119
|
-
}
|
|
119
|
+
};
|
|
120
|
+
},
|
|
121
|
+
sendEmail: async (tilmeld, options, user) => {
|
|
122
|
+
const email = new Email(
|
|
123
|
+
await tilmeld.config.configEmail(tilmeld, options, user)
|
|
124
|
+
);
|
|
120
125
|
try {
|
|
121
126
|
const result = await email.send({
|
|
122
127
|
...options,
|