@steedos/accounts 3.0.13-beta.8 → 3.0.13

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

@@ -1,111 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.login = void 0;
-var tslib_1 = require("tslib");
-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 ismobilejs_1 = require("ismobilejs");
-var objectql_1 = require("@steedos/objectql");
-var spaces_1 = require("./spaces");
-var login = function (accountsServer) {
-    return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var userAgent, ip, status, message, result, err_1, is_phone, is_tablet, _a, phone, tablet, space, remote_user, foundUser, _b, password, data;
-        var _c;
-        return tslib_1.__generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
-                    ip = (0, getClientIp_1.getClientIp)(req);
-                    status = "success";
-                    message = "";
-                    result = null;
-                    _d.label = 1;
-                case 1:
-                    _d.trys.push([1, 3, 4, 11]);
-                    return [4, accountsServer.loginWithService("password", req.body, {
-                            ip: ip,
-                            userAgent: userAgent,
-                        })];
-                case 2:
-                    result = _d.sent();
-                    if (result._next) {
-                        return [2, res.json(result)];
-                    }
-                    (0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
-                    try {
-                        if (result && result.user) {
-                            delete result.user["services"];
-                        }
-                    }
-                    catch (error) { }
-                    res.json(result);
-                    return [2];
-                case 3:
-                    err_1 = _d.sent();
-                    console.log(err_1);
-                    status = "fail";
-                    message = err_1.message;
-                    (0, send_error_1.sendError)(res, { message: err_1.message });
-                    return [3, 11];
-                case 4:
-                    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, spaces_1.getFirstSpace)(accountsServer)];
-                case 5:
-                    space = _d.sent();
-                    remote_user = null;
-                    if (!!result) return [3, 7];
-                    return [4, accountsServer
-                            .getServices()["password"].foundUser(req.body.user)];
-                case 6:
-                    foundUser = _d.sent();
-                    remote_user = foundUser ? foundUser._id : null;
-                    return [3, 8];
-                case 7:
-                    remote_user = (_c = result === null || result === void 0 ? void 0 : result.user) === null || _c === void 0 ? void 0 : _c._id;
-                    _d.label = 8;
-                case 8:
-                    if (!space) return [3, 10];
-                    _b = req.body, password = _b.password, data = tslib_1.__rest(_b, ["password"]);
-                    return [4, (0, objectql_1.getObject)("operation_logs").insert({
-                            name: "登录",
-                            type: "login",
-                            remote_user: remote_user,
-                            remote_addr: ip,
-                            http_user_agent: userAgent,
-                            is_mobile: is_phone,
-                            is_tablet: is_tablet,
-                            object: "users",
-                            status: status,
-                            create: new Date(),
-                            space: space._id,
-                            message: message,
-                            data: JSON.stringify(data),
-                            related_to: {
-                                o: "users",
-                                ids: [remote_user],
-                            },
-                        })];
-                case 9:
-                    _d.sent();
-                    _d.label = 10;
-                case 10: return [7];
-                case 11: return [2];
-            }
+const getClientIp_1 = require("../utils/getClientIp");
+const get_user_agent_1 = require("../utils/get-user-agent");
+const send_error_1 = require("../utils/send-error");
+const steedos_auth_1 = require("../utils/steedos-auth");
+const ismobilejs_1 = require("ismobilejs");
+const objectql_1 = require("@steedos/objectql");
+const spaces_1 = require("./spaces");
+const login = (accountsServer) => async (req, res) => {
+    let userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
+    const ip = (0, getClientIp_1.getClientIp)(req);
+    let status = "success";
+    let message = "";
+    let result = null;
+    try {
+        result = await accountsServer.loginWithService("password", req.body, {
+            ip,
+            userAgent,
         });
-    }); };
+        if (result._next) {
+            return res.json(result);
+        }
+        (0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
+        try {
+            if (result && result.user) {
+                delete result.user["services"];
+            }
+        }
+        catch (error) { }
+        res.json(result);
+        return;
+    }
+    catch (err) {
+        console.log(err);
+        status = "fail";
+        message = err.message;
+        (0, send_error_1.sendError)(res, { message: err.message });
+    }
+    finally {
+        let is_phone = false;
+        let is_tablet = false;
+        if (userAgent) {
+            try {
+                const { phone, tablet } = (0, ismobilejs_1.default)(userAgent);
+                is_phone = phone;
+                is_tablet = tablet;
+            }
+            catch (Exception) {
+                console.log(`Exception`, Exception);
+            }
+        }
+        const space = await (0, spaces_1.getFirstSpace)(accountsServer);
+        let remote_user = null;
+        if (!result) {
+            let foundUser = await accountsServer
+                .getServices()["password"].foundUser(req.body.user);
+            remote_user = foundUser ? foundUser._id : null;
+        }
+        else {
+            remote_user = result?.user?._id;
+        }
+        if (space) {
+            const { password, ...data } = req.body;
+            await (0, objectql_1.getObject)("operation_logs").insert({
+                name: "登录",
+                type: "login",
+                remote_user: remote_user,
+                remote_addr: ip,
+                http_user_agent: userAgent,
+                is_mobile: is_phone,
+                is_tablet,
+                object: "users",
+                status: status,
+                create: new Date(),
+                space: space._id,
+                message: message,
+                data: JSON.stringify(data),
+                related_to: {
+                    o: "users",
+                    ids: [remote_user],
+                },
+            });
+        }
+    }
 };
 exports.login = login;
 //# sourceMappingURL=login.js.map

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

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

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

@@ -1,94 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logout = void 0;
-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 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 = (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({
-                                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,
-                        });
-                    }
-                    return [7];
-                case 6:
-                    res.json(null);
-                    return [2];
+const lodash_1 = require("lodash");
+const steedos_auth_1 = require("../utils/steedos-auth");
+const objectql_1 = require("@steedos/objectql");
+const getClientIp_1 = require("../utils/getClientIp");
+const get_user_agent_1 = require("../utils/get-user-agent");
+const ismobilejs_1 = require("ismobilejs");
+const objectql_2 = require("@steedos/objectql");
+const logout = (accountsServer) => async (req, res) => {
+    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 ", "token");
+    authToken =
+        authToken && authToken.split(",").length > 1
+            ? authToken.split(",")[0]
+            : authToken;
+    (0, steedos_auth_1.clearAuthCookies)(req, res);
+    let session = null;
+    try {
+        session = await accountsServer.logout(authToken);
+    }
+    catch (err) {
+    }
+    finally {
+        let userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
+        const ip = (0, getClientIp_1.getClientIp)(req);
+        let status = "success";
+        let message = "";
+        let is_phone = false;
+        let is_tablet = false;
+        if (userAgent) {
+            try {
+                const { phone, tablet } = (0, ismobilejs_1.default)(userAgent);
+                is_phone = phone;
+                is_tablet = tablet;
             }
+            catch (Exception) {
+                console.log(`Exception`, Exception);
+            }
+        }
+        await (0, objectql_1.getObject)("operation_logs").insert({
+            name: "注销",
+            type: "logout",
+            remote_user: session?.userId,
+            remote_addr: ip,
+            http_user_agent: userAgent,
+            is_mobile: is_phone,
+            is_tablet,
+            object: "users",
+            status: status,
+            create: new Date(),
+            space: session?.space,
+            message: message,
+            data: JSON.stringify({
+                authToken: authToken,
+                session: session,
+            }),
+            related_to: {
+                o: "users",
+                ids: [session?.userId],
+            },
         });
-    }); };
+        if (authToken) {
+            const broker = (0, objectql_2.getSteedosSchema)().broker;
+            broker.broadcast("$user.logout", {
+                authToken: authToken,
+            });
+        }
+    }
+    res.json(null);
 };
 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

@@ -1,43 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.providerCallback = void 0;
-var tslib_1 = require("tslib");
-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 = (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];
-            }
-        });
-    }); };
+const getClientIp_1 = require("../../utils/getClientIp");
+const get_user_agent_1 = require("../../utils/get-user-agent");
+const send_error_1 = require("../../utils/send-error");
+const providerCallback = (accountsServer, options) => async (req, res) => {
+    try {
+        const userAgent = (0, get_user_agent_1.getUserAgent)(req);
+        const ip = (0, getClientIp_1.getClientIp)(req);
+        const loggedInUser = await accountsServer.loginWithService("oauth", {
+            ...(req.params || {}),
+            ...(req.query || {}),
+            ...(req.body || {}),
+            ...(req.session || {}),
+        }, { ip, userAgent });
+        if (options && options.onOAuthSuccess) {
+            options.onOAuthSuccess(req, res, loggedInUser);
+        }
+        if (options && options.transformOAuthResponse) {
+            res.json(options.transformOAuthResponse(loggedInUser));
+        }
+        else {
+            res.json(loggedInUser);
+        }
+    }
+    catch (err) {
+        if (options && options.onOAuthError) {
+            options.onOAuthError(req, res, err);
+        }
+        (0, send_error_1.sendError)(res, err);
+    }
 };
 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":";;;;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"}
+{"version":3,"file":"provider-callback.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/oauth/provider-callback.ts"],"names":[],"mappings":";;;AASA,yDAAsD;AAEtD,+DAA0D;AAC1D,uDAAmD;AAO5C,MAAM,gBAAgB,GAC3B,CAAC,cAA8B,EAAE,OAAgC,EAAE,EAAE,CACrE,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,gBAAgB,CACxD,OAAO,EACP;YACE,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACpB,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YACnB,GAAG,CAAE,GAA0B,CAAC,OAAO,IAAI,EAAE,CAAC;SAC/C,EACD,EAAE,EAAE,EAAE,SAAS,EAAE,CAClB,CAAC;QAEF,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YACtC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;YAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtC,CAAC;QAED,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAjCS,QAAA,gBAAgB,oBAiCzB"}