npm - @nsshunt/stsappframework - Versions diffs - 2.19.164 → 2.19.166 - Mend

@nsshunt/stsappframework 2.19.164 → 2.19.166

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/dist/authutilsnode.js +39 -6
package/dist/authutilsnode.js.map +1 -1
package/dist/index.js +1 -0
package/dist/index.js.map +1 -1
package/dist/testHelpers.js +303 -0
package/dist/testHelpers.js.map +1 -0
package/package.json +7 -1
package/src/authutilsnode.ts +44 -5
package/src/index.ts +1 -0
package/src/testHelpers.ts +306 -0
package/types/authutilsnode.d.ts +2 -1
package/types/authutilsnode.d.ts.map +1 -1
package/types/index.d.ts +1 -0
package/types/index.d.ts.map +1 -1
package/types/testHelpers.d.ts +20 -0
package/types/testHelpers.d.ts.map +1 -0

package/dist/authutilsnode.js CHANGED Viewed

@@ -22,11 +22,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AuthUtilsNode_cookiejar, _AuthUtilsNode_httpsAgent, _AuthUtilsNode_debug, _AuthUtilsNode_getHttpsAgent;
+var _AuthUtilsNode_cookiejar, _AuthUtilsNode_httpsAgent, _AuthUtilsNode_debug, _AuthUtilsNode_GetHttpsAgent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthUtilsNode = exports.STSClientID = void 0;
 const tough_cookie_1 = __importDefault(require("tough-cookie"));
 const https_1 = __importDefault(require("https"));
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const jwt_decode_1 = __importDefault(require("jwt-decode"));
+const jwks_rsa_1 = __importDefault(require("jwks-rsa"));
 const axios_1 = __importDefault(require("axios"));
 const stsconfig_1 = require("@nsshunt/stsconfig");
 const goptions = (0, stsconfig_1.$Options)();
@@ -57,7 +60,7 @@ class AuthUtilsNode {
         _AuthUtilsNode_cookiejar.set(this, void 0);
         _AuthUtilsNode_httpsAgent.set(this, null);
         _AuthUtilsNode_debug.set(this, (0, debug_1.default)(`proc:${process.pid}:AuthUtilsNode`));
-        _AuthUtilsNode_getHttpsAgent.set(this, () => {
+        _AuthUtilsNode_GetHttpsAgent.set(this, () => {
             if (__classPrivateFieldGet(this, _AuthUtilsNode_httpsAgent, "f") === null) {
                 // https://nodejs.org/api/http.html#class-httpagent
                 __classPrivateFieldSet(this, _AuthUtilsNode_httpsAgent, new https_1.default.Agent({
@@ -87,7 +90,35 @@ class AuthUtilsNode {
         this.GetCookiesFromJar = (endpoint) => __awaiter(this, void 0, void 0, function* () {
             return __classPrivateFieldGet(this, _AuthUtilsNode_cookiejar, "f").getCookies(endpoint);
         });
-        this.GetAPITokenFromAuthServer = (clientId, authClientSecret, audience) => __awaiter(this, void 0, void 0, function* () {
+        this.ValidateJWT = (token, audience, endpoint) => __awaiter(this, void 0, void 0, function* () {
+            const jwksClientUri = (endpoint
+                ? `${endpoint}${goptions.asoauthapiroot}${goptions.asjwksjsonpath}`
+                : `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}${goptions.asjwksjsonpath}`);
+            const jwks = (0, jwks_rsa_1.default)({
+                cache: true,
+                cacheMaxEntries: 5,
+                cacheMaxAge: 600000,
+                rateLimit: true,
+                jwksRequestsPerMinute: 10,
+                jwksUri: jwksClientUri,
+                timeout: 30000,
+                requestAgent: __classPrivateFieldGet(this, _AuthUtilsNode_GetHttpsAgent, "f").call(this)
+            });
+            // Use decode to get the kid
+            const decodedRefreshToken = (0, jwt_decode_1.default)(token, { header: true });
+            const kid = decodedRefreshToken.kid;
+            const key = yield jwks.getSigningKey(kid);
+            const signingKey = key.getPublicKey();
+            const verifyOptions = {
+                issuer: 'https://stsmda.com.au/stsauth/',
+                //subject:  s,
+                audience: audience,
+                //expiresIn:  600, // 10 minutes
+                algorithm: ["RS256"] // RSASSA [ "RS256", "RS384", "RS512" ]
+            };
+            return jsonwebtoken_1.default.verify(token, signingKey, verifyOptions);
+        });
+        this.GetAPITokenFromAuthServer = (clientId, authClientSecret, audience, endPoint) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const headers = { 'Content-Type': 'application/json' };
                 const payload = {
@@ -99,13 +130,15 @@ class AuthUtilsNode {
                     //@@ need scope to be the API identifier
                     grant_type: "client_credentials"
                 };
-                const url = `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}/token`;
+                const url = (endPoint
+                    ? `${endPoint}${goptions.asoauthapiroot}/token`
+                    : `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}/token`);
                 const retVal = yield (0, axios_1.default)({
                     url,
                     method: 'post',
                     data: payload,
                     headers: headers,
-                    httpsAgent: __classPrivateFieldGet(this, _AuthUtilsNode_httpsAgent, "f")
+                    httpsAgent: __classPrivateFieldGet(this, _AuthUtilsNode_GetHttpsAgent, "f").call(this)
                 });
                 if (retVal.status) {
                     if (retVal.status !== 200) {
@@ -208,5 +241,5 @@ class AuthUtilsNode {
     }
 }
 exports.AuthUtilsNode = AuthUtilsNode;
-_AuthUtilsNode_cookiejar = new WeakMap(), _AuthUtilsNode_httpsAgent = new WeakMap(), _AuthUtilsNode_debug = new WeakMap(), _AuthUtilsNode_getHttpsAgent = new WeakMap();
+_AuthUtilsNode_cookiejar = new WeakMap(), _AuthUtilsNode_httpsAgent = new WeakMap(), _AuthUtilsNode_debug = new WeakMap(), _AuthUtilsNode_GetHttpsAgent = new WeakMap();
 //# sourceMappingURL=authutilsnode.js.map

package/dist/authutilsnode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAiC;AACjC,kDAAyB;~~AAEzB~~,kDAA0B;AAE1B,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAA+B;AAE/B,~~gDAAmD~~;~~AAEnD~~,gDAA2D;AAE3D,yDAAgD;AAMhD,IAAY,WAgBX;AAhBD,WAAY,WAAW;IACnB,gFAAiE,CAAA;IACjE,8EAA+D,CAAA;IAC/D,6EAA8D,CAAA;IAC9D,sEAAuD,CAAA;IACvD,2EAA4D,CAAA;IAC5D,qFAAsE,CAAA;IACtE,2FAA4E,CAAA;IAC5E,0FAA2E,CAAA;IAC3E,iFAAkE,CAAA;IAClE,gFAAiE,CAAA;IACjE,iFAAkE,CAAA;IAClE,sFAAuE,CAAA;IACvE,qFAAsE,CAAA;IACtE,iFAAkE,CAAA;IAClE,uFAAwE,CAAA;AAC5E,CAAC,EAhBW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAgBtB;AAED,MAAa,aAAa;IAMtB;QAJA,2CAA4B;QAC5B,oCAAkC,IAAI,EAAC;QACvC,+BAAS,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,gBAAgB,CAAC,EAAC;QAM1D,uCAAiB,GAAG,EAAE;YAElB,IAAI,uBAAA,IAAI,iCAAY,KAAK,IAAI,EAAE;gBAC3B,mDAAmD;gBACnD,uBAAA,IAAI,6BAAe,IAAI,eAAK,CAAC,KAAK,CAAC;oBAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,eAAe,EAAE,QAAQ,CAAC,eAAe;oBACzC,cAAc,EAAE,QAAQ,CAAC,cAAc;oBACvC,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,kBAAkB,EAAE,KAAK;iBAC5B,CAAC,MAAA,CAAC;aACN;YACD,OAAO,uBAAA,IAAI,iCAAY,CAAC;QAC5B,CAAC,EAAA;QA+DD,oBAAe,GAAG,CAAO,OAA4B,EAAE,QAAgB,EAA2B,EAAE;YAEhG,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;gBACvB,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,YAAiB,EAAE,EAAE;oBAC5C,MAAM,MAAM,GAAQ,sBAAK,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBACrD,uBAAA,IAAI,gCAAW,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,MAAM,MAAM,GAAQ,sBAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;gBAC9D,uBAAA,IAAI,gCAAW,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;aACnD;YAED,OAAO,uBAAA,IAAI,gCAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAA,CAAC;QAEF,sBAAiB,GAAG,CAAO,QAAgB,EAA2B,EAAE;YAEpE,OAAO,uBAAA,IAAI,gCAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAA,CAAC;QAEF,8BAAyB,GAAG,CAAO,QAAqB,EAAE,gBAAwB,EAAE,QAAgB,EAAmB,EAAE;~~YACrH~~,IAAI;gBACA,MAAM,OAAO,GAAG,EAAE,cAAc,EAAE,kBAAkB,EAAC,CAAC;gBACtD,MAAM,OAAO,GAAG;oBACZ,SAAS,EAAE,QAAQ;oBACnB,aAAa,EAAE,gBAAgB;oBAC/B,6EAA6E;oBAC7E,QAAQ,EAAE,QAAQ;oBAClB,oBAAoB;oBACpB,wCAAwC;oBACxC,UAAU,EAAE,oBAAoB;iBACnC,CAAA;gBACD,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,cAAc,QAAQ,CAAC;~~gBACxF~~,MAAM,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC;oBACvB,GAAG;oBACF,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,OAAO;oBAChB,UAAU,EAAE,uBAAA,IAAI,~~iCAAY~~;~~iBAChC~~,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACf,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE;wBACvB,8BAA8B;wBAC9B,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,+EAA+E,MAAM,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC;qBACxH;iBACJ;qBAAM;oBACH,MAAM,GAAG,GAAG,8DAA8D,CAAC,GAAG,CAAA;oBAC9E,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,GAAG,CAAC,CAAC;oBACjB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,MAAM,CAAC,IAAI,EAAE;oBACb,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE;wBAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,YAAsB,CAAC;qBAC7C;yBAAM;wBACH,MAAM,GAAG,GAAG,yEAAyE,CAAC,GAAG,CAAA;wBACzF,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,GAAG,CAAC,CAAC;wBACjB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;qBACxB;iBACJ;qBAAM;oBACH,MAAM,GAAG,GAAG,4DAA4D,CAAC,GAAG,CAAA;oBAC5E,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,GAAG,CAAC,CAAC;oBACjB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxB;aACJ;YAAC,OAAO,KAAU,EAAE;gBACjB,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,sDAAsD,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC/E,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE;oBACvC,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,aAAa,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACxE;gBACD,MAAM,KAAK,CAAC;aACf;QACL,CAAC,CAAA,CAAA;~~QAvJG~~,uBAAA,IAAI,4BAAc,IAAI,sBAAK,CAAC,SAAS,EAAE,MAAA,CAAC;IAC5C,CAAC;IAkBD,8BAA8B,CAAC,OAA8B;QACzD,OAAO,UAAe,GAAQ,EAAE,GAAQ,EAAE,IAAS;;gBAC/C,IAAI,OAAO,CAAC,WAAW,EAAE;oBACrB,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzC,MAAM,mBAAmB,GAAG,EAAG,CAAC;oBAChC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;4BAC9B,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;yBACxC;qBACJ;oBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;wBAChC,MAAM,YAAY,GAAG,IAAA,0BAAe,EAAC,8BAAqB,CAAC,+BAA+B,EAAE,mBAAmB,CAAC,CAAC;wBACjH,GAAG,CAAC,MAAM,CAAC,+BAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAE,EAAE,MAAM,EAAE,+BAAW,CAAC,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;wBACtG,OAAO;qBACV;iBACJ;gBACD,IAAI,EAAE,CAAC;YACX,CAAC;SAAA,CAAA;IACL,CAAC;IACD;;;;;;;;;;;;;;;MAeD;IAEO,uBAAuB,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAS;;YAEvD,IAAI,EAAE,CAAC;YACP;;;;;;;;;;;;;;;;;;cAkBJ;QACA,CAAC;KAAA;~~CAqKJ~~;~~AA1PD~~,~~sCA0PC~~"}
1	+ {"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -18,6 +18,7 @@ __exportStar(require("./commonTypes"), exports);
 __exportStar(require("./processoptions"), exports);
 __exportStar(require("./authDefs"), exports);
 __exportStar(require("./authutilsnode"), exports);
+__exportStar(require("./testHelpers"), exports);
 __exportStar(require("./stsrouterbase"), exports);
 __exportStar(require("./stscontrollerbase"), exports);
 __exportStar(require("./singleprocessbase"), exports);

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,6CAA0B;AAC1B,kDAA+B;AAC/B,kDAA+B;AAC/B,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,mDAAgC;AAChC,yDAAsC;AACtC,oDAAiC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,6CAA0B;AAC1B,kDAA+B;AAC/B,gDAA6B;AAC7B,kDAA+B;AAC/B,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,mDAAgC;AAChC,yDAAsC;AACtC,oDAAiC"}

package/dist/testHelpers.js ADDED Viewed

@@ -0,0 +1,303 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _TestHelper_regexURLSafeStringComponent, _TestHelper_regexSTSBase64, _TestHelper_regexJWT, _TestHelper_authUtilsNode, _TestHelper_databaseContainer, _TestHelper_stsAuthContainer, _TestHelper_network, _TestHelper_endpoint, _TestHelper_httpsAgent, _TestHelper_GetHttpsAgent;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestHelper = void 0;
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)(`proc:${process.pid}:stsresourcecontroller.test`);
+const tough = __importStar(require("tough-cookie"));
+const https_1 = __importDefault(require("https"));
+const crypto_1 = __importDefault(require("crypto"));
+require("jest-date");
+const axios_1 = __importDefault(require("axios"));
+const testcontainers_1 = require("testcontainers");
+const stsconfig_1 = require("@nsshunt/stsconfig");
+let goptions = (0, stsconfig_1.$Options)();
+const stsutils_1 = require("@nsshunt/stsutils");
+const authutilsnode_1 = require("./authutilsnode");
+class TestHelper {
+    constructor() {
+        //#regexBase64URL = /^[A-Za-z0-9_-]+$/ // Base64URL  - https://base64.guru/standards/base64url
+        _TestHelper_regexURLSafeStringComponent.set(this, /[-a-zA-Z0-9@:%._+~#=]{1,256}/
+        //#regexBase64 = /(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64 - https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
+        ); // URL safe string component
+        //#regexBase64 = /(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64 - https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
+        _TestHelper_regexSTSBase64.set(this, /SES_(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/); // Base64
+        _TestHelper_regexJWT.set(this, /[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+/); // JWT (Base64URL.Base64URL.Base64URL)
+        _TestHelper_authUtilsNode.set(this, new authutilsnode_1.AuthUtilsNode());
+        _TestHelper_databaseContainer.set(this, void 0);
+        _TestHelper_stsAuthContainer.set(this, void 0);
+        _TestHelper_network.set(this, void 0);
+        _TestHelper_endpoint.set(this, '');
+        _TestHelper_httpsAgent.set(this, null);
+        _TestHelper_GetHttpsAgent.set(this, () => {
+            if (__classPrivateFieldGet(this, _TestHelper_httpsAgent, "f") === null) {
+                // https://nodejs.org/api/http.html#class-httpagent
+                __classPrivateFieldSet(this, _TestHelper_httpsAgent, new https_1.default.Agent({
+                    keepAlive: goptions.keepAlive,
+                    maxSockets: goptions.maxSockets,
+                    maxTotalSockets: goptions.maxTotalSockets,
+                    maxFreeSockets: goptions.maxFreeSockets,
+                    timeout: goptions.timeout,
+                    rejectUnauthorized: false
+                }), "f");
+            }
+            return __classPrivateFieldGet(this, _TestHelper_httpsAgent, "f");
+        });
+        this.StartNetwork = () => __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldSet(this, _TestHelper_network, yield new testcontainers_1.Network().start(), "f");
+        });
+        this.StopNetwork = () => __awaiter(this, void 0, void 0, function* () {
+            yield __classPrivateFieldGet(this, _TestHelper_network, "f").stop();
+        });
+        this.CreateRandomString = () => {
+            const charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_~.'; //    /[0-9A-Za-z\-_~.]/
+            let random = '';
+            const randomValues = Array.from(crypto_1.default.getRandomValues(new Uint8Array(43)));
+            randomValues.forEach(v => (random += charset[v % charset.length]));
+            return random;
+        };
+        this.Login = (username, password) => __awaiter(this, void 0, void 0, function* () {
+            const client_id = process.env.CLIENT_ID;
+            const nonce = crypto_1.default.randomBytes(43).toString('base64'); //CreateRandomString();
+            const response_type = 'code';
+            const redirect_uri = process.env.REDIRECT_URI;
+            const response_mode = 'query';
+            const scope = process.env.SCOPE;
+            const state = crypto_1.default.randomBytes(43).toString('base64'); // CreateRandomString();
+            const code_verifier = this.CreateRandomString();
+            const code_challenge = crypto_1.default.createHash('sha256').update(code_verifier).digest('base64');
+            const code_challenge_method = 'S256';
+            const authoriseOptions = {
+                email: username,
+                password,
+                client_id,
+                nonce,
+                response_type,
+                redirect_uri,
+                response_mode,
+                scope,
+                state,
+                code_challenge,
+                code_challenge_method
+            };
+            const url = `${__classPrivateFieldGet(this, _TestHelper_endpoint, "f")}${goptions.asapiroot}/login`;
+            const headers = { 'Content-Type': 'application/json' };
+            const retVal = yield (0, axios_1.default)({
+                url,
+                method: 'post',
+                data: authoriseOptions,
+                headers: headers,
+                httpsAgent: __classPrivateFieldGet(this, _TestHelper_GetHttpsAgent, "f").call(this)
+            });
+            //const cookieString = retVal.headers['set-cookie'];
+            /*
+            const api = request(this.#endpoint);
+            const retVal: any = await (api as any)
+                .post(`${goptions.asapiroot}/login`)
+                .send(authoriseOptions)
+            //.expect('set-cookie', /consent_cookie=.*; Max-Age=86; Path=\/; Expires=.*; HttpOnly; Secure; SameSite=Strict/);
+            const cookieString = retVal.header['set-cookie'];
+            if (cookieString) {
+                retVal.cookie = new Cookie(cookieString[0]);
+            }
+            */
+            return retVal;
+        });
+        this.GetAuthServerAPITokenFromServer = () => __awaiter(this, void 0, void 0, function* () {
+            return yield __classPrivateFieldGet(this, _TestHelper_authUtilsNode, "f").GetAPITokenFromAuthServer(authutilsnode_1.STSClientID.STSTestingService, "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==", goptions.asapiidentifier, __classPrivateFieldGet(this, _TestHelper_endpoint, "f"));
+        });
+        this.ValidateJWT = (token) => __awaiter(this, void 0, void 0, function* () {
+            return yield __classPrivateFieldGet(this, _TestHelper_authUtilsNode, "f").ValidateJWT(token, goptions.asapiidentifier, __classPrivateFieldGet(this, _TestHelper_endpoint, "f"));
+        });
+        this.StartDatabase = () => __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldSet(this, _TestHelper_databaseContainer, yield new testcontainers_1.GenericContainer("postgres")
+                .withExposedPorts(5432)
+                .withEnvironment({
+                POSTGRES_PASSWORD: "postgres",
+                //UV_THREADPOOL_SIZE: "64"
+            })
+                .withNetwork(__classPrivateFieldGet(this, _TestHelper_network, "f"))
+                .withNetworkAliases("database")
+                .start(), "f");
+            const httpPort = __classPrivateFieldGet(this, _TestHelper_databaseContainer, "f").getMappedPort(5432);
+            const host = __classPrivateFieldGet(this, _TestHelper_databaseContainer, "f").getHost();
+            const networkIpAddress = __classPrivateFieldGet(this, _TestHelper_databaseContainer, "f").getIpAddress(__classPrivateFieldGet(this, _TestHelper_network, "f").getName());
+            process.env.DB_PORT = httpPort;
+            process.env.DB_HOST = host;
+            (0, stsconfig_1.$ResetOptions)();
+            goptions = (0, stsconfig_1.$Options)();
+            debug(`httpPort: [${httpPort}]`.green);
+            debug(`host: [${host}]`.green);
+            debug(`networkIpAddress: [${networkIpAddress}]`.green);
+            debug(`connectionString: [${goptions.connectionString}]`.green);
+            debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString}]`.green);
+        });
+        this.StopDatabase = () => __awaiter(this, void 0, void 0, function* () {
+            if (__classPrivateFieldGet(this, _TestHelper_databaseContainer, "f")) {
+                yield __classPrivateFieldGet(this, _TestHelper_databaseContainer, "f").stop();
+                debug(`Used the following parameters for the database during testing:`.yellow);
+                debug(`connectionString: [${goptions.connectionString}]`.yellow);
+                debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString}]`.yellow);
+            }
+        });
+        // Note: .withCopyFilesToContainer and .withCopyContentToContainer have a defect in that Jest will not close. A file handle/stream is left open
+        // within the underlying code.
+        this.InitializeDatabase = () => __awaiter(this, void 0, void 0, function* () {
+            const stsAuthContainerInit = yield new testcontainers_1.GenericContainer("serza/stsauth:latest")
+                .withEnvironment({
+                DB_USER: "postgres",
+                DB_PASSWORD: "postgres",
+                DB_HOST: "database",
+                DB_PORT: "5432",
+                POOL_SIZE: "50",
+                MAX_CPU: "2",
+                DEBUG: "proc*",
+                HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
+                HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
+                AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
+                AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
+                AS_ENDPOINT: "https://stscore.stsmda.org"
+            })
+                .withCommand(["node", "dist/app", "create"])
+                .withNetwork(__classPrivateFieldGet(this, _TestHelper_network, "f"))
+                .withNetworkAliases("stsauthrunnerinit")
+                .withWaitStrategy(testcontainers_1.Wait.forLogMessage(`User Permissions: {"status":200,"detail":["STSREST01ReadPermission","STSREST01CreatePermission","STSREST01UpdatePermission","STSREST01DeletePermission"]}`))
+                .start();
+            yield (0, stsutils_1.Sleep)(200);
+            yield stsAuthContainerInit.stop();
+        });
+        this.StartAuthService = () => __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldSet(this, _TestHelper_stsAuthContainer, yield new testcontainers_1.GenericContainer("serza/stsauth:latest")
+                .withExposedPorts(3002)
+                .withEnvironment({
+                DB_USER: "postgres",
+                DB_PASSWORD: "postgres",
+                DB_HOST: "database",
+                DB_PORT: "5432",
+                POOL_SIZE: "50",
+                MAX_CPU: "2",
+                DEBUG: "proc*",
+                HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
+                HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
+                AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
+                AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
+                AS_ENDPOINT: "https://stscore.stsmda.org"
+            })
+                .withNetwork(__classPrivateFieldGet(this, _TestHelper_network, "f"))
+                .withNetworkAliases("stsauthrunner")
+                .withWaitStrategy(testcontainers_1.Wait.forHttp("/stsauth/v1.0/latency", 3002).usingTls().allowInsecure())
+                .start(), "f");
+            const httpAuthPort = __classPrivateFieldGet(this, _TestHelper_stsAuthContainer, "f").getMappedPort(3002);
+            yield (0, stsutils_1.Sleep)(200);
+            debug(`-------------------------------------------------------------------------------------------`.green);
+            debug(`                                 *** STSAuth Started ***: [${httpAuthPort}]`.green);
+            debug(`-------------------------------------------------------------------------------------------`.green);
+            __classPrivateFieldSet(this, _TestHelper_endpoint, `https://localhost:${httpAuthPort}`, "f");
+        });
+        this.StopAuthService = () => __awaiter(this, void 0, void 0, function* () {
+            if (__classPrivateFieldGet(this, _TestHelper_stsAuthContainer, "f")) {
+                yield __classPrivateFieldGet(this, _TestHelper_stsAuthContainer, "f").stop();
+                yield (0, stsutils_1.Sleep)(200);
+            }
+        });
+        this.TestLoginAndVerify = () => __awaiter(this, void 0, void 0, function* () {
+            expect.assertions(4);
+            const retVal = yield this.Login('user01@stsmda.com.au', 'user01password');
+            expect(retVal.status).toEqual(200);
+            debug(`${JSON.stringify(retVal.data)}`.red);
+            debug(`${JSON.stringify(retVal.headers)}`.magenta);
+            debug(`${JSON.stringify(retVal.headers['set-cookie'])}`.yellow);
+            const cookies = retVal.headers['set-cookie'];
+            debug(`${cookies[0]}`.yellow);
+            debug(`${JSON.stringify(tough.Cookie.parse(cookies[0]))}`.green);
+            const cookie = tough.Cookie.parse(cookies[0]);
+            const desiredCookieResultAxios = {
+                key: 'consent_cookie',
+                value: expect.stringMatching(__classPrivateFieldGet(this, _TestHelper_regexURLSafeStringComponent, "f")),
+                path: '/',
+                secure: true,
+                httpOnly: true,
+                sameSite: 'strict',
+            };
+            const cookieResult = JSON.parse(JSON.stringify(cookie));
+            expect(cookieResult).toMatchObject(desiredCookieResultAxios);
+            const cookieExpireDate = new Date(cookie.expires);
+            expect(cookieExpireDate).toBeAfter(new Date());
+            const desiredResult = {
+                sessionId: expect.stringMatching(__classPrivateFieldGet(this, _TestHelper_regexSTSBase64, "f")),
+                id_token: expect.stringMatching(__classPrivateFieldGet(this, _TestHelper_regexJWT, "f")),
+                consentRequired: ['res01.create', 'res01.read', 'res01.update', 'res01.delete']
+            };
+            expect(retVal.data.detail).toMatchObject(desiredResult);
+        });
+        this.TestValidateJWT = () => __awaiter(this, void 0, void 0, function* () {
+            expect.assertions(1);
+            const token = yield this.GetAuthServerAPITokenFromServer();
+            debug(token);
+            const retVal = yield this.ValidateJWT(token);
+            // https://jestjs.io/docs/expect#tomatchobjectobject
+            const desiredJWT = {
+                scope: 'offline_access session.read session.update',
+                iss: 'https://stsmda.com.au/stsauth/',
+                aud: 'https://stsmda.com.au/stsauthapi/v1.0/',
+                sub: 'session'
+            };
+            expect(retVal).toMatchObject(desiredJWT);
+        });
+        __classPrivateFieldSet(this, _TestHelper_endpoint, 'https://localhost:3002', "f"); //@@
+    }
+    get network() {
+        return __classPrivateFieldGet(this, _TestHelper_network, "f");
+    }
+}
+exports.TestHelper = TestHelper;
+_TestHelper_regexURLSafeStringComponent = new WeakMap(), _TestHelper_regexSTSBase64 = new WeakMap(), _TestHelper_regexJWT = new WeakMap(), _TestHelper_authUtilsNode = new WeakMap(), _TestHelper_databaseContainer = new WeakMap(), _TestHelper_stsAuthContainer = new WeakMap(), _TestHelper_network = new WeakMap(), _TestHelper_endpoint = new WeakMap(), _TestHelper_httpsAgent = new WeakMap(), _TestHelper_GetHttpsAgent = new WeakMap();
+//# sourceMappingURL=testHelpers.js.map

package/dist/testHelpers.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../src/testHelpers.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "2.19.164",
+  "version": "2.19.166",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -29,13 +29,16 @@
     "@types/debug": "^4.1.7",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.0",
+    "@types/jsonwebtoken": "^9.0.1",
     "@types/pg": "^8.6.6",
     "@types/uuid": "^9.0.1",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
     "eslint": "^8.38.0",
     "jest": "^29.5.0",
+    "jest-date": "^1.1.6",
     "supertest": "^6.3.3",
+    "testcontainers": "^9.5.0",
     "typescript": "^5.0.4"
   },
   "dependencies": {
@@ -54,6 +57,9 @@
     "debug": "^4.3.4",
     "express": "^4.18.2",
     "http-status-codes": "^2.2.0",
+    "jsonwebtoken": "^9.0.0",
+    "jwks-rsa": "^3.0.1",
+    "jwt-decode": "^3.1.2",
     "pidusage": "^3.0.2",
     "prom-client": "^14.2.0",
     "socket.io": "^4.6.1",

package/src/authutilsnode.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import tough from 'tough-cookie';
 import https from 'https'
+import jwt from 'jsonwebtoken';
+import jwt_decode from 'jwt-decode';
+import jwksClient from 'jwks-rsa';
 import axios from 'axios';
@@ -8,7 +11,7 @@ const goptions = $Options()
 import debugModule from 'debug'
-import { GetErrorPayload } from '@nsshunt/stsutils'
+import { GetErrorPayload, JSONObject } from '@nsshunt/stsutils'
 import { AppFrameworkErrorCode } from './validation/errors'
@@ -46,7 +49,7 @@ export class AuthUtilsNode
         this.#cookiejar = new tough.CookieJar();
     }
-    #getHttpsAgent = () =>
+    #GetHttpsAgent = () =>
     {
         if (this.#httpsAgent === null) {
             // https://nodejs.org/api/http.html#class-httpagent
@@ -143,7 +146,41 @@ export class AuthUtilsNode
         return this.#cookiejar.getCookies(endpoint);
     };
-    GetAPITokenFromAuthServer = async (clientId: STSClientID, authClientSecret: string, audience: string): Promise<string> => {
+    ValidateJWT = async (token: string, audience: string, endpoint?: string): Promise<string> => {
+        const jwksClientUri = (endpoint
+            ? `${endpoint}${goptions.asoauthapiroot}${goptions.asjwksjsonpath}`
+            : `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}${goptions.asjwksjsonpath}`);
+        const jwks = jwksClient({
+            cache: true, //@@ all config items
+            cacheMaxEntries: 5, // Default value
+            cacheMaxAge: 600000, // Defaults to 10m
+            rateLimit: true,
+            jwksRequestsPerMinute: 10, // Default value
+            jwksUri: jwksClientUri,
+            timeout: 30000, //@@ config
+            requestAgent: this.#GetHttpsAgent()
+        });
+        // Use decode to get the kid
+        const decodedRefreshToken = jwt_decode<JSONObject>(token, { header: true });
+        const kid = decodedRefreshToken.kid;
+        const key = await jwks.getSigningKey(kid);
+        const signingKey = key.getPublicKey();
+        const verifyOptions = {
+            issuer:  'https://stsmda.com.au/stsauth/',
+            //subject:  s,
+            audience:  audience,
+            //expiresIn:  600, // 10 minutes
+            algorithm:  ["RS256"]   // RSASSA [ "RS256", "RS384", "RS512" ]
+        };
+        return jwt.verify(token, signingKey, verifyOptions) as string;
+    }
+    GetAPITokenFromAuthServer = async (clientId: STSClientID, authClientSecret: string, audience: string, endPoint?: string): Promise<string> => {
         try {
             const headers = { 'Content-Type': 'application/json'};
             const payload = { //@@ make a type
@@ -155,13 +192,15 @@ export class AuthUtilsNode
                 //@@ need scope to be the API identifier
                 grant_type: "client_credentials"
             }
-            const url = `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}/token`;
+            const url = (endPoint
+                ? `${endPoint}${goptions.asoauthapiroot}/token`
+                : `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}/token`);
             const retVal = await axios({
                 url
                 ,method: 'post'
                 ,data: payload
                 ,headers: headers
-                ,httpsAgent: this.#httpsAgent
+                ,httpsAgent: this.#GetHttpsAgent()
             });
             if (retVal.status) {

package/src/index.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export * from './commonTypes'
 export * from './processoptions'
 export * from './authDefs'
 export * from './authutilsnode'
+export * from './testHelpers'
 export * from './stsrouterbase'
 export * from './stscontrollerbase'
 export * from './singleprocessbase'

package/src/testHelpers.ts ADDED Viewed

@@ -0,0 +1,306 @@
+import debugModule from 'debug'
+const debug = debugModule(`proc:${process.pid}:stsresourcecontroller.test`);
+import * as tough from 'tough-cookie'
+import https from 'https'
+import crypto from 'crypto';
+import 'jest-date'
+import axios from 'axios';
+import { GenericContainer, Network, Wait } from "testcontainers";
+import { $Options, $ResetOptions } from '@nsshunt/stsconfig'
+let goptions = $Options()
+import { Sleep } from '@nsshunt/stsutils'
+import { AuthUtilsNode, STSClientID } from './authutilsnode'
+export class TestHelper {
+    //#regexBase64URL = /^[A-Za-z0-9_-]+$/ // Base64URL  - https://base64.guru/standards/base64url
+    #regexURLSafeStringComponent = /[-a-zA-Z0-9@:%._+~#=]{1,256}/ // URL safe string component
+    //#regexBase64 = /(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64 - https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
+    #regexSTSBase64 = /SES_(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64
+    #regexJWT = /[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+/ // JWT (Base64URL.Base64URL.Base64URL)
+    #authUtilsNode = new AuthUtilsNode();
+    #databaseContainer: any;
+    #stsAuthContainer: any;
+    #network: any;
+    #endpoint = '';
+    #httpsAgent: https.Agent | null = null;
+    constructor() {
+        this.#endpoint = 'https://localhost:3002'; //@@
+    }
+    #GetHttpsAgent = () =>
+    {
+        if (this.#httpsAgent === null) {
+            // https://nodejs.org/api/http.html#class-httpagent
+            this.#httpsAgent = new https.Agent({
+                keepAlive: goptions.keepAlive,
+                maxSockets: goptions.maxSockets,
+                maxTotalSockets: goptions.maxTotalSockets,
+                maxFreeSockets: goptions.maxFreeSockets,
+                timeout: goptions.timeout,
+                rejectUnauthorized: false
+            });
+        }
+        return this.#httpsAgent;
+    }
+    StartNetwork = async () => {
+        this.#network = await new Network().start();
+    }
+    StopNetwork = async () => {
+        await this.#network.stop();
+    }
+    get network() {
+        return this.#network;
+    }
+    CreateRandomString = () => {
+        const charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_~.'; //    /[0-9A-Za-z\-_~.]/
+        let random = '';
+        const randomValues: number[] = Array.from(crypto.getRandomValues(new Uint8Array(43)));
+        randomValues.forEach(v => (random += charset[v % charset.length]));
+        return random;
+    }
+    Login = async (username: string, password: string) => {
+        const client_id = process.env.CLIENT_ID as string;
+        const nonce = crypto.randomBytes(43).toString('base64'); //CreateRandomString();
+        const response_type = 'code';
+        const redirect_uri = process.env.REDIRECT_URI as string;
+        const response_mode = 'query';
+        const scope = process.env.SCOPE as string;
+        const state = crypto.randomBytes(43).toString('base64'); // CreateRandomString();
+        const code_verifier = this.CreateRandomString();
+        const code_challenge = crypto.createHash('sha256').update(code_verifier).digest('base64');
+        const code_challenge_method = 'S256';
+        const authoriseOptions: any = {
+            email: username,
+            password,
+            client_id,
+            nonce,
+            response_type,
+            redirect_uri,
+            response_mode,
+            scope,
+            state,
+            code_challenge,
+            code_challenge_method
+        }
+        const url = `${this.#endpoint}${goptions.asapiroot}/login`;
+        const headers = { 'Content-Type': 'application/json'};
+        const retVal = await axios({
+            url
+            ,method: 'post'
+            ,data: authoriseOptions
+            ,headers: headers
+            ,httpsAgent: this.#GetHttpsAgent()
+        });
+        //const cookieString = retVal.headers['set-cookie'];
+        /*
+        const api = request(this.#endpoint);
+        const retVal: any = await (api as any)
+            .post(`${goptions.asapiroot}/login`)
+            .send(authoriseOptions)
+        //.expect('set-cookie', /consent_cookie=.*; Max-Age=86; Path=\/; Expires=.*; HttpOnly; Secure; SameSite=Strict/);
+        const cookieString = retVal.header['set-cookie'];
+        if (cookieString) {
+            retVal.cookie = new Cookie(cookieString[0]);
+        }
+        */
+        return retVal;
+    }
+    GetAuthServerAPITokenFromServer = async (): Promise<string> => {
+        return await this.#authUtilsNode.GetAPITokenFromAuthServer(STSClientID.STSTestingService,
+            "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
+            goptions.asapiidentifier, this.#endpoint)
+    }
+    ValidateJWT = async (token: string): Promise<string> => {
+        return await this.#authUtilsNode.ValidateJWT(token, goptions.asapiidentifier, this.#endpoint);
+    }
+    StartDatabase = async () => {
+        this.#databaseContainer = await new GenericContainer("postgres")
+            .withExposedPorts(5432)
+            .withEnvironment({
+                POSTGRES_PASSWORD: "postgres",
+                //UV_THREADPOOL_SIZE: "64"
+            })
+            .withNetwork(this.#network)
+            .withNetworkAliases("database")
+            .start();
+        const httpPort = this.#databaseContainer.getMappedPort(5432);
+        const host = this.#databaseContainer.getHost();
+        const networkIpAddress = this.#databaseContainer.getIpAddress(this.#network.getName());
+        process.env.DB_PORT = httpPort;
+        process.env.DB_HOST = host;
+        $ResetOptions();
+        goptions = $Options()
+        debug(`httpPort: [${httpPort}]`.green)
+        debug(`host: [${host}]`.green)
+        debug(`networkIpAddress: [${networkIpAddress}]`.green)
+        debug(`connectionString: [${goptions.connectionString}]`.green)
+        debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString }]`.green)
+    }
+    StopDatabase = async () => {
+        if (this.#databaseContainer) {
+            await this.#databaseContainer.stop();
+            debug(`Used the following parameters for the database during testing:`.yellow);
+            debug(`connectionString: [${goptions.connectionString}]`.yellow);
+            debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString }]`.yellow);
+        }
+    }
+    // Note: .withCopyFilesToContainer and .withCopyContentToContainer have a defect in that Jest will not close. A file handle/stream is left open
+    // within the underlying code.
+    InitializeDatabase = async () => {
+        const stsAuthContainerInit = await new GenericContainer("serza/stsauth:latest")
+            .withEnvironment({
+                DB_USER: "postgres",
+                DB_PASSWORD: "postgres",
+                DB_HOST: "database", // "192.168.14.101",
+                DB_PORT: "5432",
+                POOL_SIZE: "50",
+                MAX_CPU: "2",
+                DEBUG: "proc*",
+                HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
+                HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
+                AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
+                AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
+                AS_ENDPOINT: "https://stscore.stsmda.org"
+            })
+            .withCommand(["node", "dist/app", "create"])
+            .withNetwork(this.#network)
+            .withNetworkAliases("stsauthrunnerinit")
+            .withWaitStrategy(Wait.forLogMessage(`User Permissions: {"status":200,"detail":["STSREST01ReadPermission","STSREST01CreatePermission","STSREST01UpdatePermission","STSREST01DeletePermission"]}`))
+            .start();
+        await Sleep(200);
+        await stsAuthContainerInit.stop();
+    }
+    StartAuthService = async () => {
+        this.#stsAuthContainer = await new GenericContainer("serza/stsauth:latest")
+            .withExposedPorts(3002)
+            .withEnvironment({
+                DB_USER: "postgres",
+                DB_PASSWORD: "postgres",
+                DB_HOST: "database",
+                DB_PORT: "5432",
+                POOL_SIZE: "50",
+                MAX_CPU: "2",
+                DEBUG: "proc*",
+                HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
+                HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
+                AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
+                AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
+                AS_ENDPOINT: "https://stscore.stsmda.org"
+            })
+            .withNetwork(this.#network)
+            .withNetworkAliases("stsauthrunner")
+            .withWaitStrategy(Wait.forHttp("/stsauth/v1.0/latency", 3002).usingTls().allowInsecure())
+            .start();
+        const httpAuthPort = this.#stsAuthContainer.getMappedPort(3002);
+        await Sleep(200);
+        debug(`-------------------------------------------------------------------------------------------`.green)
+        debug(`                                 *** STSAuth Started ***: [${httpAuthPort}]`.green)
+        debug(`-------------------------------------------------------------------------------------------`.green)
+        this.#endpoint = `https://localhost:${httpAuthPort}`;
+    }
+    StopAuthService = async () => {
+        if (this.#stsAuthContainer) {
+            await this.#stsAuthContainer.stop();
+            await Sleep(200);
+        }
+    }
+    TestLoginAndVerify = async () => {
+        expect.assertions(4);
+        const retVal = await this.Login('user01@stsmda.com.au', 'user01password');
+        expect(retVal.status).toEqual(200);
+        debug(`${JSON.stringify(retVal.data)}`.red);
+        debug(`${JSON.stringify(retVal.headers)}`.magenta);
+        debug(`${JSON.stringify(retVal.headers['set-cookie'])}`.yellow);
+        const cookies = retVal.headers['set-cookie'] as string[];
+        debug(`${cookies[0]}`.yellow);
+        debug(`${JSON.stringify(tough.Cookie.parse(cookies[0]))}`.green);
+        const cookie = tough.Cookie.parse(cookies[0]) as tough.Cookie;
+        const desiredCookieResultAxios = {
+            key: 'consent_cookie',
+            value: expect.stringMatching(this.#regexURLSafeStringComponent),
+            path: '/',
+            secure: true,
+            httpOnly: true,
+            sameSite: 'strict',
+        }
+        const cookieResult = JSON.parse(JSON.stringify(cookie));
+        expect(cookieResult).toMatchObject(desiredCookieResultAxios);
+        const cookieExpireDate = new Date(cookie.expires);
+        expect(cookieExpireDate).toBeAfter(new Date());
+        const desiredResult = {
+            sessionId: expect.stringMatching(this.#regexSTSBase64),
+            id_token: expect.stringMatching(this.#regexJWT),
+            consentRequired: [ 'res01.create', 'res01.read', 'res01.update', 'res01.delete' ]
+        }
+        expect(retVal.data.detail).toMatchObject(desiredResult);
+    }
+    TestValidateJWT = async () => {
+        expect.assertions(1);
+        const token = await this.GetAuthServerAPITokenFromServer();
+        debug(token);
+        const retVal = await this.ValidateJWT(token);
+        // https://jestjs.io/docs/expect#tomatchobjectobject
+        const desiredJWT = {
+            scope: 'offline_access session.read session.update',
+            iss: 'https://stsmda.com.au/stsauth/',
+            aud: 'https://stsmda.com.au/stsauthapi/v1.0/',
+            sub: 'session'
+        };
+        expect(retVal).toMatchObject(desiredJWT);
+    }
+}

package/types/authutilsnode.d.ts CHANGED Viewed

@@ -26,6 +26,7 @@ export declare class AuthUtilsNode {
     verifyRequestMiddleware(req: any, res: any, next: any): Promise<void>;
     SetCookiesToJar: (headers: Record<string, any>, endpoint: string) => Promise<tough.Cookie[]>;
     GetCookiesFromJar: (endpoint: string) => Promise<tough.Cookie[]>;
-    GetAPITokenFromAuthServer: (clientId: STSClientID, authClientSecret: string, audience: string) => Promise<string>;
+    ValidateJWT: (token: string, audience: string, endpoint?: string) => Promise<string>;
+    GetAPITokenFromAuthServer: (clientId: STSClientID, authClientSecret: string, audience: string, endPoint?: string) => Promise<string>;
 }
 //# sourceMappingURL=authutilsnode.d.ts.map

package/types/authutilsnode.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;~~AAgBjC~~,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,oBAAY,WAAW;IACnB,gBAAgB,iDAAiD;IACjE,cAAc,iDAAiD;IAC/D,aAAa,iDAAiD;IAC9D,MAAM,iDAAiD;IACvD,WAAW,iDAAiD;IAC5D,qBAAqB,iDAAiD;IACtE,2BAA2B,iDAAiD;IAC5E,0BAA0B,iDAAiD;IAC3E,iBAAiB,iDAAiD;IAClE,gBAAgB,iDAAiD;IACjE,iBAAiB,iDAAiD;IAClE,sBAAsB,iDAAiD;IACvE,qBAAqB,iDAAiD;IACtE,iBAAiB,iDAAiD;IAClE,+BAA+B,yCAAyC;CAC3E;AAED,qBAAa,aAAa;;;IA0BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAC9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAoCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAwB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAa/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,yBAAyB,aAAoB,WAAW,oBAAoB,MAAM,YAAY,MAAM,KAAG,QAAQ,MAAM,CAAC,~~CAmDrH~~;CA4FJ"}
1	+ {"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAmBjC,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,oBAAY,WAAW;IACnB,gBAAgB,iDAAiD;IACjE,cAAc,iDAAiD;IAC/D,aAAa,iDAAiD;IAC9D,MAAM,iDAAiD;IACvD,WAAW,iDAAiD;IAC5D,qBAAqB,iDAAiD;IACtE,2BAA2B,iDAAiD;IAC5E,0BAA0B,iDAAiD;IAC3E,iBAAiB,iDAAiD;IAClE,gBAAgB,iDAAiD;IACjE,iBAAiB,iDAAiD;IAClE,sBAAsB,iDAAiD;IACvE,qBAAqB,iDAAiD;IACtE,iBAAiB,iDAAiD;IAClE,+BAA+B,yCAAyC;CAC3E;AAED,qBAAa,aAAa;;;IA0BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAC9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAoCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAwB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAa/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAgCxF;IAED,yBAAyB,aAAoB,WAAW,oBAAoB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAqDxI;CA4FJ"}

package/types/index.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export * from './commonTypes';
 export * from './processoptions';
 export * from './authDefs';
 export * from './authutilsnode';
+export * from './testHelpers';
 export * from './stsrouterbase';
 export * from './stscontrollerbase';
 export * from './singleprocessbase';

package/types/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA"}

package/types/testHelpers.d.ts ADDED Viewed

@@ -0,0 +1,20 @@
+import 'jest-date';
+export declare class TestHelper {
+    #private;
+    constructor();
+    StartNetwork: () => Promise<void>;
+    StopNetwork: () => Promise<void>;
+    get network(): any;
+    CreateRandomString: () => string;
+    Login: (username: string, password: string) => Promise<import("axios").AxiosResponse<any, any>>;
+    GetAuthServerAPITokenFromServer: () => Promise<string>;
+    ValidateJWT: (token: string) => Promise<string>;
+    StartDatabase: () => Promise<void>;
+    StopDatabase: () => Promise<void>;
+    InitializeDatabase: () => Promise<void>;
+    StartAuthService: () => Promise<void>;
+    StopAuthService: () => Promise<void>;
+    TestLoginAndVerify: () => Promise<void>;
+    TestValidateJWT: () => Promise<void>;
+}
+//# sourceMappingURL=testHelpers.d.ts.map

package/types/testHelpers.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"testHelpers.d.ts","sourceRoot":"","sources":["../src/testHelpers.ts"],"names":[],"mappings":"AAQA,OAAO,WAAW,CAAA;AAalB,qBAAa,UAAU;;;IAmCnB,YAAY,sBAEX;IAED,WAAW,sBAEV;IAED,IAAI,OAAO,QAEV;IAED,kBAAkB,eAMjB;IAED,KAAK,aAAoB,MAAM,YAAY,MAAM,sDAuDhD;IAED,+BAA+B,QAAa,QAAQ,MAAM,CAAC,CAI1D;IAED,WAAW,UAAiB,MAAM,KAAG,QAAQ,MAAM,CAAC,CAEnD;IAED,aAAa,sBA0BZ;IAED,YAAY,sBAQX;IAID,kBAAkB,sBAyBjB;IAED,gBAAgB,sBA8Bf;IAED,eAAe,sBAKd;IAED,kBAAkB,sBAqCjB;IAED,eAAe,sBAgBd;CACJ"}