@steedos/accounts 2.3.1 → 2.3.2-beta.3
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 -5
- package/lib/index.js.map +1 -1
- package/lib/rest-express/endpoints/initServer.js +2 -3
- package/lib/rest-express/endpoints/initServer.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/settings.js +5 -0
- package/lib/rest-express/endpoints/steedos/settings.js.map +1 -1
- package/lib/rest-express/express-middleware.js +1 -2
- package/lib/rest-express/express-middleware.js.map +1 -1
- package/package.json +6 -6
- package/src/index.ts +3 -7
- package/src/rest-express/endpoints/initServer.ts +2 -3
- package/src/rest-express/endpoints/steedos/settings.ts +7 -1
- package/src/rest-express/express-middleware.ts +1 -1
package/lib/index.js
CHANGED
|
@@ -13,7 +13,6 @@ var db_1 = require("./db");
|
|
|
13
13
|
var objectql_1 = require("@steedos/objectql");
|
|
14
14
|
var url_1 = require("url");
|
|
15
15
|
var core_1 = require("./core");
|
|
16
|
-
var initServer_1 = require("./rest-express/endpoints/initServer");
|
|
17
16
|
var steedos_auth_1 = require("./rest-express/utils/steedos-auth");
|
|
18
17
|
Object.defineProperty(exports, "setAuthCookies", { enumerable: true, get: function () { return steedos_auth_1.setAuthCookies; } });
|
|
19
18
|
Object.defineProperty(exports, "clearAuthCookies", { enumerable: true, get: function () { return steedos_auth_1.clearAuthCookies; } });
|
|
@@ -144,9 +143,9 @@ function getAccountsRouter(context) {
|
|
|
144
143
|
var router;
|
|
145
144
|
return tslib_1.__generator(this, function (_a) {
|
|
146
145
|
router = (0, rest_express_1.default)(exports.accountsServer, {
|
|
147
|
-
path: '/',
|
|
146
|
+
path: '/accounts',
|
|
148
147
|
});
|
|
149
|
-
router.get('/', function (req, res) {
|
|
148
|
+
router.get('/accounts', function (req, res) {
|
|
150
149
|
res.redirect("a/");
|
|
151
150
|
res.end();
|
|
152
151
|
});
|
|
@@ -166,8 +165,7 @@ function init(context) {
|
|
|
166
165
|
context.settings.public.webservices.accounts = { url: '/accounts' };
|
|
167
166
|
}
|
|
168
167
|
getAccountsRouter(context).then(function (accountsRouter) {
|
|
169
|
-
|
|
170
|
-
context.app.use("/initServer", initServer_1.default);
|
|
168
|
+
require('./rest-express/endpoints/initServer');
|
|
171
169
|
});
|
|
172
170
|
}
|
|
173
171
|
exports.init = init;
|
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,mCAA+D;AAC/D,uCAA8C;AAC9C,4CAA2C;AAC3C,+CAA6C;AAC7C,mDAAgD;AAGhD,2BAAgC;AAChC,8CAAqG;AACrG,2BAA0B;AAE1B,+BAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
var express = require("express");
|
|
5
4
|
var objectql_1 = require("@steedos/objectql");
|
|
6
|
-
var router =
|
|
7
|
-
router.post('/', function (req, res, next) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
5
|
+
var router = require('@steedos/router').staticRouter();
|
|
6
|
+
router.post('/initServer', function (req, res, next) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
8
7
|
var broker, body, result, error_1;
|
|
9
8
|
return tslib_1.__generator(this, function (_a) {
|
|
10
9
|
switch (_a.label) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initServer.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/initServer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"initServer.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/initServer.ts"],"names":[],"mappings":";;;AAAA,8CAAoD;AACpD,IAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC;AAEzD,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;gBAEtC,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC,MAAM,CAAC;gBACnC,IAAI,GAAQ,GAAG,CAAC,IAAI,CAAC;gBACZ,WAAM,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAA;;gBAApH,MAAM,GAAG,SAA2G;gBAC1H,WAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;;gBAEnC,WAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAK,CAAC,OAAO,CAAC,EAAA;;;;KAE7C,CAAC,CAAA;AAEF,kBAAe,MAAM,CAAA"}
|
|
@@ -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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"}
|
|
@@ -4,7 +4,6 @@ var tslib_1 = require("tslib");
|
|
|
4
4
|
var provider_callback_1 = require("./endpoints/oauth/provider-callback");
|
|
5
5
|
var reset_1 = require("./endpoints/password/reset");
|
|
6
6
|
var verify_email_1 = require("./endpoints/password/verify-email");
|
|
7
|
-
var express = require("express");
|
|
8
7
|
var cookieParser = require("cookie-parser");
|
|
9
8
|
var cookie = require('cookie-parser');
|
|
10
9
|
var refresh_access_token_1 = require("./endpoints/refresh-access-token");
|
|
@@ -33,7 +32,7 @@ var accountsExpress = function (accountsServer, options) {
|
|
|
33
32
|
if (path === '/') {
|
|
34
33
|
path = '';
|
|
35
34
|
}
|
|
36
|
-
var router =
|
|
35
|
+
var router = require('@steedos/router').staticRouter();
|
|
37
36
|
router.use(cookieParser());
|
|
38
37
|
router.post("".concat(path, "/impersonate"), (0, impersonate_1.impersonate)(accountsServer));
|
|
39
38
|
router.get("".concat(path, "/authorize"), (0, user_loader_1.userLoader)(accountsServer), (0, authorize_1.authorize)(accountsServer));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,oDAAmF;AACnF,kEAA6G;
|
|
1
|
+
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.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.3",
|
|
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.3",
|
|
58
|
+
"@steedos/meteor-bundle-runner": "2.3.2-beta.3",
|
|
59
|
+
"@steedos/objectql": "2.3.2-beta.3",
|
|
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.3",
|
|
67
67
|
"typescript": "4.6.3"
|
|
68
68
|
},
|
|
69
69
|
"publishConfig": {
|
|
70
70
|
"access": "public"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "1f337e8da176f1c75a8596b29ec7889eca996dc1"
|
|
73
73
|
}
|
package/src/index.ts
CHANGED
|
@@ -15,7 +15,6 @@ import { URL } from 'url';
|
|
|
15
15
|
import * as bodyParser from 'body-parser';
|
|
16
16
|
import { sendMail, sendSMS } from './core';
|
|
17
17
|
|
|
18
|
-
import initServer from './rest-express/endpoints/initServer';
|
|
19
18
|
export { setAuthCookies, clearAuthCookies } from './rest-express/utils/steedos-auth';
|
|
20
19
|
export { getMergedTenant } from './core';
|
|
21
20
|
|
|
@@ -144,10 +143,10 @@ export const accountsServer = getAccountsServer()
|
|
|
144
143
|
export async function getAccountsRouter(context) {
|
|
145
144
|
|
|
146
145
|
const router = accountsExpress(accountsServer, {
|
|
147
|
-
path: '/',
|
|
146
|
+
path: '/accounts',
|
|
148
147
|
});
|
|
149
148
|
|
|
150
|
-
router.get('/', (req, res) => {
|
|
149
|
+
router.get('/accounts', (req, res) => {
|
|
151
150
|
res.redirect("a/");
|
|
152
151
|
res.end();
|
|
153
152
|
});
|
|
@@ -170,9 +169,6 @@ export function init(context) {
|
|
|
170
169
|
context.settings.public.webservices.accounts = { url: '/accounts' }
|
|
171
170
|
}
|
|
172
171
|
getAccountsRouter(context).then((accountsRouter) => {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
context.app.use("/initServer", initServer);
|
|
176
|
-
|
|
172
|
+
require('./rest-express/endpoints/initServer')
|
|
177
173
|
})
|
|
178
174
|
}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import * as express from 'express'
|
|
2
1
|
import { getSteedosSchema } from '@steedos/objectql'
|
|
3
|
-
const router =
|
|
2
|
+
const router = require('@steedos/router').staticRouter();
|
|
4
3
|
|
|
5
|
-
router.post('/', async (req, res, next) => {
|
|
4
|
+
router.post('/initServer', async (req, res, next) => {
|
|
6
5
|
try {
|
|
7
6
|
const broker = getSteedosSchema().broker;
|
|
8
7
|
const body: any = req.body;
|
|
@@ -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 : {} ),
|