@intuitionrobotics/user-account 0.41.68 → 0.41.71

package/app-backend/modules/AccountModule.js

@@ -1,28 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,33 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountModule = exports.AccountsModule_Class = exports.Collection_Accounts = exports.Collection_Sessions = exports.Header_SessionId = void 0;
 /*
@@ -79,454 +28,265 @@ exports.AccountModule = exports.AccountsModule_Class = exports.Collection_Accoun
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var ts_common_1 = require("@intuitionrobotics/ts-common");
-var backend_1 = require("@intuitionrobotics/firebase/backend");
-var _imports_1 = require("./_imports");
-var backend_2 = require("@intuitionrobotics/thunderstorm/backend");
-var backend_3 = require("@intuitionrobotics/db-api-generator/backend");
+const ts_common_1 = require("@intuitionrobotics/ts-common");
+const backend_1 = require("@intuitionrobotics/firebase/backend");
+const _imports_1 = require("./_imports");
+const backend_2 = require("@intuitionrobotics/thunderstorm/backend");
+const backend_3 = require("@intuitionrobotics/db-api-generator/backend");
 exports.Header_SessionId = new backend_2.HeaderKey(_imports_1.HeaderKey_SessionId);
 exports.Collection_Sessions = "user-account--sessions";
 exports.Collection_Accounts = "user-account--accounts";
-var dispatch_onUserLogin = new ts_common_1.Dispatcher("__onUserLogin");
-var dispatch_onNewUserRegistered = new ts_common_1.Dispatcher("__onNewUserRegistered");
+const dispatch_onUserLogin = new ts_common_1.Dispatcher("__onUserLogin");
+const dispatch_onNewUserRegistered = new ts_common_1.Dispatcher("__onNewUserRegistered");
 function getUIAccount(account) {
-    var email = account.email, _id = account._id;
-    return { email: email, _id: _id };
+    const { email, _id } = account;
+    return { email, _id };
 }
-var AccountsModule_Class = /** @class */ (function (_super) {
-    __extends(AccountsModule_Class, _super);
-    function AccountsModule_Class() {
-        var _this = _super.call(this) || this;
-        _this.TTLExpired = function (session) {
-            var delta = ts_common_1.currentTimeMillies() - session.timestamp;
-            var sessionTTLms = _this.config.sessionTTLms.web;
+class AccountsModule_Class extends ts_common_1.Module {
+    constructor() {
+        super();
+        this.TTLExpired = (session) => {
+            const delta = ts_common_1.currentTimeMillies() - session.timestamp;
+            let sessionTTLms = this.config.sessionTTLms.web;
             if (session.frontType === _imports_1.FrontType.App)
-                sessionTTLms = _this.config.sessionTTLms.app;
+                sessionTTLms = this.config.sessionTTLms.app;
             return delta > sessionTTLms || delta < 0;
         };
-        _this.upsertSession = function (userId, frontType) { return __awaiter(_this, void 0, void 0, function () {
-            var session, account;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.sessions.queryUnique({ where: { userId: userId } })];
-                    case 1:
-                        session = _a.sent();
-                        if (!(!session || this.TTLExpired(session))) return [3 /*break*/, 3];
-                        session = {
-                            sessionId: ts_common_1.generateHex(64),
-                            timestamp: ts_common_1.currentTimeMillies(),
-                            userId: userId
-                        };
-                        if (frontType)
-                            session.frontType = frontType;
-                        return [4 /*yield*/, this.sessions.upsert(session)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [4 /*yield*/, this.getUserEmailFromSession(session)];
-                    case 4:
-                        account = _a.sent();
-                        return [2 /*return*/, { sessionId: session.sessionId, email: account.email }];
-                }
-            });
-        }); };
-        _this.setDefaultConfig({ sessionTTLms: { web: ts_common_1.Day, app: ts_common_1.Day } });
-        return _this;
+        this.upsertSession = (userId, frontType) => __awaiter(this, void 0, void 0, function* () {
+            let session = yield this.sessions.queryUnique({ where: { userId } });
+            if (!session || this.TTLExpired(session)) {
+                session = {
+                    sessionId: ts_common_1.generateHex(64),
+                    timestamp: ts_common_1.currentTimeMillies(),
+                    userId
+                };
+                if (frontType)
+                    session.frontType = frontType;
+                yield this.sessions.upsert(session);
+            }
+            const account = yield this.getUserEmailFromSession(session);
+            return { sessionId: session.sessionId, email: account.email };
+        });
+        this.setDefaultConfig({ sessionTTLms: { web: ts_common_1.Day, app: ts_common_1.Day } });
     }
-    AccountsModule_Class.prototype.__queryRequestInfo = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var data, e_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.validateSession(request)];
-                    case 1:
-                        data = _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        e_1 = _a.sent();
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/, {
-                            key: this.getName(),
-                            data: data
-                        }];
-                }
-            });
+    __queryRequestInfo(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let data;
+            try {
+                data = yield this.validateSession(request);
+            }
+            catch (e) {
+            }
+            return {
+                key: this.getName(),
+                data: data
+            };
         });
-    };
-    AccountsModule_Class.prototype.init = function () {
-        var firestore = backend_1.FirebaseModule.createAdminSession(this.config.projectId).getFirestore();
+    }
+    init() {
+        const firestore = backend_1.FirebaseModule.createAdminSession(this.config.projectId).getFirestore();
         this.sessions = firestore.getCollection(exports.Collection_Sessions, ["userId"]);
         this.accounts = firestore.getCollection(exports.Collection_Accounts, ["email"]);
-    };
-    AccountsModule_Class.prototype.getUser = function (_email) {
-        return __awaiter(this, void 0, void 0, function () {
-            var email;
-            return __generator(this, function (_a) {
-                email = _email.toLowerCase();
-                return [2 /*return*/, this.accounts.queryUnique({ where: { email: email }, select: ["email", "_id"] })];
-            });
+    }
+    getUser(_email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const email = _email.toLowerCase();
+            return this.accounts.queryUnique({ where: { email }, select: ["email", "_id"] });
         });
-    };
-    AccountsModule_Class.prototype.listUsers = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.accounts.getAll(["_id", "email"])];
-            });
+    }
+    listUsers() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.accounts.getAll(["_id", "email"]);
         });
-    };
-    AccountsModule_Class.prototype.listSessions = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.sessions.getAll(["userId", "timestamp"])];
-            });
+    }
+    listSessions() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sessions.getAll(["userId", "timestamp"]);
         });
-    };
-    AccountsModule_Class.prototype.getSession = function (_email) {
-        return __awaiter(this, void 0, void 0, function () {
-            var email;
-            return __generator(this, function (_a) {
-                email = _email.toLowerCase();
-                return [2 /*return*/, this.accounts.queryUnique({ where: { email: email } })];
-            });
+    }
+    getSession(_email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const email = _email.toLowerCase();
+            return this.accounts.queryUnique({ where: { email } });
         });
-    };
-    AccountsModule_Class.prototype.querySessions = function (_email) {
-        return __awaiter(this, void 0, void 0, function () {
-            var account, sessions;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getSession(_email)];
-                    case 1:
-                        account = _a.sent();
-                        if (!account)
-                            return [2 /*return*/];
-                        return [4 /*yield*/, this.sessions.query({ select: ["userId", "timestamp", "frontType"], where: { userId: account._id } })];
-                    case 2:
-                        sessions = _a.sent();
-                        return [2 /*return*/, sessions.map(function (session) {
-                                return __assign(__assign({}, session), { isExpired: _this.TTLExpired(session) });
-                            })];
-                }
+    }
+    querySessions(_email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.getSession(_email);
+            if (!account)
+                return;
+            const sessions = yield this.sessions.query({ select: ["userId", "timestamp", "frontType"], where: { userId: account._id } });
+            return sessions.map((session) => {
+                return Object.assign(Object.assign({}, session), { isExpired: this.TTLExpired(session) });
             });
         });
-    };
-    AccountsModule_Class.prototype.create = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var account, session;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.createAccount(request)];
-                    case 1:
-                        account = _a.sent();
-                        return [4 /*yield*/, this.login(request)];
-                    case 2:
-                        session = _a.sent();
-                        return [4 /*yield*/, dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)])];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/, session];
-                }
-            });
+    }
+    create(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.createAccount(request);
+            const session = yield this.login(request);
+            yield dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)]);
+            return session;
         });
-    };
-    AccountsModule_Class.prototype.upsert = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var callback, account;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        callback = function () { return Promise.resolve([]); };
-                        return [4 /*yield*/, this.accounts.runInTransaction(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
-                                var existAccount;
-                                var _this = this;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, transaction.queryUnique(this.accounts, { where: { email: request.email } })];
-                                        case 1:
-                                            existAccount = _a.sent();
-                                            if (existAccount)
-                                                return [2 /*return*/, this.changePassword(request.email, request.password, transaction)];
-                                            callback = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                return [2 /*return*/, dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)])];
-                                            }); }); };
-                                            return [2 /*return*/, this.createImpl(request, transaction)];
-                                    }
-                                });
-                            }); })];
-                    case 1:
-                        account = _a.sent();
-                        return [4 /*yield*/, this.loginValidate(request, false)];
-                    case 2:
-                        _a.sent();
-                        return [4 /*yield*/, callback()];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/, getUIAccount(account)];
-                }
-            });
+    }
+    upsert(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let callback = () => Promise.resolve([]);
+            const account = yield this.accounts.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+                const existAccount = yield transaction.queryUnique(this.accounts, { where: { email: request.email } });
+                if (existAccount)
+                    return this.changePassword(request.email, request.password, transaction);
+                callback = () => __awaiter(this, void 0, void 0, function* () { return dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)]); });
+                return this.createImpl(request, transaction);
+            }));
+            yield this.loginValidate(request, false);
+            yield callback();
+            return getUIAccount(account);
         });
-    };
-    AccountsModule_Class.prototype.addNewAccount = function (email, password, password_check) {
-        return __awaiter(this, void 0, void 0, function () {
-            var account;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(password && password_check)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.createAccount({ password: password, password_check: password_check, email: email })];
-                    case 1:
-                        account = _a.sent();
-                        return [4 /*yield*/, dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)])];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.createSAML(email)];
-                    case 4:
-                        account = _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/, getUIAccount(account)];
-                }
-            });
+    }
+    addNewAccount(email, password, password_check) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let account;
+            if (password && password_check) {
+                account = yield this.createAccount({ password, password_check, email });
+                yield dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(account)]);
+            }
+            else
+                account = yield this.createSAML(email);
+            return getUIAccount(account);
         });
-    };
-    AccountsModule_Class.prototype.changePassword = function (userEmail, newPassword, _transaction) {
-        return __awaiter(this, void 0, void 0, function () {
-            var email, processor;
-            var _this = this;
-            return __generator(this, function (_a) {
-                email = userEmail.toLowerCase();
-                processor = function (transaction) { return __awaiter(_this, void 0, void 0, function () {
-                    var account;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, transaction.queryUnique(this.accounts, { where: { email: email } })];
-                            case 1:
-                                account = _a.sent();
-                                if (!account)
-                                    throw new backend_2.ApiException(422, "User with email does not exist");
-                                if (!account.saltedPassword || !account.salt)
-                                    throw new backend_2.ApiException(401, "Account login using SAML");
-                                account.saltedPassword = ts_common_1.hashPasswordWithSalt(account.salt, newPassword);
-                                account._audit = ts_common_1.auditBy(email, 'Changed password');
-                                return [2 /*return*/, transaction.upsert(this.accounts, account)];
-                        }
-                    });
-                }); };
-                if (_transaction)
-                    return [2 /*return*/, processor(_transaction)];
-                return [2 /*return*/, this.accounts.runInTransaction(processor)];
+    }
+    changePassword(userEmail, newPassword, _transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const email = userEmail.toLowerCase();
+            const processor = (transaction) => __awaiter(this, void 0, void 0, function* () {
+                const account = yield transaction.queryUnique(this.accounts, { where: { email } });
+                if (!account)
+                    throw new backend_2.ApiException(422, "User with email does not exist");
+                if (!account.saltedPassword || !account.salt)
+                    throw new backend_2.ApiException(401, "Account login using SAML");
+                account.saltedPassword = ts_common_1.hashPasswordWithSalt(account.salt, newPassword);
+                account._audit = ts_common_1.auditBy(email, 'Changed password');
+                return transaction.upsert(this.accounts, account);
             });
+            if (_transaction)
+                return processor(_transaction);
+            return this.accounts.runInTransaction(processor);
         });
-    };
-    AccountsModule_Class.prototype.createAccount = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                request.email = request.email.toLowerCase();
-                ts_common_1.validate(request.email, backend_3.validateEmail);
-                return [2 /*return*/, this.accounts.runInTransaction(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
-                        var account;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, transaction.queryUnique(this.accounts, { where: { email: request.email } })];
-                                case 1:
-                                    account = _a.sent();
-                                    if (account)
-                                        throw new backend_2.ApiException(422, "User with email already exists");
-                                    return [2 /*return*/, this.createImpl(request, transaction)];
-                            }
-                        });
-                    }); })];
-            });
+    }
+    createAccount(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            request.email = request.email.toLowerCase();
+            ts_common_1.validate(request.email, backend_3.validateEmail);
+            return this.accounts.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+                const account = yield transaction.queryUnique(this.accounts, { where: { email: request.email } });
+                if (account)
+                    throw new backend_2.ApiException(422, "User with email already exists");
+                return this.createImpl(request, transaction);
+            }));
         });
-    };
-    AccountsModule_Class.prototype.createImpl = function (request, transaction) {
-        var salt = ts_common_1.generateHex(32);
-        var account = {
+    }
+    createImpl(request, transaction) {
+        const salt = ts_common_1.generateHex(32);
+        const account = {
             _id: ts_common_1.generateHex(32),
             _audit: ts_common_1.auditBy(request.email),
             email: request.email,
-            salt: salt,
+            salt,
             saltedPassword: ts_common_1.hashPasswordWithSalt(salt, request.password)
         };
         return transaction.insert(this.accounts, account);
-    };
-    AccountsModule_Class.prototype.logout = function (sessionId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var query;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        query = { where: { sessionId: sessionId } };
-                        return [4 /*yield*/, this.sessions.deleteUnique(query)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
+    }
+    logout(sessionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = { where: { sessionId } };
+            yield this.sessions.deleteUnique(query);
         });
-    };
-    AccountsModule_Class.prototype.login = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.loginValidate(request)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
+    }
+    login(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.loginValidate(request);
         });
-    };
-    AccountsModule_Class.prototype.loginValidate = function (request, doCreateSession) {
-        if (doCreateSession === void 0) { doCreateSession = true; }
-        return __awaiter(this, void 0, void 0, function () {
-            var query, account, session;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        request.email = request.email.toLowerCase();
-                        query = { where: { email: request.email } };
-                        return [4 /*yield*/, this.accounts.queryUnique(query)];
-                    case 1:
-                        account = _a.sent();
-                        if (!account)
-                            throw new backend_2.ApiException(401, "account does not exists");
-                        if (!account.saltedPassword || !account.salt)
-                            throw new backend_2.ApiException(401, "Account login using SAML");
-                        if (account.saltedPassword !== ts_common_1.hashPasswordWithSalt(account.salt, request.password))
-                            throw new backend_2.ApiException(401, "wrong username or password");
-                        if (!!account._id) return [3 /*break*/, 3];
-                        account._id = ts_common_1.generateHex(32);
-                        return [4 /*yield*/, this.accounts.upsert(account)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        if (!doCreateSession) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.upsertSession(account._id, request.frontType)];
-                    case 4:
-                        session = _a.sent();
-                        _a.label = 5;
-                    case 5: return [4 /*yield*/, dispatch_onUserLogin.dispatchModuleAsync([getUIAccount(account)])];
-                    case 6:
-                        _a.sent();
-                        return [2 /*return*/, session];
-                }
-            });
+    }
+    loginValidate(request, doCreateSession = true) {
+        return __awaiter(this, void 0, void 0, function* () {
+            request.email = request.email.toLowerCase();
+            const query = { where: { email: request.email } };
+            const account = yield this.accounts.queryUnique(query);
+            if (!account)
+                throw new backend_2.ApiException(401, "account does not exists");
+            if (!account.saltedPassword || !account.salt)
+                throw new backend_2.ApiException(401, "Account login using SAML");
+            if (account.saltedPassword !== ts_common_1.hashPasswordWithSalt(account.salt, request.password))
+                throw new backend_2.ApiException(401, "wrong username or password");
+            if (!account._id) {
+                account._id = ts_common_1.generateHex(32);
+                yield this.accounts.upsert(account);
+            }
+            let session;
+            if (doCreateSession)
+                session = yield this.upsertSession(account._id, request.frontType);
+            yield dispatch_onUserLogin.dispatchModuleAsync([getUIAccount(account)]);
+            return session;
         });
-    };
-    AccountsModule_Class.prototype.loginSAML = function (__email) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _email, account, session;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _email = __email.toLowerCase();
-                        return [4 /*yield*/, this.createSAML(_email)];
-                    case 1:
-                        account = _a.sent();
-                        return [4 /*yield*/, this.upsertSession(account._id)];
-                    case 2:
-                        session = _a.sent();
-                        return [4 /*yield*/, dispatch_onUserLogin.dispatchModuleAsync([getUIAccount(account)])];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/, session];
-                }
-            });
+    }
+    loginSAML(__email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const _email = __email.toLowerCase();
+            const account = yield this.createSAML(_email);
+            const session = yield this.upsertSession(account._id);
+            yield dispatch_onUserLogin.dispatchModuleAsync([getUIAccount(account)]);
+            return session;
         });
-    };
-    AccountsModule_Class.prototype.createSAML = function (__email) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _email, query, dispatchEvent, toRet;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _email = __email.toLowerCase();
-                        query = { where: { email: _email } };
-                        dispatchEvent = false;
-                        return [4 /*yield*/, this.accounts.runInTransaction(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
-                                var account, _account;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, transaction.queryUnique(this.accounts, query)];
-                                        case 1:
-                                            account = _a.sent();
-                                            if (account === null || account === void 0 ? void 0 : account._id)
-                                                return [2 /*return*/, account];
-                                            _account = __assign({ _id: ts_common_1.generateHex(32), _audit: ts_common_1.auditBy(_email), email: _email }, account);
-                                            dispatchEvent = true;
-                                            return [2 /*return*/, transaction.upsert(this.accounts, _account)];
-                                    }
-                                });
-                            }); })];
-                    case 1:
-                        toRet = _a.sent();
-                        if (!dispatchEvent) return [3 /*break*/, 3];
-                        return [4 /*yield*/, dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(toRet)])];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/, toRet];
-                }
-            });
+    }
+    createSAML(__email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const _email = __email.toLowerCase();
+            const query = { where: { email: _email } };
+            let dispatchEvent = false;
+            const toRet = yield this.accounts.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+                const account = yield transaction.queryUnique(this.accounts, query);
+                if (account === null || account === void 0 ? void 0 : account._id)
+                    return account;
+                const _account = Object.assign({ _id: ts_common_1.generateHex(32), _audit: ts_common_1.auditBy(_email), email: _email }, account);
+                dispatchEvent = true;
+                return transaction.upsert(this.accounts, _account);
+            }));
+            if (dispatchEvent)
+                yield dispatch_onNewUserRegistered.dispatchModuleAsync([getUIAccount(toRet)]);
+            return toRet;
         });
-    };
-    AccountsModule_Class.prototype.validateSession = function (request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var sessionId;
-            return __generator(this, function (_a) {
-                sessionId = exports.Header_SessionId.get(request);
-                if (!sessionId)
-                    throw new backend_2.ApiException(404, 'Missing sessionId');
-                return [2 /*return*/, this.validateSessionId(sessionId)];
-            });
+    }
+    validateSession(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sessionId = exports.Header_SessionId.get(request);
+            if (!sessionId)
+                throw new backend_2.ApiException(404, 'Missing sessionId');
+            return this.validateSessionId(sessionId);
         });
-    };
-    AccountsModule_Class.prototype.validateSessionId = function (sessionId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var query, session;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        query = { where: { sessionId: sessionId } };
-                        return [4 /*yield*/, this.sessions.queryUnique(query)];
-                    case 1:
-                        session = _a.sent();
-                        if (!session)
-                            throw new backend_2.ApiException(401, "Invalid session id: " + sessionId);
-                        if (this.TTLExpired(session))
-                            throw new backend_2.ApiException(401, "Session timed out");
-                        return [4 /*yield*/, this.getUserEmailFromSession(session)];
-                    case 2: return [2 /*return*/, _a.sent()];
-                }
-            });
+    }
+    validateSessionId(sessionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = { where: { sessionId } };
+            const session = yield this.sessions.queryUnique(query);
+            if (!session)
+                throw new backend_2.ApiException(401, `Invalid session id: ${sessionId}`);
+            if (this.TTLExpired(session))
+                throw new backend_2.ApiException(401, "Session timed out");
+            return yield this.getUserEmailFromSession(session);
         });
-    };
-    AccountsModule_Class.prototype.getUserEmailFromSession = function (session) {
-        return __awaiter(this, void 0, void 0, function () {
-            var account;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.accounts.queryUnique({ where: { _id: session.userId } })];
-                    case 1:
-                        account = _a.sent();
-                        if (!!account) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.sessions.deleteItem(session)];
-                    case 2:
-                        _a.sent();
-                        throw new backend_2.ApiException(403, "No user found for session: " + ts_common_1.__stringify(session));
-                    case 3: return [2 /*return*/, getUIAccount(account)];
-                }
-            });
+    }
+    getUserEmailFromSession(session) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.accounts.queryUnique({ where: { _id: session.userId } });
+            if (!account) {
+                yield this.sessions.deleteItem(session);
+                throw new backend_2.ApiException(403, `No user found for session: ${ts_common_1.__stringify(session)}`);
+            }
+            return getUIAccount(account);
         });
-    };
-    return AccountsModule_Class;
-}(ts_common_1.Module));
+    }
+}
 exports.AccountsModule_Class = AccountsModule_Class;
 exports.AccountModule = new AccountsModule_Class();
 //# sourceMappingURL=AccountModule.js.map