@steedos/accounts 3.0.13-beta.8 → 3.0.13

package/lib/rest-express/user-loader.js

@@ -1,95 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.userLoader = void 0;
-var tslib_1 = require("tslib");
-var lodash_1 = require("lodash");
-var db_1 = require("../db");
-var objectql_1 = require("@steedos/objectql");
-var core_1 = require("../core");
-var config = (0, objectql_1.getSteedosConfig)();
-var userLoader = function (accountsServer) {
-    return function (req, res, next) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var authToken, user, spaces, userSpaces, steedosService, dbSpaces, _i, dbSpaces_1, space, logo_url, e_1;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    authToken = (0, lodash_1.get)(req.cookies, "X-Auth-Token") ||
-                        (0, lodash_1.get)(req.headers, "Authorization") ||
-                        (0, lodash_1.get)(req.headers, "authorization");
-                    authToken =
-                        authToken && authToken.replace("Bearer ", "").replace("BEARER ", "");
-                    authToken =
-                        authToken && authToken.split(",").length > 1
-                            ? authToken.split(",")[0]
-                            : authToken;
-                    if (!!(0, lodash_1.isEmpty)(authToken)) return [3, 7];
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 6, , 7]);
-                    req.authToken = authToken;
-                    return [4, accountsServer.resumeSession(authToken)];
-                case 2:
-                    user = _a.sent();
-                    user.id = user._id;
-                    user.userId = user._id;
-                    if (user.emails && user.emails.length > 0) {
-                        user.email = user.emails[0].address;
-                    }
-                    req.user = user;
-                    req.userId = user.id;
-                    spaces = [];
-                    return [4, db_1.db.find("space_users", {
-                            filters: [
-                                ["user", "=", user.id],
-                                ["user_accepted", "=", true],
-                            ],
-                            fields: ["space"],
-                        })];
-                case 3:
-                    userSpaces = _a.sent();
-                    steedosService = (0, core_1.getSteedosService)();
-                    if (!(userSpaces && userSpaces.length > 0)) return [3, 5];
-                    return [4, db_1.db.find("spaces", {
-                            filters: [["_id", "in", (0, lodash_1.map)(userSpaces, "space")]],
-                            fields: ["_id", "name", "avatar", "avatar_dark"],
-                        })];
-                case 4:
-                    dbSpaces = _a.sent();
-                    for (_i = 0, dbSpaces_1 = dbSpaces; _i < dbSpaces_1.length; _i++) {
-                        space = dbSpaces_1[_i];
-                        logo_url = "";
-                        if (steedosService) {
-                            if (space.avatar_dark) {
-                                logo_url =
-                                    steedosService +
-                                        "api/v6/files/cfs.avatars.filerecord/" +
-                                        space.avatar_dark;
-                            }
-                            else if (space.avatar) {
-                                logo_url =
-                                    steedosService +
-                                        "api/v6/files/cfs.avatars.filerecord/" +
-                                        space.avatar;
-                            }
+const lodash_1 = require("lodash");
+const db_1 = require("../db");
+const objectql_1 = require("@steedos/objectql");
+const core_1 = require("../core");
+const config = (0, objectql_1.getSteedosConfig)();
+const userLoader = (accountsServer) => async (req, res, next) => {
+    let authToken = (0, lodash_1.get)(req.cookies, "X-Auth-Token") ||
+        (0, lodash_1.get)(req.headers, "Authorization") ||
+        (0, lodash_1.get)(req.headers, "authorization");
+    authToken =
+        authToken && authToken.replace("Bearer ", "").replace("BEARER ", "");
+    authToken =
+        authToken && authToken.split(",").length > 1
+            ? authToken.split(",")[0]
+            : authToken;
+    if (!(0, lodash_1.isEmpty)(authToken)) {
+        try {
+            req.authToken = authToken;
+            const user = await accountsServer.resumeSession(authToken);
+            user.id = user._id;
+            user.userId = user._id;
+            if (user.emails && user.emails.length > 0) {
+                user.email = user.emails[0].address;
+            }
+            req.user = user;
+            req.userId = user.id;
+            const spaces = [];
+            const userSpaces = await db_1.db.find("space_users", {
+                filters: [
+                    ["user", "=", user.id],
+                    ["user_accepted", "=", true],
+                ],
+                fields: ["space"],
+            });
+            let steedosService = (0, core_1.getSteedosService)();
+            if (userSpaces && userSpaces.length > 0) {
+                const dbSpaces = await db_1.db.find("spaces", {
+                    filters: [["_id", "in", (0, lodash_1.map)(userSpaces, "space")]],
+                    fields: ["_id", "name", "avatar", "avatar_dark"],
+                });
+                for (let space of dbSpaces) {
+                    let logo_url = "";
+                    if (steedosService) {
+                        if (space.avatar_dark) {
+                            logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    space.avatar_dark;
+                        }
+                        else if (space.avatar) {
+                            logo_url =
+                                steedosService +
+                                    "api/v6/files/cfs.avatars.filerecord/" +
+                                    space.avatar;
                         }
-                        spaces.push({
-                            _id: space._id,
-                            name: space.name,
-                            logo_url: logo_url,
-                        });
                     }
-                    _a.label = 5;
-                case 5:
-                    req.user.spaces = spaces;
-                    return [3, 7];
-                case 6:
-                    e_1 = _a.sent();
-                    console.log(e_1);
-                    return [3, 7];
-                case 7: return [2, next()];
+                    spaces.push({
+                        _id: space._id,
+                        name: space.name,
+                        logo_url,
+                    });
+                }
             }
-        });
-    }); };
+            req.user.spaces = spaces;
+        }
+        catch (e) {
+            console.log(e);
+        }
+    }
+    return next();
 };
 exports.userLoader = userLoader;
 //# sourceMappingURL=user-loader.js.map

package/lib/rest-express/user-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-loader.js","sourceRoot":"","sources":["../../src/rest-express/user-loader.ts"],"names":[],"mappings":";;;;AACA,iCAA2C;AAE3C,4BAA2B;AAC3B,8CAAqD;AACrD,gCAA4C;AAC5C,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAE3B,IAAM,UAAU,GACrB,UAAC,cAA8B;IAC/B,OAAA,UAAO,GAAoB,EAAE,GAAqB,EAAE,IAAS;;;;;oBACvD,SAAS,GACX,IAAA,YAAG,EAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC;wBAChC,IAAA,YAAG,EAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC;wBACjC,IAAA,YAAG,EAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;oBAEpC,SAAS;wBACP,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oBACvE,SAAS;wBACP,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC;4BAC1C,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;4BACzB,CAAC,CAAC,SAAS,CAAC;yBAEZ,CAAC,IAAA,gBAAO,EAAC,SAAS,CAAC,EAAnB,cAAmB;;;;oBAElB,GAAW,CAAC,SAAS,GAAG,SAAS,CAAC;oBACjB,WAAM,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAAzD,IAAI,GAAQ,SAA6C;oBAC/D,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;oBACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;oBACvB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBACtC,CAAC;oBACA,GAAW,CAAC,IAAI,GAAG,IAAI,CAAC;oBACxB,GAAW,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,GAAG,EAAE,CAAC;oBAEC,WAAM,OAAE,CAAC,IAAI,CAAC,aAAa,EAAE;4BAC9C,OAAO,EAAE;gCACP,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gCACtB,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC;6BAC7B;4BACD,MAAM,EAAE,CAAC,OAAO,CAAC;yBAClB,CAAC,EAAA;;oBANI,UAAU,GAAG,SAMjB;oBAEE,cAAc,GAAG,IAAA,wBAAiB,GAAE,CAAC;yBAErC,CAAA,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAA,EAAnC,cAAmC;oBACpB,WAAM,OAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;4BACvC,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,YAAG,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;4BAClD,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC;yBACjD,CAAC,EAAA;;oBAHI,QAAQ,GAAG,SAGf;oBAEF,WAA0B,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE,CAAC;wBAApB,KAAK;wBACR,QAAQ,GAAG,EAAE,CAAC;wBAClB,IAAI,cAAc,EAAE,CAAC;4BACnB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gCACtB,QAAQ;oCACN,cAAc;wCACd,sCAAsC;wCACtC,KAAK,CAAC,WAAW,CAAC;4BACtB,CAAC;iCAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gCACxB,QAAQ;oCACN,cAAc;wCACd,sCAAsC;wCACtC,KAAK,CAAC,MAAM,CAAC;4BACjB,CAAC;wBACH,CAAC;wBACD,MAAM,CAAC,IAAI,CAAC;4BACV,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,IAAI,EAAE,KAAK,CAAC,IAAI;4BAChB,QAAQ,UAAA;yBACT,CAAC,CAAC;oBACL,CAAC;;;oBAEF,GAAW,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;;;;oBAElC,OAAO,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC;;wBAGnB,WAAO,IAAI,EAAE,EAAC;;;SACf;AAtED,CAsEC,CAAC;AAxES,QAAA,UAAU,cAwEnB"}
+{"version":3,"file":"user-loader.js","sourceRoot":"","sources":["../../src/rest-express/user-loader.ts"],"names":[],"mappings":"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"}

package/lib/rest-express/utils/get-user-agent.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserAgent = void 0;
-var getUserAgent = function (req) {
-    var userAgent = req.headers['user-agent'] || '';
+const getUserAgent = (req) => {
+    let userAgent = req.headers['user-agent'] || '';
     if (req.headers['x-ucbrowser-ua']) {
         userAgent = req.headers['x-ucbrowser-ua'];
     }

package/lib/rest-express/utils/get-user-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-user-agent.js","sourceRoot":"","sources":["../../../src/rest-express/utils/get-user-agent.ts"],"names":[],"mappings":";;;AAEO,IAAM,YAAY,GAAG,UAAC,GAAoB;IAC/C,IAAI,SAAS,GAAY,GAAG,CAAC,OAAO,CAAC,YAAY,CAAY,IAAI,EAAE,CAAC;IACpE,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAElC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAW,CAAC;IACtD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}
+{"version":3,"file":"get-user-agent.js","sourceRoot":"","sources":["../../../src/rest-express/utils/get-user-agent.ts"],"names":[],"mappings":";;;AAEO,MAAM,YAAY,GAAG,CAAC,GAAoB,EAAE,EAAE;IACnD,IAAI,SAAS,GAAY,GAAG,CAAC,OAAO,CAAC,YAAY,CAAY,IAAI,EAAE,CAAC;IACpE,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAElC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAW,CAAC;IACtD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}

package/lib/rest-express/utils/getClientIp.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientIp = void 0;
-var requestIp = require("request-ip");
-var getClientIp = function (req) {
-    var ip = requestIp.getClientIp(req);
+const requestIp = require("request-ip");
+const getClientIp = (req) => {
+    let ip = requestIp.getClientIp(req);
     if (ip && ip.startsWith("::ffff:")) {
         ip = ip.substring(7);
     }

package/lib/rest-express/utils/getClientIp.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientIp.js","sourceRoot":"","sources":["../../../src/rest-express/utils/getClientIp.ts"],"names":[],"mappings":";;;AASA,sCAAwC;AAEjC,IAAM,WAAW,GAAG,UAAC,GAAG;IAC7B,IAAI,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACnC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAGD,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;QACjB,EAAE,GAAG,WAAW,CAAC;IACnB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB"}
+{"version":3,"file":"getClientIp.js","sourceRoot":"","sources":["../../../src/rest-express/utils/getClientIp.ts"],"names":[],"mappings":";;;AASA,wCAAwC;AAEjC,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,EAAE;IACjC,IAAI,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACnC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAGD,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;QACjB,EAAE,GAAG,WAAW,CAAC;IACnB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB"}

package/lib/rest-express/utils/send-error.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendError = void 0;
-var sendError = function (res, err) {
-    return res.status(400).json({
-        message: err.message,
-        loginInfo: err.loginInfo,
-        errorCode: err.errorCode,
-    });
-};
+const sendError = (res, err) => res.status(400).json({
+    message: err.message,
+    loginInfo: err.loginInfo,
+    errorCode: err.errorCode,
+});
 exports.sendError = sendError;
 //# sourceMappingURL=send-error.js.map

package/lib/rest-express/utils/send-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"send-error.js","sourceRoot":"","sources":["../../../src/rest-express/utils/send-error.ts"],"names":[],"mappings":";;;AAAO,IAAM,SAAS,GAAG,UAAC,GAAQ,EAAE,GAAQ;IAC1C,OAAA,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;AAJF,CAIE,CAAC;AALQ,QAAA,SAAS,aAKjB"}
+{"version":3,"file":"send-error.js","sourceRoot":"","sources":["../../../src/rest-express/utils/send-error.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE,CAC9C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC,OAAO;IACpB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,SAAS,EAAE,GAAG,CAAC,SAAS;CACzB,CAAC,CAAC;AALQ,QAAA,SAAS,aAKjB"}

package/lib/rest-express/utils/steedos-auth.js

@@ -1,34 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearAuthCookies = exports.setAuthCookies = exports.getAuthTokenCookie = exports.hashStampedToken = exports.hashLoginToken = void 0;
-var tslib_1 = require("tslib");
-var crypto = require("crypto");
-var auth = require('@steedos/auth');
-var Cookies = require('cookies');
-var hashLoginToken = function (loginToken) {
-    var hash = crypto.createHash('sha256');
+const crypto = require("crypto");
+const auth = require('@steedos/auth');
+const Cookies = require('cookies');
+const hashLoginToken = function (loginToken) {
+    const hash = crypto.createHash('sha256');
     hash.update(loginToken);
     return hash.digest('base64');
 };
 exports.hashLoginToken = hashLoginToken;
-var hashStampedToken = function (stampedToken) {
-    var hashedStampedToken = Object.keys(stampedToken).reduce(function (prev, key) {
-        var _a;
-        return key === 'token' ?
-            prev : tslib_1.__assign(tslib_1.__assign({}, prev), (_a = {}, _a[key] = stampedToken[key], _a));
-    }, {});
-    return tslib_1.__assign(tslib_1.__assign({}, hashedStampedToken), { hashedToken: (0, exports.hashLoginToken)(stampedToken.token) });
+const hashStampedToken = function (stampedToken) {
+    const hashedStampedToken = Object.keys(stampedToken).reduce((prev, key) => key === 'token' ?
+        prev :
+        { ...prev, [key]: stampedToken[key] }, {});
+    return {
+        ...hashedStampedToken,
+        hashedToken: (0, exports.hashLoginToken)(stampedToken.token)
+    };
 };
 exports.hashStampedToken = hashStampedToken;
-var getAuthTokenCookie = function (req, res) {
-    var cookies = new Cookies(req, res);
+const getAuthTokenCookie = function (req, res) {
+    let cookies = new Cookies(req, res);
     return cookies.get('X-Auth-Token');
 };
 exports.getAuthTokenCookie = getAuthTokenCookie;
-var setAuthCookies = function (req, res, userId, authToken, accessToken, spaceId) {
+const setAuthCookies = function (req, res, userId, authToken, accessToken, spaceId) {
     auth.setAuthCookies(req, res, userId, authToken, spaceId);
-    var cookies = new Cookies(req, res);
-    var options = {
+    let cookies = new Cookies(req, res);
+    let options = {
         maxAge: 90 * 60 * 60 * 24 * 1000,
         httpOnly: true,
         overwrite: true,
@@ -37,9 +37,9 @@ var setAuthCookies = function (req, res, userId, authToken, accessToken, spaceId
     return;
 };
 exports.setAuthCookies = setAuthCookies;
-var clearAuthCookies = function (req, res) {
-    var cookies = new Cookies(req, res);
-    var options = {
+const clearAuthCookies = function (req, res) {
+    let cookies = new Cookies(req, res);
+    let options = {
         maxAge: 0,
         httpOnly: true,
         overwrite: true

package/lib/rest-express/utils/steedos-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"steedos-auth.js","sourceRoot":"","sources":["../../../src/rest-express/utils/steedos-auth.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAClC,IAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACtC,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE5B,IAAM,cAAc,GAAG,UAAU,UAAU;IAC9C,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAA;AAJY,QAAA,cAAc,kBAI1B;AAEM,IAAM,gBAAgB,GAAG,UAAU,YAAY;IAClD,IAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,UAAC,IAAI,EAAE,GAAG;;QAAK,OAAA,GAAG,KAAK,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,CAAC,uCACD,IAAI,gBAAG,GAAG,IAAG,YAAY,CAAC,GAAG,CAAC,MAAE;IAFxB,CAEwB,EACvC,EAAE,CACH,CAAA;IACD,6CACK,kBAAkB,KACrB,WAAW,EAAE,IAAA,sBAAc,EAAC,YAAY,CAAC,KAAK,CAAC,IAC/C;AACN,CAAC,CAAA;AAXY,QAAA,gBAAgB,oBAW5B;AAEM,IAAM,kBAAkB,GAAG,UAAS,GAAG,EAAE,GAAG;IACjD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACrC,CAAC,CAAA;AAHY,QAAA,kBAAkB,sBAG9B;AAEM,IAAM,cAAc,GAAG,UAAU,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,OAAQ;IACtF,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;QAChC,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO;AACX,CAAC,CAAA;AAVY,QAAA,cAAc,kBAU1B;AAEM,IAAM,gBAAgB,GAAG,UAAU,GAAG,EAAE,GAAG;IAChD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO;AACT,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}
+{"version":3,"file":"steedos-auth.js","sourceRoot":"","sources":["../../../src/rest-express/utils/steedos-auth.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACtC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE5B,MAAM,cAAc,GAAG,UAAU,UAAU;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAA;AAJY,QAAA,cAAc,kBAI1B;AAEM,MAAM,gBAAgB,GAAG,UAAU,YAAY;IAClD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;QAC9B,IAAI,CAAC,CAAC;QACN,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,EACvC,EAAE,CACH,CAAA;IACD,OAAO;QACL,GAAG,kBAAkB;QACrB,WAAW,EAAE,IAAA,sBAAc,EAAC,YAAY,CAAC,KAAK,CAAC;KAChD,CAAC;AACN,CAAC,CAAA;AAXY,QAAA,gBAAgB,oBAW5B;AAEM,MAAM,kBAAkB,GAAG,UAAS,GAAG,EAAE,GAAG;IACjD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACrC,CAAC,CAAA;AAHY,QAAA,kBAAkB,sBAG9B;AAEM,MAAM,cAAc,GAAG,UAAU,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,OAAQ;IACtF,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;QAChC,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO;AACX,CAAC,CAAA;AAVY,QAAA,cAAc,kBAU1B;AAEM,MAAM,gBAAgB,GAAG,UAAU,GAAG,EAAE,GAAG;IAChD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO;AACT,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}

package/lib/rest-express/utils/users.js

@@ -1,37 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserSpace = exports.getUserSpaces = void 0;
-var tslib_1 = require("tslib");
-var db_1 = require("../../db");
-var _ = require("lodash");
-var getUserSpaces = function (userId) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, db_1.db.find("space_users", {
-                    filters: [["user", "=", userId], ["user_accepted", "=", true]],
-                    fields: ["space"]
-                })];
-            case 1: return [2, _a.sent()];
-        }
+const db_1 = require("../../db");
+const _ = require("lodash");
+const getUserSpaces = async (userId) => {
+    return await db_1.db.find("space_users", {
+        filters: [["user", "=", userId], ["user_accepted", "=", true]],
+        fields: ["space"]
     });
-}); };
+};
 exports.getUserSpaces = getUserSpaces;
-var getUserSpace = function (userId, spaceId) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var userSpaces;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, (0, exports.getUserSpaces)(userId)];
-            case 1:
-                userSpaces = _a.sent();
-                if (!userSpaces || userSpaces.length < 1) {
-                    return [2];
-                }
-                if (spaceId && _.find(userSpaces, function (o) { return o.space === spaceId; })) {
-                    return [2, spaceId];
-                }
-                return [2, userSpaces[0].space];
-        }
-    });
-}); };
+const getUserSpace = async (userId, spaceId) => {
+    const userSpaces = await (0, exports.getUserSpaces)(userId);
+    if (!userSpaces || userSpaces.length < 1) {
+        return;
+    }
+    if (spaceId && _.find(userSpaces, function (o) { return o.space === spaceId; })) {
+        return spaceId;
+    }
+    return userSpaces[0].space;
+};
 exports.getUserSpace = getUserSpace;
 //# sourceMappingURL=users.js.map

package/lib/rest-express/utils/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/rest-express/utils/users.ts"],"names":[],"mappings":";;;;AAAA,+BAA8B;AAC9B,0BAA4B;AAErB,IAAM,aAAa,GAAG,UAAO,MAAM;;;oBACjC,WAAM,OAAE,CAAC,IAAI,CAAC,aAAa,EAAE;oBAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAC,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;oBAC7D,MAAM,EAAE,CAAC,OAAO,CAAC;iBAClB,CAAC,EAAA;oBAHF,WAAO,SAGL,EAAC;;;KACJ,CAAA;AALY,QAAA,aAAa,iBAKzB;AAEM,IAAM,YAAY,GAAG,UAAO,MAAM,EAAE,OAAO;;;;oBAC7B,WAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,EAAA;;gBAAxC,UAAU,GAAG,SAA2B;gBAC9C,IAAG,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;oBACvC,WAAQ;gBACV,CAAC;gBAED,IAAG,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC;oBAC7E,WAAO,OAAO,EAAA;gBAChB,CAAC;gBAED,WAAO,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAA;;;KAC3B,CAAA;AAXY,QAAA,YAAY,gBAWxB"}
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/rest-express/utils/users.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAC9B,4BAA4B;AAErB,MAAM,aAAa,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE;IAC5C,OAAO,MAAM,OAAE,CAAC,IAAI,CAAC,aAAa,EAAE;QAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAC,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,EAAE,CAAC,OAAO,CAAC;KAClB,CAAC,CAAC;AACL,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB;AAEM,MAAM,YAAY,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,EAAE;IACnD,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAC;IAC/C,IAAG,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;QACvC,OAAQ;IACV,CAAC;IAED,IAAG,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC;QAC7E,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AAC5B,CAAC,CAAA;AAXY,QAAA,YAAY,gBAWxB"}