@steedos/accounts 2.1.54 → 2.1.55
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/index.js +3 -1
- package/lib/index.js.map +1 -1
- package/package.json +6 -6
- package/src/index.ts +4 -1
package/lib/index.js
CHANGED
|
@@ -16,9 +16,11 @@ var core_1 = require("./core");
|
|
|
16
16
|
var config = objectql_1.getSteedosConfig();
|
|
17
17
|
function getAccountsServer() {
|
|
18
18
|
var accountsConfig = config.accounts || {};
|
|
19
|
+
var emailConfig = config.email || {};
|
|
19
20
|
var tokenSecret = accountsConfig.tokenSecret || "secret";
|
|
20
21
|
var accessTokenExpiresIn = accountsConfig.accessTokenExpiresIn || "90d";
|
|
21
22
|
var refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
|
|
23
|
+
var mailSignname = emailConfig.signname || "华炎魔方";
|
|
22
24
|
mongoose.connect(db_1.mongoUrl, { useNewUrlParser: true });
|
|
23
25
|
var connection = mongoose.connection;
|
|
24
26
|
var rootUrl = process.env.ROOT_URL
|
|
@@ -59,7 +61,7 @@ function getAccountsServer() {
|
|
|
59
61
|
emailTemplates: {
|
|
60
62
|
from: emailFrom,
|
|
61
63
|
verificationCode: {
|
|
62
|
-
subject: function (user, token) { return "\u3010\
|
|
64
|
+
subject: function (user, token) { return "\u3010" + mailSignname + "\u3011\u9A8C\u8BC1\u7801\uFF1A" + token; },
|
|
63
65
|
text: function (user, url, token) {
|
|
64
66
|
return "\u60A8\u7684\u9A8C\u8BC1\u7801\u662F: " + token + "\uFF0C\u8BF7\u4E0D\u8981\u6CC4\u9732\u7ED9\u4ED6\u4EBA\u3002";
|
|
65
67
|
},
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAEA,mCAAqC;AACrC,iCAAmC;AACnC,mCAA0C;AAC1C,uCAA8C;AAC9C,4CAA2C;AAC3C,+CAA6C;AAC7C,mDAAgD;AAGhD,2BAAgC;AAChC,8CAAuF;AACvF,2BAA0B;AAE1B,+BAA0C;AAI1C,IAAM,MAAM,GAAG,2BAAgB,EAAE,CAAC;AAElC,SAAS,iBAAiB;IACxB,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC3C,IAAI,WAAW,GAAG,cAAc,CAAC,WAAW,IAAI,QAAQ,CAAC;IACzD,IAAI,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,IAAI,KAAK,CAAC;IACxE,IAAI,qBAAqB,GAAG,cAAc,CAAC,qBAAqB,IAAI,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.1.
|
|
4
|
+
"version": "2.1.55",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"validator": "^13.6.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@steedos/auth": "2.1.
|
|
56
|
-
"@steedos/meteor-bundle-runner": "2.1.
|
|
57
|
-
"@steedos/objectql": "2.1.
|
|
55
|
+
"@steedos/auth": "2.1.55",
|
|
56
|
+
"@steedos/meteor-bundle-runner": "2.1.55",
|
|
57
|
+
"@steedos/objectql": "2.1.55",
|
|
58
58
|
"@steedos/steedos-plugin-workflow": "^2.0.4",
|
|
59
59
|
"@types/dotenv-flow": "^3.0.0",
|
|
60
60
|
"@types/node": "12.6.8",
|
|
@@ -62,12 +62,12 @@
|
|
|
62
62
|
"dotenv": "^8.2.0",
|
|
63
63
|
"dotenv-flow": "^3.1.0",
|
|
64
64
|
"nodemon": "1.19.1",
|
|
65
|
-
"steedos-server": "2.1.
|
|
65
|
+
"steedos-server": "2.1.55",
|
|
66
66
|
"ts-node": "8.3.0",
|
|
67
67
|
"typescript": "3.5.3"
|
|
68
68
|
},
|
|
69
69
|
"publishConfig": {
|
|
70
70
|
"access": "public"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "4cf71f0e696a28b30084bb07471cfbdc6c875f96"
|
|
73
73
|
}
|
package/src/index.ts
CHANGED
|
@@ -21,9 +21,12 @@ const config = getSteedosConfig();
|
|
|
21
21
|
|
|
22
22
|
function getAccountsServer() {
|
|
23
23
|
let accountsConfig = config.accounts || {};
|
|
24
|
+
let emailConfig = config.email || {};
|
|
24
25
|
let tokenSecret = accountsConfig.tokenSecret || "secret";
|
|
25
26
|
let accessTokenExpiresIn = accountsConfig.accessTokenExpiresIn || "90d";
|
|
26
27
|
let refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
|
|
28
|
+
let mailSignname = emailConfig.signname || "华炎魔方";
|
|
29
|
+
|
|
27
30
|
|
|
28
31
|
mongoose.connect(mongoUrl, { useNewUrlParser: true });
|
|
29
32
|
const connection = mongoose.connection;
|
|
@@ -67,7 +70,7 @@ function getAccountsServer() {
|
|
|
67
70
|
emailTemplates: {
|
|
68
71
|
from: emailFrom,
|
|
69
72
|
verificationCode: {
|
|
70
|
-
subject: (user, token) =>
|
|
73
|
+
subject: (user, token) => `【${mailSignname}】验证码：${token}`,
|
|
71
74
|
text: (user: any, url: string, token) =>
|
|
72
75
|
`您的验证码是: ${token}，请不要泄露给他人。`,
|
|
73
76
|
html: (user: any, url: string, token: string) =>
|