@steedos/accounts 2.2.33 → 2.2.36
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 +17 -1
- package/lib/index.js.map +1 -1
- package/package.json +7 -7
- package/src/index.ts +26 -11
package/lib/index.js
CHANGED
|
@@ -29,7 +29,23 @@ function getAccountsServer() {
|
|
|
29
29
|
var accessTokenExpiresIn = accountsConfig.accessTokenExpiresIn || "90d";
|
|
30
30
|
var refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
|
|
31
31
|
var mailSignname = emailConfig.signname || "华炎魔方";
|
|
32
|
-
|
|
32
|
+
if (process.env.STEEDOS_CSFLE_MASTER_KEY) {
|
|
33
|
+
var keyVaultNamespace = objectql_1.SteedosFieldEncryptionSharedConsts.keyVaultNamespace, getKMSProviders = objectql_1.SteedosFieldEncryptionSharedConsts.getKMSProviders;
|
|
34
|
+
var kmsProvider = getKMSProviders();
|
|
35
|
+
mongoose.connect(db_1.mongoUrl, {
|
|
36
|
+
useNewUrlParser: true,
|
|
37
|
+
useUnifiedTopology: true,
|
|
38
|
+
monitorCommands: true,
|
|
39
|
+
autoEncryption: {
|
|
40
|
+
keyVaultNamespace: keyVaultNamespace,
|
|
41
|
+
kmsProviders: kmsProvider,
|
|
42
|
+
bypassAutoEncryption: true,
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
mongoose.connect(db_1.mongoUrl, { useNewUrlParser: true });
|
|
48
|
+
}
|
|
33
49
|
var connection = mongoose.connection;
|
|
34
50
|
var rootUrl = process.env.ROOT_URL
|
|
35
51
|
? process.env.ROOT_URL
|
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;AAChD,4CAA4C;AAC5C,0DAAwD;AACxD,2BAAgC;AAChC,
|
|
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.2.
|
|
4
|
+
"version": "2.2.36",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"ismobilejs": "^1.1.1",
|
|
44
44
|
"js-yaml": "^3.13.1",
|
|
45
45
|
"mem": "^5.1.1",
|
|
46
|
-
"mongoose": "5.
|
|
46
|
+
"mongoose": "5.13.14",
|
|
47
47
|
"nodemailer": "^6.3.0",
|
|
48
48
|
"oauth2-server": "^2.4.1",
|
|
49
49
|
"pug": "^3.0.2",
|
|
@@ -53,9 +53,9 @@
|
|
|
53
53
|
"validator": "^13.6.0"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@steedos/auth": "2.2.
|
|
57
|
-
"@steedos/meteor-bundle-runner": "2.2.
|
|
58
|
-
"@steedos/objectql": "2.2.
|
|
56
|
+
"@steedos/auth": "2.2.36",
|
|
57
|
+
"@steedos/meteor-bundle-runner": "2.2.36",
|
|
58
|
+
"@steedos/objectql": "2.2.36",
|
|
59
59
|
"@steedos/steedos-plugin-workflow": "^2.0.4",
|
|
60
60
|
"@types/dotenv-flow": "^3.0.0",
|
|
61
61
|
"@types/node": "12.6.8",
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"dotenv": "^8.2.0",
|
|
64
64
|
"dotenv-flow": "^3.1.0",
|
|
65
65
|
"nodemon": "1.19.1",
|
|
66
|
-
"steedos-server": "2.2.
|
|
66
|
+
"steedos-server": "2.2.36",
|
|
67
67
|
"ts-node": "8.3.0",
|
|
68
68
|
"typescript": "3.5.3"
|
|
69
69
|
},
|
|
70
70
|
"publishConfig": {
|
|
71
71
|
"access": "public"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "c19065633fb41278b2ab6e244f3d0f6afa08c2f2"
|
|
74
74
|
}
|
package/src/index.ts
CHANGED
|
@@ -10,10 +10,10 @@ import MongoDBInterface from './database-mongo';
|
|
|
10
10
|
// import accountsSamlIdp from './saml-idp';
|
|
11
11
|
import { userLoader } from './rest-express/user-loader';
|
|
12
12
|
import { mongoUrl } from './db';
|
|
13
|
-
import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
|
|
13
|
+
import { getSteedosConfig, getSteedosSchema, SteedosFieldEncryptionSharedConsts } from '@steedos/objectql'
|
|
14
14
|
import { URL } from 'url';
|
|
15
15
|
import * as bodyParser from 'body-parser';
|
|
16
|
-
import { sendMail, sendSMS} from './core';
|
|
16
|
+
import { sendMail, sendSMS } from './core';
|
|
17
17
|
|
|
18
18
|
import oauth2Consent from './oauth2/consent';
|
|
19
19
|
import oauth2Login from './oauth2/login';
|
|
@@ -33,7 +33,22 @@ function getAccountsServer() {
|
|
|
33
33
|
let refreshTokenExpiresIn = accountsConfig.refreshTokenExpiresIn || "7d";
|
|
34
34
|
let mailSignname = emailConfig.signname || "华炎魔方";
|
|
35
35
|
|
|
36
|
-
|
|
36
|
+
if (process.env.STEEDOS_CSFLE_MASTER_KEY) {
|
|
37
|
+
const { keyVaultNamespace, getKMSProviders } = SteedosFieldEncryptionSharedConsts;
|
|
38
|
+
const kmsProvider = getKMSProviders();
|
|
39
|
+
mongoose.connect(mongoUrl, {
|
|
40
|
+
useNewUrlParser: true,
|
|
41
|
+
useUnifiedTopology: true,
|
|
42
|
+
monitorCommands: true,
|
|
43
|
+
autoEncryption: {
|
|
44
|
+
keyVaultNamespace: keyVaultNamespace,
|
|
45
|
+
kmsProviders: kmsProvider,
|
|
46
|
+
bypassAutoEncryption: true,
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
} else {
|
|
50
|
+
mongoose.connect(mongoUrl, { useNewUrlParser: true });
|
|
51
|
+
}
|
|
37
52
|
const connection = mongoose.connection;
|
|
38
53
|
|
|
39
54
|
const rootUrl = process.env.ROOT_URL
|
|
@@ -128,7 +143,7 @@ function getAccountsServer() {
|
|
|
128
143
|
|
|
129
144
|
export const accountsServer = getAccountsServer()
|
|
130
145
|
|
|
131
|
-
export async function getAccountsRouter(context){
|
|
146
|
+
export async function getAccountsRouter(context) {
|
|
132
147
|
|
|
133
148
|
const router = accountsExpress(accountsServer, {
|
|
134
149
|
path: '/',
|
|
@@ -145,18 +160,18 @@ export async function getAccountsRouter(context){
|
|
|
145
160
|
return router
|
|
146
161
|
}
|
|
147
162
|
|
|
148
|
-
export function init(context){
|
|
163
|
+
export function init(context) {
|
|
149
164
|
|
|
150
|
-
if(context.settings){
|
|
151
|
-
if(!context.settings.public){
|
|
152
|
-
|
|
165
|
+
if (context.settings) {
|
|
166
|
+
if (!context.settings.public) {
|
|
167
|
+
context.settings.public = {}
|
|
153
168
|
}
|
|
154
|
-
if(!context.settings.public.webservices){
|
|
155
|
-
|
|
169
|
+
if (!context.settings.public.webservices) {
|
|
170
|
+
context.settings.public.webservices = {}
|
|
156
171
|
}
|
|
157
172
|
context.settings.public.webservices.accounts = { url: '/accounts' }
|
|
158
173
|
}
|
|
159
|
-
getAccountsRouter(context).then(
|
|
174
|
+
getAccountsRouter(context).then((accountsRouter) => {
|
|
160
175
|
context.app.use("/accounts", accountsRouter);
|
|
161
176
|
|
|
162
177
|
context.app.use("/initServer", initServer);
|