@steedos/accounts 2.2.55-beta.7 → 2.3.0-beta.3

package/lib/password/accounts-password.js

@@ -7,17 +7,14 @@ var server_1 = require("../server");
 var utils_1 = require("./utils");
 var errors_1 = require("./errors");
 var objectql_1 = require("@steedos/objectql");
-var EFFECTIVE_TIME = 10; //10分钟
+var EFFECTIVE_TIME = 10;
 var CODE_LENGTH = 6;
 var MAX_FAILURE_COUNT = 10;
 var _ = require('underscore');
 var moment = require('moment');
 var defaultOptions = {
-    // 3 days - 3 * 24 * 60 * 60 * 1000
     verifyEmailTokenExpiration: 259200000,
-    // 3 days - 3 * 24 * 60 * 60 * 1000
     passwordResetTokenExpiration: 259200000,
-    // 30 days - 30 * 24 * 60 * 60 * 1000
     passwordEnrollTokenExpiration: 2592000000,
     notifyUserAfterPasswordChanged: true,
     returnTokensAfterResetPassword: false,
@@ -46,10 +43,7 @@ var getPathFragmentPrefix = function () {
     }
     return pathFragmentPrefix;
 };
-// interface MyDatabaseInterface extends DatabaseInterface{
-//   updateUser?(userId: string, options: any): Promise<void>;
-// }
-var AccountsPassword = /** @class */ (function () {
+var AccountsPassword = (function () {
     function AccountsPassword(options) {
         if (options === void 0) { options = {}; }
         this.serviceName = 'password';
@@ -58,7 +52,6 @@ var AccountsPassword = /** @class */ (function () {
     }
     AccountsPassword.prototype.setStore = function (store) {
         this.db = store;
-        // this.twoFactor.setStore(store);
     };
     AccountsPassword.prototype.authenticate = function (params) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -73,9 +66,9 @@ var AccountsPassword = /** @class */ (function () {
                             password = passwordUnencrypted;
                             isHashPassword = false;
                         }
-                        if (!(user && token)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.codeAuthenticator(user, token, locale)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                        if (!(user && token)) return [3, 2];
+                        return [4, this.codeAuthenticator(user, token, locale)];
+                    case 1: return [2, _a.sent()];
                     case 2:
                         if (!user || !password) {
                             throw new Error(this.options.errors.unrecognizedOptionsForLogin);
@@ -83,39 +76,20 @@ var AccountsPassword = /** @class */ (function () {
                         if ((!(0, lodash_1.isString)(user) && !(0, lodash_1.isPlainObject)(user)) || !(0, lodash_1.isString)(password)) {
                             throw new Error(this.options.errors.matchFailed);
                         }
-                        return [4 /*yield*/, this.passwordAuthenticator(user, password, isHashPassword)];
+                        return [4, this.passwordAuthenticator(user, password, isHashPassword)];
                     case 3:
                         foundUser = _a.sent();
-                        // // If user activated two factor authentication try with the code
-                        // if (getUserTwoFactorService(foundUser)) {
-                        //   await this.twoFactor.authenticate(foundUser, code!);
-                        // }
-                        return [2 /*return*/, foundUser];
+                        return [2, foundUser];
                 }
             });
         });
     };
-    /**
-     * @description Find a user by one of his emails.
-     * @param {string} email - User email.
-     * @returns {Promise<Object>} - Return a user or null if not found.
-     */
     AccountsPassword.prototype.findUserByEmail = function (email) {
         return this.db.findUserByEmail(email);
     };
-    /**
-     * @description Find a user by his username.
-     * @param {string} username - User username.
-     * @returns {Promise<Object>} - Return a user or null if not found.
-     */
     AccountsPassword.prototype.findUserById = function (id) {
         return this.db.findUserById(id);
     };
-    /**
-     * @description Find a user by his username.
-     * @param {string} username - User username.
-     * @returns {Promise<Object>} - Return a user or null if not found.
-     */
     AccountsPassword.prototype.findUserByUsername = function (username) {
         return this.db.findUserByUsername(username);
     };
@@ -123,43 +97,21 @@ var AccountsPassword = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.db.getInviteInfo(id)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.db.getInviteInfo(id)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
     };
-    /**
-     * @description Add an email address for a user.
-     * It will trigger the `validateEmail` option and throw if email is invalid.
-     * Use this instead of directly updating the database.
-     * @param {string} userId - User id.
-     * @param {string} newEmail - A new email address for the user.
-     * @param {boolean} [verified] - Whether the new email address should be marked as verified.
-     * Defaults to false.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.addEmail = function (userId, newEmail, verified) {
         if (!this.options.validateEmail(newEmail)) {
             throw new Error(this.options.errors.invalidEmail);
         }
         return this.db.addEmail(userId, newEmail, verified);
     };
-    /**
-     * @description Remove an email address for a user.
-     * Use this instead of directly updating the database.
-     * @param {string} userId - User id.
-     * @param {string} email - The email address to remove.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.removeEmail = function (userId, email) {
         return this.db.removeEmail(userId, email);
     };
-    /**
-     * @description Marks the user's email address as verified.
-     * @param {string} token - The token retrieved from the verification URL.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.verifyEmail = function (token) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, verificationTokens, tokenRecord, emailRecord;
@@ -169,7 +121,7 @@ var AccountsPassword = /** @class */ (function () {
                         if (!token || !(0, lodash_1.isString)(token)) {
                             throw new Error(this.options.errors.invalidToken);
                         }
-                        return [4 /*yield*/, this.db.findUserByEmailVerificationToken(token)];
+                        return [4, this.db.findUserByEmailVerificationToken(token)];
                     case 1:
                         user = _a.sent();
                         if (!user) {
@@ -184,20 +136,14 @@ var AccountsPassword = /** @class */ (function () {
                         if (!emailRecord) {
                             throw new Error(this.options.errors.verifyEmailLinkUnknownAddress);
                         }
-                        return [4 /*yield*/, this.db.verifyEmail(user.id, emailRecord.address)];
+                        return [4, this.db.verifyEmail(user.id, emailRecord.address)];
                     case 2:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
     };
-    /**
-     * @description Reset the password for a user using a token received in email.
-     * @param {string} token - The token retrieved from the reset password URL.
-     * @param {string} newPassword - A new password for the user.
-     * @returns {Promise<LoginResult | null>} - If `returnTokensAfterResetPassword` option is true return the session tokens and user object, otherwise return null.
-     */
     AccountsPassword.prototype.resetPassword = function (token, newPassword, infos) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, resetTokens, resetTokenRecord, emails, password, address, passwordChangedMail;
@@ -210,7 +156,7 @@ var AccountsPassword = /** @class */ (function () {
                         if (!newPassword || !(0, lodash_1.isString)(newPassword)) {
                             throw new Error(this.options.errors.invalidNewPassword);
                         }
-                        return [4 /*yield*/, this.db.findUserByResetPasswordToken(token)];
+                        return [4, this.db.findUserByResetPasswordToken(token)];
                     case 1:
                         user = _a.sent();
                         if (!user) {
@@ -228,40 +174,38 @@ var AccountsPassword = /** @class */ (function () {
                         if (!(0, lodash_1.includes)(emails.map(function (email) { return email.address; }), resetTokenRecord.address)) {
                             throw new Error(this.options.errors.resetPasswordLinkUnknownAddress);
                         }
-                        return [4 /*yield*/, this.hashAndBcryptPassword(newPassword)];
+                        return [4, this.hashAndBcryptPassword(newPassword)];
                     case 2:
                         password = _a.sent();
-                        // Change the user password and remove the old token
-                        return [4 /*yield*/, this.db.setResetPassword(user.id, resetTokenRecord.address, password, token)];
+                        return [4, this.db.setResetPassword(user.id, resetTokenRecord.address, password, token)];
                     case 3:
-                        // Change the user password and remove the old token
                         _a.sent();
                         this.server.getHooks().emit(server_1.ServerHooks.ResetPasswordSuccess, user);
-                        if (!(resetTokenRecord.reason === 'enroll')) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.db.verifyEmail(user.id, resetTokenRecord.address)];
+                        if (!(resetTokenRecord.reason === 'enroll')) return [3, 5];
+                        return [4, this.db.verifyEmail(user.id, resetTokenRecord.address)];
                     case 4:
                         _a.sent();
                         _a.label = 5;
                     case 5:
-                        if (!this.options.invalidateAllSessionsAfterPasswordReset) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.db.invalidateAllSessions(user.id)];
+                        if (!this.options.invalidateAllSessionsAfterPasswordReset) return [3, 7];
+                        return [4, this.db.invalidateAllSessions(user.id)];
                     case 6:
                         _a.sent();
                         _a.label = 7;
                     case 7:
-                        if (!this.options.notifyUserAfterPasswordChanged) return [3 /*break*/, 9];
+                        if (!this.options.notifyUserAfterPasswordChanged) return [3, 9];
                         address = user.emails && user.emails[0].address;
-                        if (!address) return [3 /*break*/, 9];
+                        if (!address) return [3, 9];
                         passwordChangedMail = this.server.prepareMail(address, '', this.server.sanitizeUser(user), '', this.server.options.emailTemplates.passwordChanged, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(passwordChangedMail)];
+                        return [4, this.server.options.sendMail(passwordChangedMail)];
                     case 8:
                         _a.sent();
                         _a.label = 9;
                     case 9:
                         if (this.options.returnTokensAfterResetPassword) {
-                            return [2 /*return*/, this.server.loginWithUser(user, infos)];
+                            return [2, this.server.loginWithUser(user, infos)];
                         }
-                        return [2 /*return*/, null];
+                        return [2, null];
                 }
             });
         });
@@ -281,14 +225,14 @@ var AccountsPassword = /** @class */ (function () {
                         login_expiration_in_days = null;
                         phone_logout_other_clients = false;
                         phone_login_expiration_in_days = null;
-                        return [4 /*yield*/, (0, objectql_1.getObject)("space_users").find({
+                        return [4, (0, objectql_1.getObject)("space_users").find({
                                 filters: "(user eq '".concat(userId, "') and (space eq '").concat(spaceId, "')"),
                             })];
                     case 1:
                         spaceUsers = _a.sent();
-                        if (!(spaceUsers.length > 0)) return [3 /*break*/, 3];
+                        if (!(spaceUsers.length > 0)) return [3, 3];
                         spaceUser = spaceUsers[0];
-                        return [4 /*yield*/, (0, objectql_1.getObject)("permission_set").find({
+                        return [4, (0, objectql_1.getObject)("permission_set").find({
                                 filters: "(name eq '".concat(spaceUser.profile, "') and (type eq 'profile') and (space eq '").concat(spaceId, "')"),
                             })];
                     case 2:
@@ -322,7 +266,7 @@ var AccountsPassword = /** @class */ (function () {
                             }
                         }
                         _a.label = 3;
-                    case 3: return [2 /*return*/, Object.assign({
+                    case 3: return [2, Object.assign({
                             space: spaceId,
                             password_history: password_history,
                             max_login_attempts: max_login_attempts,
@@ -337,33 +281,19 @@ var AccountsPassword = /** @class */ (function () {
             });
         });
     };
-    /**
-     * @description Change the password for a user.
-     * @param {string} userId - User id.
-     * @param {string} newPassword - A new password for the user.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.setPassword = function (userId, newPassword) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var password;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, utils_1.bcryptPassword)(newPassword)];
+                    case 0: return [4, (0, utils_1.bcryptPassword)(newPassword)];
                     case 1:
                         password = _a.sent();
-                        return [2 /*return*/, this.db.setPassword(userId, password)];
+                        return [2, this.db.setPassword(userId, password)];
                 }
             });
         });
     };
-    /**
-     * @description Change the current user's password.
-     * It will trigger the `validatePassword` option and throw if password is invalid.
-     * @param {string} userId - User id.
-     * @param {string} oldPassword - The user's current password.
-     * @param {string} newPassword - A new password for the user.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.changePassword = function (userId, oldPassword, newPassword) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, saas, passwordHistory, userProfile, validPasswordHistory, _i, validPasswordHistory_1, item, verify, password, address, passwordChangedMail;
@@ -373,22 +303,22 @@ var AccountsPassword = /** @class */ (function () {
                         if (!this.options.validatePassword(newPassword)) {
                             throw new Error(this.options.errors.invalidPassword);
                         }
-                        return [4 /*yield*/, this.passwordAuthenticator({ id: userId }, oldPassword)];
+                        return [4, this.passwordAuthenticator({ id: userId }, oldPassword)];
                     case 1:
                         user = _a.sent();
                         saas = (0, objectql_1.getSteedosConfig)().tenant.saas;
-                        if (!!saas) return [3 /*break*/, 6];
+                        if (!!saas) return [3, 6];
                         passwordHistory = user.services.password_history || [];
-                        return [4 /*yield*/, this.getUserProfile(userId)];
+                        return [4, this.getUserProfile(userId)];
                     case 2:
                         userProfile = _a.sent();
                         validPasswordHistory = _.last(passwordHistory, userProfile.password_history);
                         _i = 0, validPasswordHistory_1 = validPasswordHistory;
                         _a.label = 3;
                     case 3:
-                        if (!(_i < validPasswordHistory_1.length)) return [3 /*break*/, 6];
+                        if (!(_i < validPasswordHistory_1.length)) return [3, 6];
                         item = validPasswordHistory_1[_i];
-                        return [4 /*yield*/, (0, utils_1.verifyPassword)(newPassword, item)];
+                        return [4, (0, utils_1.verifyPassword)(newPassword, item)];
                     case 4:
                         verify = _a.sent();
                         if (verify) {
@@ -397,41 +327,33 @@ var AccountsPassword = /** @class */ (function () {
                         _a.label = 5;
                     case 5:
                         _i++;
-                        return [3 /*break*/, 3];
-                    case 6: return [4 /*yield*/, (0, utils_1.bcryptPassword)(newPassword)];
+                        return [3, 3];
+                    case 6: return [4, (0, utils_1.bcryptPassword)(newPassword)];
                     case 7:
                         password = _a.sent();
-                        return [4 /*yield*/, this.db.setPassword(userId, password)];
+                        return [4, this.db.setPassword(userId, password)];
                     case 8:
                         _a.sent();
                         this.server.getHooks().emit(server_1.ServerHooks.ChangePasswordSuccess, user);
-                        if (!this.options.invalidateAllSessionsAfterPasswordChanged) return [3 /*break*/, 10];
-                        return [4 /*yield*/, this.db.invalidateAllSessions(user.id)];
+                        if (!this.options.invalidateAllSessionsAfterPasswordChanged) return [3, 10];
+                        return [4, this.db.invalidateAllSessions(user.id)];
                     case 9:
                         _a.sent();
                         _a.label = 10;
                     case 10:
-                        if (!this.options.notifyUserAfterPasswordChanged) return [3 /*break*/, 12];
+                        if (!this.options.notifyUserAfterPasswordChanged) return [3, 12];
                         address = user.emails && user.emails[0].address;
-                        if (!address) return [3 /*break*/, 12];
+                        if (!address) return [3, 12];
                         passwordChangedMail = this.server.prepareMail(address, '', this.server.sanitizeUser(user), '', this.server.options.emailTemplates.passwordChanged, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(passwordChangedMail)];
+                        return [4, this.server.options.sendMail(passwordChangedMail)];
                     case 11:
                         _a.sent();
                         _a.label = 12;
-                    case 12: return [2 /*return*/];
+                    case 12: return [2];
                 }
             });
         });
     };
-    /**
-     * @description Send an email with a link the user can use verify their email address.
-     * @param {string} [address] - Which address of the user's to send the email to.
-     * This address must be in the user's emails list.
-     * Defaults to the first unverified email in the list.
-     * If the address is already verified we do not send any email.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.sendVerificationEmail = function (address) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, code, token, resetPasswordMail;
@@ -441,40 +363,31 @@ var AccountsPassword = /** @class */ (function () {
                         if (!address || !(0, lodash_1.isString)(address)) {
                             throw new Error(this.options.errors.invalidEmail);
                         }
-                        return [4 /*yield*/, this.db.findUserByEmail(address)];
+                        return [4, this.db.findUserByEmail(address)];
                     case 1:
                         user = _a.sent();
                         if (!user) {
-                            // To prevent user enumeration we fail silently
                             if (this.server.options.ambiguousErrorMessages) {
-                                return [2 /*return*/];
+                                return [2];
                             }
                             throw new Error(this.options.errors.userNotFound);
                         }
-                        //Do not send an email if the address is already verified
                         if (user.email_verified)
-                            return [2 /*return*/];
+                            return [2];
                         code = (0, server_1.generateRandomCode)();
                         token = (0, server_1.generateRandomToken)();
-                        return [4 /*yield*/, this.db.addEmailVerificationToken(user.id, address, token, code)];
+                        return [4, this.db.addEmailVerificationToken(user.id, address, token, code)];
                     case 2:
                         _a.sent();
                         resetPasswordMail = this.server.prepareMail(address, code, this.server.sanitizeUser(user), getPathFragmentPrefix() + 'verify-email', this.server.options.emailTemplates.verifyEmail, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(resetPasswordMail)];
+                        return [4, this.server.options.sendMail(resetPasswordMail)];
                     case 3:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
     };
-    /**
-     * @description Send an email with a link the user can use to reset their password.
-     * @param {string} [address] - Which address of the user's to send the email to.
-     * This address must be in the user's emails list.
-     * Defaults to the first email in the list.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.sendResetPasswordEmail = function (address) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, token, resetPasswordMail;
@@ -484,37 +397,28 @@ var AccountsPassword = /** @class */ (function () {
                         if (!address || !(0, lodash_1.isString)(address)) {
                             throw new Error(this.options.errors.invalidEmail);
                         }
-                        return [4 /*yield*/, this.db.findUserByEmail(address)];
+                        return [4, this.db.findUserByEmail(address)];
                     case 1:
                         user = _a.sent();
                         if (!user) {
-                            // To prevent user enumeration we fail silently
                             if (this.server.options.ambiguousErrorMessages) {
-                                return [2 /*return*/];
+                                return [2];
                             }
                             throw new Error(this.options.errors.userNotFound);
                         }
                         token = (0, server_1.generateRandomToken)();
-                        return [4 /*yield*/, this.db.addResetPasswordToken(user.id, address, token, 'reset')];
+                        return [4, this.db.addResetPasswordToken(user.id, address, token, 'reset')];
                     case 2:
                         _a.sent();
                         resetPasswordMail = this.server.prepareMail(address, token, this.server.sanitizeUser(user), getPathFragmentPrefix() + 'reset-password', this.server.options.emailTemplates.resetPassword, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(resetPasswordMail)];
+                        return [4, this.server.options.sendMail(resetPasswordMail)];
                     case 3:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
     };
-    /**
-     * @description Send an email with a link the user can use to set their initial password.
-     * The user's email will be verified after clicking on the link.
-     * @param {string} [address] - Which address of the user's to send the email to.
-     * This address must be in the user's emails list.
-     * Defaults to the first email in the list.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.sendEnrollmentEmail = function (address) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, token, enrollmentMail;
@@ -524,30 +428,25 @@ var AccountsPassword = /** @class */ (function () {
                         if (!address || !(0, lodash_1.isString)(address)) {
                             throw new Error(this.options.errors.invalidEmail);
                         }
-                        return [4 /*yield*/, this.db.findUserByEmail(address)];
+                        return [4, this.db.findUserByEmail(address)];
                     case 1:
                         user = _a.sent();
                         if (!user) {
                             throw new Error(this.options.errors.userNotFound);
                         }
                         token = (0, server_1.generateRandomToken)();
-                        return [4 /*yield*/, this.db.addResetPasswordToken(user.id, address, token, 'enroll')];
+                        return [4, this.db.addResetPasswordToken(user.id, address, token, 'enroll')];
                     case 2:
                         _a.sent();
                         enrollmentMail = this.server.prepareMail(address, token, this.server.sanitizeUser(user), getPathFragmentPrefix() + 'enroll-account', this.server.options.emailTemplates.enrollAccount, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(enrollmentMail)];
+                        return [4, this.server.options.sendMail(enrollmentMail)];
                     case 3:
                         _a.sent();
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
     };
-    /**
-     * @description Create a new user.
-     * @param user - The user object.
-     * @returns Return the id of user created.
-     */
     AccountsPassword.prototype.createUser = function (user) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, _c, _d, r, userId_1, e_1;
@@ -565,8 +464,8 @@ var AccountsPassword = /** @class */ (function () {
                             throw new Error(this.options.errors.invalidEmail);
                         }
                         _a = user.mobile;
-                        if (!_a) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.db.findUserByMobile(user.mobile)];
+                        if (!_a) return [3, 2];
+                        return [4, this.db.findUserByMobile(user.mobile)];
                     case 1:
                         _a = (_e.sent());
                         _e.label = 2;
@@ -575,8 +474,8 @@ var AccountsPassword = /** @class */ (function () {
                             throw new Error(this.options.errors.mobileAlreadyExists);
                         }
                         _b = user.username;
-                        if (!_b) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.db.findUserByUsername(user.username)];
+                        if (!_b) return [3, 4];
+                        return [4, this.db.findUserByUsername(user.username)];
                     case 3:
                         _b = (_e.sent());
                         _e.label = 4;
@@ -585,8 +484,8 @@ var AccountsPassword = /** @class */ (function () {
                             throw new Error(this.options.errors.usernameAlreadyExists);
                         }
                         _c = user.email;
-                        if (!_c) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.db.findUserByEmail(user.email)];
+                        if (!_c) return [3, 6];
+                        return [4, this.db.findUserByEmail(user.email)];
                     case 5:
                         _c = (_e.sent());
                         _e.label = 6;
@@ -597,21 +496,19 @@ var AccountsPassword = /** @class */ (function () {
                         if (!user.password && !user.verifyCode) {
                             throw new Error(this.options.errors.invalidVerifyParam);
                         }
-                        if (!user.password) return [3 /*break*/, 9];
+                        if (!user.password) return [3, 9];
                         if (!this.options.validatePassword(user.password)) {
                             throw new Error(this.options.errors.invalidPassword);
                         }
-                        // user.password = await this.hashAndBcryptPassword(user.password);
                         _d = user;
-                        return [4 /*yield*/, (0, utils_1.bcryptPassword)(user.password)];
-                    case 7: return [4 /*yield*/, _e.sent()];
+                        return [4, (0, utils_1.bcryptPassword)(user.password)];
+                    case 7: return [4, _e.sent()];
                     case 8:
-                        // user.password = await this.hashAndBcryptPassword(user.password);
                         _d.password = _e.sent();
                         _e.label = 9;
                     case 9:
-                        if (!user.verifyCode) return [3 /*break*/, 11];
-                        return [4 /*yield*/, this.db.checkVerificationCode(user, user.verifyCode)];
+                        if (!user.verifyCode) return [3, 11];
+                        return [4, this.db.checkVerificationCode(user, user.verifyCode)];
                     case 10:
                         r = _e.sent();
                         if (!r) {
@@ -625,7 +522,7 @@ var AccountsPassword = /** @class */ (function () {
                         _e.label = 11;
                     case 11:
                         _e.trys.push([11, 13, , 15]);
-                        return [4 /*yield*/, this.db.createUser(user)];
+                        return [4, this.db.createUser(user)];
                     case 12:
                         userId_1 = _e.sent();
                         (0, lodash_1.defer)(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -635,22 +532,22 @@ var AccountsPassword = /** @class */ (function () {
                                     case 0:
                                         if (this.options.sendVerificationEmailAfterSignup && user.email && !user.email_verified)
                                             this.sendVerificationEmail(user.email);
-                                        return [4 /*yield*/, this.db.findUserById(userId_1)];
+                                        return [4, this.db.findUserById(userId_1)];
                                     case 1:
                                         userRecord = (_a.sent());
                                         this.server.getHooks().emit(server_1.ServerHooks.CreateUserSuccess, userRecord);
-                                        return [2 /*return*/];
+                                        return [2];
                                 }
                             });
                         }); });
-                        return [2 /*return*/, userId_1];
+                        return [2, userId_1];
                     case 13:
                         e_1 = _e.sent();
-                        return [4 /*yield*/, this.server.getHooks().emit(server_1.ServerHooks.CreateUserError, user)];
+                        return [4, this.server.getHooks().emit(server_1.ServerHooks.CreateUserError, user)];
                     case 14:
                         _e.sent();
                         throw e_1;
-                    case 15: return [2 /*return*/];
+                    case 15: return [2];
                 }
             });
         });
@@ -662,8 +559,8 @@ var AccountsPassword = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.passwordAuthenticator({ email: email }, password)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4, this.passwordAuthenticator({ email: email }, password)];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });
@@ -679,31 +576,27 @@ var AccountsPassword = /** @class */ (function () {
                             ? this.toMobileAndEmail({ user: user })
                             : this.toMobileAndEmail(tslib_1.__assign({}, user)), username = _a.username, email = _a.email, id = _a.id, mobile = _a.mobile;
                         foundUser = null;
-                        if (!id) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.db.findUserById(id)];
+                        if (!id) return [3, 2];
+                        return [4, this.db.findUserById(id)];
                     case 1:
-                        // this._validateLoginWithField('id', user);
                         foundUser = _b.sent();
-                        return [3 /*break*/, 8];
+                        return [3, 8];
                     case 2:
-                        if (!username) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.db.findUserByUsername(username)];
+                        if (!username) return [3, 4];
+                        return [4, this.db.findUserByUsername(username)];
                     case 3:
-                        // this._validateLoginWithField('username', user);
                         foundUser = _b.sent();
-                        return [3 /*break*/, 8];
+                        return [3, 8];
                     case 4:
-                        if (!mobile) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.db.findUserByMobile(mobile)];
+                        if (!mobile) return [3, 6];
+                        return [4, this.db.findUserByMobile(mobile)];
                     case 5:
-                        // this._validateLoginWithField('username', user);
                         foundUser = _b.sent();
-                        return [3 /*break*/, 8];
+                        return [3, 8];
                     case 6:
-                        if (!email) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.db.findUserByEmail(email)];
+                        if (!email) return [3, 8];
+                        return [4, this.db.findUserByEmail(email)];
                     case 7:
-                        // this._validateLoginWithField('email', user);
                         foundUser = _b.sent();
                         _b.label = 8;
                     case 8:
@@ -712,7 +605,7 @@ var AccountsPassword = /** @class */ (function () {
                                 ? this.options.errors.invalidCredentials
                                 : this.options.errors.userNotFound);
                         }
-                        return [4 /*yield*/, this.db.findPasswordHash(foundUser.id)];
+                        return [4, this.db.findPasswordHash(foundUser.id)];
                     case 9:
                         hash = _b.sent();
                         if (!hash) {
@@ -741,21 +634,21 @@ var AccountsPassword = /** @class */ (function () {
                         else {
                             pass = hashAlgorithm ? (0, utils_1.hashPassword)(password, hashAlgorithm) : password;
                         }
-                        return [4 /*yield*/, (0, utils_1.verifyPassword)(pass, hash)];
+                        return [4, (0, utils_1.verifyPassword)(pass, hash)];
                     case 10:
                         isPasswordValid = _b.sent();
-                        if (!!isPasswordValid) return [3 /*break*/, 16];
-                        if (!!saas) return [3 /*break*/, 15];
-                        return [4 /*yield*/, this.getUserProfile(foundUser.id)];
+                        if (!!isPasswordValid) return [3, 16];
+                        if (!!saas) return [3, 15];
+                        return [4, this.getUserProfile(foundUser.id)];
                     case 11:
                         userProfile = _b.sent();
-                        return [4 /*yield*/, this.db.updateUser(foundUser.id, { $inc: { login_failed_number: 1 } })];
+                        return [4, this.db.updateUser(foundUser.id, { $inc: { login_failed_number: 1 } })];
                     case 12:
                         _b.sent();
-                        return [4 /*yield*/, this.db.findUserById(foundUser.id)];
+                        return [4, this.db.findUserById(foundUser.id)];
                     case 13:
                         user_1 = _b.sent();
-                        if (!(user_1.login_failed_number >= userProfile.max_login_attempts)) return [3 /*break*/, 15];
+                        if (!(user_1.login_failed_number >= userProfile.max_login_attempts)) return [3, 15];
                         lockout_interval = userProfile.lockout_interval;
                         login_failed_lockout_time = null;
                         if (lockout_interval === 0) {
@@ -764,18 +657,18 @@ var AccountsPassword = /** @class */ (function () {
                         else {
                             login_failed_lockout_time = new Date(moment().add(userProfile.lockout_interval, 'm'));
                         }
-                        return [4 /*yield*/, this.db.updateUser(foundUser.id, { $set: { lockout: true, login_failed_lockout_time: login_failed_lockout_time } })];
+                        return [4, this.db.updateUser(foundUser.id, { $set: { lockout: true, login_failed_lockout_time: login_failed_lockout_time } })];
                     case 14:
                         _b.sent();
                         _b.label = 15;
                     case 15: throw new Error(this.server.options.ambiguousErrorMessages
                         ? this.options.errors.invalidCredentials
                         : this.options.errors.incorrectPassword);
-                    case 16: return [4 /*yield*/, this.db.updateUser(foundUser.id, { $set: { lockout: false, login_failed_number: 0 }, $unset: { login_failed_lockout_time: 1 } })];
+                    case 16: return [4, this.db.updateUser(foundUser.id, { $set: { lockout: false, login_failed_number: 0 }, $unset: { login_failed_lockout_time: 1 } })];
                     case 17:
                         _b.sent();
                         _b.label = 18;
-                    case 18: return [2 /*return*/, foundUser];
+                    case 18: return [2, foundUser];
                 }
             });
         });
@@ -789,7 +682,7 @@ var AccountsPassword = /** @class */ (function () {
                         _a = (0, lodash_1.isString)(user)
                             ? this.toMobileAndEmail({ user: user })
                             : this.toMobileAndEmail(tslib_1.__assign({}, user)), username = _a.username, email = _a.email, mobile = _a.mobile, id = _a.id;
-                        return [4 /*yield*/, this.db.findUserByVerificationCode({ email: email, mobile: mobile }, token)];
+                        return [4, this.db.findUserByVerificationCode({ email: email, mobile: mobile }, token)];
                     case 1:
                         foundUser = _b.sent();
                         if (!foundUser) {
@@ -797,7 +690,7 @@ var AccountsPassword = /** @class */ (function () {
                                 ? this.options.errors.invalidCode
                                 : this.options.errors.userNotFound);
                         }
-                        return [2 /*return*/, foundUser];
+                        return [2, foundUser];
                 }
             });
         });
@@ -808,16 +701,10 @@ var AccountsPassword = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 hashAlgorithm = this.options.passwordHashAlgorithm;
                 hashedPassword = hashAlgorithm ? (0, utils_1.hashPassword)(password, hashAlgorithm) : password;
-                return [2 /*return*/, (0, utils_1.bcryptPassword)(hashedPassword)];
+                return [2, (0, utils_1.bcryptPassword)(hashedPassword)];
             });
         });
     };
-    /**
-     * Given a username, user and/or email figure out the username and/or email.
-     *
-     * @param user An object containing at least `username`, `user` and/or `email`.
-     * @returns An object containing `id`, `username` and `email`.
-     */
     AccountsPassword.prototype.toMobileAndEmail = function (_a) {
         var user = _a.user, username = _a.username, email = _a.email, mobile = _a.mobile, id = _a.id;
         if (user && !username && !email && !mobile) {
@@ -830,14 +717,6 @@ var AccountsPassword = /** @class */ (function () {
         }
         return { username: username, email: email, mobile: mobile, id: id };
     };
-    /**
-     * @description Send an email with a link the user can use verify their email address.
-     * @param {string} [address] - Which address of the user's to send the email to.
-     * This address must be in the user's emails list.
-     * Defaults to the first unverified email in the list.
-     * If the address is already verified we do not send any email.
-     * @returns {Promise<void>} - Return a Promise.
-     */
     AccountsPassword.prototype.sendVerificationCode = function (user) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var code, result, verificationCodeMail, result, sms;
@@ -845,29 +724,29 @@ var AccountsPassword = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         code = (0, server_1.generateRandomCode)();
-                        if (!user.email) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.db.addVerificationCode(user, code, { MAX_FAILURE_COUNT: MAX_FAILURE_COUNT, EFFECTIVE_TIME: EFFECTIVE_TIME })];
+                        if (!user.email) return [3, 3];
+                        return [4, this.db.addVerificationCode(user, code, { MAX_FAILURE_COUNT: MAX_FAILURE_COUNT, EFFECTIVE_TIME: EFFECTIVE_TIME })];
                     case 1:
                         result = _a.sent();
                         verificationCodeMail = this.server.prepareMail(user.email, result.code, null, getPathFragmentPrefix() + 'verify-email', this.server.options.emailTemplates.verificationCode, this.server.options.emailTemplates.from);
-                        return [4 /*yield*/, this.server.options.sendMail(verificationCodeMail)];
+                        return [4, this.server.options.sendMail(verificationCodeMail)];
                     case 2:
                         _a.sent();
-                        return [2 /*return*/, result.owner];
+                        return [2, result.owner];
                     case 3:
-                        if (!user.mobile) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.db.addVerificationCode(user, code, { MAX_FAILURE_COUNT: MAX_FAILURE_COUNT, EFFECTIVE_TIME: EFFECTIVE_TIME })];
+                        if (!user.mobile) return [3, 6];
+                        return [4, this.db.addVerificationCode(user, code, { MAX_FAILURE_COUNT: MAX_FAILURE_COUNT, EFFECTIVE_TIME: EFFECTIVE_TIME })];
                     case 4:
                         result = _a.sent();
                         sms = {
                             mobile: user.mobile,
                             message: "\u60A8\u7684\u9A8C\u8BC1\u7801\u4E3A\uFF1A".concat(result.code, "\uFF0C\u8BE5\u9A8C\u8BC1\u7801").concat(EFFECTIVE_TIME, "\u5206\u949F\u5185\u6709\u6548\uFF0C\u8BF7\u52FF\u6CC4\u6F0F\u4E8E\u4ED6\u4EBA\uFF01")
                         };
-                        return [4 /*yield*/, this.server.options.sendSMS(sms)];
+                        return [4, this.server.options.sendSMS(sms)];
                     case 5:
                         _a.sent();
-                        return [2 /*return*/, result.owner];
-                    case 6: return [2 /*return*/];
+                        return [2, result.owner];
+                    case 6: return [2];
                 }
             });
         });