@steedos/accounts 3.0.13-beta.9 → 3.0.13

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

@@ -1,109 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changePassword = void 0;
-var tslib_1 = require("tslib");
-var send_error_1 = require("../../utils/send-error");
-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 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, 11, , 12]);
-                    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, 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);
-                        }
-                    }
-                    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];
+const send_error_1 = require("../../utils/send-error");
+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 db_1 = require("../../../db");
+const config = (0, objectql_1.getSteedosConfig)();
+const changePassword = (accountsServer) => async (req, res) => {
+    try {
+        if (!req.userId) {
+            res.status(401);
+            res.json({ message: "Unauthorized" });
+            return;
+        }
+        const { oldPassword, newPassword } = req.body;
+        const password = accountsServer.getServices().password;
+        await password.changePassword(req.userId, oldPassword, newPassword);
+        password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false, password_modified_at: new Date() } });
+        try {
+            await db_1.db.updateMany("space_users", [["user", "=", req.userId]], { password_expired: false });
+            const userAgent = (0, get_user_agent_1.getUserAgent)(req);
+            const ip = (0, getClientIp_1.getClientIp)(req);
+            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 userSpaces = await db_1.db.find("space_users", {
+                filters: [
+                    ["user", "=", req.userId],
+                    ["user_accepted", "=", true],
+                ],
+                fields: ["space"],
+            });
+            if (userSpaces && userSpaces.length > 0) {
+                for (let userSpace of userSpaces) {
+                    const userId = req.userId;
+                    await (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,
+                        object: "users",
+                        status: "success",
+                        create: new Date(),
+                        create_by: userId,
+                        modified_by: userId,
+                        space: userSpace.space,
+                        related_to: {
+                            o: "users",
+                            ids: [userId],
+                        },
+                    });
+                }
+            }
+        }
+        catch (error) {
+            console.log("error", error);
+        }
+        res.json({ userId: req.userId, password_expired: false });
+    }
+    catch (err) {
+        (0, send_error_1.sendError)(res, err);
+    }
 };
 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/password/register.js

@@ -1,101 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerPassword = void 0;
-var tslib_1 = require("tslib");
-var send_error_1 = require("../../utils/send-error");
-var core_1 = require("../../../core");
-var steedos_auth_1 = require("../../utils/steedos-auth");
-var db_1 = require("../../../db");
-var objectql_1 = require("@steedos/objectql");
-var registerPassword = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var spaceId, codeRequired, password, inviteInfo, space, userId, foundedUser, result, enable_MFA, userProfile, err_1;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 15, , 16]);
-                spaceId = '';
-                if (req.body.spaceId) {
-                    spaceId = req.body.spaceId;
-                }
-                return [4, (0, core_1.canRegister)(spaceId, 'signupAccount')];
-            case 1:
-                if (!(_a.sent())) {
-                    throw new Error('accounts.unenableRegister');
-                }
-                return [4, (0, core_1.loginWithCode)(spaceId)];
-            case 2:
-                codeRequired = _a.sent();
-                if (codeRequired && !req.body.verifyCode) {
-                    throw new Error('accounts.codeRequired');
-                }
-                password = accountsServer.getServices().password;
-                inviteInfo = null;
-                if (!req.body.invite_token) return [3, 5];
-                return [4, password.getInviteInfo(req.body.invite_token)];
-            case 3:
-                inviteInfo = _a.sent();
-                if (!inviteInfo || !inviteInfo.valid) {
-                    throw new Error('accounts.invalid_invite');
-                }
-                return [4, (0, core_1.canRegister)(inviteInfo.space, 'inviteSpaceUser')];
-            case 4:
-                if (!(_a.sent())) {
-                    throw new Error('accounts.unenableRegister');
-                }
-                _a.label = 5;
-            case 5: return [4, db_1.db.findOne("spaces", req.body.spaceId, { fields: ["name"] })];
-            case 6:
-                space = _a.sent();
-                return [4, password.createUser(req.body)];
-            case 7:
-                userId = _a.sent();
-                if (!(inviteInfo && inviteInfo.space)) return [3, 9];
-                return [4, (0, objectql_1.getSteedosSchema)().broker.call("spaces.addSpaceUsers", {
-                        spaceId: inviteInfo.space,
-                        userId: userId,
-                        user_accepted: true,
-                    })];
-            case 8:
-                _a.sent();
-                return [3, 11];
-            case 9:
-                if (!(req.body.spaceId && space)) return [3, 11];
-                return [4, (0, objectql_1.getSteedosSchema)().broker.call("spaces.addSpaceUsers", {
-                        spaceId: req.body.spaceId,
-                        userId: userId,
-                        user_accepted: true,
-                    })];
-            case 10:
-                _a.sent();
-                _a.label = 11;
-            case 11: return [4, password.findUserById(userId)];
-            case 12:
-                foundedUser = _a.sent();
-                return [4, accountsServer.loginWithUser(foundedUser, {})];
-            case 13:
-                result = _a.sent();
-                (0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
-                enable_MFA = false;
-                return [4, password.getUserProfile(result.user._id)];
-            case 14:
-                userProfile = _a.sent();
-                if (userProfile) {
-                    enable_MFA = userProfile.enable_MFA || false;
-                }
-                if (enable_MFA) {
-                    if (!req.body.verifyCode) {
-                        result._next = 'TO_VERIFY_MOBILE';
-                    }
-                }
-                res.json(result);
-                return [3, 16];
-            case 15:
-                err_1 = _a.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 16];
-            case 16: return [2];
+const send_error_1 = require("../../utils/send-error");
+const core_1 = require("../../../core");
+const steedos_auth_1 = require("../../utils/steedos-auth");
+const db_1 = require("../../../db");
+const objectql_1 = require("@steedos/objectql");
+const registerPassword = (accountsServer) => async (req, res) => {
+    try {
+        let spaceId = '';
+        if (req.body.spaceId) {
+            spaceId = req.body.spaceId;
         }
-    });
-}); }; };
+        if (!(await (0, core_1.canRegister)(spaceId, 'signupAccount'))) {
+            throw new Error('accounts.unenableRegister');
+        }
+        let codeRequired = await (0, core_1.loginWithCode)(spaceId);
+        if (codeRequired && !req.body.verifyCode) {
+            throw new Error('accounts.codeRequired');
+        }
+        const password = accountsServer.getServices().password;
+        let inviteInfo = null;
+        if (req.body.invite_token) {
+            inviteInfo = await password.getInviteInfo(req.body.invite_token);
+            if (!inviteInfo || !inviteInfo.valid) {
+                throw new Error('accounts.invalid_invite');
+            }
+            if (!(await (0, core_1.canRegister)(inviteInfo.space, 'inviteSpaceUser'))) {
+                throw new Error('accounts.unenableRegister');
+            }
+        }
+        const space = await db_1.db.findOne("spaces", req.body.spaceId, { fields: ["name"] });
+        const userId = await password.createUser(req.body);
+        if (inviteInfo && inviteInfo.space) {
+            await (0, objectql_1.getSteedosSchema)().broker.call(`spaces.addSpaceUsers`, {
+                spaceId: inviteInfo.space,
+                userId,
+                user_accepted: true,
+            });
+        }
+        else if (req.body.spaceId && space) {
+            await (0, objectql_1.getSteedosSchema)().broker.call(`spaces.addSpaceUsers`, {
+                spaceId: req.body.spaceId,
+                userId,
+                user_accepted: true,
+            });
+        }
+        const foundedUser = await password.findUserById(userId);
+        const result = await accountsServer.loginWithUser(foundedUser, {});
+        (0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
+        let enable_MFA = false;
+        const userProfile = await password.getUserProfile(result.user._id);
+        if (userProfile) {
+            enable_MFA = userProfile.enable_MFA || false;
+        }
+        if (enable_MFA) {
+            if (!req.body.verifyCode) {
+                result._next = 'TO_VERIFY_MOBILE';
+            }
+        }
+        res.json(result);
+    }
+    catch (err) {
+        (0, send_error_1.sendError)(res, err);
+    }
+};
 exports.registerPassword = registerPassword;
 //# sourceMappingURL=register.js.map

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

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

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

@@ -1,54 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendResetPasswordEmail = exports.resetPassword = void 0;
-var tslib_1 = require("tslib");
-var send_error_1 = require("../../utils/send-error");
-var get_user_agent_1 = require("../../utils/get-user-agent");
-var request_ip_1 = require("request-ip");
-var resetPassword = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var _a, token, newPassword, userAgent, ip, password, loginResult, err_1;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _b.trys.push([0, 2, , 3]);
-                _a = req.body, token = _a.token, newPassword = _a.newPassword;
-                userAgent = (0, get_user_agent_1.getUserAgent)(req);
-                ip = (0, request_ip_1.getClientIp)(req);
-                password = accountsServer.getServices().password;
-                return [4, password.resetPassword(token, newPassword, { userAgent: userAgent, ip: ip })];
-            case 1:
-                loginResult = _b.sent();
-                res.json(loginResult);
-                return [3, 3];
-            case 2:
-                err_1 = _b.sent();
-                (0, send_error_1.sendError)(res, err_1);
-                return [3, 3];
-            case 3: return [2];
-        }
-    });
-}); }; };
+const send_error_1 = require("../../utils/send-error");
+const get_user_agent_1 = require("../../utils/get-user-agent");
+const request_ip_1 = require("request-ip");
+const resetPassword = (accountsServer) => async (req, res) => {
+    try {
+        const { token, newPassword } = req.body;
+        const userAgent = (0, get_user_agent_1.getUserAgent)(req);
+        const ip = (0, request_ip_1.getClientIp)(req);
+        const password = accountsServer.getServices().password;
+        const loginResult = await password.resetPassword(token, newPassword, { userAgent, ip });
+        res.json(loginResult);
+    }
+    catch (err) {
+        (0, send_error_1.sendError)(res, err);
+    }
+};
 exports.resetPassword = resetPassword;
-var sendResetPasswordEmail = function (accountsServer) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var email, password, err_2;
-    return tslib_1.__generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                email = req.body.email;
-                password = accountsServer.getServices().password;
-                return [4, password.sendResetPasswordEmail(email)];
-            case 1:
-                _a.sent();
-                res.json(null);
-                return [3, 3];
-            case 2:
-                err_2 = _a.sent();
-                (0, send_error_1.sendError)(res, err_2);
-                return [3, 3];
-            case 3: return [2];
-        }
-    });
-}); }; };
+const sendResetPasswordEmail = (accountsServer) => async (req, res) => {
+    try {
+        const { email } = req.body;
+        const password = accountsServer.getServices().password;
+        await password.sendResetPasswordEmail(email);
+        res.json(null);
+    }
+    catch (err) {
+        (0, send_error_1.sendError)(res, err);
+    }
+};
 exports.sendResetPasswordEmail = sendResetPasswordEmail;
 //# sourceMappingURL=reset.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/reset.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AACnD,6DAA0D;AAC1D,yCAAyC;AAElC,IAAM,aAAa,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC/D,GAAoB,EACpB,GAAqB;;;;;;gBAGb,KAAyB,GAAG,CAAC,IAAI,EAA/B,KAAK,WAAA,EAAE,WAAW,iBAAA,CAAc;gBAClC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;gBAC9B,EAAE,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;gBACtB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACxC,WAAM,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,SAAS,WAAA,EAAE,EAAE,IAAA,EAAE,CAAC,EAAA;;gBAAjF,WAAW,GAAG,SAAmE;gBACvF,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;;;;gBAEtB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAdgE,CAchE,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEK,IAAM,sBAAsB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACxE,GAAoB,EACpB,GAAqB;;;;;;gBAGX,KAAK,GAAK,GAAG,CAAC,IAAI,MAAb,CAAc;gBACrB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC5D,WAAM,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAA;;gBAA5C,SAA4C,CAAC;gBAC7C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;gBAEf,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZyE,CAYzE,CAAC;AAZW,QAAA,sBAAsB,0BAYjC"}
+{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/reset.ts"],"names":[],"mappings":";;;AAEA,uDAAmD;AACnD,+DAA0D;AAC1D,2CAAyC;AAElC,MAAM,aAAa,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EACpE,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACxC,MAAM,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QACxF,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEK,MAAM,sBAAsB,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EAC7E,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC7C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC"}