@steedos/accounts 2.1.64 → 2.1.68
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 +2 -0
- package/lib/index.js.map +1 -1
- package/lib/rest-express/endpoints/initServer.js +27 -0
- package/lib/rest-express/endpoints/initServer.js.map +1 -0
- package/lib/rest-express/endpoints/steedos/settings.js +12 -4
- package/lib/rest-express/endpoints/steedos/settings.js.map +1 -1
- package/package.json +6 -6
- package/src/index.ts +4 -1
- package/src/rest-express/endpoints/initServer.ts +16 -0
- package/src/rest-express/endpoints/steedos/settings.ts +16 -5
package/lib/index.js
CHANGED
|
@@ -18,6 +18,7 @@ var core_1 = require("./core");
|
|
|
18
18
|
var consent_1 = require("./oauth2/consent");
|
|
19
19
|
var login_1 = require("./oauth2/login");
|
|
20
20
|
var logout_1 = require("./oauth2/logout");
|
|
21
|
+
var initServer_1 = require("./rest-express/endpoints/initServer");
|
|
21
22
|
var config_1 = require("./oauth2/config");
|
|
22
23
|
Object.defineProperty(exports, "hydraAdmin", { enumerable: true, get: function () { return config_1.hydraAdmin; } });
|
|
23
24
|
var config = objectql_1.getSteedosConfig();
|
|
@@ -154,6 +155,7 @@ function init(context) {
|
|
|
154
155
|
}
|
|
155
156
|
getAccountsRouter(context).then(function (accountsRouter) {
|
|
156
157
|
context.app.use("/accounts", accountsRouter);
|
|
158
|
+
context.app.use("/initServer", initServer_1.default);
|
|
157
159
|
context.app.use("/oauth2/consent", user_loader_1.userLoader(exports.accountsServer), consent_1.default);
|
|
158
160
|
context.app.use("/oauth2/login", user_loader_1.userLoader(exports.accountsServer), login_1.default);
|
|
159
161
|
context.app.use("/oauth2/logout", logout_1.default);
|
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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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var tslib_1 = require("tslib");
|
|
4
|
+
var express = require("express");
|
|
5
|
+
var objectql_1 = require("@steedos/objectql");
|
|
6
|
+
var router = express.Router();
|
|
7
|
+
router.post('/', function (req, res, next) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
8
|
+
var broker, body, result, error_1;
|
|
9
|
+
return tslib_1.__generator(this, function (_a) {
|
|
10
|
+
switch (_a.label) {
|
|
11
|
+
case 0:
|
|
12
|
+
_a.trys.push([0, 2, , 3]);
|
|
13
|
+
broker = objectql_1.getSteedosSchema().broker;
|
|
14
|
+
body = req.body;
|
|
15
|
+
return [4 /*yield*/, broker.call("@steedos/service-cloud-init.initServer", { spaceId: body.spaceId, apiKey: body.apiKey })];
|
|
16
|
+
case 1:
|
|
17
|
+
result = _a.sent();
|
|
18
|
+
return [2 /*return*/, res.status(200).send(result)];
|
|
19
|
+
case 2:
|
|
20
|
+
error_1 = _a.sent();
|
|
21
|
+
return [2 /*return*/, res.status(500).send(error_1.message)];
|
|
22
|
+
case 3: return [2 /*return*/];
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
}); });
|
|
26
|
+
exports.default = router;
|
|
27
|
+
//# sourceMappingURL=initServer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"initServer.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/initServer.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,8CAAoD;AACpD,IAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAO,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;gBAE5B,MAAM,GAAG,2BAAgB,EAAE,CAAC,MAAM,CAAC;gBACnC,IAAI,GAAQ,GAAG,CAAC,IAAI,CAAC;gBACZ,qBAAM,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,sBAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;;gBAEnC,sBAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAK,CAAC,OAAO,CAAC,EAAA;;;;KAE7C,CAAC,CAAA;AAEF,kBAAe,MAAM,CAAA"}
|
|
@@ -8,7 +8,7 @@ var db_1 = require("../../../db");
|
|
|
8
8
|
var core_1 = require("../../../core");
|
|
9
9
|
var config = objectql_1.getSteedosConfig();
|
|
10
10
|
exports.getSettings = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
11
|
-
var tenant, spaceDoc, steedosService, already_mail_service, already_sms_service;
|
|
11
|
+
var tenant, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo;
|
|
12
12
|
return tslib_1.__generator(this, function (_a) {
|
|
13
13
|
switch (_a.label) {
|
|
14
14
|
case 0:
|
|
@@ -28,8 +28,11 @@ exports.getSettings = function (accountsServer) { return function (req, res) { r
|
|
|
28
28
|
if (config.tenant) {
|
|
29
29
|
_.assignIn(tenant, config.tenant);
|
|
30
30
|
}
|
|
31
|
-
if (!
|
|
32
|
-
|
|
31
|
+
if (!tenant._id) {
|
|
32
|
+
tenant._id = process.env.STEEDOS_CLOUD_SPACE_ID;
|
|
33
|
+
}
|
|
34
|
+
if (!tenant._id) return [3 /*break*/, 2];
|
|
35
|
+
return [4 /*yield*/, db_1.db.findOne("spaces", tenant._id, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"] })];
|
|
33
36
|
case 1:
|
|
34
37
|
spaceDoc = _a.sent();
|
|
35
38
|
steedosService = core_1.getSteedosService();
|
|
@@ -52,12 +55,17 @@ exports.getSettings = function (accountsServer) { return function (req, res) { r
|
|
|
52
55
|
case 2:
|
|
53
56
|
already_mail_service = core_1.canSendEmail();
|
|
54
57
|
already_sms_service = true || core_1.canSendSMS();
|
|
58
|
+
broker = objectql_1.getSteedosSchema().broker;
|
|
59
|
+
return [4 /*yield*/, broker.call("@steedos/service-cloud-init.serverInitInfo", {})];
|
|
60
|
+
case 3:
|
|
61
|
+
serverInitInfo = _a.sent();
|
|
55
62
|
res.json({
|
|
56
63
|
tenant: tenant,
|
|
57
64
|
password: config.password ? config.password : {},
|
|
58
65
|
root_url: process.env.ROOT_URL,
|
|
59
66
|
already_mail_service: already_mail_service,
|
|
60
|
-
already_sms_service: already_sms_service
|
|
67
|
+
already_sms_service: already_sms_service,
|
|
68
|
+
serverInitInfo: serverInitInfo
|
|
61
69
|
});
|
|
62
70
|
return [2 /*return*/];
|
|
63
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":";;;;AACA,0BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":";;;;AACA,0BAA4B;AAE5B,8CAAsE;AACtE,kCAAiC;AACjC,sCAA4E;AAE5E,IAAM,MAAM,GAAG,2BAAgB,EAAE,CAAC;AAErB,QAAA,WAAW,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC3D,GAAoB,EACpB,GAAqB;;;;;gBAEnB,MAAM,GAAQ;oBAChB,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,SAAS;oBACnB,cAAc,EAAE,SAAS;oBACzB,oBAAoB,EAAE,IAAI;oBAC1B,eAAe,EAAE,IAAI;oBACrB,sBAAsB,EAAE,IAAI;oBAC5B,qBAAqB,EAAE,IAAI;oBAC3B,wBAAwB,EAAE,KAAK;oBAC/B,uBAAuB,EAAE,KAAK;oBAC9B,kBAAkB,EAAE,KAAK;oBACzB,iBAAiB,EAAE,KAAK;iBACzB,CAAA;gBAED,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;iBAClC;gBAED,IAAG,CAAC,MAAM,CAAC,GAAG,EAAC;oBACb,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;iBAChD;qBAGG,MAAM,CAAC,GAAG,EAAV,wBAAU;gBACG,qBAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAC,CAAC,EAAA;;gBAA/I,QAAQ,GAAG,SAAoI;gBAC/I,cAAc,GAAG,wBAAiB,EAAE,CAAC;gBACzC,IAAI,cAAc,IAAI,QAAQ,EAAE;oBAC5B,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAC/B,IAAI,QAAQ,CAAC,YAAY,EAAE;wBACzB,MAAM,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,YAAY,CAAA;qBAChF;yBAAM,IAAI,QAAQ,CAAC,WAAW,EAAE;wBAC/B,MAAM,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAA;qBAC/E;yBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;wBAC1B,MAAM,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,MAAM,CAAA;qBAC1E;oBACD,IAAI,QAAQ,CAAC,UAAU,EAAE;wBACvB,MAAM,CAAC,cAAc,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAA;qBACpF;iBACF;;;gBAGC,oBAAoB,GAAG,mBAAY,EAAE,CAAC;gBACtC,mBAAmB,GAAG,IAAI,IAAI,iBAAU,EAAE,CAAC;gBAGzC,MAAM,GAAG,2BAAgB,EAAE,CAAC,MAAM,CAAC;gBAClB,qBAAM,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE,EAAE,CAAC,EAAA;;gBAApF,cAAc,GAAG,SAAmE;gBAG1F,GAAG,CAAC,IAAI,CAAC;oBACP,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAA,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAA,EAAE;oBAC5C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;oBAC9B,oBAAoB,EAAE,oBAAoB;oBAC1C,mBAAmB,EAAE,mBAAmB;oBACxC,cAAc,EAAE,cAAc;iBAC/B,CAAC,CAAA;;;;KACH,EA7D8D,CA6D9D,CAAA"}
|
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.68",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -54,9 +54,9 @@
|
|
|
54
54
|
"validator": "^13.6.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@steedos/auth": "2.1.
|
|
58
|
-
"@steedos/meteor-bundle-runner": "2.1.
|
|
59
|
-
"@steedos/objectql": "2.1.
|
|
57
|
+
"@steedos/auth": "2.1.68",
|
|
58
|
+
"@steedos/meteor-bundle-runner": "2.1.68",
|
|
59
|
+
"@steedos/objectql": "2.1.68",
|
|
60
60
|
"@steedos/steedos-plugin-workflow": "^2.0.4",
|
|
61
61
|
"@types/dotenv-flow": "^3.0.0",
|
|
62
62
|
"@types/node": "12.6.8",
|
|
@@ -64,12 +64,12 @@
|
|
|
64
64
|
"dotenv": "^8.2.0",
|
|
65
65
|
"dotenv-flow": "^3.1.0",
|
|
66
66
|
"nodemon": "1.19.1",
|
|
67
|
-
"steedos-server": "2.1.
|
|
67
|
+
"steedos-server": "2.1.68",
|
|
68
68
|
"ts-node": "8.3.0",
|
|
69
69
|
"typescript": "3.5.3"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "08258fa4543a8cf425156f057c6016ca3c1deaf9"
|
|
75
75
|
}
|
package/src/index.ts
CHANGED
|
@@ -10,7 +10,7 @@ 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,
|
|
13
|
+
import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
|
|
14
14
|
import { URL } from 'url';
|
|
15
15
|
import * as bodyParser from 'body-parser';
|
|
16
16
|
import { sendMail, sendSMS} from './core';
|
|
@@ -18,6 +18,7 @@ import { sendMail, sendSMS} from './core';
|
|
|
18
18
|
import oauth2Consent from './oauth2/consent';
|
|
19
19
|
import oauth2Login from './oauth2/login';
|
|
20
20
|
import oauth2Logout from './oauth2/logout';
|
|
21
|
+
import initServer from './rest-express/endpoints/initServer';
|
|
21
22
|
export { hydraAdmin } from './oauth2/config';
|
|
22
23
|
|
|
23
24
|
declare var WebApp;
|
|
@@ -159,6 +160,8 @@ export function init(context){
|
|
|
159
160
|
getAccountsRouter(context).then( (accountsRouter) => {
|
|
160
161
|
context.app.use("/accounts", accountsRouter);
|
|
161
162
|
|
|
163
|
+
context.app.use("/initServer", initServer);
|
|
164
|
+
|
|
162
165
|
context.app.use("/oauth2/consent", userLoader(accountsServer), oauth2Consent);
|
|
163
166
|
context.app.use("/oauth2/login", userLoader(accountsServer), oauth2Login);
|
|
164
167
|
context.app.use("/oauth2/logout", oauth2Logout);
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as express from 'express'
|
|
2
|
+
import { getSteedosSchema } from '@steedos/objectql'
|
|
3
|
+
const router = express.Router()
|
|
4
|
+
|
|
5
|
+
router.post('/', async (req, res, next) => {
|
|
6
|
+
try {
|
|
7
|
+
const broker = getSteedosSchema().broker;
|
|
8
|
+
const body: any = req.body;
|
|
9
|
+
const result = await broker.call(`@steedos/service-cloud-init.initServer`, { spaceId: body.spaceId, apiKey: body.apiKey });
|
|
10
|
+
return res.status(200).send(result)
|
|
11
|
+
} catch (error) {
|
|
12
|
+
return res.status(500).send(error.message)
|
|
13
|
+
}
|
|
14
|
+
})
|
|
15
|
+
|
|
16
|
+
export default router
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as express from 'express';
|
|
2
2
|
import * as _ from 'lodash';
|
|
3
3
|
import { AccountsServer } from '../../../server';
|
|
4
|
-
import { getSteedosConfig } from '@steedos/objectql'
|
|
4
|
+
import { getSteedosConfig, getSteedosSchema } from '@steedos/objectql'
|
|
5
5
|
import { db } from '../../../db';
|
|
6
6
|
import { canSendEmail, canSendSMS, getSteedosService } from '../../../core';
|
|
7
7
|
|
|
@@ -11,7 +11,7 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
11
11
|
req: express.Request,
|
|
12
12
|
res: express.Response
|
|
13
13
|
) => {
|
|
14
|
-
let tenant = {
|
|
14
|
+
let tenant: any = {
|
|
15
15
|
name: "Steedos",
|
|
16
16
|
logo_url: undefined,
|
|
17
17
|
background_url: undefined,
|
|
@@ -29,8 +29,13 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
29
29
|
_.assignIn(tenant, config.tenant)
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
if
|
|
33
|
-
|
|
32
|
+
if(!tenant._id){
|
|
33
|
+
tenant._id = process.env.STEEDOS_CLOUD_SPACE_ID
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
if (tenant._id) {
|
|
38
|
+
let spaceDoc = await db.findOne("spaces", tenant._id, {fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"]})
|
|
34
39
|
let steedosService = getSteedosService();
|
|
35
40
|
if (steedosService && spaceDoc) {
|
|
36
41
|
_.assignIn(tenant, spaceDoc);
|
|
@@ -50,11 +55,17 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
50
55
|
let already_mail_service = canSendEmail();
|
|
51
56
|
let already_sms_service = true || canSendSMS();
|
|
52
57
|
|
|
58
|
+
//allowInit
|
|
59
|
+
const broker = getSteedosSchema().broker;
|
|
60
|
+
const serverInitInfo = await broker.call(`@steedos/service-cloud-init.serverInitInfo`, {});
|
|
61
|
+
|
|
62
|
+
|
|
53
63
|
res.json({
|
|
54
64
|
tenant: tenant,
|
|
55
65
|
password: config.password?config.password:{},
|
|
56
66
|
root_url: process.env.ROOT_URL,
|
|
57
67
|
already_mail_service: already_mail_service,
|
|
58
|
-
already_sms_service: already_sms_service
|
|
68
|
+
already_sms_service: already_sms_service,
|
|
69
|
+
serverInitInfo: serverInitInfo
|
|
59
70
|
})
|
|
60
71
|
}
|