@steedos/accounts 3.0.0-beta.13 → 3.0.0-beta.131

package/lib/rest-express/endpoints/update-session.js

@@ -2,51 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSession = 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 updateSession = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var userId, serviceName, userAgent, ip, services, db_1, spaceId, accessToken, session, validSpaceId, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 3, , 4]);
-                userId = req.user._id;
-                serviceName = req.params.service;
-                userAgent = (0, get_user_agent_1.getUserAgent)(req) || '';
-                ip = requestIp.getClientIp(req);
-                services = accountsServer.getServices();
-                db_1 = services[serviceName].db;
-                spaceId = req.body.spaceId;
-                accessToken = req.body.accessToken;
-                return [4, accountsServer.findSessionByAccessToken(accessToken)];
-            case 1:
-                session = _a.sent();
-                if (!session) {
-                    throw new Error('Invalid accessToken');
-                }
-                return [4, (0, users_1.getUserSpace)(userId, spaceId)];
-            case 2:
-                validSpaceId = _a.sent();
-                if (validSpaceId) {
-                    userAgent = "".concat(userAgent, " Space/").concat(validSpaceId);
-                    db_1.updateSession(session.id, {
-                        ip: ip,
-                        userAgent: userAgent
-                    });
-                }
-                (0, steedos_auth_1.setAuthCookies)(req, res, session.userId, (0, steedos_auth_1.getAuthTokenCookie)(req, res), accessToken, validSpaceId);
-                res.json({});
-                return [3, 4];
-            case 3:
-                err_1 = _a.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 4];
-            case 4: return [2];
-        }
-    });
-}); }; };
+var updateSession = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var userId, serviceName, userAgent, ip, services, db_1, spaceId, accessToken, session, validSpaceId, err_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 3, , 4]);
+                    userId = req.user._id;
+                    serviceName = req.params.service;
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    services = accountsServer.getServices();
+                    db_1 = services[serviceName].db;
+                    spaceId = req.body.spaceId;
+                    accessToken = req.body.accessToken;
+                    return [4, accountsServer.findSessionByAccessToken(accessToken)];
+                case 1:
+                    session = _a.sent();
+                    if (!session) {
+                        throw new Error("Invalid accessToken");
+                    }
+                    return [4, (0, users_1.getUserSpace)(userId, spaceId)];
+                case 2:
+                    validSpaceId = _a.sent();
+                    if (validSpaceId) {
+                        userAgent = "".concat(userAgent, " Space/").concat(validSpaceId);
+                        db_1.updateSession(session.id, {
+                            ip: ip,
+                            userAgent: userAgent,
+                        });
+                    }
+                    (0, steedos_auth_1.setAuthCookies)(req, res, session.userId, (0, steedos_auth_1.getAuthTokenCookie)(req, res), accessToken, validSpaceId);
+                    res.json({});
+                    return [3, 4];
+                case 3:
+                    err_1 = _a.sent();
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 4];
+                case 4: return [2];
+            }
+        });
+    }); };
+};
 exports.updateSession = updateSession;
 //# sourceMappingURL=update-session.js.map

package/lib/rest-express/endpoints/update-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-session.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/update-session.ts"],"names":[],"mappings":";;;;AACA,sCAAwC;AAExC,0DAAuD;AACvD,kDAAgD;AAChD,sDAA2E;AAE3E,wCAA6C;AAGtC,IAAM,aAAa,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC/D,GAAoB,EACpB,GAAqB;;;;;;gBAGb,MAAM,GAAI,GAAW,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC/B,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;gBACnC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAClC,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAClC,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC;gBAC7C,OAAK,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;gBAC5B,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC7B,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;gBACrB,WAAM,cAAc,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAA;;gBAAxE,OAAO,GAAO,SAA0D;gBAE5E,IAAG,CAAC,OAAO,EAAC,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACzC,CAAC;gBAGkB,WAAM,IAAA,oBAAY,EAAC,MAAM,EAAE,OAAO,CAAC,EAAA;;gBAAlD,YAAY,GAAG,SAAmC;gBACtD,IAAG,YAAY,EAAC,CAAC;oBACf,SAAS,GAAG,UAAG,SAAS,oBAAU,YAAY,CAAE,CAAA;oBAChD,IAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE;wBAC3B,EAAE,IAAA;wBACF,SAAS,WAAA;qBAAC,CAAC,CAAC;gBAChB,CAAC;gBAGD,IAAA,6BAAc,EAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,IAAA,iCAAkB,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;gBAElG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;;;gBAEb,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAnCgE,CAmChE,CAAC;AAnCW,QAAA,aAAa,iBAmCxB"}
+{"version":3,"file":"update-session.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/update-session.ts"],"names":[],"mappings":";;;;AACA,oDAAmD;AAEnD,0DAAuD;AACvD,kDAAgD;AAChD,sDAA2E;AAE3E,wCAA8C;AAGvC,IAAM,aAAa,GACxB,UAAC,cAA8B;IAC/B,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,MAAM,GAAI,GAAW,CAAC,IAAI,CAAC,GAAG,CAAC;oBAC/B,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;oBACnC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,IAAI,EAAE,CAAC;oBAClC,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;oBACxB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC;oBAC7C,OAAK,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;oBAC5B,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;oBAC7B,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;oBAErC,WAAM,cAAc,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAA;;oBADxD,OAAO,GACT,SAA0D;oBAE5D,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBACzC,CAAC;oBAGkB,WAAM,IAAA,oBAAY,EAAC,MAAM,EAAE,OAAO,CAAC,EAAA;;oBAAlD,YAAY,GAAG,SAAmC;oBACtD,IAAI,YAAY,EAAE,CAAC;wBACjB,SAAS,GAAG,UAAG,SAAS,oBAAU,YAAY,CAAE,CAAC;wBACjD,IAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE;4BAC3B,EAAE,IAAA;4BACF,SAAS,WAAA;yBACV,CAAC,CAAC;oBACL,CAAC;oBAGD,IAAA,6BAAc,EACZ,GAAG,EACH,GAAG,EACH,OAAO,CAAC,MAAM,EACd,IAAA,iCAAkB,EAAC,GAAG,EAAE,GAAG,CAAC,EAC5B,WAAW,EACX,YAAY,CACb,CAAC;oBAEF,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;;;oBAEb,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AAzCD,CAyCC,CAAC;AA3CS,QAAA,aAAa,iBA2CtB"}

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

@@ -7,74 +7,89 @@ 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/files/avatars/" + space.avatar_dark;
-                        }
-                        else if (space.avatar) {
-                            logo_url = steedosService + "api/files/avatars/" + space.avatar;
+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;
+                            }
                         }
+                        spaces.push({
+                            _id: space._id,
+                            name: space.name,
+                            logo_url: logo_url,
+                        });
                     }
-                    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()];
-        }
-    });
-}); }; };
+                    _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()];
+            }
+        });
+    }); };
+};
 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":"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"}
+{"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/getClientIp.js

@@ -0,0 +1,16 @@
+"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);
+    if (ip && ip.startsWith("::ffff:")) {
+        ip = ip.substring(7);
+    }
+    if (ip === "::1") {
+        ip = "127.0.0.1";
+    }
+    return ip;
+};
+exports.getClientIp = getClientIp;
+//# sourceMappingURL=getClientIp.js.map

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

@@ -0,0 +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"}

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@steedos/accounts",
-  "private": false,
-  "version": "3.0.0-beta.13",
+  "version": "3.0.0-beta.131",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,9 +28,9 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/auth": "3.0.0-beta.13",
-    "@steedos/objectql": "3.0.0-beta.13",
-    "@steedos/utils": "3.0.0-beta.13",
+    "@steedos/auth": "3.0.0-beta.131",
+    "@steedos/objectql": "3.0.0-beta.131",
+    "@steedos/utils": "3.0.0-beta.131",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "1.19.0",
@@ -60,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "156746559d0ad3804b2344a06b1bcda26a703213"
+  "gitHead": "be17fae35ef8081798c61d30e4633e0f0f433cef"
 }