@magda/typescript-common 0.0.60-alpha.7 → 0.0.60-dt.1

package/dist/appendUrlSegments.d.ts

@@ -0,0 +1,2 @@
+declare function appendUrlSegments(url: string, segments: string[]): string;
+export default appendUrlSegments;

package/dist/appendUrlSegments.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const urijs_1 = __importDefault(require("urijs"));
+function appendUrlSegments(url, segments) {
+    url = url ? url : "";
+    const uri = urijs_1.default(url);
+    return uri
+        .segmentCoded(uri
+        .segmentCoded()
+        .filter((item) => !!item)
+        .concat(segments))
+        .toString();
+}
+exports.default = appendUrlSegments;
+//# sourceMappingURL=appendUrlSegments.js.map

package/dist/appendUrlSegments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appendUrlSegments.js","sourceRoot":"","sources":["../src/appendUrlSegments.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,SAAS,iBAAiB,CAAC,GAAW,EAAE,QAAkB;IACtD,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACrB,MAAM,GAAG,GAAG,eAAK,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG;SACL,YAAY,CACT,GAAG;SACE,YAAY,EAAE;SACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,QAAQ,CAAC,CACxB;SACA,QAAQ,EAAE,CAAC;AACpB,CAAC;AAED,kBAAe,iBAAiB,CAAC"}

package/dist/getAbsoluteUrl.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Join `url` with `baseUrl` if `url` is not an absolute url
+ *
+ * @export
+ * @param {string} url
+ * @param {string} baseUrl
+ * @param {{ [key: string]: string }} [optionalQueries]
+ * @returns
+ */
+export default function getAbsoluteUrl(url: string, baseUrl: string, optionalQueries?: {
+    [key: string]: string;
+}): string;

package/dist/getAbsoluteUrl.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const urijs_1 = __importDefault(require("urijs"));
+/**
+ * Join `url` with `baseUrl` if `url` is not an absolute url
+ *
+ * @export
+ * @param {string} url
+ * @param {string} baseUrl
+ * @param {{ [key: string]: string }} [optionalQueries]
+ * @returns
+ */
+function getAbsoluteUrl(url, baseUrl, optionalQueries) {
+    const uri = urijs_1.default(url);
+    if (uri.hostname()) {
+        // --- absolute url, return directly
+        return url;
+    }
+    else {
+        if (typeof baseUrl !== "string") {
+            baseUrl = "";
+        }
+        const baseUri = urijs_1.default(baseUrl);
+        const query = uri.search(true);
+        const mergedUri = baseUri.segmentCoded(baseUri.segmentCoded().concat(uri.segmentCoded()));
+        return mergedUri
+            .search(Object.assign(Object.assign({}, (query ? query : {})), (optionalQueries ? optionalQueries : {})))
+            .toString();
+    }
+}
+exports.default = getAbsoluteUrl;
+//# sourceMappingURL=getAbsoluteUrl.js.map

package/dist/getAbsoluteUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAbsoluteUrl.js","sourceRoot":"","sources":["../src/getAbsoluteUrl.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B;;;;;;;;GAQG;AACH,SAAwB,cAAc,CAClC,GAAW,EACX,OAAe,EACf,eAA2C;IAE3C,MAAM,GAAG,GAAG,eAAK,CAAC,GAAG,CAAC,CAAC;IACvB,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE;QAChB,oCAAoC;QACpC,OAAO,GAAG,CAAC;KACd;SAAM;QACH,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,OAAO,GAAG,EAAE,CAAC;SAChB;QACD,MAAM,OAAO,GAAG,eAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAClC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CACpD,CAAC;QAEF,OAAO,SAAS;aACX,MAAM,iCACA,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GACpB,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAC7C;aACD,QAAQ,EAAE,CAAC;KACnB;AACL,CAAC;AA1BD,iCA0BC"}

package/dist/markdownToHtml.js

@@ -12,7 +12,7 @@ const md = new markdown_it_1.default({
 });
 const htmlRegex = /^\s*<[^>]+>/;
 function markdownToHtml(markdownString, allowUnsafeHtml = false, options = {
-    FORBID_TAGS: ["svg", "math"]
+    FORBID_TAGS: ["svg", "math", "style"]
 }) {
     if (!markdownString || typeof markdownString !== "string") {
         return markdownString;

package/dist/markdownToHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdownToHtml.js","sourceRoot":"","sources":["../src/markdownToHtml.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AACrC,0DAAkC;AAElC,MAAM,EAAE,GAAG,IAAI,qBAAU,CAAC;IACtB,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,aAAa,CAAC;AAEhC,SAAwB,cAAc,CAClC,cAAsB,EACtB,kBAA2B,KAAK,EAChC,OAAO,GAAG;IACN,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;CAC/B;IAED,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACvD,OAAO,cAAc,CAAC;KACzB;IACD,6EAA6E;IAC7E,0CAA0C;IAC1C,IAAI,UAAU,CAAC;IACf,IAAI,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QAChC,UAAU,GAAG,cAAc,CAAC;KAC/B;SAAM;QACH,2GAA2G;QAC3G,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KAC1C;IACD,IAAI,eAAe,EAAE;QACjB,OAAO,UAAU,CAAC;KACrB;SAAM;QACH,OAAO,mBAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KAClD;AACL,CAAC;AAxBD,iCAwBC"}
+{"version":3,"file":"markdownToHtml.js","sourceRoot":"","sources":["../src/markdownToHtml.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AACrC,0DAAkC;AAElC,MAAM,EAAE,GAAG,IAAI,qBAAU,CAAC;IACtB,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,aAAa,CAAC;AAEhC,SAAwB,cAAc,CAClC,cAAsB,EACtB,kBAA2B,KAAK,EAChC,OAAO,GAAG;IACN,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;CACxC;IAED,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACvD,OAAO,cAAc,CAAC;KACzB;IACD,6EAA6E;IAC7E,0CAA0C;IAC1C,IAAI,UAAU,CAAC;IACf,IAAI,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QAChC,UAAU,GAAG,cAAc,CAAC;KAC/B;SAAM;QACH,2GAA2G;QAC3G,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KAC1C;IACD,IAAI,eAAe,EAAE;QACjB,OAAO,UAAU,CAAC;KACrB;SAAM;QACH,OAAO,mBAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KAClD;AACL,CAAC;AAxBD,iCAwBC"}

package/dist/session/cookieUtils.d.ts

@@ -0,0 +1,16 @@
+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";
+};
+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

@@ -0,0 +1,19 @@
+"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 = {
+    maxAge: 7 * 60 * 60 * 1000,
+    sameSite: "lax",
+    httpOnly: true,
+    secure: "auto"
+};
+function deleteCookie(cookieName, cookieOptions, res) {
+    const deleteCookieOptions = Object.assign({}, 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);
+}
+exports.deleteCookie = deleteCookie;
+//# sourceMappingURL=cookieUtils.js.map

package/dist/session/cookieUtils.js.map

@@ -0,0 +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"}

package/dist/session/destroySession.d.ts

@@ -0,0 +1,10 @@
+import express from "express";
+/**
+ * destroy the session.
+ *  - will delete the session data from session store only.
+ *  - will not delete session cookie (Call deleteCookie method for deleting cookie)
+ * @export
+ * @param {express.Request} req
+ * @return {*}  {Promise<void>}
+ */
+export default function destroySession(req: express.Request): Promise<void>;

package/dist/session/destroySession.js

@@ -0,0 +1,44 @@
+"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.
+ *  - will not delete session cookie (Call deleteCookie method for deleting cookie)
+ * @export
+ * @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();
+            }
+        });
+    });
+}
+exports.default = destroySession;
+//# sourceMappingURL=destroySession.js.map

package/dist/session/destroySession.js.map

@@ -0,0 +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,UAAI,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"}

package/dist/session/getSessionId.d.ts

@@ -0,0 +1,2 @@
+import express from "express";
+export default function getSessionId(req: express.Request, secret?: string): string;

package/dist/session/getSessionId.js

@@ -0,0 +1,28 @@
+"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];
+    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);
+            if (unsignResult === false) {
+                return null;
+            }
+            return unsignResult;
+        }
+        else {
+            return sessionCookie;
+        }
+    }
+}
+exports.default = getSessionId;
+//# sourceMappingURL=getSessionId.js.map

package/dist/session/getSessionId.js.map

@@ -0,0 +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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/typescript-common",
   "description": "Common TypeScript code shared between components.",
-  "version": "0.0.60-alpha.7",
+  "version": "0.0.60-dt.1",
   "license": "Apache-2.0",
   "scripts": {
     "prebuild": "rimraf dist tsconfig.tsbuildinfo",
@@ -17,8 +17,8 @@
     "release": "npm publish || echo \"Skip releasing npm package @magda/typescript-common.\""
   },
   "devDependencies": {
-    "@magda/registry-aspects": "^0.0.60-alpha.7",
-    "@magda/scripts": "^0.0.60-alpha.7",
+    "@magda/registry-aspects": "^0.0.60-dt.1",
+    "@magda/scripts": "^0.0.60-dt.1",
     "@types/chai": "^4.0.0",
     "@types/chai-as-promised": "^7.1.0",
     "@types/cross-spawn": "^6.0.1",
@@ -51,7 +51,7 @@
     "@types/resolve": "^1.14.0",
     "@types/vfile-message": "^2.0.0",
     "body-parser": "^1.18.2",
-    "dompurify": "^2.0.3",
+    "dompurify": "^2.3.0",
     "express": "^4.17.1",
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.4.0",