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

package/lib/rest-express/endpoints/logout.js

@@ -5,83 +5,90 @@ var tslib_1 = require("tslib");
 var lodash_1 = require("lodash");
 var steedos_auth_1 = require("../utils/steedos-auth");
 var objectql_1 = require("@steedos/objectql");
-var requestIp = require("request-ip");
+var getClientIp_1 = require("../utils/getClientIp");
 var get_user_agent_1 = require("../utils/get-user-agent");
 var ismobilejs_1 = require("ismobilejs");
 var objectql_2 = require("@steedos/objectql");
-var logout = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var authToken, session, err_1, userAgent, ip, status, message, is_phone, is_tablet, _a, phone, tablet, broker;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.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 ', 'token');
-                authToken = authToken && authToken.split(',').length > 1 ? authToken.split(',')[0] : authToken;
-                (0, steedos_auth_1.clearAuthCookies)(req, res);
-                session = null;
-                _b.label = 1;
-            case 1:
-                _b.trys.push([1, 3, 4, 6]);
-                return [4, accountsServer.logout(authToken)];
-            case 2:
-                session = _b.sent();
-                return [3, 6];
-            case 3:
-                err_1 = _b.sent();
-                return [3, 6];
-            case 4:
-                userAgent = (0, get_user_agent_1.getUserAgent)(req) || '';
-                ip = requestIp.getClientIp(req);
-                status = 'success';
-                message = '';
-                is_phone = false;
-                is_tablet = false;
-                if (userAgent) {
-                    try {
-                        _a = (0, ismobilejs_1.default)(userAgent), phone = _a.phone, tablet = _a.tablet;
-                        is_phone = phone;
-                        is_tablet = tablet;
-                    }
-                    catch (Exception) {
-                        console.log("Exception", Exception);
+var logout = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var authToken, session, err_1, userAgent, ip, status, message, is_phone, is_tablet, _a, phone, tablet, broker;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.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 ", "token");
+                    authToken =
+                        authToken && authToken.split(",").length > 1
+                            ? authToken.split(",")[0]
+                            : authToken;
+                    (0, steedos_auth_1.clearAuthCookies)(req, res);
+                    session = null;
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, 4, 6]);
+                    return [4, accountsServer.logout(authToken)];
+                case 2:
+                    session = _b.sent();
+                    return [3, 6];
+                case 3:
+                    err_1 = _b.sent();
+                    return [3, 6];
+                case 4:
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    status = "success";
+                    message = "";
+                    is_phone = false;
+                    is_tablet = false;
+                    if (userAgent) {
+                        try {
+                            _a = (0, ismobilejs_1.default)(userAgent), phone = _a.phone, tablet = _a.tablet;
+                            is_phone = phone;
+                            is_tablet = tablet;
+                        }
+                        catch (Exception) {
+                            console.log("Exception", Exception);
+                        }
                     }
-                }
-                return [4, (0, objectql_1.getObject)('operation_logs').insert({
-                        name: '注销',
-                        type: 'logout',
-                        remote_user: session === null || session === void 0 ? void 0 : session.userId,
-                        remote_addr: ip,
-                        http_user_agent: userAgent,
-                        is_mobile: is_phone,
-                        is_tablet: is_tablet,
-                        object: 'users',
-                        status: status,
-                        create: new Date(),
-                        space: session === null || session === void 0 ? void 0 : session.space,
-                        message: message,
-                        data: JSON.stringify({
+                    return [4, (0, objectql_1.getObject)("operation_logs").insert({
+                            name: "注销",
+                            type: "logout",
+                            remote_user: session === null || session === void 0 ? void 0 : session.userId,
+                            remote_addr: ip,
+                            http_user_agent: userAgent,
+                            is_mobile: is_phone,
+                            is_tablet: is_tablet,
+                            object: "users",
+                            status: status,
+                            create: new Date(),
+                            space: session === null || session === void 0 ? void 0 : session.space,
+                            message: message,
+                            data: JSON.stringify({
+                                authToken: authToken,
+                                session: session,
+                            }),
+                            related_to: {
+                                o: "users",
+                                ids: [session === null || session === void 0 ? void 0 : session.userId],
+                            },
+                        })];
+                case 5:
+                    _b.sent();
+                    if (authToken) {
+                        broker = (0, objectql_2.getSteedosSchema)().broker;
+                        broker.broadcast("$user.logout", {
                             authToken: authToken,
-                            session: session
-                        }),
-                        related_to: {
-                            o: "users",
-                            ids: [session === null || session === void 0 ? void 0 : session.userId]
-                        }
-                    })];
-            case 5:
-                _b.sent();
-                broker = (0, objectql_2.getSteedosSchema)().broker;
-                broker.broadcast("$user.logout", {
-                    authToken: authToken
-                });
-                return [7];
-            case 6:
-                res.json(null);
-                return [2];
-        }
-    });
-}); }; };
+                        });
+                    }
+                    return [7];
+                case 6:
+                    res.json(null);
+                    return [2];
+            }
+        });
+    }); };
+};
 exports.logout = logout;
 //# sourceMappingURL=logout.js.map

package/lib/rest-express/endpoints/logout.js.map

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

package/lib/rest-express/endpoints/oauth/provider-callback.js

@@ -2,40 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.providerCallback = 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 providerCallback = function (accountsServer, options) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var userAgent, ip, loggedInUser, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                userAgent = (0, get_user_agent_1.getUserAgent)(req);
-                ip = requestIp.getClientIp(req);
-                return [4, accountsServer.loginWithService('oauth', tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, (req.params || {})), (req.query || {})), (req.body || {})), (req.session || {})), { ip: ip, userAgent: userAgent })];
-            case 1:
-                loggedInUser = _a.sent();
-                if (options && options.onOAuthSuccess) {
-                    options.onOAuthSuccess(req, res, loggedInUser);
-                }
-                if (options && options.transformOAuthResponse) {
-                    res.json(options.transformOAuthResponse(loggedInUser));
-                }
-                else {
-                    res.json(loggedInUser);
-                }
-                return [3, 3];
-            case 2:
-                err_1 = _a.sent();
-                if (options && options.onOAuthError) {
-                    options.onOAuthError(req, res, err_1);
-                }
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 3];
-            case 3: return [2];
-        }
-    });
-}); }; };
+var providerCallback = function (accountsServer, options) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var userAgent, ip, loggedInUser, err_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req);
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    return [4, accountsServer.loginWithService("oauth", tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, (req.params || {})), (req.query || {})), (req.body || {})), (req.session || {})), { ip: ip, userAgent: userAgent })];
+                case 1:
+                    loggedInUser = _a.sent();
+                    if (options && options.onOAuthSuccess) {
+                        options.onOAuthSuccess(req, res, loggedInUser);
+                    }
+                    if (options && options.transformOAuthResponse) {
+                        res.json(options.transformOAuthResponse(loggedInUser));
+                    }
+                    else {
+                        res.json(loggedInUser);
+                    }
+                    return [3, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    if (options && options.onOAuthError) {
+                        options.onOAuthError(req, res, err_1);
+                    }
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); };
+};
 exports.providerCallback = providerCallback;
 //# sourceMappingURL=provider-callback.js.map

package/lib/rest-express/endpoints/oauth/provider-callback.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-callback.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/oauth/provider-callback.ts"],"names":[],"mappings":";;;;AACA,sCAAwC;AAExC,6DAA0D;AAC1D,qDAAmD;AAO5C,IAAM,gBAAgB,GAAG,UAC9B,cAA8B,EAC9B,OAAgC,IAC7B,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;gBAE7C,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;gBAC9B,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACjB,WAAM,cAAc,CAAC,gBAAgB,CACxD,OAAO,0EAEF,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAClB,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GACjB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,GAChB,CAAE,GAA0B,CAAC,OAAO,IAAI,EAAE,CAAC,GAEhD,EAAE,EAAE,IAAA,EAAE,SAAS,WAAA,EAAE,CAClB,EAAA;;gBATK,YAAY,GAAG,SASpB;gBAED,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;oBACtC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;gBACjD,CAAC;gBAED,IAAI,OAAO,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;oBAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACzB,CAAC;;;;gBAED,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;oBACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAG,CAAC,CAAC;gBACtC,CAAC;gBAED,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EA/BI,CA+BJ,CAAC;AAlCW,QAAA,gBAAgB,oBAkC3B"}
+{"version":3,"file":"provider-callback.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/oauth/provider-callback.ts"],"names":[],"mappings":";;;;AASA,uDAAsD;AAEtD,6DAA0D;AAC1D,qDAAmD;AAO5C,IAAM,gBAAgB,GAC3B,UAAC,cAA8B,EAAE,OAAgC;IACjE,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;oBAC9B,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;oBACP,WAAM,cAAc,CAAC,gBAAgB,CACxD,OAAO,0EAEF,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAClB,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GACjB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,GAChB,CAAE,GAA0B,CAAC,OAAO,IAAI,EAAE,CAAC,GAEhD,EAAE,EAAE,IAAA,EAAE,SAAS,WAAA,EAAE,CAClB,EAAA;;oBATK,YAAY,GAAG,SASpB;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;wBACtC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;oBACjD,CAAC;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;wBAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBACzB,CAAC;;;;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;wBACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAG,CAAC,CAAC;oBACtC,CAAC;oBAED,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AA/BD,CA+BC,CAAC;AAjCS,QAAA,gBAAgB,oBAiCzB"}

package/lib/rest-express/endpoints/password/change-password.js

@@ -4,101 +4,106 @@ exports.changePassword = void 0;
 var tslib_1 = require("tslib");
 var send_error_1 = require("../../utils/send-error");
 var objectql_1 = require("@steedos/objectql");
-var requestIp = require("request-ip");
+var getClientIp_1 = require("../../utils/getClientIp");
 var get_user_agent_1 = require("../../utils/get-user-agent");
 var ismobilejs_1 = require("ismobilejs");
 var db_1 = require("../../../db");
 var config = (0, objectql_1.getSteedosConfig)();
-var changePassword = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var _a, oldPassword, newPassword, password, userAgent, ip, is_phone, is_tablet, _b, phone, tablet, userSpaces, _i, userSpaces_1, userSpace, userId, error_1, err_1;
-    return tslib_1.__generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                _c.trys.push([0, 10, , 11]);
-                if (!req.userId) {
-                    res.status(401);
-                    res.json({ message: 'Unauthorized' });
-                    return [2];
-                }
-                _a = req.body, oldPassword = _a.oldPassword, newPassword = _a.newPassword;
-                password = accountsServer.getServices().password;
-                return [4, password.changePassword(req.userId, oldPassword, newPassword)];
-            case 1:
-                _c.sent();
-                password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
-                _c.label = 2;
-            case 2:
-                _c.trys.push([2, 8, , 9]);
-                Creator.getCollection('space_users').update({ user: req.userId }, { $set: { password_expired: false } }, {
-                    multi: true
-                });
-                userAgent = (0, get_user_agent_1.getUserAgent)(req);
-                ip = requestIp.getClientIp(req);
-                is_phone = false;
-                is_tablet = false;
-                if (userAgent) {
-                    try {
-                        _b = (0, ismobilejs_1.default)(userAgent), phone = _b.phone, tablet = _b.tablet;
-                        is_phone = phone;
-                        is_tablet = tablet;
+var changePassword = function (accountsServer) {
+    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, oldPassword, newPassword, password, userAgent, ip, is_phone, is_tablet, _b, phone, tablet, userSpaces, _i, userSpaces_1, userSpace, userId, error_1, err_1;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 11, , 12]);
+                    if (!req.userId) {
+                        res.status(401);
+                        res.json({ message: "Unauthorized" });
+                        return [2];
                     }
-                    catch (Exception) {
-                        console.log("Exception", Exception);
-                    }
-                }
-                return [4, db_1.db.find("space_users", {
-                        filters: [["user", "=", req.userId], ["user_accepted", "=", true]],
-                        fields: ["space"],
-                    })];
-            case 3:
-                userSpaces = _c.sent();
-                if (!(userSpaces && userSpaces.length > 0)) return [3, 7];
-                _i = 0, userSpaces_1 = userSpaces;
-                _c.label = 4;
-            case 4:
-                if (!(_i < userSpaces_1.length)) return [3, 7];
-                userSpace = userSpaces_1[_i];
-                userId = req.userId;
-                return [4, (0, objectql_1.getObject)('operation_logs').insert({
-                        name: '修改密码',
-                        type: 'change_password',
-                        remote_user: userId,
-                        remote_addr: ip,
-                        http_user_agent: userAgent,
-                        is_mobile: is_phone,
-                        is_tablet: is_tablet,
-                        object: 'users',
-                        status: 'success',
-                        create: new Date(),
-                        create_by: userId,
-                        modified_by: userId,
-                        space: userSpace.space,
-                        related_to: {
-                            o: "users",
-                            ids: [userId]
+                    _a = req.body, oldPassword = _a.oldPassword, newPassword = _a.newPassword;
+                    password = accountsServer.getServices().password;
+                    return [4, password.changePassword(req.userId, oldPassword, newPassword)];
+                case 1:
+                    _c.sent();
+                    password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
+                    _c.label = 2;
+                case 2:
+                    _c.trys.push([2, 9, , 10]);
+                    return [4, db_1.db.updateMany("space_users", [["user", "=", req.userId]], { password_expired: false })];
+                case 3:
+                    _c.sent();
+                    userAgent = (0, get_user_agent_1.getUserAgent)(req);
+                    ip = (0, getClientIp_1.getClientIp)(req);
+                    is_phone = false;
+                    is_tablet = false;
+                    if (userAgent) {
+                        try {
+                            _b = (0, ismobilejs_1.default)(userAgent), phone = _b.phone, tablet = _b.tablet;
+                            is_phone = phone;
+                            is_tablet = tablet;
+                        }
+                        catch (Exception) {
+                            console.log("Exception", Exception);
                         }
-                    })];
-            case 5:
-                _c.sent();
-                _c.label = 6;
-            case 6:
-                _i++;
-                return [3, 4];
-            case 7: return [3, 9];
-            case 8:
-                error_1 = _c.sent();
-                console.log('error', error_1);
-                return [3, 9];
-            case 9:
-                res.json({ userId: req.userId, password_expired: false });
-                return [3, 11];
-            case 10:
-                err_1 = _c.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 11];
-            case 11: return [2];
-        }
-    });
-}); }; };
+                    }
+                    return [4, db_1.db.find("space_users", {
+                            filters: [
+                                ["user", "=", req.userId],
+                                ["user_accepted", "=", true],
+                            ],
+                            fields: ["space"],
+                        })];
+                case 4:
+                    userSpaces = _c.sent();
+                    if (!(userSpaces && userSpaces.length > 0)) return [3, 8];
+                    _i = 0, userSpaces_1 = userSpaces;
+                    _c.label = 5;
+                case 5:
+                    if (!(_i < userSpaces_1.length)) return [3, 8];
+                    userSpace = userSpaces_1[_i];
+                    userId = req.userId;
+                    return [4, (0, objectql_1.getObject)("operation_logs").insert({
+                            name: "修改密码",
+                            type: "change_password",
+                            remote_user: userId,
+                            remote_addr: ip,
+                            http_user_agent: userAgent,
+                            is_mobile: is_phone,
+                            is_tablet: is_tablet,
+                            object: "users",
+                            status: "success",
+                            create: new Date(),
+                            create_by: userId,
+                            modified_by: userId,
+                            space: userSpace.space,
+                            related_to: {
+                                o: "users",
+                                ids: [userId],
+                            },
+                        })];
+                case 6:
+                    _c.sent();
+                    _c.label = 7;
+                case 7:
+                    _i++;
+                    return [3, 5];
+                case 8: return [3, 10];
+                case 9:
+                    error_1 = _c.sent();
+                    console.log("error", error_1);
+                    return [3, 10];
+                case 10:
+                    res.json({ userId: req.userId, password_expired: false });
+                    return [3, 12];
+                case 11:
+                    err_1 = _c.sent();
+                    (0, send_error_1.sendError)(res, err_1);
+                    return [3, 12];
+                case 12: return [2];
+            }
+        });
+    }); };
+};
 exports.changePassword = changePassword;
 //# sourceMappingURL=change-password.js.map

package/lib/rest-express/endpoints/password/change-password.js.map

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

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"}