@steedos/accounts 3.0.0-beta.15 → 3.0.0-beta.151

package/lib/rest-express/endpoints/service-authenticate.js

@@ -2,83 +2,85 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serviceAuthenticate = void 0;
 var tslib_1 = require("tslib");
-var requestIp = require("request-ip");
+var getClientIp_1 = require("../utils/getClientIp");
 var get_user_agent_1 = require("../utils/get-user-agent");
 var send_error_1 = require("../utils/send-error");
 var steedos_auth_1 = require("../utils/steedos-auth");
 var users_1 = require("../utils/users");
-var serviceAuthenticate = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var serviceName, userAgent, ip, email, spaceId, services, db_1, loggedInUser, session, validSpaceId, user, authToken, stampedAuthToken, hashedToken, _user, data, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 7, , 8]);
-                serviceName = req.params.service;
-                userAgent = (0, get_user_agent_1.getUserAgent)(req) || '';
-                ip = requestIp.getClientIp(req);
-                email = req.body.user.email;
-                spaceId = req.body.spaceId;
-                services = accountsServer.getServices();
-                db_1 = services[serviceName].db;
-                if (email && email.indexOf("@") < 0) {
-                    req.body.user.username = email;
-                }
-                return [4, accountsServer.loginWithService(serviceName, req.body, {
-                        ip: ip,
-                        userAgent: userAgent
-                    })];
-            case 1:
-                loggedInUser = _a.sent();
-                return [4, accountsServer.findSessionByAccessToken(loggedInUser.tokens.accessToken)];
-            case 2:
-                session = _a.sent();
-                return [4, (0, users_1.getUserSpace)(session.userId, spaceId)];
-            case 3:
-                validSpaceId = _a.sent();
-                if (validSpaceId) {
-                    userAgent = "".concat(userAgent, " Space/").concat(validSpaceId);
-                    db_1.updateSession(loggedInUser.sessionId, {
-                        ip: ip,
-                        userAgent: userAgent
-                    });
-                }
-                return [4, db_1.collection.findOne({ _id: session.userId }, { password_expired: 1 })];
-            case 4:
-                user = _a.sent();
-                authToken = null;
-                stampedAuthToken = {
-                    token: session.token,
-                    when: new Date
-                };
-                authToken = stampedAuthToken.token;
-                hashedToken = (0, steedos_auth_1.hashStampedToken)(stampedAuthToken);
-                return [4, db_1.collection.findOne({ _id: session.userId }, { services: 1 })];
-            case 5:
-                _user = _a.sent();
-                if (!_user['services']) {
-                    _user['services'] = {};
-                }
-                if (!_user['services']['resume']) {
-                    _user['services']['resume'] = { loginTokens: [] };
-                }
-                if (!_user['services']['resume']['loginTokens']) {
-                    _user['services']['resume']['loginTokens'] = [];
-                }
-                _user['services']['resume']['loginTokens'].push(hashedToken);
-                data = { services: _user['services'] };
-                return [4, db_1.collection.updateOne({ _id: session.userId }, { $set: data })];
-            case 6:
-                _a.sent();
-                (0, steedos_auth_1.setAuthCookies)(req, res, session.userId, authToken, loggedInUser.tokens.accessToken, validSpaceId);
-                res.json(loggedInUser);
-                return [3, 8];
-            case 7:
-                err_1 = _a.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 8];
-            case 8: return [2];
-        }
-    });
-}); }; };
+var serviceAuthenticate = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var serviceName, userAgent, ip, email, spaceId, services, db_1, loggedInUser, session, validSpaceId, user, authToken, stampedAuthToken, hashedToken, _user, data, err_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 7, , 8]);
+                    serviceName = req.params.service;
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    email = req.body.user.email;
+                    spaceId = req.body.spaceId;
+                    services = accountsServer.getServices();
+                    db_1 = services[serviceName].db;
+                    if (email && email.indexOf("@") < 0) {
+                        req.body.user.username = email;
+                    }
+                    return [4, accountsServer.loginWithService(serviceName, req.body, {
+                            ip: ip,
+                            userAgent: userAgent,
+                        })];
+                case 1:
+                    loggedInUser = _a.sent();
+                    return [4, accountsServer.findSessionByAccessToken(loggedInUser.tokens.accessToken)];
+                case 2:
+                    session = _a.sent();
+                    return [4, (0, users_1.getUserSpace)(session.userId, spaceId)];
+                case 3:
+                    validSpaceId = _a.sent();
+                    if (validSpaceId) {
+                        userAgent = "".concat(userAgent, " Space/").concat(validSpaceId);
+                        db_1.updateSession(loggedInUser.sessionId, {
+                            ip: ip,
+                            userAgent: userAgent,
+                        });
+                    }
+                    return [4, db_1.collection.findOne({ _id: session.userId }, { password_expired: 1 })];
+                case 4:
+                    user = _a.sent();
+                    authToken = null;
+                    stampedAuthToken = {
+                        token: session.token,
+                        when: new Date(),
+                    };
+                    authToken = stampedAuthToken.token;
+                    hashedToken = (0, steedos_auth_1.hashStampedToken)(stampedAuthToken);
+                    return [4, db_1.collection.findOne({ _id: session.userId }, { services: 1 })];
+                case 5:
+                    _user = _a.sent();
+                    if (!_user["services"]) {
+                        _user["services"] = {};
+                    }
+                    if (!_user["services"]["resume"]) {
+                        _user["services"]["resume"] = { loginTokens: [] };
+                    }
+                    if (!_user["services"]["resume"]["loginTokens"]) {
+                        _user["services"]["resume"]["loginTokens"] = [];
+                    }
+                    _user["services"]["resume"]["loginTokens"].push(hashedToken);
+                    data = { services: _user["services"] };
+                    return [4, db_1.collection.updateOne({ _id: session.userId }, { $set: data })];
+                case 6:
+                    _a.sent();
+                    (0, steedos_auth_1.setAuthCookies)(req, res, session.userId, authToken, loggedInUser.tokens.accessToken, validSpaceId);
+                    res.json(loggedInUser);
+                    return [3, 8];
+                case 7:
+                    err_1 = _a.sent();
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 8];
+                case 8: return [2];
+            }
+        });
+    }); };
+};
 exports.serviceAuthenticate = serviceAuthenticate;
 //# sourceMappingURL=service-authenticate.js.map

package/lib/rest-express/endpoints/service-authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-authenticate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/service-authenticate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-authenticate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/service-authenticate.ts"],"names":[],"mappings":"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"}

package/lib/rest-express/endpoints/steedos/get-tenant.js

@@ -5,47 +5,70 @@ var tslib_1 = require("tslib");
 var send_error_1 = require("../../utils/send-error");
 var db_1 = require("../../../db");
 var core_1 = require("../../../core");
-var getTenant = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var spaceId, spaceDoc, steedosService, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                spaceId = req.params.id;
-                if (!spaceId)
-                    throw new Error("accounts.tenant_id_required");
-                return [4, db_1.db.findOne("spaces", spaceId, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"] })];
-            case 1:
-                spaceDoc = _a.sent();
-                if (!spaceDoc) {
-                    return [2, res.send({
-                            exists: false
+var getTenant = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var spaceId, spaceDoc, steedosService, err_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    spaceId = req.params.id;
+                    if (!spaceId)
+                        throw new Error("accounts.tenant_id_required");
+                    return [4, db_1.db.findOne("spaces", spaceId, {
+                            fields: [
+                                "name",
+                                "avatar",
+                                "avatar_dark",
+                                "background",
+                                "enable_register",
+                                "account_logo",
+                            ],
                         })];
-                }
-                steedosService = (0, core_1.getSteedosService)();
-                if (steedosService) {
-                    if (spaceDoc.account_logo) {
-                        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.account_logo;
+                case 1:
+                    spaceDoc = _a.sent();
+                    if (!spaceDoc) {
+                        return [2, res.send({
+                                exists: false,
+                            })];
                     }
-                    else if (spaceDoc.avatar_dark) {
-                        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar_dark;
+                    steedosService = (0, core_1.getSteedosService)();
+                    if (steedosService) {
+                        if (spaceDoc.account_logo) {
+                            spaceDoc.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.account_logo;
+                        }
+                        else if (spaceDoc.avatar_dark) {
+                            spaceDoc.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.avatar_dark;
+                        }
+                        else if (spaceDoc.avatar) {
+                            spaceDoc.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.avatar;
+                        }
+                        if (spaceDoc.background) {
+                            spaceDoc.background_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.background;
+                        }
                     }
-                    else if (spaceDoc.avatar) {
-                        spaceDoc.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar;
-                    }
-                    if (spaceDoc.background) {
-                        spaceDoc.background_url = steedosService + "api/files/avatars/" + spaceDoc.background;
-                    }
-                }
-                res.json(spaceDoc);
-                return [3, 3];
-            case 2:
-                err_1 = _a.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 3];
-            case 3: return [2];
-        }
-    });
-}); }; };
+                    res.json(spaceDoc);
+                    return [3, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); };
+};
 exports.getTenant = getTenant;
 //# sourceMappingURL=get-tenant.js.map

package/lib/rest-express/endpoints/steedos/get-tenant.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-tenant.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/get-tenant.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AAEnD,kCAAiC;AACjC,sCAAgD;AAEzC,IAAM,SAAS,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC3D,GAAoB,EACpB,GAAqB;;;;;;gBAIb,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO;oBACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;gBAE/B,WAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAC,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAC,CAAC,EAAA;;gBAA5I,QAAQ,GAAG,SAAiI;gBAElJ,IAAG,CAAC,QAAQ,EAAC,CAAC;oBACZ,WAAO,GAAG,CAAC,IAAI,CAAC;4BACZ,MAAM,EAAE,KAAK;yBAChB,CAAC,EAAC;gBACL,CAAC;gBAEG,cAAc,GAAG,IAAA,wBAAiB,GAAE,CAAC;gBAEzC,IAAI,cAAc,EAAE,CAAC;oBACnB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;wBAC1B,QAAQ,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,YAAY,CAAA;oBACnF,CAAC;yBAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wBAChC,QAAQ,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAA;oBAClF,CAAC;yBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAC3B,QAAQ,CAAC,QAAQ,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,MAAM,CAAA;oBAC7E,CAAC;oBACD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACxB,QAAQ,CAAC,cAAc,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAA;oBACvF,CAAC;gBACH,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;;;;gBAEnB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EApC4D,CAoC5D,CAAC;AApCW,QAAA,SAAS,aAoCpB"}
+{"version":3,"file":"get-tenant.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/get-tenant.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AAEnD,kCAAiC;AACjC,sCAAkD;AAE3C,IAAM,SAAS,GACpB,UAAC,cAA8B;IAC/B,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC9B,IAAI,CAAC,OAAO;wBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBAE5C,WAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE;4BACnD,MAAM,EAAE;gCACN,MAAM;gCACN,QAAQ;gCACR,aAAa;gCACb,YAAY;gCACZ,iBAAiB;gCACjB,cAAc;6BACf;yBACF,CAAC,EAAA;;oBATI,QAAQ,GAAG,SASf;oBAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACd,WAAO,GAAG,CAAC,IAAI,CAAC;gCACd,MAAM,EAAE,KAAK;6BACd,CAAC,EAAC;oBACL,CAAC;oBAEG,cAAc,GAAG,IAAA,wBAAiB,GAAE,CAAC;oBAEzC,IAAI,cAAc,EAAE,CAAC;wBACnB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;4BAC1B,QAAQ,CAAC,QAAQ;gCACf,cAAc;oCACd,sCAAsC;oCACtC,QAAQ,CAAC,YAAY,CAAC;wBAC1B,CAAC;6BAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;4BAChC,QAAQ,CAAC,QAAQ;gCACf,cAAc;oCACd,sCAAsC;oCACtC,QAAQ,CAAC,WAAW,CAAC;wBACzB,CAAC;6BAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;4BAC3B,QAAQ,CAAC,QAAQ;gCACf,cAAc;oCACd,sCAAsC;oCACtC,QAAQ,CAAC,MAAM,CAAC;wBACpB,CAAC;wBACD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;4BACxB,QAAQ,CAAC,cAAc;gCACrB,cAAc;oCACd,sCAAsC;oCACtC,QAAQ,CAAC,UAAU,CAAC;wBACxB,CAAC;oBACH,CAAC;oBACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;;;;oBAEnB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AApDD,CAoDC,CAAC;AAtDS,QAAA,SAAS,aAsDlB"}

package/lib/rest-express/endpoints/steedos/settings.js

@@ -6,98 +6,129 @@ var _ = require("lodash");
 var objectql_1 = require("@steedos/objectql");
 var db_1 = require("../../../db");
 var core_1 = require("../../../core");
-var validator = require('validator');
-var util = require('@steedos/utils');
-var clone = require('clone');
+var validator = require("validator");
+var util = require("@steedos/utils");
+var clone = require("clone");
 var config = (0, objectql_1.getSteedosConfig)();
-var getSettings = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var tenant, platform, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant, settings;
-    var _a, _b, _c;
-    return tslib_1.__generator(this, function (_d) {
-        switch (_d.label) {
-            case 0:
-                tenant = {
-                    name: "Steedos",
-                    logo_url: undefined,
-                    background_url: undefined,
-                    enable_create_tenant: true,
-                    enable_register: true,
-                    enable_forget_password: true,
-                    enable_password_login: true,
-                    enable_mobile_code_login: false,
-                    enable_email_code_login: false,
-                    enable_bind_mobile: false,
-                    enable_bind_email: false,
-                    enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true),
-                    enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || 'false'),
-                    page_login: process.env.STEEDOS_TENANT_PAGE_LOGIN,
-                    page_logout: process.env.STEEDOS_TENANT_PAGE_LOGOUT
-                };
-                if (config.tenant) {
-                    _.assignIn(tenant, config.tenant);
-                }
-                if (!tenant._id) {
-                    tenant._id = process.env.STEEDOS_TENANT_ID;
-                }
-                platform = ((_a = global.Steedos.settings.public) === null || _a === void 0 ? void 0 : _a.platform) || {};
-                if (!tenant._id) return [3, 2];
-                return [4, db_1.db.findOne("spaces", tenant._id, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo", "favicon"] })];
-            case 1:
-                spaceDoc = _d.sent();
-                steedosService = (0, core_1.getSteedosService)();
-                if (steedosService && spaceDoc) {
-                    _.assignIn(tenant, spaceDoc);
-                    if (spaceDoc.account_logo) {
-                        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.account_logo;
+var getSettings = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var tenant, platform, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo, _tenant, settings;
+        var _a, _b, _c;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    tenant = {
+                        name: "Steedos",
+                        logo_url: undefined,
+                        background_url: undefined,
+                        enable_create_tenant: true,
+                        enable_register: true,
+                        enable_forget_password: true,
+                        enable_password_login: true,
+                        enable_mobile_code_login: false,
+                        enable_email_code_login: false,
+                        enable_bind_mobile: false,
+                        enable_bind_email: false,
+                        enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || "false", true),
+                        enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || "false"),
+                        page_login: process.env.STEEDOS_TENANT_PAGE_LOGIN,
+                        page_logout: process.env.STEEDOS_TENANT_PAGE_LOGOUT,
+                    };
+                    if (config.tenant) {
+                        _.assignIn(tenant, config.tenant);
                     }
-                    else if (spaceDoc.avatar_dark) {
-                        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar_dark;
+                    if (!tenant._id) {
+                        tenant._id = process.env.STEEDOS_TENANT_ID;
                     }
-                    else if (spaceDoc.avatar) {
-                        tenant.logo_url = steedosService + "api/files/avatars/" + spaceDoc.avatar;
+                    platform = ((_a = global.Steedos.settings.public) === null || _a === void 0 ? void 0 : _a.platform) || {};
+                    if (!tenant._id) return [3, 2];
+                    return [4, db_1.db.findOne("spaces", tenant._id, {
+                            fields: [
+                                "name",
+                                "avatar",
+                                "avatar_dark",
+                                "background",
+                                "enable_register",
+                                "account_logo",
+                                "favicon",
+                            ],
+                        })];
+                case 1:
+                    spaceDoc = _d.sent();
+                    steedosService = (0, core_1.getSteedosService)();
+                    if (steedosService && spaceDoc) {
+                        _.assignIn(tenant, spaceDoc);
+                        if (spaceDoc.account_logo) {
+                            tenant.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.account_logo;
+                        }
+                        else if (spaceDoc.avatar_dark) {
+                            tenant.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.avatar_dark;
+                        }
+                        else if (spaceDoc.avatar) {
+                            tenant.logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.avatar;
+                        }
+                        if (spaceDoc.background) {
+                            tenant.background_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.background;
+                        }
+                        if ((platform === null || platform === void 0 ? void 0 : platform.is_oem) && spaceDoc.favicon) {
+                            tenant.favicon_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    spaceDoc.favicon;
+                        }
                     }
-                    if (spaceDoc.background) {
-                        tenant.background_url = steedosService + "api/files/avatars/" + spaceDoc.background;
+                    _d.label = 2;
+                case 2:
+                    already_mail_service = (0, core_1.canSendEmail)();
+                    already_sms_service = true || (0, core_1.canSendSMS)();
+                    broker = (0, objectql_1.getSteedosSchema)().broker;
+                    serverInitInfo = {};
+                    _tenant = clone(tenant);
+                    delete _tenant["tokenSecret"];
+                    delete _tenant["accessTokenExpiresIn"];
+                    delete _tenant["refreshTokenExpiresIn"];
+                    if (tenant.enable_saas) {
+                        delete _tenant._id;
                     }
-                    if ((platform === null || platform === void 0 ? void 0 : platform.is_oem) && spaceDoc.favicon) {
-                        tenant.favicon_url = steedosService + "api/files/avatars/" + spaceDoc.favicon;
-                    }
-                }
-                _d.label = 2;
-            case 2:
-                already_mail_service = (0, core_1.canSendEmail)();
-                already_sms_service = true || (0, core_1.canSendSMS)();
-                broker = (0, objectql_1.getSteedosSchema)().broker;
-                serverInitInfo = {};
-                _tenant = clone(tenant);
-                delete _tenant['tokenSecret'];
-                delete _tenant['accessTokenExpiresIn'];
-                delete _tenant['refreshTokenExpiresIn'];
-                if (tenant.enable_saas) {
-                    delete _tenant._id;
-                }
-                settings = {};
-                if (!tenant._id) return [3, 4];
-                return [4, util.getSettings(tenant._id, true)];
-            case 3:
-                settings = _d.sent();
-                _d.label = 4;
-            case 4:
-                res.json({
-                    tenant: _tenant,
-                    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 : {}),
-                    root_url: process.env.ROOT_URL,
-                    already_mail_service: already_mail_service,
-                    already_sms_service: already_sms_service,
-                    serverInitInfo: serverInitInfo,
-                    redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST,
-                    platform: platform,
-                    public: global.Steedos.settings.public || {},
-                    settings: settings
-                });
-                return [2];
-        }
-    });
-}); }; };
+                    settings = {};
+                    if (!tenant._id) return [3, 4];
+                    return [4, util.getSettings(tenant._id, true)];
+                case 3:
+                    settings = _d.sent();
+                    _d.label = 4;
+                case 4:
+                    res.json({
+                        tenant: _tenant,
+                        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
+                                : {},
+                        root_url: process.env.ROOT_URL,
+                        already_mail_service: already_mail_service,
+                        already_sms_service: already_sms_service,
+                        serverInitInfo: serverInitInfo,
+                        redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST,
+                        platform: platform,
+                        public: global.Steedos.settings.public || {},
+                        settings: settings,
+                    });
+                    return [2];
+            }
+        });
+    }); };
+};
 exports.getSettings = getSettings;
 //# sourceMappingURL=settings.js.map

package/lib/rest-express/endpoints/steedos/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}