@steedos/accounts 2.3.1 → 2.3.2-beta.2
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.
|
@@ -6,6 +6,7 @@ var _ = require("lodash");
|
|
|
6
6
|
var objectql_1 = require("@steedos/objectql");
|
|
7
7
|
var db_1 = require("../../../db");
|
|
8
8
|
var core_1 = require("../../../core");
|
|
9
|
+
var validator = require('validator');
|
|
9
10
|
var clone = require('clone');
|
|
10
11
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
11
12
|
var getSettings = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
@@ -26,6 +27,7 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
26
27
|
enable_email_code_login: false,
|
|
27
28
|
enable_bind_mobile: false,
|
|
28
29
|
enable_bind_email: false,
|
|
30
|
+
enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true)
|
|
29
31
|
};
|
|
30
32
|
if (config.tenant) {
|
|
31
33
|
_.assignIn(tenant, config.tenant);
|
|
@@ -65,6 +67,9 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
65
67
|
delete _tenant['tokenSecret'];
|
|
66
68
|
delete _tenant['accessTokenExpiresIn'];
|
|
67
69
|
delete _tenant['refreshTokenExpiresIn'];
|
|
70
|
+
if (tenant.enable_saas) {
|
|
71
|
+
delete _tenant._id;
|
|
72
|
+
}
|
|
68
73
|
res.json({
|
|
69
74
|
tenant: _tenant,
|
|
70
75
|
password: config.password ? config.password : (((_a = config.public) === null || _a === void 0 ? void 0 : _a.password) ? (_b = config.public) === null || _b === void 0 ? void 0 : _b.password : {}),
|
|
@@ -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;
|
|
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.3.
|
|
4
|
+
"version": "2.3.2-beta.2",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -54,20 +54,20 @@
|
|
|
54
54
|
"validator": "^13.6.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@steedos/auth": "2.3.
|
|
58
|
-
"@steedos/meteor-bundle-runner": "2.3.
|
|
59
|
-
"@steedos/objectql": "2.3.
|
|
57
|
+
"@steedos/auth": "2.3.2-beta.2",
|
|
58
|
+
"@steedos/meteor-bundle-runner": "2.3.2-beta.2",
|
|
59
|
+
"@steedos/objectql": "2.3.2-beta.2",
|
|
60
60
|
"@types/dotenv-flow": "^3.0.0",
|
|
61
61
|
"@types/node": "12.6.8",
|
|
62
62
|
"cross-env": "^7.0.3",
|
|
63
63
|
"dotenv": "^8.2.0",
|
|
64
64
|
"dotenv-flow": "^3.1.0",
|
|
65
65
|
"nodemon": "^2.0.19",
|
|
66
|
-
"steedos-server": "2.3.
|
|
66
|
+
"steedos-server": "2.3.2-beta.2",
|
|
67
67
|
"typescript": "4.6.3"
|
|
68
68
|
},
|
|
69
69
|
"publishConfig": {
|
|
70
70
|
"access": "public"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "2e469778c682ec784fbfb93f5e83d2f5f9671ea5"
|
|
73
73
|
}
|
|
@@ -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: 2022-
|
|
5
|
+
* @LastEditTime: 2022-11-15 10:15:34
|
|
6
6
|
* @Description:
|
|
7
7
|
*/
|
|
8
8
|
import * as express from 'express';
|
|
@@ -11,6 +11,7 @@ import { AccountsServer } from '../../../server';
|
|
|
11
11
|
import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
|
|
12
12
|
import { db } from '../../../db';
|
|
13
13
|
import { canSendEmail, canSendSMS, getSteedosService } from '../../../core';
|
|
14
|
+
const validator = require('validator');
|
|
14
15
|
|
|
15
16
|
const clone = require('clone');
|
|
16
17
|
|
|
@@ -32,6 +33,7 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
32
33
|
enable_email_code_login: false,
|
|
33
34
|
enable_bind_mobile: false,
|
|
34
35
|
enable_bind_email: false,
|
|
36
|
+
enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true)
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
if (config.tenant) {
|
|
@@ -74,6 +76,10 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
74
76
|
delete _tenant['accessTokenExpiresIn']
|
|
75
77
|
delete _tenant['refreshTokenExpiresIn']
|
|
76
78
|
|
|
79
|
+
if(tenant.enable_saas){
|
|
80
|
+
delete _tenant._id;
|
|
81
|
+
}
|
|
82
|
+
|
|
77
83
|
res.json({
|
|
78
84
|
tenant: _tenant,
|
|
79
85
|
password: config.password ? config.password : ( config.public?.password ? config.public?.password : {} ),
|