@intuitionrobotics/user-account 0.45.3 → 0.46.0

package/app-backend/modules/AccountModule.d.ts

@@ -1,7 +1,10 @@
-import { Module } from "@intuitionrobotics/ts-common";
-import { FirestoreTransaction } from "@intuitionrobotics/firebase/backend";
-import { DB_Account, DB_Session, FrontType, PostAssertBody, Request_CreateAccount, Request_LoginAccount, Request_UpsertAccount, Response_Auth, Response_Validation, UI_Account, UI_Session } from "./_imports";
-import { ApiResponse, ExpressRequest, HeaderKey, QueryRequestInfo } from "@intuitionrobotics/thunderstorm/backend";
+import { DB_Account } from "./types";
+import { DB_Session, FrontType, PostAssertBody, Request_CreateAccount, Request_LoginAccount, Request_UpsertAccount, Response_Auth, Response_Validation, UI_Account, UI_Session } from "../../shared/api";
+import { HeaderKey } from "@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { ExpressRequest, QueryRequestInfo } from "@intuitionrobotics/thunderstorm/app-backend/utils/types";
+import { ApiResponse } from "@intuitionrobotics/thunderstorm/app-backend/modules/server/server-api";
+import { FirestoreTransaction } from "@intuitionrobotics/firebase/app-backend/firestore/FirestoreTransaction";
 export declare const Header_SessionId: HeaderKey;
 declare type Config = {
     projectId: string;
@@ -30,7 +33,6 @@ export declare class AccountsModule_Class extends Module<Config> implements Quer
     private accounts;
     protected init(): void;
     getUser(_email: string): Promise<UI_Account | undefined>;
-    getUsers(_emails: string[]): Promise<UI_Account[]>;
     listUsers(): Promise<UI_Account[]>;
     listSessions(): Promise<DB_Session[]>;
     getSession(_email: string): Promise<DB_Account | undefined>;
@@ -44,7 +46,8 @@ export declare class AccountsModule_Class extends Module<Config> implements Quer
     logout(sessionId: string): Promise<void>;
     logoutAccount(accountId: string): Promise<void>;
     login(request: Request_LoginAccount, response: ApiResponse): Promise<Response_Auth>;
-    private loginValidate;
+    loginValidate(request: Request_LoginAccount): Promise<undefined>;
+    loginValidate(request: Request_LoginAccount, response?: ApiResponse): Promise<Response_Auth>;
     loginSAML(__email: string): Promise<Response_Auth>;
     private createSAML;
     private isAuthRequest;
@@ -52,7 +55,7 @@ export declare class AccountsModule_Class extends Module<Config> implements Quer
     validateAuthenticationHeader(request: ExpressRequest, scopes: string[], response?: ApiResponse): Promise<Response_Validation>;
     setJWTinResp(response: ApiResponse, jwt: string): void;
     generateJWT(account: UI_Account, sessionId: string): string;
-    validateSession: (request: ExpressRequest, scopes: string[], response?: ApiResponse | undefined) => Promise<UI_Account>;
+    validateSession: (request: ExpressRequest, scopes: string[], response?: ApiResponse | undefined) => Promise<Response_Validation>;
     validateSessionId(sessionId: string): Promise<UI_Account>;
     private getUserEmailFromSession;
     private getUserEmailFromUserId;

package/app-backend/modules/AccountModule.js

@@ -10,41 +10,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountModule = exports.AccountsModule_Class = exports.Collection_Accounts = exports.Collection_Sessions = exports.Header_SessionId = void 0;
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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 SecretsModule_1 = require("./SecretsModule");
 const SamlModule_1 = require("./SamlModule");
-const thunderstorm_1 = require("@intuitionrobotics/thunderstorm");
-exports.Header_SessionId = new backend_2.HeaderKey(_imports_1.HeaderKey_SessionId, 404);
+const api_1 = require("../../shared/api");
+const HttpServer_1 = require("@intuitionrobotics/thunderstorm/app-backend/modules/server/HttpServer");
+const dispatcher_1 = require("@intuitionrobotics/ts-common/core/dispatcher");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
+const crypto_tools_1 = require("@intuitionrobotics/ts-common/utils/crypto-tools");
+const FirebaseModule_1 = require("@intuitionrobotics/firebase/app-backend/FirebaseModule");
+const exceptions_1 = require("@intuitionrobotics/thunderstorm/app-backend/exceptions");
+const validator_1 = require("@intuitionrobotics/ts-common/validator/validator");
+const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
+const exceptions_2 = require("@intuitionrobotics/ts-common/core/exceptions");
+const consts_1 = require("@intuitionrobotics/thunderstorm/shared/consts");
+exports.Header_SessionId = new HttpServer_1.HeaderKey(api_1.HeaderKey_SessionId, 404);
 exports.Collection_Sessions = "user-account--sessions";
 exports.Collection_Accounts = "user-account--accounts";
-const dispatch_onUserLogin = new ts_common_1.Dispatcher("__onUserLogin");
-const dispatch_onNewUserRegistered = new ts_common_1.Dispatcher("__onNewUserRegistered");
+const dispatch_onUserLogin = new dispatcher_1.Dispatcher("__onUserLogin");
+const dispatch_onNewUserRegistered = new dispatcher_1.Dispatcher("__onNewUserRegistered");
 function getUIAccount(account) {
     const { email, _id } = account;
     return { email, _id };
 }
-class AccountsModule_Class extends ts_common_1.Module {
+class AccountsModule_Class extends module_1.Module {
     constructor() {
         super("AccountsModule");
         this.isAuthRequest = (request) => request.header(SecretsModule_1.SecretsModule.AUTHENTICATION_KEY) !== undefined;
@@ -54,13 +44,13 @@ class AccountsModule_Class extends ts_common_1.Module {
             return yield this.validateSessionId(exports.Header_SessionId.get(request));
         });
         this.TTLExpired = (session) => {
-            const delta = ts_common_1.currentTimeMillies() - session.timestamp;
+            const delta = date_time_tools_1.currentTimeMillies() - session.timestamp;
             let sessionTTLms = this.config.sessionTTLms.web;
-            if (session.frontType === _imports_1.FrontType.App)
+            if (session.frontType === api_1.FrontType.App)
                 sessionTTLms = this.config.sessionTTLms.app;
             return delta > sessionTTLms || delta < 0;
         };
-        this.setDefaultConfig({ sessionTTLms: { web: ts_common_1.Day, app: ts_common_1.Day, jwt: 30 * ts_common_1.Minute }, jwtSecretKey: "TS_AUTH_SECRET" });
+        this.setConfig({ sessionTTLms: { web: date_time_tools_1.Day, app: date_time_tools_1.Day, jwt: 30 * date_time_tools_1.Minute }, jwtSecretKey: "TS_AUTH_SECRET" });
     }
     __queryRequestInfo(request) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -77,7 +67,7 @@ class AccountsModule_Class extends ts_common_1.Module {
         });
     }
     init() {
-        const firestore = backend_1.FirebaseModule.createAdminSession(this.config.projectId).getFirestore();
+        const firestore = FirebaseModule_1.FirebaseModule.createAdminSession(this.config.projectId).getFirestore();
         this.sessions = firestore.getCollection(exports.Collection_Sessions, ["userId"]);
         this.accounts = firestore.getCollection(exports.Collection_Accounts, ["email"]);
     }
@@ -91,20 +81,6 @@ class AccountsModule_Class extends ts_common_1.Module {
             });
         });
     }
-    getUsers(_emails) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return ts_common_1.batchActionParallel(_emails, 10, (batchedEmails) => __awaiter(this, void 0, void 0, function* () {
-                return this.accounts.query({
-                    where: {
-                        email: {
-                            $in: batchedEmails.map(e => e.toLowerCase())
-                        }
-                    },
-                    select: ["email", "_id"]
-                });
-            }));
-        });
-    }
     listUsers() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.accounts.getAll(["_id",
@@ -180,11 +156,11 @@ class AccountsModule_Class extends ts_common_1.Module {
             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");
+                    throw new exceptions_1.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');
+                    throw new exceptions_1.ApiException(401, "Account login using SAML");
+                account.saltedPassword = crypto_tools_1.hashPasswordWithSalt(account.salt, newPassword);
+                account._audit = date_time_tools_1.auditBy(email, 'Changed password');
                 return transaction.upsert(this.accounts, account);
             });
             if (_transaction)
@@ -195,23 +171,23 @@ class AccountsModule_Class extends ts_common_1.Module {
     createAccount(request) {
         return __awaiter(this, void 0, void 0, function* () {
             request.email = request.email.toLowerCase();
-            ts_common_1.validate(request.email, ts_common_1.validateEmail);
+            validator_1.validate(request.email, validator_1.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");
+                    throw new exceptions_1.ApiException(422, "User with email already exists");
                 return this.createImpl(request, transaction);
             }));
         });
     }
     createImpl(request, transaction) {
-        const salt = ts_common_1.generateHex(32);
+        const salt = random_tools_1.generateHex(32);
         const account = {
-            _id: ts_common_1.generateHex(32),
-            _audit: ts_common_1.auditBy(request.email),
+            _id: random_tools_1.generateHex(32),
+            _audit: date_time_tools_1.auditBy(request.email),
             email: request.email,
             salt,
-            saltedPassword: ts_common_1.hashPasswordWithSalt(salt, request.password)
+            saltedPassword: crypto_tools_1.hashPasswordWithSalt(salt, request.password)
         };
         return transaction.insert(this.accounts, account);
     }
@@ -237,13 +213,13 @@ class AccountsModule_Class extends ts_common_1.Module {
             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");
+                throw new exceptions_1.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");
+                throw new exceptions_1.ApiException(401, "Account login using SAML");
+            if (account.saltedPassword !== crypto_tools_1.hashPasswordWithSalt(account.salt, request.password))
+                throw new exceptions_1.ApiException(401, "wrong username or password");
             if (!account._id) {
-                account._id = ts_common_1.generateHex(32);
+                account._id = random_tools_1.generateHex(32);
                 yield this.accounts.upsert(account);
             }
             let sessionWithAccountId;
@@ -273,7 +249,7 @@ class AccountsModule_Class extends ts_common_1.Module {
                 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);
+                const _account = Object.assign({ _id: random_tools_1.generateHex(32), _audit: date_time_tools_1.auditBy(_email), email: _email }, account);
                 dispatchEvent = true;
                 return transaction.upsert(this.accounts, _account);
             }));
@@ -284,13 +260,13 @@ class AccountsModule_Class extends ts_common_1.Module {
     }
     verifyAccount(account) {
         if (!account)
-            throw new ts_common_1.BadImplementationException('Missing account in token payload');
+            throw new exceptions_2.BadImplementationException('Missing account in token payload');
         const email = account['email'];
         if (!email || typeof email !== 'string')
-            throw new ts_common_1.BadImplementationException('Missing email in token payload');
+            throw new exceptions_2.BadImplementationException('Missing email in token payload');
         const _id = account['_id'];
         if (!_id || typeof _id !== 'string')
-            throw new ts_common_1.BadImplementationException('Missing _id in token payload');
+            throw new exceptions_2.BadImplementationException('Missing _id in token payload');
         return { _id, email };
     }
     validateAuthenticationHeader(request, scopes, response) {
@@ -300,7 +276,7 @@ class AccountsModule_Class extends ts_common_1.Module {
             const isExpired = SecretsModule_1.SecretsModule.isExpired(token);
             const sessionId = payload.sessionId;
             if (!sessionId)
-                throw new ts_common_1.BadImplementationException(`Missing session id in token ${JSON.stringify(payload)}`);
+                throw new exceptions_2.BadImplementationException(`Missing session id in token ${JSON.stringify(payload)}`);
             if (!isExpired) {
                 const account = payload.account;
                 this.verifyAccount(account);
@@ -316,13 +292,13 @@ class AccountsModule_Class extends ts_common_1.Module {
     }
     setJWTinResp(response, jwt) {
         // Set in header response
-        response.setHeaders({ [thunderstorm_1.HeaderKey_JWT]: jwt });
+        response.setHeaders({ [consts_1.HeaderKey_JWT]: jwt });
     }
     generateJWT(account, sessionId) {
         return SecretsModule_1.SecretsModule.generateJwt({
             account,
             sessionId,
-            exp: ts_common_1.currentTimeMillies() + this.config.sessionTTLms.jwt
+            exp: date_time_tools_1.currentTimeMillies() + this.config.sessionTTLms.jwt
         }, this.config.jwtSecretKey);
     }
     validateSessionId(sessionId) {
@@ -330,9 +306,9 @@ class AccountsModule_Class extends ts_common_1.Module {
             const query = { where: { sessionId } };
             const session = yield this.sessions.queryUnique(query);
             if (!session)
-                throw new backend_2.ApiException(401, `Invalid session id: ${sessionId}`);
+                throw new exceptions_1.ApiException(401, `Invalid session id: ${sessionId}`);
             if (this.TTLExpired(session))
-                throw new backend_2.ApiException(401, "Session timed out");
+                throw new exceptions_1.ApiException(401, "Session timed out");
             return yield this.getUserEmailFromSession(session);
         });
     }
@@ -341,7 +317,7 @@ class AccountsModule_Class extends ts_common_1.Module {
             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)}`);
+                throw new exceptions_1.ApiException(403, `No user found for session: ${tools_1.__stringify(session)}`);
             }
             return getUIAccount(account);
         });
@@ -350,7 +326,7 @@ class AccountsModule_Class extends ts_common_1.Module {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.accounts.queryUnique({ where: { _id: userId } });
             if (!account)
-                throw new backend_2.ApiException(403, `No user found for session: ${userId}`);
+                throw new exceptions_1.ApiException(403, `No user found for session: ${userId}`);
             return getUIAccount(account);
         });
     }
@@ -376,8 +352,8 @@ class AccountsModule_Class extends ts_common_1.Module {
             if (session && !this.TTLExpired(session))
                 return session;
             const _session = {
-                sessionId: ts_common_1.generateHex(64),
-                timestamp: ts_common_1.currentTimeMillies(),
+                sessionId: random_tools_1.generateHex(64),
+                timestamp: date_time_tools_1.currentTimeMillies(),
                 userId: account._id,
             };
             if (frontType)
@@ -392,17 +368,17 @@ class AccountsModule_Class extends ts_common_1.Module {
             };
             try {
                 const data = yield SamlModule_1.SamlModule.assert(options);
-                this.logDebug(`Got data from assertion ${ts_common_1.__stringify(data)}`);
+                this.logDebug(`Got data from assertion ${tools_1.__stringify(data)}`);
                 const email = data.userId;
                 const loginData = yield exports.AccountModule.loginSAML(email);
-                let redirectUrl = data.loginContext[_imports_1.QueryParam_RedirectUrl];
-                redirectUrl = redirectUrl.replace(new RegExp(_imports_1.QueryParam_SessionId.toUpperCase(), "g"), loginData.sessionId);
-                redirectUrl = redirectUrl.replace(new RegExp(_imports_1.QueryParam_Email.toUpperCase(), "g"), email);
-                redirectUrl = redirectUrl.replace(new RegExp(_imports_1.QueryParam_JWT.toUpperCase(), "g"), loginData.jwt);
+                let redirectUrl = data.loginContext[api_1.QueryParam_RedirectUrl];
+                redirectUrl = redirectUrl.replace(new RegExp(api_1.QueryParam_SessionId.toUpperCase(), "g"), loginData.sessionId);
+                redirectUrl = redirectUrl.replace(new RegExp(api_1.QueryParam_Email.toUpperCase(), "g"), email);
+                redirectUrl = redirectUrl.replace(new RegExp(api_1.QueryParam_JWT.toUpperCase(), "g"), loginData.jwt);
                 return yield response.redirect(302, redirectUrl);
             }
             catch (error) {
-                throw new backend_2.ApiException(401, 'Error authenticating user', error);
+                throw new exceptions_1.ApiException(401, 'Error authenticating user', error);
             }
         });
     }

package/app-backend/modules/AccountModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/AccountModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/AccountModule.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/JWTBuilder.d.ts

@@ -1,4 +1,4 @@
-import { ObjectTS } from "@intuitionrobotics/ts-common";
+import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
 import { Algorithm } from "jws";
 export declare const ALGORITHM = "alg";
 export declare const CONTENT_TYPE = "cty";

package/app-backend/modules/JWTBuilder.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JWTBuilder = exports.TYP_DEFAULT = exports.AUDIENCE = exports.JWT_ID = exports.ISSUED_AT = exports.NOT_BEFORE = exports.EXPIRES_AT = exports.SUBJECT = exports.ISSUER = exports.KEY_ID = exports.TYPE = exports.CONTENT_TYPE = exports.ALGORITHM = void 0;
-const ts_common_1 = require("@intuitionrobotics/ts-common");
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
 const jws_1 = require("jws");
 const SecretsModule_1 = require("./SecretsModule");
 //Header
@@ -70,7 +71,7 @@ class JWTBuilder {
         return this;
     }
     setIssuedAt() {
-        this.payload[exports.ISSUED_AT] = Math.floor(ts_common_1.currentTimeMillies() / 1000);
+        this.payload[exports.ISSUED_AT] = Math.floor(date_time_tools_1.currentTimeMillies() / 1000);
     }
     setJWTID(jti) {
         this.payload[exports.JWT_ID] = jti;
@@ -96,7 +97,7 @@ class JWTBuilder {
     assertAlg(alg) {
         const foundAlg = jws_1.ALGORITHMS.find(a => a === alg);
         if (!foundAlg)
-            throw new ts_common_1.BadImplementationException(`Algorithm with name ${alg} is not valid`);
+            throw new exceptions_1.BadImplementationException(`Algorithm with name ${alg} is not valid`);
     }
     build(secret) {
         this.setIssuedAt();
@@ -106,9 +107,9 @@ class JWTBuilder {
             // TODO move the config to the module which I need to create
             this.setIssuer(SecretsModule_1.SecretsModule.getIss());
         if (!this.getExpiration())
-            throw new ts_common_1.BadImplementationException("Missing expiration, cannot build a valid JWT without this value");
+            throw new exceptions_1.BadImplementationException("Missing expiration, cannot build a valid JWT without this value");
         if (!this.getAlgorithm())
-            throw new ts_common_1.BadImplementationException("Missing algorithm, cannot build a valid JWT without this value");
+            throw new exceptions_1.BadImplementationException("Missing algorithm, cannot build a valid JWT without this value");
         return jws_1.sign({ secret, payload: this.payload, header: this.header });
     }
 }

package/app-backend/modules/JWTBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"JWTBuilder.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/JWTBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JWTBuilder.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/JWTBuilder.ts"],"names":[],"mappings":"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"}

package/app-backend/modules/SamlModule.d.ts

@@ -1,6 +1,7 @@
+import { Module } from "@intuitionrobotics/ts-common/core/module";
 import { IdentityProvider, IdentityProviderOptions, SAMLAssertResponse, ServiceProviderOptions } from "saml2-js";
-import { Module } from "@intuitionrobotics/ts-common";
-import { RequestBody_SamlAssertOptions, RequestParams_LoginSAML } from "./_imports";
+import { RequestParams_LoginSAML } from "../../shared/api";
+import { RequestBody_SamlAssertOptions } from "./types";
 declare type SamlConfig = {
     idConfig: IdentityProviderOptions;
     spConfig: ServiceProviderOptions;

package/app-backend/modules/SamlModule.js

@@ -1,22 +1,4 @@
 "use strict";
-/*
- * Permissions management system, define access level for each of
- * your server apis, and restrict users by giving them access levels
- *
- * Copyright (C) 2020 Intuition Robotics
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 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) {
@@ -28,16 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SamlModule = exports.SamlModule_Class = void 0;
+const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
+const module_1 = require("@intuitionrobotics/ts-common/core/module");
+const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
 const saml2_js_1 = require("saml2-js");
-const ts_common_1 = require("@intuitionrobotics/ts-common");
-class SamlModule_Class extends ts_common_1.Module {
+class SamlModule_Class extends module_1.Module {
     constructor() {
         super("SamlModule");
         this.loginRequest = (loginContext) => __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, rejected) => {
                 const sp = new saml2_js_1.ServiceProvider(this.config.spConfig);
                 const options = {
-                    relay_state: ts_common_1.__stringify(loginContext)
+                    relay_state: tools_1.__stringify(loginContext)
                 };
                 sp.create_login_request_url(this.identityProvider, options, (error, loginUrl, requestId) => {
                     if (error)
@@ -67,9 +51,9 @@ class SamlModule_Class extends ts_common_1.Module {
     }
     init() {
         if (!this.config.idConfig)
-            throw new ts_common_1.ImplementationMissingException("Config must contain idConfig");
+            throw new exceptions_1.ImplementationMissingException("Config must contain idConfig");
         if (!this.config.spConfig)
-            throw new ts_common_1.ImplementationMissingException("Config must contain spConfig");
+            throw new exceptions_1.ImplementationMissingException("Config must contain spConfig");
         this.identityProvider = new saml2_js_1.IdentityProvider(this.config.idConfig);
     }
 }

package/app-backend/modules/SamlModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"SamlModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/SamlModule.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;AAEH,uCAMkB;AAClB,4DAIsC;AAgCtC,MAAa,gBACZ,SAAQ,kBAAkB;IAI1B;QACC,KAAK,CAAC,YAAY,CAAC,CAAC;QAarB,iBAAY,GAAG,CAAO,YAAqC,EAAE,EAAE;YAC9D,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAChD,MAAM,EAAE,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrD,MAAM,OAAO,GAAG;oBACf,WAAW,EAAE,uBAAW,CAAC,YAAY,CAAC;iBACtC,CAAC;gBACF,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;oBAC1F,IAAI,KAAK;wBACR,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAExB,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QAEJ,CAAC,CAAA,CAAC;QAEF,WAAM,GAAG,CAAO,OAAsC,EAA+B,EAAE;YAAC,OAAA,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAC7I,MAAM,EAAE,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrD,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAO,KAAK,EAAE,QAA4B,EAAE,EAAE;oBAC5F,IAAI,KAAK;wBACR,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAExB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;oBACrC,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;oBACpD,IAAI,CAAC,WAAW;wBACf,OAAO,QAAQ,CAAC,+CAA+C,MAAM,GAAG,CAAC,CAAC;oBAE3E,OAAO,CAAC;wBACC,MAAM,EAAE,MAAM;wBACd,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;wBACrC,YAAY,EAAE,QAAQ;qBACtB,CAAC,CAAC;gBACZ,CAAC,CAAA,CAAC,CAAC;YACJ,CAAC,CAAC,CAAA;UAAA,CAAC;IA7CH,CAAC;IAES,IAAI;QACb,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ;YACxB,MAAM,IAAI,0CAA8B,CAAC,8BAA8B,CAAC,CAAC;QAE1E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ;YACxB,MAAM,IAAI,0CAA8B,CAAC,8BAA8B,CAAC,CAAC;QAE1E,IAAI,CAAC,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpE,CAAC;CAoCD;AArDD,4CAqDC;AAEY,QAAA,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"SamlModule.js","sourceRoot":"","sources":["../../../src/main/app-backend/modules/SamlModule.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6EAA4F;AAC5F,qEAAgE;AAChE,oEAAqE;AACrE,uCAMkB;AA+BlB,MAAa,gBACT,SAAQ,eAAkB;IAI1B;QACI,KAAK,CAAC,YAAY,CAAC,CAAC;QAaxB,iBAAY,GAAG,CAAO,YAAqC,EAAE,EAAE;YAC3D,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAC7C,MAAM,EAAE,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrD,MAAM,OAAO,GAAG;oBACZ,WAAW,EAAE,mBAAW,CAAC,YAAY,CAAC;iBACzC,CAAC;gBACF,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;oBACvF,IAAI,KAAK;wBACL,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAE3B,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACtB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QAEP,CAAC,CAAA,CAAC;QAEF,WAAM,GAAG,CAAO,OAAsC,EAA+B,EAAE;YAAC,OAAA,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAC1I,MAAM,EAAE,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrD,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAO,KAAK,EAAE,QAA4B,EAAE,EAAE;oBACzF,IAAI,KAAK;wBACL,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAE3B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;oBACrC,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;oBACpD,IAAI,CAAC,WAAW;wBACZ,OAAO,QAAQ,CAAC,+CAA+C,MAAM,GAAG,CAAC,CAAC;oBAE9E,OAAO,CAAC;wBACJ,MAAM,EAAE,MAAM;wBACd,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;wBACrC,YAAY,EAAE,QAAQ;qBACzB,CAAC,CAAC;gBACP,CAAC,CAAA,CAAC,CAAC;YACP,CAAC,CAAC,CAAA;UAAA,CAAC;IA7CH,CAAC;IAES,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ;YACrB,MAAM,IAAI,2CAA8B,CAAC,8BAA8B,CAAC,CAAC;QAE7E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ;YACrB,MAAM,IAAI,2CAA8B,CAAC,8BAA8B,CAAC,CAAC;QAE7E,IAAI,CAAC,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;CAoCJ;AArDD,4CAqDC;AAEY,QAAA,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAC"}

package/app-backend/modules/SecretsModule.d.ts

@@ -1,5 +1,7 @@
-import { Module, ObjectTS } from "@intuitionrobotics/ts-common";
-import { ApiException, ExpressRequest } from "@intuitionrobotics/thunderstorm/backend";
+import { ApiException } from "@intuitionrobotics/thunderstorm/app-backend/exceptions";
+import { ExpressRequest } from "@intuitionrobotics/thunderstorm/app-backend/utils/types";
+import { Module } from "@intuitionrobotics/ts-common/core/module";
+import { ObjectTS } from "@intuitionrobotics/ts-common/utils/types";
 import * as jws from "jws";
 import { Algorithm, Signature } from "jws";
 export declare class TokenExpiredException extends ApiException {