@magda/typescript-common 2.3.2 → 3.0.0-alpha.0

package/dist/session/cookieUtils.d.ts

@@ -1,16 +1,5 @@
-import express from "express";
-/** This is present in the express-session types but not actually exported properly, so it needs to be copy-pasted here */
-export declare type CookieOptions = {
-    maxAge?: number;
-    signed?: boolean;
-    expires?: Date;
-    httpOnly?: boolean;
-    path?: string;
-    domain?: string;
-    secure?: boolean | "auto";
-    encode?: (val: string) => string;
-    sameSite?: boolean | "lax" | "strict" | "none";
-};
+import express, { CookieOptions as CookieOptionsType } from "express";
+export type CookieOptions = CookieOptionsType;
 export declare const DEFAULT_SESSION_COOKIE_NAME: string;
 export declare let DEFAULT_SESSION_COOKIE_OPTIONS: CookieOptions;
 export declare function deleteCookie(cookieName: string, cookieOptions: CookieOptions, res: express.Response): void;

package/dist/session/cookieUtils.js

@@ -1,19 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteCookie = exports.DEFAULT_SESSION_COOKIE_OPTIONS = exports.DEFAULT_SESSION_COOKIE_NAME = void 0;
-exports.DEFAULT_SESSION_COOKIE_NAME = "connect.sid";
-exports.DEFAULT_SESSION_COOKIE_OPTIONS = {
+export const DEFAULT_SESSION_COOKIE_NAME = "connect.sid";
+export let DEFAULT_SESSION_COOKIE_OPTIONS = {
     maxAge: 7 * 60 * 60 * 1000,
     sameSite: "lax",
     httpOnly: true,
-    secure: "auto"
+    secure: false
 };
-function deleteCookie(cookieName, cookieOptions, res) {
-    const deleteCookieOptions = Object.assign({}, cookieOptions);
+export function deleteCookie(cookieName, cookieOptions, res) {
+    const deleteCookieOptions = {
+        ...cookieOptions
+    };
     // --- `clearCookie` works in a way like it will fail to delete cookie if maxAge presents T_T
     // --- https://github.com/expressjs/express/issues/3856#issuecomment-502397226
     delete deleteCookieOptions.maxAge;
     res.clearCookie(cookieName, deleteCookieOptions);
+    res.clearCookie(cookieName, cookieOptions);
 }
-exports.deleteCookie = deleteCookie;
 //# sourceMappingURL=cookieUtils.js.map

package/dist/session/cookieUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cookieUtils.js","sourceRoot":"","sources":["../../src/session/cookieUtils.ts"],"names":[],"mappings":";;;AAea,QAAA,2BAA2B,GAAW,aAAa,CAAC;AAEtD,QAAA,8BAA8B,GAAkB;IACvD,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAC1B,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,MAAM;CACjB,CAAC;AAEF,SAAgB,YAAY,CACxB,UAAkB,EAClB,aAA4B,EAC5B,GAAqB;IAErB,MAAM,mBAAmB,qBAClB,aAAa,CACnB,CAAC;IACF,6FAA6F;IAC7F,8EAA8E;IAC9E,OAAO,mBAAmB,CAAC,MAAM,CAAC;IAClC,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;AACrD,CAAC;AAZD,oCAYC"}
+{"version":3,"file":"cookieUtils.js","sourceRoot":"","sources":["../../src/session/cookieUtils.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,2BAA2B,GAAW,aAAa,CAAC;AAEjE,MAAM,CAAC,IAAI,8BAA8B,GAAkB;IACvD,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAC1B,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,KAAK;CAChB,CAAC;AAEF,MAAM,UAAU,YAAY,CACxB,UAAkB,EAClB,aAA4B,EAC5B,GAAqB;IAErB,MAAM,mBAAmB,GAAG;QACxB,GAAG,aAAa;KACnB,CAAC;IACF,6FAA6F;IAC7F,8EAA8E;IAC9E,OAAO,mBAAmB,CAAC,MAAM,CAAC;IAClC,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACjD,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC/C,CAAC"}

package/dist/session/destroySession.js

@@ -1,14 +1,3 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * destroy the session.
  *  - will delete the session data from session store only.
@@ -17,28 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @param {express.Request} req
  * @return {*}  {Promise<void>}
  */
-function destroySession(req) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            var _a;
-            if ((_a = req === null || req === void 0 ? void 0 : req.session) === null || _a === void 0 ? void 0 : _a.destroy) {
-                req.session.destroy((err) => {
-                    if (err) {
-                        // Failed to access session storage to delete session data
-                        reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            }
-            else {
-                // --- express-session 1.17 may not always initialise session
-                // --- if req.session not exist, should just resolve promise
-                resolve();
-            }
-        });
+export default async function destroySession(req) {
+    return new Promise((resolve, reject) => {
+        if (req?.session?.destroy) {
+            req.session.destroy((err) => {
+                if (err) {
+                    // Failed to access session storage to delete session data
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        else {
+            // --- express-session 1.17 may not always initialise session
+            // --- if req.session not exist, should just resolve promise
+            resolve();
+        }
     });
 }
-exports.default = destroySession;
 //# sourceMappingURL=destroySession.js.map

package/dist/session/destroySession.js.map

@@ -1 +1 @@
-{"version":3,"file":"destroySession.js","sourceRoot":"","sources":["../../src/session/destroySession.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA;;;;;;;GAOG;AACH,SAA8B,cAAc,CACxC,GAAoB;;QAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;YACnC,IAAI,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,OAAO,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACxB,IAAI,GAAG,EAAE;wBACL,0DAA0D;wBAC1D,MAAM,CAAC,GAAG,CAAC,CAAC;qBACf;yBAAM;wBACH,OAAO,EAAE,CAAC;qBACb;gBACL,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,6DAA6D;gBAC7D,4DAA4D;gBAC5D,OAAO,EAAE,CAAC;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAnBD,iCAmBC"}
+{"version":3,"file":"destroySession.js","sourceRoot":"","sources":["../../src/session/destroySession.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CACxC,GAAoB;IAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE;YACvB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxB,IAAI,GAAG,EAAE;oBACL,0DAA0D;oBAC1D,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;qBAAM;oBACH,OAAO,EAAE,CAAC;iBACb;YACL,CAAC,CAAC,CAAC;SACN;aAAM;YACH,6DAA6D;YAC7D,4DAA4D;YAC5D,OAAO,EAAE,CAAC;SACb;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/session/getSessionId.js

@@ -1,19 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const cookie_signature_1 = __importDefault(require("cookie-signature"));
-const cookieUtils_1 = require("./cookieUtils");
-function getSessionId(req, secret = "") {
-    const sessionCookie = req.cookies[cookieUtils_1.DEFAULT_SESSION_COOKIE_NAME];
+import signature from "cookie-signature";
+import { DEFAULT_SESSION_COOKIE_NAME } from "./cookieUtils.js";
+export default function getSessionId(req, secret = "") {
+    const sessionCookie = req.cookies[DEFAULT_SESSION_COOKIE_NAME];
     if (!sessionCookie) {
         return null;
     }
     else {
         if (sessionCookie.substr(0, 2) === "s:") {
             // --- process signed cookie
-            const unsignResult = cookie_signature_1.default.unsign(sessionCookie.slice(2), secret);
+            const unsignResult = signature.unsign(sessionCookie.slice(2), secret);
             if (unsignResult === false) {
                 return null;
             }
@@ -24,5 +19,4 @@ function getSessionId(req, secret = "") {
         }
     }
 }
-exports.default = getSessionId;
 //# sourceMappingURL=getSessionId.js.map

package/dist/session/getSessionId.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSessionId.js","sourceRoot":"","sources":["../../src/session/getSessionId.ts"],"names":[],"mappings":";;;;;AACA,wEAAyC;AACzC,+CAA4D;AAE5D,SAAwB,YAAY,CAChC,GAAoB,EACpB,SAAiB,EAAE;IAEnB,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,yCAA2B,CAAW,CAAC;IACzE,IAAI,CAAC,aAAa,EAAE;QAChB,OAAO,IAAI,CAAC;KACf;SAAM;QACH,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;YACrC,4BAA4B;YAC5B,MAAM,YAAY,GAAG,0BAAS,CAAC,MAAM,CACjC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EACtB,MAAM,CACT,CAAC;YACF,IAAI,YAAY,KAAK,KAAK,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YACD,OAAO,YAAY,CAAC;SACvB;aAAM;YACH,OAAO,aAAa,CAAC;SACxB;KACJ;AACL,CAAC;AAtBD,+BAsBC"}
+{"version":3,"file":"getSessionId.js","sourceRoot":"","sources":["../../src/session/getSessionId.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAE/D,MAAM,CAAC,OAAO,UAAU,YAAY,CAChC,GAAoB,EACpB,SAAiB,EAAE;IAEnB,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,2BAA2B,CAAW,CAAC;IACzE,IAAI,CAAC,aAAa,EAAE;QAChB,OAAO,IAAI,CAAC;KACf;SAAM;QACH,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;YACrC,4BAA4B;YAC5B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CACjC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EACtB,MAAM,CACT,CAAC;YACF,IAAI,YAAY,KAAK,KAAK,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YACD,OAAO,YAAY,CAAC;SACvB;aAAM;YACH,OAAO,aAAa,CAAC;SACxB;KACJ;AACL,CAAC"}

package/dist/tenant-api/AuthorizedTenantClient.d.ts

@@ -1,4 +1,4 @@
-import { Tenant } from "../tenant-api/Tenant";
+import { Tenant } from "../tenant-api/Tenant.js";
 export interface TenantOptions {
     urlStr: string;
     maxRetries?: number;

package/dist/tenant-api/AuthorizedTenantClient.js

@@ -1,61 +1,47 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("isomorphic-fetch");
-const TenantConsts_1 = require("../registry/TenantConsts");
-const lodash_1 = __importDefault(require("lodash"));
-const retry_1 = __importDefault(require("../retry"));
-const formatServiceError_1 = __importDefault(require("../formatServiceError"));
-const createServiceError_1 = __importDefault(require("../createServiceError"));
-const buildJwt_1 = __importDefault(require("../session/buildJwt"));
-class AuthorizedTenantClient {
+import fetch from "cross-fetch";
+import { MAGDA_ADMIN_PORTAL_ID } from "../registry/TenantConsts.js";
+import lodash from "lodash";
+import retry from "../retry.js";
+import formatServiceError from "../formatServiceError.js";
+import createServiceError from "../createServiceError.js";
+import buildJwt from "../session/buildJwt.js";
+export default class AuthorizedTenantClient {
+    jwt = null;
+    requestInitOption = null;
+    url;
+    maxRetries;
+    secondsBetweenRetries;
+    defaultHeaders = {};
     constructor({ urlStr, maxRetries = 2, secondsBetweenRetries = 10, jwtSecret = null, userId = null }) {
-        this.jwt = null;
-        this.requestInitOption = null;
-        this.defaultHeaders = {};
         this.url = urlStr;
         this.maxRetries = maxRetries;
         this.secondsBetweenRetries = secondsBetweenRetries;
         if (jwtSecret && userId) {
-            this.jwt = buildJwt_1.default(jwtSecret, userId);
+            this.jwt = buildJwt(jwtSecret, userId);
         }
         this.requestInitOption = {
             headers: {
                 "X-Magda-Session": this.jwt,
                 "Content-Type": "application/json",
-                "X-Magda-Tenant-Id": `${TenantConsts_1.MAGDA_ADMIN_PORTAL_ID}`
+                "X-Magda-Tenant-Id": `${MAGDA_ADMIN_PORTAL_ID}`
             }
         };
     }
     getMergeRequestInitOption(extraOptions = null) {
-        return lodash_1.default.merge({}, this.requestInitOption, extraOptions);
+        return lodash.merge({}, this.requestInitOption, extraOptions);
     }
-    get() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield fetch(`${this.url}` + "/tenants", this.getMergeRequestInitOption({ method: "GET" }));
-            return res.json();
-        });
+    async get() {
+        const res = await fetch(`${this.url}` + "/tenants", this.getMergeRequestInitOption({ method: "GET" }));
+        return res.json();
     }
     getTenants() {
         const operation = () => () => this.get();
-        return retry_1.default(operation(), this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError_1.default("Failed to GET tenants.", e, retriesLeft)))
+        return retry(operation(), this.secondsBetweenRetries, this.maxRetries, (e, retriesLeft) => console.log(formatServiceError("Failed to GET tenants.", e, retriesLeft)))
             .then((result) => result)
             .catch((e) => {
             // --- we should re-throw the exception rather than return it as promise resolved value
-            throw createServiceError_1.default(e);
+            throw createServiceError(e);
         });
     }
 }
-exports.default = AuthorizedTenantClient;
 //# sourceMappingURL=AuthorizedTenantClient.js.map

package/dist/tenant-api/AuthorizedTenantClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthorizedTenantClient.js","sourceRoot":"","sources":["../../src/tenant-api/AuthorizedTenantClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC5B,2DAAiE;AAEjE,oDAA4B;AAC5B,qDAA6B;AAC7B,+EAAuD;AACvD,+EAAuD;AACvD,mEAA2C;AAgB3C,MAAqB,sBAAsB;IASvC,YAAY,EACR,MAAM,EACN,UAAU,GAAG,CAAC,EACd,qBAAqB,GAAG,EAAE,EAC1B,SAAS,GAAG,IAAI,EAChB,MAAM,GAAG,IAAI,EACD;QAdR,QAAG,GAAW,IAAI,CAAC;QACnB,sBAAiB,GAAgB,IAAI,CAAC;QAKpC,mBAAc,GAAQ,EAAE,CAAC;QAS/B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEnD,IAAI,SAAS,IAAI,MAAM,EAAE;YACrB,IAAI,CAAC,GAAG,GAAG,kBAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC1C;QAED,IAAI,CAAC,iBAAiB,GAAG;YACrB,OAAO,EAAE;gBACL,iBAAiB,EAAE,IAAI,CAAC,GAAG;gBAC3B,cAAc,EAAE,kBAAkB;gBAClC,mBAAmB,EAAE,GAAG,oCAAqB,EAAE;aAClD;SACJ,CAAC;IACN,CAAC;IAEO,yBAAyB,CAC7B,eAA4B,IAAI;QAEhC,OAAO,gBAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IAClE,CAAC;IAEa,GAAG;;YACb,MAAM,GAAG,GAAG,MAAM,KAAK,CACnB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,EAC1B,IAAI,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CACpD,CAAC;YAEF,OAA0B,GAAG,CAAC,IAAI,EAAE,CAAC;QACzC,CAAC;KAAA;IAED,UAAU;QACN,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzC,OAAY,eAAK,CACb,SAAS,EAAE,EACX,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,UAAU,EACf,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CACf,OAAO,CAAC,GAAG,CACP,4BAAkB,CAAC,wBAAwB,EAAE,CAAC,EAAE,WAAW,CAAC,CAC/D,CACR;aACI,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;aACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,uFAAuF;YACvF,MAAM,4BAAkB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACX,CAAC;CACJ;AAlED,yCAkEC"}
+{"version":3,"file":"AuthorizedTenantClient.js","sourceRoot":"","sources":["../../src/tenant-api/AuthorizedTenantClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAgB9C,MAAM,CAAC,OAAO,OAAO,sBAAsB;IAC/B,GAAG,GAAW,IAAI,CAAC;IACnB,iBAAiB,GAAgB,IAAI,CAAC;IAEpC,GAAG,CAAS;IACZ,UAAU,CAAS;IACnB,qBAAqB,CAAS;IAC9B,cAAc,GAAQ,EAAE,CAAC;IAEnC,YAAY,EACR,MAAM,EACN,UAAU,GAAG,CAAC,EACd,qBAAqB,GAAG,EAAE,EAC1B,SAAS,GAAG,IAAI,EAChB,MAAM,GAAG,IAAI,EACD;QACZ,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEnD,IAAI,SAAS,IAAI,MAAM,EAAE;YACrB,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC1C;QAED,IAAI,CAAC,iBAAiB,GAAG;YACrB,OAAO,EAAE;gBACL,iBAAiB,EAAE,IAAI,CAAC,GAAG;gBAC3B,cAAc,EAAE,kBAAkB;gBAClC,mBAAmB,EAAE,GAAG,qBAAqB,EAAE;aAClD;SACJ,CAAC;IACN,CAAC;IAEO,yBAAyB,CAC7B,eAA4B,IAAI;QAEhC,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,GAAG;QACb,MAAM,GAAG,GAAG,MAAM,KAAK,CACnB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,EAC1B,IAAI,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CACpD,CAAC;QAEF,OAA0B,GAAG,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,UAAU;QACN,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzC,OAAY,KAAK,CACb,SAAS,EAAE,EACX,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,UAAU,EACf,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CACf,OAAO,CAAC,GAAG,CACP,kBAAkB,CAAC,wBAAwB,EAAE,CAAC,EAAE,WAAW,CAAC,CAC/D,CACR;aACI,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;aACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,uFAAuF;YACvF,MAAM,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACX,CAAC;CACJ"}

package/dist/tenant-api/Tenant.js

@@ -1,10 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tenant = void 0;
 /**
  * A tenant in the tenants table.
  */
-class Tenant {
+export class Tenant {
+    /**
+     * The unique domain name of the tenant.
+     */
+    "domainname";
+    /**
+     * The unique ID of the tenant
+     */
+    "id";
+    /**
+     * The status of the tenant
+     */
+    "enabled";
 }
-exports.Tenant = Tenant;
 //# sourceMappingURL=Tenant.js.map

package/dist/tenant-api/Tenant.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tenant.js","sourceRoot":"","sources":["../../src/tenant-api/Tenant.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,MAAM;CAalB;AAbD,wBAaC"}
+{"version":3,"file":"Tenant.js","sourceRoot":"","sources":["../../src/tenant-api/Tenant.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,MAAM;IACf;;OAEG;IACH,YAAY,CAAS;IACrB;;OAEG;IACH,IAAI,CAAS;IACb;;OAEG;IACH,SAAS,CAAU;CACtB"}

package/dist/test/JsonConnector.spec.js

@@ -1,53 +1,48 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-require("mocha");
-const nock_1 = __importDefault(require("nock"));
+import { expect } from "chai";
+import "mocha";
+import nock from "nock";
 // import sinon from "sinon";
-const AsyncPage_1 = __importDefault(require("../AsyncPage"));
+import AsyncPage from "../AsyncPage.js";
 // import { AspectDefinition } from "../generated/registry/api";
-const AuthorizedRegistryClient_1 = __importDefault(require("../registry/AuthorizedRegistryClient"));
-const JsonConnector_1 = __importDefault(require("../JsonConnector"));
-const JsonTransformer_1 = __importDefault(require("../JsonTransformer"));
-const ConnectorRecordId_1 = __importDefault(require("../ConnectorRecordId"));
+import AuthRegistryClient from "../registry/AuthorizedRegistryClient.js";
+import JsonConnector from "../JsonConnector.js";
+import JsonTransformer from "../JsonTransformer.js";
+import ConnectorRecordId from "../ConnectorRecordId.js";
 // ConnectorSource,
 describe("JsonConnector", () => {
     before(() => {
-        nock_1.default.disableNetConnect();
+        nock.disableNetConnect();
     });
     after(() => {
-        nock_1.default.enableNetConnect();
+        nock.enableNetConnect();
     });
     afterEach(() => {
-        nock_1.default.cleanAll();
+        nock.cleanAll();
     });
     const tenant_id_1 = 1;
     describe("crawlTag", () => {
         it("auto-generates a tag that is distinct between instances by default", () => {
             for (let i = 0; i < 100; i++) {
-                const connectorA = new JsonConnector_1.default({
+                const connectorA = new JsonConnector({
                     source: {
                         // --- id & name is compulsory
                         id: "xxx",
                         name: "xxx"
                     }
                 });
-                const connectorB = new JsonConnector_1.default({
+                const connectorB = new JsonConnector({
                     source: {
                         // --- id & name is compulsory
                         id: "xxx",
                         name: "xxx"
                     }
                 });
-                chai_1.expect(connectorA.sourceTag).not.to.equal(connectorB.sourceTag);
+                expect(connectorA.sourceTag).not.to.equal(connectorB.sourceTag);
             }
         });
         it("accepts an overridden tag", () => {
             const tag = "blah";
-            const connector = new JsonConnector_1.default({
+            const connector = new JsonConnector({
                 source: {
                     // --- id & name is compulsory
                     id: "xxx",
@@ -55,7 +50,7 @@ describe("JsonConnector", () => {
                 },
                 sourceTag: tag
             });
-            chai_1.expect(connector.sourceTag).to.equal(tag);
+            expect(connector.sourceTag).to.equal(tag);
         });
         it("applies the tag to datasets", () => {
             const { scope, connector } = setupCrawlTest();
@@ -78,8 +73,8 @@ describe("JsonConnector", () => {
                 .reply(201, { count: 1 });
             return connector.run().then((result) => {
                 scope.done();
-                chai_1.expect(result.recordsTrimmed).to.equal(1);
-                chai_1.expect(result.trimStillProcessing).to.be.false;
+                expect(result.recordsTrimmed).to.equal(1);
+                expect(result.trimStillProcessing).to.be.false;
             });
         });
         it("accepts a 202 Accepted status from the registry when deleting", () => {
@@ -88,7 +83,7 @@ describe("JsonConnector", () => {
             scope.delete(/.*/).reply(202);
             return connector.run().then((result) => {
                 scope.done();
-                chai_1.expect(result.trimStillProcessing).to.be.true;
+                expect(result.trimStillProcessing).to.be.true;
             });
         });
         it("Will add aspect to all records according to `presetAspects` config", () => {
@@ -114,7 +109,7 @@ describe("JsonConnector", () => {
             return connector.run().then((result) => {
                 scope.done();
                 receivedRecords.forEach((record) => {
-                    chai_1.expect(record.aspects).to.have.deep.property("test-aspect-id", {
+                    expect(record.aspects).to.have.deep.property("test-aspect-id", {
                         "test-aspect-data1": randomValue
                     });
                 });
@@ -145,12 +140,12 @@ describe("JsonConnector", () => {
                 scope.done();
                 receivedRecords.forEach((record) => {
                     if (record.id.indexOf("ds-") === 0) {
-                        chai_1.expect(record.aspects).to.have.deep.property("test-aspect-id", {
+                        expect(record.aspects).to.have.deep.property("test-aspect-id", {
                             "test-aspect-data1": randomValue
                         });
                     }
                     else {
-                        chai_1.expect(record.aspects).to.not.have.property("test-aspect-id");
+                        expect(record.aspects).to.not.have.property("test-aspect-id");
                     }
                 });
             });
@@ -213,14 +208,14 @@ describe("JsonConnector", () => {
                 scope.done();
                 receivedRecords.forEach((record) => {
                     if (record.id.indexOf("ds-") === 0) {
-                        chai_1.expect(record.aspects).to.have.deep.property("test-aspect-id", {
+                        expect(record.aspects).to.have.deep.property("test-aspect-id", {
                             // --- Dataset record's value should be kept for the first property:
                             "test-aspect-data1": datasetRandomValue1,
                             "test-aspect-data2": randomValue2
                         });
                     }
                     else {
-                        chai_1.expect(record.aspects).to.have.deep.property("test-aspect-id", {
+                        expect(record.aspects).to.have.deep.property("test-aspect-id", {
                             "test-aspect-data1": randomValue1,
                             "test-aspect-data2": randomValue2
                         });
@@ -246,7 +241,7 @@ describe("JsonConnector", () => {
             return connector.run().then((result) => {
                 scope.done();
                 receivedRecords.forEach((record) => {
-                    chai_1.expect(record.aspects["source"]).to.have.deep.property("extras", {
+                    expect(record.aspects["source"]).to.have.deep.property("extras", {
                         testData: randomValue
                     });
                 });
@@ -270,13 +265,13 @@ describe("JsonConnector", () => {
             scope.delete(/.*/).reply(202);
             return connector.run().then((result) => {
                 scope.done();
-                chai_1.expect(receivedRecords.length).to.equal(3);
+                expect(receivedRecords.length).to.equal(3);
                 const datasets = receivedRecords.filter((record) => !!record.aspects["dataset-distributions"]);
-                chai_1.expect(datasets.length).to.equal(1);
-                chai_1.expect(datasets[0].name).to.equal("blah2-dataset-2");
+                expect(datasets.length).to.equal(1);
+                expect(datasets[0].name).to.equal("blah2-dataset-2");
                 const dists = receivedRecords.filter((record) => !record.aspects["dataset-distributions"]);
-                chai_1.expect(dists.length).to.equal(2);
-                chai_1.expect(dists.map((dist) => dist.name)).to.include.members([
+                expect(dists.length).to.equal(2);
+                expect(dists.map((dist) => dist.name)).to.include.members([
                     "blah-dist-1",
                     "blah-dist-2"
                 ]);
@@ -302,18 +297,18 @@ describe("JsonConnector", () => {
             scope.delete(/.*/).reply(202);
             return connector.run().then((result) => {
                 scope.done();
-                chai_1.expect(receivedRecords.length).to.equal(2);
+                expect(receivedRecords.length).to.equal(2);
                 const datasets = receivedRecords.filter((record) => !!record.aspects["dataset-distributions"]);
-                chai_1.expect(datasets.length).to.equal(1);
-                chai_1.expect(datasets[0].name).to.equal("blah-dataset-1");
+                expect(datasets.length).to.equal(1);
+                expect(datasets[0].name).to.equal("blah-dataset-1");
                 const dists = receivedRecords.filter((record) => !record.aspects["dataset-distributions"]);
-                chai_1.expect(dists.length).to.equal(1);
-                chai_1.expect(dists[0].name).to.equal("blah-dist-2");
+                expect(dists.length).to.equal(1);
+                expect(dists[0].name).to.equal("blah-dist-2");
             });
         });
         function setupCrawlTest(config = {}, transformerConfig = {}) {
-            const scope = nock_1.default("http://example.com");
-            const registry = new AuthorizedRegistryClient_1.default({
+            const scope = nock("http://example.com");
+            const registry = new AuthRegistryClient({
                 baseUrl: "http://example.com",
                 jwtSecret: "squirrel",
                 userId: "b1fddd6f-e230-4068-bd2c-1a21844f1598",
@@ -322,7 +317,7 @@ describe("JsonConnector", () => {
             });
             const source = new FakeConnectorSource(config);
             const transformer = new FakeJsonTransformer(transformerConfig);
-            const connector = new JsonConnector_1.default({
+            const connector = new JsonConnector({
                 source,
                 transformer,
                 registry
@@ -331,34 +326,34 @@ describe("JsonConnector", () => {
         }
     });
 });
-class FakeJsonTransformer extends JsonTransformer_1.default {
+class FakeJsonTransformer extends JsonTransformer {
     getIdFromJsonOrganization(jsonOrganization, sourceId) {
-        return new ConnectorRecordId_1.default("id", "Organization", "source");
+        return new ConnectorRecordId("id", "Organization", "source");
     }
     getIdFromJsonDataset(jsonDataset, sourceId) {
-        return new ConnectorRecordId_1.default("id", "Dataset", "source");
+        return new ConnectorRecordId("id", "Dataset", "source");
     }
     getIdFromJsonDistribution(jsonDistribution, jsonDataset, sourceId) {
-        return new ConnectorRecordId_1.default("id", "Distribution", "source");
+        return new ConnectorRecordId("id", "Distribution", "source");
     }
     getNameFromJsonOrganization(jsonOrganization) {
-        return (jsonOrganization === null || jsonOrganization === void 0 ? void 0 : jsonOrganization.name) ? jsonOrganization.name : "name";
+        return jsonOrganization?.name ? jsonOrganization.name : "name";
     }
     getNameFromJsonDataset(jsonDataset) {
-        return (jsonDataset === null || jsonDataset === void 0 ? void 0 : jsonDataset.name) ? jsonDataset.name : "name";
+        return jsonDataset?.name ? jsonDataset.name : "name";
     }
     getNameFromJsonDistribution(jsonDistribution, jsonDataset) {
-        return (jsonDistribution === null || jsonDistribution === void 0 ? void 0 : jsonDistribution.name) ? jsonDistribution.name : "name";
+        return jsonDistribution?.name ? jsonDistribution.name : "name";
     }
 }
 class FakeConnectorSource {
+    id = "id";
+    name = "name";
+    hasFirstClassOrganizations = false;
+    presetRecordAspects = null;
+    extras = null;
+    customJsFilterCode = "";
     constructor(config = {}) {
-        this.id = "id";
-        this.name = "name";
-        this.hasFirstClassOrganizations = false;
-        this.presetRecordAspects = null;
-        this.extras = null;
-        this.customJsFilterCode = "";
         if (config.extras) {
             this.extras = config.extras;
         }
@@ -373,19 +368,19 @@ class FakeConnectorSource {
         return Promise.resolve();
     }
     searchDatasetsByTitle(title, maxResults) {
-        return AsyncPage_1.default.single([]);
+        return AsyncPage.single([]);
     }
     getJsonFirstClassOrganization(id) {
         return Promise.resolve();
     }
     searchFirstClassOrganizationsByTitle(title, maxResults) {
-        return AsyncPage_1.default.single([]);
+        return AsyncPage.single([]);
     }
     getJsonDatasetPublisherId(dataset) {
         return "id";
     }
     getJsonDatasets() {
-        return AsyncPage_1.default.single([
+        return AsyncPage.single([
             {
                 blah: "blah-dataset-1",
                 name: "blah-dataset-1"
@@ -397,7 +392,7 @@ class FakeConnectorSource {
         ]);
     }
     getJsonFirstClassOrganizations() {
-        return AsyncPage_1.default.single([
+        return AsyncPage.single([
             {
                 blah: "blah-org-1",
                 name: "blah-org-1"
@@ -405,7 +400,7 @@ class FakeConnectorSource {
         ]);
     }
     getJsonDistributions() {
-        return AsyncPage_1.default.single([
+        return AsyncPage.single([
             {
                 blah: "blah-dist-1",
                 name: "blah-dist-1"