@steedos/accounts 3.0.0-beta.98 → 3.0.0

package/lib/rest-express/endpoints/refresh-access-token.js

@@ -2,30 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refreshAccessToken = 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 refreshAccessToken = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var _a, accessToken, refreshToken, userAgent, ip, refreshedSession, err_1;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _b.trys.push([0, 2, , 3]);
-                _a = req.body, accessToken = _a.accessToken, refreshToken = _a.refreshToken;
-                userAgent = (0, get_user_agent_1.getUserAgent)(req);
-                ip = requestIp.getClientIp(req);
-                return [4, accountsServer.refreshTokens(accessToken, refreshToken, ip, userAgent)];
-            case 1:
-                refreshedSession = _b.sent();
-                res.json(refreshedSession);
-                return [3, 3];
-            case 2:
-                err_1 = _b.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 3];
-            case 3: return [2];
-        }
-    });
-}); }; };
+var refreshAccessToken = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, accessToken, refreshToken, userAgent, ip, refreshedSession, err_1;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 2, , 3]);
+                    _a = req.body, accessToken = _a.accessToken, refreshToken = _a.refreshToken;
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req);
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    return [4, accountsServer.refreshTokens(accessToken, refreshToken, ip, userAgent)];
+                case 1:
+                    refreshedSession = _b.sent();
+                    res.json(refreshedSession);
+                    return [3, 3];
+                case 2:
+                    err_1 = _b.sent();
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); };
+};
 exports.refreshAccessToken = refreshAccessToken;
 //# sourceMappingURL=refresh-access-token.js.map

package/lib/rest-express/endpoints/refresh-access-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-access-token.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/refresh-access-token.ts"],"names":[],"mappings":";;;;AACA,sCAAwC;AAExC,0DAAuD;AACvD,kDAAgD;AAEzC,IAAM,kBAAkB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACpE,GAAoB,EACpB,GAAqB;;;;;;gBAGb,KAAgC,GAAG,CAAC,IAAI,EAAtC,WAAW,iBAAA,EAAE,YAAY,kBAAA,CAAc;gBACzC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;gBAC9B,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACb,WAAM,cAAc,CAAC,aAAa,CACzD,WAAW,EACX,YAAY,EACZ,EAAE,EACF,SAAS,CACV,EAAA;;gBALK,gBAAgB,GAAG,SAKxB;gBACD,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;;;;gBAE3B,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAlBqE,CAkBrE,CAAC;AAlBW,QAAA,kBAAkB,sBAkB7B"}
+{"version":3,"file":"refresh-access-token.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/refresh-access-token.ts"],"names":[],"mappings":";;;;AACA,oDAAmD;AAEnD,0DAAuD;AACvD,kDAAgD;AAEzC,IAAM,kBAAkB,GAC7B,UAAC,cAA8B;IAC/B,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,KAAgC,GAAG,CAAC,IAAI,EAAtC,WAAW,iBAAA,EAAE,YAAY,kBAAA,CAAc;oBACzC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;oBAC9B,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;oBACH,WAAM,cAAc,CAAC,aAAa,CACzD,WAAW,EACX,YAAY,EACZ,EAAE,EACF,SAAS,CACV,EAAA;;oBALK,gBAAgB,GAAG,SAKxB;oBACD,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;;;;oBAE3B,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AAfD,CAeC,CAAC;AAjBS,QAAA,kBAAkB,sBAiB3B"}

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/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/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.98",
+  "version": "3.0.0",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,12 +28,12 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/auth": "3.0.0-beta.98",
-    "@steedos/objectql": "3.0.0-beta.98",
-    "@steedos/utils": "3.0.0-beta.98",
+    "@steedos/auth": "3.0.0",
+    "@steedos/objectql": "3.0.0",
+    "@steedos/utils": "3.0.0",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
-    "body-parser": "1.19.0",
+    "body-parser": "^2.2.1",
     "chalk": "^2.4.2",
     "cookie-parser": "1.4.3",
     "cookies": "^0.8.0",
@@ -42,7 +41,7 @@
     "crypto": "^1.0.1",
     "csurf": "^1.11.0",
     "emittery": "0.11.0",
-    "express": "4.17.1",
+    "express": "^5.1.0",
     "ismobilejs": "^1.1.1",
     "js-yaml": "^3.14.1",
     "jsonwebtoken": "^8.5.1",
@@ -60,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4b7a81157f9279ab1750ef877d94c9d64ae7968e"
+  "gitHead": "20ea485d800dd4ad0a99c82b26000879c2f85741"
 }

package/src/core/index.ts

@@ -1,10 +1,10 @@
-import { getSteedosConfig } from "@steedos/objectql";
+import { getSteedosConfig, getSteedosSchema } from "@steedos/objectql";
 import { db } from "../db";
 import * as _ from "lodash";
 import chalk from "chalk";
 const clone = require("clone");
 
-declare var MailQueue;
+// declare var MailQueue;
 declare var SMSQueue;
 
 const config = getSteedosConfig();
@@ -242,24 +242,16 @@ export const getSteedosService = () => {
 
 export const sendMail = async (mail: any): Promise<void> => {
   const { to, subject, html } = mail;
-  const config = getSteedosConfig().email || {};
-  let canSend = canSendEmail();
-  //如果没有配置发送邮件服务，则打印log
   console.log(chalk.green(`MAIL: ${to}, ${subject}`));
-  if (!canSend) {
-    console.log(
-      chalk.red(
-        "ERROR sending mail, please set email configs in steedos.config.js",
-      ),
-    );
-    return;
-  } else {
-    MailQueue.send({
-      to: to,
-      from: config.from || "华炎魔方",
-      subject: subject,
-      html: html,
-    });
+  try {
+    const mailOptions = {
+      to, // 收件人
+      subject, // 主题
+      html, // 内容
+    };
+    await getSteedosSchema().broker.call("@builder6/email.send", mailOptions);
+  } catch (e) {
+    console.log(e);
   }
 };
 

package/src/rest-express/endpoints/authorize.ts

@@ -5,7 +5,7 @@ import { AccountsServer } from "../../server";
 import { sendError } from "../utils/send-error";
 import { setAuthCookies, clearAuthCookies } from "../utils/steedos-auth";
 import { getUserIdByToken } from "@steedos/auth";
-import * as requestIp from "request-ip";
+import { getClientIp } from "../utils/getClientIp";
 import { getUserAgent } from "../utils/get-user-agent";
 
 const queryString = require("querystring");
@@ -20,7 +20,7 @@ export const authorize =
     const connection = req.query.connection || "steedos";
     const state = req.query.state || "";
     const userAgent = getUserAgent(req);
-    const ip = requestIp.getClientIp(req);
+    const ip = getClientIp(req);
     let query = queryString.stringify(req.query);
     let redirect_uri = req.query.redirect_uri
       ? (req.query.redirect_uri as string)

package/src/rest-express/endpoints/impersonate.ts

@@ -1,32 +1,31 @@
-import * as express from 'express';
-import * as requestIp from 'request-ip';
-import { AccountsServer } from '../../server';
-import { LoginUserIdentity } from '@accounts/types';
-import { getUserAgent } from '../utils/get-user-agent';
-import { sendError } from '../utils/send-error';
+import * as express from "express";
+import { getClientIp } from "../utils/getClientIp";
+import { AccountsServer } from "../../server";
+import { LoginUserIdentity } from "@accounts/types";
+import { getUserAgent } from "../utils/get-user-agent";
+import { sendError } from "../utils/send-error";
 
-export const impersonate = (accountsServer: AccountsServer) => async (
-  req: express.Request,
-  res: express.Response
-) => {
-  try {
-    const {
-      impersonated,
-      accessToken,
-    }: {
-      accessToken: string;
-      impersonated: LoginUserIdentity;
-    } = req.body;
-    const userAgent = getUserAgent(req);
-    const ip = requestIp.getClientIp(req);
-    const impersonateRes = await accountsServer.impersonate(
-      accessToken,
-      impersonated,
-      ip,
-      userAgent
-    );
-    res.json(impersonateRes);
-  } catch (err) {
-    sendError(res, err);
-  }
-};
+export const impersonate =
+  (accountsServer: AccountsServer) =>
+  async (req: express.Request, res: express.Response) => {
+    try {
+      const {
+        impersonated,
+        accessToken,
+      }: {
+        accessToken: string;
+        impersonated: LoginUserIdentity;
+      } = req.body;
+      const userAgent = getUserAgent(req);
+      const ip = getClientIp(req);
+      const impersonateRes = await accountsServer.impersonate(
+        accessToken,
+        impersonated,
+        ip,
+        userAgent,
+      );
+      res.json(impersonateRes);
+    } catch (err) {
+      sendError(res, err);
+    }
+  };