@steedos/accounts 2.7.0-beta.9 → 2.7.0
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.
|
@@ -7,10 +7,11 @@ var objectql_1 = require("@steedos/objectql");
|
|
|
7
7
|
var db_1 = require("../../../db");
|
|
8
8
|
var core_1 = require("../../../core");
|
|
9
9
|
var validator = require('validator');
|
|
10
|
+
var util = require('@steedos/utils');
|
|
10
11
|
var clone = require('clone');
|
|
11
12
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
12
13
|
var getSettings = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
13
|
-
var tenant, platform, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant;
|
|
14
|
+
var tenant, platform, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant, settings;
|
|
14
15
|
var _a, _b, _c;
|
|
15
16
|
return tslib_1.__generator(this, function (_d) {
|
|
16
17
|
switch (_d.label) {
|
|
@@ -75,6 +76,13 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
75
76
|
if (tenant.enable_saas) {
|
|
76
77
|
delete _tenant._id;
|
|
77
78
|
}
|
|
79
|
+
settings = {};
|
|
80
|
+
if (!tenant._id) return [3, 4];
|
|
81
|
+
return [4, util.getSettings(tenant._id, true)];
|
|
82
|
+
case 3:
|
|
83
|
+
settings = _d.sent();
|
|
84
|
+
_d.label = 4;
|
|
85
|
+
case 4:
|
|
78
86
|
res.json({
|
|
79
87
|
tenant: _tenant,
|
|
80
88
|
password: config.password ? config.password : (((_b = config.public) === null || _b === void 0 ? void 0 : _b.password) ? (_c = config.public) === null || _c === void 0 ? void 0 : _c.password : {}),
|
|
@@ -84,7 +92,8 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
84
92
|
serverInitInfo: serverInitInfo,
|
|
85
93
|
redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST,
|
|
86
94
|
platform: platform,
|
|
87
|
-
public: global.Meteor.settings.public || {}
|
|
95
|
+
public: global.Meteor.settings.public || {},
|
|
96
|
+
settings: settings
|
|
88
97
|
});
|
|
89
98
|
return [2];
|
|
90
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":";;;;AAQA,0BAA4B;AAE5B,8CAAsE;AACtE,kCAAiC;AACjC,sCAA4E;AAC5E,IAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.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.7.0
|
|
4
|
+
"version": "2.7.0",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
"@accounts/two-factor": "^0.20.1",
|
|
30
30
|
"@accounts/types": "0.20.1",
|
|
31
31
|
"@babel/runtime": "^7.12.18",
|
|
32
|
+
"@steedos/utils": "2.7.0",
|
|
32
33
|
"app-root-path": "^2.2.1",
|
|
33
34
|
"bcryptjs": "^2.4.3",
|
|
34
35
|
"body-parser": "1.19.0",
|
|
@@ -55,20 +56,20 @@
|
|
|
55
56
|
"validator": "^13.6.0"
|
|
56
57
|
},
|
|
57
58
|
"devDependencies": {
|
|
58
|
-
"@steedos/auth": "2.7.0
|
|
59
|
-
"@steedos/meteor-bundle-runner": "2.7.0
|
|
60
|
-
"@steedos/objectql": "2.7.0
|
|
59
|
+
"@steedos/auth": "2.7.0",
|
|
60
|
+
"@steedos/meteor-bundle-runner": "2.7.0",
|
|
61
|
+
"@steedos/objectql": "2.7.0",
|
|
61
62
|
"@types/dotenv-flow": "^3.0.0",
|
|
62
63
|
"@types/node": "12.6.8",
|
|
63
64
|
"cross-env": "^7.0.3",
|
|
64
65
|
"dotenv": "^8.2.0",
|
|
65
66
|
"dotenv-flow": "^3.1.0",
|
|
66
67
|
"nodemon": "^2.0.19",
|
|
67
|
-
"steedos-server": "2.7.0
|
|
68
|
+
"steedos-server": "2.7.0",
|
|
68
69
|
"typescript": "4.6.3"
|
|
69
70
|
},
|
|
70
71
|
"publishConfig": {
|
|
71
72
|
"access": "public"
|
|
72
73
|
},
|
|
73
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "2f1586ea4f8af5b93753878e96f1f48adbef31a7"
|
|
74
75
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: baozhoutao@steedos.com
|
|
3
3
|
* @Date: 2022-03-28 09:35:34
|
|
4
4
|
* @LastEditors: baozhoutao@steedos.com
|
|
5
|
-
* @LastEditTime:
|
|
5
|
+
* @LastEditTime: 2024-04-15 15:13:49
|
|
6
6
|
* @Description:
|
|
7
7
|
*/
|
|
8
8
|
import * as express from 'express';
|
|
@@ -12,7 +12,7 @@ import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
|
|
|
12
12
|
import { db } from '../../../db';
|
|
13
13
|
import { canSendEmail, canSendSMS, getSteedosService } from '../../../core';
|
|
14
14
|
const validator = require('validator');
|
|
15
|
-
|
|
15
|
+
const util = require('@steedos/utils')
|
|
16
16
|
const clone = require('clone');
|
|
17
17
|
|
|
18
18
|
const config = getSteedosConfig();
|
|
@@ -90,6 +90,13 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
90
90
|
delete _tenant._id;
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
+
|
|
94
|
+
let settings = {};
|
|
95
|
+
|
|
96
|
+
if(tenant._id){
|
|
97
|
+
settings = await util.getSettings(tenant._id, true)
|
|
98
|
+
}
|
|
99
|
+
|
|
93
100
|
res.json({
|
|
94
101
|
tenant: _tenant,
|
|
95
102
|
password: config.password ? config.password : ( config.public?.password ? config.public?.password : {} ),
|
|
@@ -99,6 +106,7 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
99
106
|
serverInitInfo: serverInitInfo,
|
|
100
107
|
redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST,
|
|
101
108
|
platform: platform,
|
|
102
|
-
public: (global as any).Meteor.settings.public || {}
|
|
109
|
+
public: (global as any).Meteor.settings.public || {},
|
|
110
|
+
settings: settings
|
|
103
111
|
})
|
|
104
112
|
}
|