@steedos/accounts 3.0.0-beta.120 → 3.0.0-beta.123
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/lib/core/index.js +22 -17
- package/lib/core/index.js.map +1 -1
- package/package.json +5 -5
- package/src/core/index.ts +11 -19
package/lib/core/index.js
CHANGED
|
@@ -281,25 +281,30 @@ var getSteedosService = function () {
|
|
|
281
281
|
};
|
|
282
282
|
exports.getSteedosService = getSteedosService;
|
|
283
283
|
var sendMail = function (mail) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
284
|
-
var to, subject, html,
|
|
284
|
+
var to, subject, html, mailOptions, e_1;
|
|
285
285
|
return tslib_1.__generator(this, function (_a) {
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
286
|
+
switch (_a.label) {
|
|
287
|
+
case 0:
|
|
288
|
+
to = mail.to, subject = mail.subject, html = mail.html;
|
|
289
|
+
console.log(chalk_1.default.green("MAIL: ".concat(to, ", ").concat(subject)));
|
|
290
|
+
_a.label = 1;
|
|
291
|
+
case 1:
|
|
292
|
+
_a.trys.push([1, 3, , 4]);
|
|
293
|
+
mailOptions = {
|
|
294
|
+
to: to,
|
|
295
|
+
subject: subject,
|
|
296
|
+
html: html,
|
|
297
|
+
};
|
|
298
|
+
return [4, (0, objectql_1.getSteedosSchema)().broker.call("@builder6/email.send", mailOptions)];
|
|
299
|
+
case 2:
|
|
300
|
+
_a.sent();
|
|
301
|
+
return [3, 4];
|
|
302
|
+
case 3:
|
|
303
|
+
e_1 = _a.sent();
|
|
304
|
+
console.log(e_1);
|
|
305
|
+
return [3, 4];
|
|
306
|
+
case 4: return [2];
|
|
301
307
|
}
|
|
302
|
-
return [2];
|
|
303
308
|
});
|
|
304
309
|
}); };
|
|
305
310
|
exports.sendMail = sendMail;
|
package/lib/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.123",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"files": [
|
|
6
6
|
"/package.json",
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
"@accounts/two-factor": "^0.20.1",
|
|
29
29
|
"@accounts/types": "0.20.1",
|
|
30
30
|
"@babel/runtime": "^7.12.18",
|
|
31
|
-
"@steedos/auth": "3.0.0-beta.
|
|
32
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
33
|
-
"@steedos/utils": "3.0.0-beta.
|
|
31
|
+
"@steedos/auth": "3.0.0-beta.123",
|
|
32
|
+
"@steedos/objectql": "3.0.0-beta.123",
|
|
33
|
+
"@steedos/utils": "3.0.0-beta.123",
|
|
34
34
|
"app-root-path": "^2.2.1",
|
|
35
35
|
"bcryptjs": "^2.4.3",
|
|
36
36
|
"body-parser": "1.19.0",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"publishConfig": {
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "6a325cca301fe0d4ad64bcac6173db2ff4c86731"
|
|
63
63
|
}
|
package/src/core/index.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { getSteedosConfig } from "@steedos/objectql";
|
|
1
|
+
import { getSteedosConfig, getSteedosSchema } from "@steedos/objectql";
|
|
2
2
|
import { db } from "../db";
|
|
3
3
|
import * as _ from "lodash";
|
|
4
4
|
import chalk from "chalk";
|
|
5
5
|
const clone = require("clone");
|
|
6
6
|
|
|
7
|
-
declare var MailQueue;
|
|
7
|
+
// declare var MailQueue;
|
|
8
8
|
declare var SMSQueue;
|
|
9
9
|
|
|
10
10
|
const config = getSteedosConfig();
|
|
@@ -242,24 +242,16 @@ export const getSteedosService = () => {
|
|
|
242
242
|
|
|
243
243
|
export const sendMail = async (mail: any): Promise<void> => {
|
|
244
244
|
const { to, subject, html } = mail;
|
|
245
|
-
const config = getSteedosConfig().email || {};
|
|
246
|
-
let canSend = canSendEmail();
|
|
247
|
-
//如果没有配置发送邮件服务，则打印log
|
|
248
245
|
console.log(chalk.green(`MAIL: ${to}, ${subject}`));
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
to: to,
|
|
259
|
-
from: config.from || "华炎魔方",
|
|
260
|
-
subject: subject,
|
|
261
|
-
html: html,
|
|
262
|
-
});
|
|
246
|
+
try {
|
|
247
|
+
const mailOptions = {
|
|
248
|
+
to, // 收件人
|
|
249
|
+
subject, // 主题
|
|
250
|
+
html, // 内容
|
|
251
|
+
};
|
|
252
|
+
await getSteedosSchema().broker.call("@builder6/email.send", mailOptions);
|
|
253
|
+
} catch (e) {
|
|
254
|
+
console.log(e);
|
|
263
255
|
}
|
|
264
256
|
};
|
|
265
257
|
|