@nsshunt/stsutils 1.10.6 → 1.12.0

package/.eslintrc.json

@@ -17,7 +17,7 @@
     "plugins": [
         "@typescript-eslint"
     ],
-    "ignorePatterns": ["temp.js", "**/k6scripts/*.js", "**/public/*", "**/dist/*"],
+    "ignorePatterns": ["temp.js", "**/k6scripts/*.js", "**/public/*", "**/dist/*", "**/types/*"],
     "rules": {
         "indent": ["error", "tab"],
         //"no-mixed-spaces-and-tabs": [2, "smart-tabs"],

package/.github/workflows/npm-publish.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 17
+          node-version: 18
       - run: npm ci
       - run: npm run lint
       - run: npm test
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 17
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run build

package/dist/errorhandling.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorhandling.js","sourceRoot":"","sources":["../errorhandling.ts"],"names":[],"mappings":";;;AAcA,SAAgB,eAAe,CAAC,SAAoB,EAAE,UAAe,IAAI;IACxE,OAAO;QACN,KAAK,EAAE,SAAS,CAAC,IAAI;QACrB,iBAAiB,EAAE,SAAS,CAAC,WAAW;QACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,wDAAwD;QACxD,8DAA8D;QAC9D,OAAO,EAAE,OAAO;KAChB,CAAA;AACF,CAAC;AATD,0CASC"}
+{"version":3,"file":"errorhandling.js","sourceRoot":"","sources":["../src/errorhandling.ts"],"names":[],"mappings":";;;AAcA,SAAgB,eAAe,CAAC,SAAoB,EAAE,UAAmB,IAAI;IAC5E,OAAO;QACN,KAAK,EAAE,SAAS,CAAC,IAAI;QACrB,iBAAiB,EAAE,SAAS,CAAC,WAAW;QACxC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,wDAAwD;QACxD,8DAA8D;QAC9D,OAAO,EAAE,OAAO;KAChB,CAAA;AACF,CAAC;AATD,0CASC"}

package/dist/index.js

@@ -14,6 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// This also works :-
+//interface JSONObject2 extends Record<string, string | number | string[] | Array<JSONObject2> | JSONObject2> {};
 __exportStar(require("./errorhandling"), exports);
 __exportStar(require("./stsoptionsbase"), exports);
 __exportStar(require("./sleep"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,mDAAgC;AAChC,0CAAuB;AACvB,6CAA0B;AAC1B,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,qBAAqB;AACrB,iHAAiH;AAEjH,kDAA+B;AAC/B,mDAAgC;AAChC,0CAAuB;AACvB,6CAA0B;AAC1B,gDAA6B"}

package/dist/oauth2terms.js

@@ -63,28 +63,29 @@ var OIDCAddressClaim;
     OIDCAddressClaim["COUNTRY"] = "country";
 })(OIDCAddressClaim = exports.OIDCAddressClaim || (exports.OIDCAddressClaim = {}));
 class OAuth2ParameterErrorType {
+    static NOT_EQUAL = {
+        code: 'STS_OAUTH2_ERR_0001',
+        description: 'Parameter values not equal.'
+    };
+    static NOT_PRESENT = {
+        code: 'STS_OAUTH2_ERR_0002',
+        description: 'Parameter not provided.'
+    };
+    static INVALID_FORMAT = {
+        code: 'STS_OAUTH2_ERR_0003',
+        description: 'Parameter value format invalid.'
+    };
+    static EXPIRED = {
+        code: 'STS_OAUTH2_ERR_0004',
+        description: 'Parameter value expired.'
+    };
 }
 exports.OAuth2ParameterErrorType = OAuth2ParameterErrorType;
-OAuth2ParameterErrorType.NOT_EQUAL = {
-    code: 'STS_OAUTH2_ERR_0001',
-    description: 'Parameter values not equal.'
-};
-OAuth2ParameterErrorType.NOT_PRESENT = {
-    code: 'STS_OAUTH2_ERR_0002',
-    description: 'Parameter not provided.'
-};
-OAuth2ParameterErrorType.INVALID_FORMAT = {
-    code: 'STS_OAUTH2_ERR_0003',
-    description: 'Parameter value format invalid.'
-};
-OAuth2ParameterErrorType.EXPIRED = {
-    code: 'STS_OAUTH2_ERR_0004',
-    description: 'Parameter value expired.'
-};
 function compareParameterTypes(source1, source2, authParameterTypes) {
     const errors = [];
-    authParameterTypes.forEach(authParameterType => {
-        if (source1[authParameterType].localeCompare(source2[authParameterType]) !== 0) {
+    for (let i = 0; i < authParameterTypes.length; i++) {
+        const authParameterType = authParameterTypes[i];
+        if (source1[i].localeCompare(source2[i]) !== 0) {
             const error = {
                 error: OAuth2ParameterErrorType.NOT_EQUAL.code,
                 error_description: OAuth2ParameterErrorType.NOT_EQUAL.description,
@@ -93,7 +94,7 @@ function compareParameterTypes(source1, source2, authParameterTypes) {
             };
             errors.push(error);
         }
-    });
+    }
     return errors;
 }
 exports.compareParameterTypes = compareParameterTypes;

package/dist/oauth2terms.js.map

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

package/dist/sleep.js

@@ -1,26 +1,13 @@
 "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 });
 exports.JestSleep = exports.Sleep = void 0;
-function Sleep(milliseconds = 1000) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => setTimeout(resolve, milliseconds));
-    });
+async function Sleep(milliseconds = 1000) {
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
 }
 exports.Sleep = Sleep;
 // poolsleep is required to avoid JEST reporting unclosed handles during shutdown of all tests
-function JestSleep() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return Sleep(100);
-    });
+async function JestSleep() {
+    return Sleep(100);
 }
 exports.JestSleep = JestSleep;
 //# sourceMappingURL=sleep.js.map

package/dist/sleep.js.map

@@ -1 +1 @@
-{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../sleep.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,SAAsB,KAAK,CAAC,YAAY,GAAG,IAAI;;QAC9C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;IACjE,CAAC;CAAA;AAFD,sBAEC;AAED,8FAA8F;AAC9F,SAAsB,SAAS;;QAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;CAAA;AAFD,8BAEC"}
+{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAC,YAAY,GAAG,IAAI;IAC9C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;AACjE,CAAC;AAFD,sBAEC;AAED,8FAA8F;AACvF,KAAK,UAAU,SAAS;IAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC;AAFD,8BAEC"}

package/dist/stsoptionsbase.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.STSOptionsBase = void 0;
 const validate_js_1 = require("./validate.js");
 class STSOptionsBase {
+    _options;
     constructor(options = null) {
-        this._options = null;
         this._options = options;
         if (options !== null) {
             if (typeof options.validator === 'undefined') {

package/dist/stsoptionsbase.js.map

@@ -1 +1 @@
-{"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,MAAa,cAAc;IAI1B,YAAY,UAAe,IAAI;QAFvB,aAAQ,GAAQ,IAAI,CAAC;QAIzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE3B,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,yGAAyG,CAAC,CAAA;aACxH;iBAAM;gBACN,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aACrC;SACD;IACF,CAAC;IAED,IAAI,OAAO;QAEV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAtBD,wCAsBC"}
+{"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAIxC,MAAa,cAAc;IAElB,QAAQ,CAAoB;IAEpC,YAAY,UAA6B,IAAI;QAEzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE3B,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,yGAAyG,CAAC,CAAA;aACxH;iBAAM;gBACN,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAmB,EAAE,OAAO,CAAC,CAAC;aAC/C;SACD;IACF,CAAC;IAED,IAAI,OAAO;QAEV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAtBD,wCAsBC"}

package/dist/stsutils.test.js

@@ -1,16 +1,8 @@
-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());
-    });
-};
+"use strict";
 describe("Test Latency Controller", () => {
-    test('Testing Module', () => __awaiter(this, void 0, void 0, function* () {
+    test('Testing Module', async () => {
         expect.assertions(1);
         expect(1).toEqual(1);
-    }));
+    });
 });
 //# sourceMappingURL=stsutils.test.js.map

package/dist/stsutils.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"stsutils.test.js","sourceRoot":"","sources":["../stsutils.test.js"],"names":[],"mappings":";;;;;;;;;AACA,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IAExC,IAAI,CAAC,gBAAgB,EAAE,GAAS,EAAE;QAEjC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"stsutils.test.js","sourceRoot":"","sources":["../src/stsutils.test.js"],"names":[],"mappings":";AACA,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IAExC,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAEjC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/validate.js

@@ -33,7 +33,9 @@ function AddSchema(name, schema) {
 exports.AddSchema = AddSchema;
 function Validate(name, payload) {
     const validator = ajv.getSchema(name);
-    return _Validate(validator, payload);
+    if (validator) {
+        return _Validate(validator, payload);
+    }
 }
 exports.Validate = Validate;
 //# sourceMappingURL=validate.js.map

package/dist/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA0C;AAE1C,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,SAAc,EAAE,OAAY,EAAO,EAAE;IACvD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,SAAS,CAAC,MAAM,CAAC;KACxB;SAAM;QACN,OAAO,IAAI,CAAC;KACZ;IACD;;;;;;UAMG;AACJ,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAc;IACrD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B;;;;OAIG;AAEJ,CAAC;AARD,8BAQC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAe;IACrD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACrC,OAAO,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAHD,4BAGC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA0C;AAK1C,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,SAAuC,EAAE,OAAmB,EAAkB,EAAE;IAClG,MAAM,KAAK,GAAY,SAAS,CAAC,OAAO,CAAY,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,SAAS,CAAC,MAAM,CAAC;KACxB;SAAM;QACN,OAAO,IAAI,CAAC;KACZ;IACD;;;;;;UAMG;AACJ,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAc;IACrD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B;;;;OAIG;AAEJ,CAAC;AARD,8BAQC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAmB;IACzD,MAAM,SAAS,GAA6C,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC/E,IAAI,SAAS,EAAE;QACd,OAAO,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KACrC;AACF,CAAC;AALD,4BAKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsutils",
-  "version": "1.10.6",
+  "version": "1.12.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "@types/jest": "^27.4.1",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
+    "@types/debug": "^4.1.7",
     "eslint": "^8.14.0",
     "jest": "^28.0.2",
     "supertest": "^6.2.2",
@@ -41,6 +42,7 @@
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "colors": "^1.4.0",
-    "debug": "^4.3.4"
+    "debug": "^4.3.4",
+    "@tsconfig/node18": "^1.0.0"
   }
 }

package/{errorhandling.ts → src/errorhandling.ts}

@@ -9,10 +9,10 @@ export type errorPayload = {
 	timestamp: number,
 	//trace_id: "255d1aef-8c98-452f-ac51-23d051240864", //@@
 	//correlation_id: "fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7", //@@
-	details?: any
+	details?: unknown
 }
 
-export function GetErrorPayload(errorCode: errorCode, details: any = null): errorPayload {
+export function GetErrorPayload(errorCode: errorCode, details: unknown = null): errorPayload {
 	return {
 		error: errorCode.code,
 		error_description: errorCode.description,

package/src/index.ts

@@ -0,0 +1,11 @@
+export interface JSONObject {
+    [x: string]: string | number | boolean | string[] | Array<JSONObject> | JSONObject | undefined
+}
+// This also works :-
+//interface JSONObject2 extends Record<string, string | number | string[] | Array<JSONObject2> | JSONObject2> {};
+
+export * from './errorhandling'
+export * from './stsoptionsbase'
+export * from './sleep'
+export * from './validate'
+export * from './oauth2terms'

package/{oauth2terms.ts → src/oauth2terms.ts}

@@ -80,10 +80,11 @@ export class OAuth2ParameterErrorType {
 	}
 }
 
-export function compareParameterTypes(source1: string[], source2: string[], authParameterTypes: string[]): errorPayload[] {
+export function compareParameterTypes(source1: string[], source2: string[], authParameterTypes: OAuth2ParameterType[]): errorPayload[] {
 	const errors: errorPayload[] = [ ];
-	authParameterTypes.forEach(authParameterType => {
-		if (source1[authParameterType].localeCompare(source2[authParameterType]) !== 0) {
+	for (let i=0 ; i < authParameterTypes.length; i++) {
+		const authParameterType = authParameterTypes[i];
+		if (source1[i].localeCompare(source2[i]) !== 0) {
 			const error: errorPayload = {
 				error: OAuth2ParameterErrorType.NOT_EQUAL.code,
 				error_description: OAuth2ParameterErrorType.NOT_EQUAL.description,
@@ -92,6 +93,6 @@ export function compareParameterTypes(source1: string[], source2: string[], auth
 			}
 			errors.push(error);
 		}
-	});
+	}
 	return errors;
 }

package/{stsoptionsbase.ts → src/stsoptionsbase.ts}

@@ -1,10 +1,12 @@
 import { Validate } from './validate.js'
 
+import { JSONObject } from './index'
+
 export class STSOptionsBase
 {
-	private _options: any = null;
+	private _options: JSONObject | null;
 
-	constructor(options: any = null)
+	constructor(options: JSONObject | null = null)
 	{
     	this._options = options;
 
@@ -13,7 +15,7 @@ export class STSOptionsBase
 				console.log(JSON.stringify(options));
 				console.trace("Options Here ------------------------------------------------------------------------------------------")
 			} else {
-				Validate(options.validator, options);
+				Validate(options.validator as string, options);
 			}
 		}
 	}

package/{validate.ts → src/validate.ts}

@@ -1,9 +1,12 @@
 import Ajv, { Schema } from 'ajv/dist/jtd'
 
+import { JSONObject } from './index'
+import { AnyValidateFunction } from 'ajv/dist/core';
+
 const ajv = new Ajv();
 
-const _Validate = (validator: any, payload: any): any => {
-	const valid = validator(payload);
+const _Validate = (validator: AnyValidateFunction<unknown>, payload: JSONObject): unknown | null => {
+	const valid: boolean = validator(payload) as boolean;
 	if (!valid) {
 		return validator.errors;
 	} else {
@@ -28,7 +31,9 @@ export function AddSchema(name: string, schema: Schema): void {
 
 }
 
-export function Validate(name: string, payload: string): any {
-	const validator = ajv.getSchema(name)
-	return _Validate(validator, payload);
+export function Validate(name: string, payload: JSONObject): unknown {
+	const validator: AnyValidateFunction<unknown> | undefined = ajv.getSchema(name)
+	if (validator) {
+		return _Validate(validator, payload);
+	}
 }

package/tsconfig.json

@@ -1,16 +1,14 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "target": "es6",
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "**/node_modules/**/*", "**/*.spec.ts"],
+    "compilerOptions": {
     "moduleResolution": "node",
     "sourceMap": true,
     "outDir": "dist",
     "allowJs": true,
     "declaration": true,
     "declarationDir": "./types",
-    "declarationMap": true
-  },
-  "lib": ["es2015"]
+    "declarationMap": true,
+  }
 }
-

package/types/errorhandling.d.ts

@@ -6,7 +6,7 @@ export declare type errorPayload = {
     error: string;
     error_description: string;
     timestamp: number;
-    details?: any;
+    details?: unknown;
 };
-export declare function GetErrorPayload(errorCode: errorCode, details?: any): errorPayload;
+export declare function GetErrorPayload(errorCode: errorCode, details?: unknown): errorPayload;
 //# sourceMappingURL=errorhandling.d.ts.map

package/types/errorhandling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorhandling.d.ts","sourceRoot":"","sources":["../errorhandling.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,oBAAY,YAAY,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,CAAC,EAAE,GAAG,CAAA;CACb,CAAA;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,GAAE,GAAU,GAAG,YAAY,CASvF"}
+{"version":3,"file":"errorhandling.d.ts","sourceRoot":"","sources":["../src/errorhandling.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,oBAAY,YAAY,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAGlB,OAAO,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,GAAE,OAAc,GAAG,YAAY,CAS3F"}

package/types/index.d.ts

@@ -1,3 +1,6 @@
+export interface JSONObject {
+    [x: string]: string | number | boolean | string[] | Array<JSONObject> | JSONObject | undefined;
+}
 export * from './errorhandling';
 export * from './stsoptionsbase';
 export * from './sleep';

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,SAAS,CAAA;AACvB,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,SAAS,CAAA;CACjG;AAID,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,SAAS,CAAA;AACvB,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA"}

package/types/oauth2terms.d.ts

@@ -60,5 +60,5 @@ export declare class OAuth2ParameterErrorType {
     static readonly INVALID_FORMAT: errorCode;
     static readonly EXPIRED: errorCode;
 }
-export declare function compareParameterTypes(source1: string[], source2: string[], authParameterTypes: string[]): errorPayload[];
+export declare function compareParameterTypes(source1: string[], source2: string[], authParameterTypes: OAuth2ParameterType[]): errorPayload[];
 //# sourceMappingURL=oauth2terms.d.ts.map

package/types/oauth2terms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2terms.d.ts","sourceRoot":"","sources":["../oauth2terms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGzD,oBAAY,mBAAmB;IAC9B,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,KAAK,UAAU;IACf,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,iBAAiB,sBAAsB;IACvC,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,cAAc,mBAAmB;CACjC;AAID,oBAAY,iBAAiB;IAC5B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,kBAAkB,uBAAuB;IACzC,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;IAC/C,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,KAAK,UAAU;CACf;AAED,oBAAY,gBAAgB;IAC3B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,OAAO,YAAY;CACnB;AAED,qBAAa,wBAAwB;IACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAGnC;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAGrC;IACD,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAGxC;IACD,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAGjC;CACD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,YAAY,EAAE,CAcxH"}
+{"version":3,"file":"oauth2terms.d.ts","sourceRoot":"","sources":["../src/oauth2terms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGzD,oBAAY,mBAAmB;IAC9B,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,KAAK,UAAU;IACf,YAAY,iBAAiB;IAC7B,KAAK,UAAU;IACf,iBAAiB,sBAAsB;IACvC,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,cAAc,mBAAmB;CACjC;AAID,oBAAY,iBAAiB;IAC5B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,kBAAkB,uBAAuB;IACzC,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;IAC/C,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,KAAK,UAAU;CACf;AAED,oBAAY,gBAAgB;IAC3B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,OAAO,YAAY;CACnB;AAED,qBAAa,wBAAwB;IACpC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAGnC;IACD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAGrC;IACD,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,CAGxC;IACD,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAGjC;CACD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,YAAY,EAAE,CAerI"}

package/types/sleep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../sleep.ts"],"names":[],"mappings":"AAAA,wBAAsB,KAAK,CAAC,YAAY,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D;AAGD,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/C"}
+{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":"AAAA,wBAAsB,KAAK,CAAC,YAAY,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D;AAGD,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/C"}

package/types/stsoptionsbase.d.ts

@@ -1,6 +1,7 @@
+import { JSONObject } from './index';
 export declare class STSOptionsBase {
     private _options;
-    constructor(options?: any);
-    get options(): any;
+    constructor(options?: JSONObject | null);
+    get options(): JSONObject | null;
 }
 //# sourceMappingURL=stsoptionsbase.d.ts.map

package/types/stsoptionsbase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":"AAEA,qBAAa,cAAc;IAE1B,OAAO,CAAC,QAAQ,CAAa;gBAEjB,OAAO,GAAE,GAAU;IAc/B,IAAI,OAAO,QAGV;CACD"}
+{"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,qBAAa,cAAc;IAE1B,OAAO,CAAC,QAAQ,CAAoB;gBAExB,OAAO,GAAE,UAAU,GAAG,IAAW;IAc7C,IAAI,OAAO,sBAGV;CACD"}

package/types/stsutils.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stsutils.test.d.ts","sourceRoot":"","sources":["../stsutils.test.js"],"names":[],"mappings":""}
+{"version":3,"file":"stsutils.test.d.ts","sourceRoot":"","sources":["../src/stsutils.test.js"],"names":[],"mappings":""}

package/types/validate.d.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'ajv/dist/jtd';
+import { JSONObject } from './index';
 export declare function AddSchema(name: string, schema: Schema): void;
-export declare function Validate(name: string, payload: string): any;
+export declare function Validate(name: string, payload: JSONObject): unknown;
 //# sourceMappingURL=validate.d.ts.map

package/types/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAoB1C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5D;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAG3D"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAqBpC,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5D;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAKnE"}

package/index.ts

@@ -1,5 +0,0 @@
-export * from './errorhandling'
-export * from './stsoptionsbase'
-export * from './sleep'
-export * from './validate'
-export * from './oauth2terms'