@nsshunt/stsutils 1.15.5 → 1.15.7
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.
- package/.eslintrc.json +1 -1
- package/.github/workflows/npm-publish.yml +6 -6
- package/dist/errorhandling.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/oauth2terms.js.map +1 -1
- package/dist/sleep.js.map +1 -1
- package/dist/stsoptionsbase.js.map +1 -1
- package/dist/stsutils.test.js.map +1 -1
- package/dist/validate.js.map +1 -1
- package/package.json +7 -7
- package/src/errorhandling.ts +8 -8
- package/src/index.ts +1 -1
- package/src/oauth2terms.ts +30 -30
- package/src/sleep.ts +2 -2
- package/src/stsoptionsbase.ts +17 -17
- package/src/stsutils.test.js +5 -5
- package/src/validate.ts +13 -13
- package/types/oauth2terms.d.ts.map +1 -1
- package/types/stsoptionsbase.d.ts.map +1 -1
package/.eslintrc.json
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
],
|
|
20
20
|
"ignorePatterns": ["temp.js", "**/k6scripts/*.js", "**/public/*", "**/dist/*", "**/types/*"],
|
|
21
21
|
"rules": {
|
|
22
|
-
"indent": ["error"
|
|
22
|
+
"indent": ["error"],
|
|
23
23
|
"no-mixed-spaces-and-tabs": [2],
|
|
24
24
|
//"no-mixed-spaces-and-tabs": 0, // disable rule
|
|
25
25
|
"@typescript-eslint/no-var-requires": "warn"
|
|
@@ -13,10 +13,10 @@ jobs:
|
|
|
13
13
|
build:
|
|
14
14
|
runs-on: ubuntu-latest
|
|
15
15
|
steps:
|
|
16
|
-
- uses: actions/checkout@
|
|
17
|
-
- uses: actions/setup-node@
|
|
16
|
+
- uses: actions/checkout@v3
|
|
17
|
+
- uses: actions/setup-node@v3
|
|
18
18
|
with:
|
|
19
|
-
node-version:
|
|
19
|
+
node-version: 19
|
|
20
20
|
- run: npm ci
|
|
21
21
|
- run: npm run lint
|
|
22
22
|
- run: npm test
|
|
@@ -25,10 +25,10 @@ jobs:
|
|
|
25
25
|
needs: build
|
|
26
26
|
runs-on: ubuntu-latest
|
|
27
27
|
steps:
|
|
28
|
-
- uses: actions/checkout@
|
|
29
|
-
- uses: actions/setup-node@
|
|
28
|
+
- uses: actions/checkout@v3
|
|
29
|
+
- uses: actions/setup-node@v3
|
|
30
30
|
with:
|
|
31
|
-
node-version:
|
|
31
|
+
node-version: 19
|
|
32
32
|
registry-url: https://registry.npmjs.org/
|
|
33
33
|
- run: npm ci
|
|
34
34
|
- run: npm run build
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorhandling.js","sourceRoot":"","sources":["../src/errorhandling.ts"],"names":[],"mappings":";;;AAcA,SAAgB,eAAe,CAAC,SAAoB,EAAE,UAAmB,IAAI;
|
|
1
|
+
{"version":3,"file":"errorhandling.js","sourceRoot":"","sources":["../src/errorhandling.ts"],"names":[],"mappings":";;;AAcA,SAAgB,eAAe,CAAC,SAAoB,EAAE,UAAmB,IAAI;IACzE,OAAO;QACH,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;KACnB,CAAA;AACL,CAAC;AATD,0CASC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;;;;;;;;;;;;;;;AAMF,kDAA+B;AAC/B,mDAAgC;AAChC,0CAAuB;AACvB,6CAA0B;AAC1B,gDAA6B;AAE7B,iDAAiD;AAEpC,QAAA,MAAM,GAAwB,EAAG,CAAC;AAE/C,SAAgB,OAAO;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;;;;;;;;;;;;;;;AAMF,kDAA+B;AAC/B,mDAAgC;AAChC,0CAAuB;AACvB,6CAA0B;AAC1B,gDAA6B;AAE7B,iDAAiD;AAEpC,QAAA,MAAM,GAAwB,EAAG,CAAC;AAE/C,SAAgB,OAAO;IACnB,OAAO,cAA2B,CAAC;AACvC,CAAC;AAFD,0BAEC;AAED;;;;;;;;;EASE;AAEF;;;;;;;;;;;;EAYE"}
|
package/dist/oauth2terms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2terms.js","sourceRoot":"","sources":["../src/oauth2terms.ts"],"names":[],"mappings":";;;AAEA,gEAAgE;AAChE,IAAY,mBAwBX;AAxBD,WAAY,mBAAmB;IAC9B,4CAAqB,CAAA;IACrB,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;IAC/B,sCAAe,CAAA;IACf,sCAAe,CAAA;IACf,oDAA6B,CAAA;IAC7B,sCAAe,CAAA;IACf,8DAAuC,CAAA;IACvC,kDAA2B,CAAA;IAC3B,8CAAuB,CAAA;IACvB,gDAAyB,CAAA;IACzB,oCAAa,CAAA;IACb,oDAA6B,CAAA;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IACzB,4CAAqB,CAAA;IACrB,4CAAqB,CAAA;IACrB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;IAC/B,8CAAuB,CAAA;IACvB,4CAAqB,CAAA;IACrB,wDAAiC,CAAA,CAAC,gBAAgB;AACnD,CAAC,EAxBW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAwB9B;AAED,uBAAuB;AACvB,oEAAoE;AACpE,IAAY,iBAsBX;AAtBD,WAAY,iBAAiB;IAC5B,gCAAW,CAAA;IACX,kCAAa,CAAA;IACb,8CAAyB,CAAA;IACzB,gDAA2B,CAAA;IAC3B,gDAA2B,CAAA;IAC3B,0CAAqB,CAAA;IACrB,8DAAyC,CAAA;IACzC,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,sDAAiC,CAAA;IACjC,sCAAiB,CAAA;IACjB,4CAAuB,CAAA;IACvB,0CAAqB,CAAA;IACrB,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,oEAA+C,CAAA;IAC/C,wCAAmB,CAAA;IACnB,oDAA+B,CAAA;IAC/B,oCAAe,CAAA,CAAC,gBAAgB;AACjC,CAAC,EAtBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAsB5B;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC3B,2CAAuB,CAAA;IACvB,qDAAiC,CAAA;IACjC,yCAAqB,CAAA;IACrB,qCAAiB,CAAA;IACjB,uCAAmB,CAAA;AACpB,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAED,MAAa,wBAAwB;
|
|
1
|
+
{"version":3,"file":"oauth2terms.js","sourceRoot":"","sources":["../src/oauth2terms.ts"],"names":[],"mappings":";;;AAEA,gEAAgE;AAChE,IAAY,mBAwBX;AAxBD,WAAY,mBAAmB;IAC9B,4CAAqB,CAAA;IACrB,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;IAC/B,sCAAe,CAAA;IACf,sCAAe,CAAA;IACf,oDAA6B,CAAA;IAC7B,sCAAe,CAAA;IACf,8DAAuC,CAAA;IACvC,kDAA2B,CAAA;IAC3B,8CAAuB,CAAA;IACvB,gDAAyB,CAAA;IACzB,oCAAa,CAAA;IACb,oDAA6B,CAAA;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;IACzB,4CAAqB,CAAA;IACrB,4CAAqB,CAAA;IACrB,sDAA+B,CAAA;IAC/B,sDAA+B,CAAA;IAC/B,8CAAuB,CAAA;IACvB,4CAAqB,CAAA;IACrB,wDAAiC,CAAA,CAAC,gBAAgB;AACnD,CAAC,EAxBW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAwB9B;AAED,uBAAuB;AACvB,oEAAoE;AACpE,IAAY,iBAsBX;AAtBD,WAAY,iBAAiB;IAC5B,gCAAW,CAAA;IACX,kCAAa,CAAA;IACb,8CAAyB,CAAA;IACzB,gDAA2B,CAAA;IAC3B,gDAA2B,CAAA;IAC3B,0CAAqB,CAAA;IACrB,8DAAyC,CAAA;IACzC,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,sDAAiC,CAAA;IACjC,sCAAiB,CAAA;IACjB,4CAAuB,CAAA;IACvB,0CAAqB,CAAA;IACrB,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,oEAA+C,CAAA;IAC/C,wCAAmB,CAAA;IACnB,oDAA+B,CAAA;IAC/B,oCAAe,CAAA,CAAC,gBAAgB;AACjC,CAAC,EAtBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAsB5B;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC3B,2CAAuB,CAAA;IACvB,qDAAiC,CAAA;IACjC,yCAAqB,CAAA;IACrB,qCAAiB,CAAA;IACjB,uCAAmB,CAAA;AACpB,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAED,MAAa,wBAAwB;IACjC,MAAM,CAAU,SAAS,GAAc;QACnC,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,6BAA6B;KAC7C,CAAA;IACD,MAAM,CAAU,WAAW,GAAc;QACrC,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,yBAAyB;KACzC,CAAA;IACD,MAAM,CAAU,cAAc,GAAc;QACxC,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,iCAAiC;KACjD,CAAA;IACD,MAAM,CAAU,OAAO,GAAc;QACjC,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,0BAA0B;KAC1C,CAAA;;AAhBL,4DAiBC;AAED,SAAgB,qBAAqB,CAAC,OAAiB,EAAE,OAAiB,EAAE,kBAAyC;IACjH,MAAM,MAAM,GAAmB,EAAG,CAAC;IACnC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAG,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAC5C,MAAM,KAAK,GAAiB;gBACxB,KAAK,EAAE,wBAAwB,CAAC,SAAS,CAAC,IAAI;gBAC9C,iBAAiB,EAAE,wBAAwB,CAAC,SAAS,CAAC,WAAW;gBACjE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,OAAO,EAAE,GAAG,wBAAwB,CAAC,SAAS,CAAC,WAAW,iBAAiB,iBAAiB,GAAG;aAClG,CAAA;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAfD,sDAeC"}
|
package/dist/sleep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAC,YAAY,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../src/sleep.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAC,YAAY,GAAG,IAAI;IAC3C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;AACpE,CAAC;AAFD,sBAEC;AAED,8FAA8F;AACvF,KAAK,UAAU,SAAS;IAC3B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAFD,8BAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAIxC,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAIxC,MAAa,cAAc;IAEf,QAAQ,CAAoB;IAEpC,YAAY,UAA6B,IAAI;QAEzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,OAAO,KAAK,IAAI,EAAE;YAClB,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC1C,uCAAuC;gBACvC,0HAA0H;aAC7H;iBAAM;gBACH,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAmB,EAAE,OAAO,CAAC,CAAC;aAClD;SACJ;IACL,CAAC;IAED,IAAI,OAAO;QAEP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ;AAtBD,wCAsBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsutils.test.js","sourceRoot":"","sources":["../src/stsutils.test.js"],"names":[],"mappings":";AACA,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"stsutils.test.js","sourceRoot":"","sources":["../src/stsutils.test.js"],"names":[],"mappings":";AACA,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IAErC,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAE9B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/dist/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;IAC/F,MAAM,KAAK,GAAY,SAAS,CAAC,OAAO,CAAY,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,SAAS,CAAC,MAAM,CAAC;KAC3B;SAAM;QACH,OAAO,IAAI,CAAC;KACf;IACD;;;;;;UAMA;AACJ,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAc;IAClD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B;;;;OAIA;AAEJ,CAAC;AARD,8BAQC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAmB;IACtD,MAAM,SAAS,GAA6C,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC/E,IAAI,SAAS,EAAE;QACX,OAAO,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KACxC;AACL,CAAC;AALD,4BAKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsutils",
|
|
3
|
-
"version": "1.15.
|
|
3
|
+
"version": "1.15.7",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -25,20 +25,20 @@
|
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/preset-env": "^7.20.2",
|
|
28
|
-
"@babel/preset-typescript": "^7.
|
|
28
|
+
"@babel/preset-typescript": "^7.21.0",
|
|
29
29
|
"@tsconfig/node18": "^1.0.1",
|
|
30
30
|
"@types/debug": "^4.1.7",
|
|
31
31
|
"@types/jest": "^29.4.0",
|
|
32
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
33
|
-
"@typescript-eslint/parser": "^5.
|
|
34
|
-
"eslint": "^8.
|
|
35
|
-
"jest": "^29.
|
|
32
|
+
"@typescript-eslint/eslint-plugin": "^5.54.1",
|
|
33
|
+
"@typescript-eslint/parser": "^5.54.1",
|
|
34
|
+
"eslint": "^8.36.0",
|
|
35
|
+
"jest": "^29.5.0",
|
|
36
36
|
"supertest": "^6.3.3",
|
|
37
37
|
"typescript": "^4.9.5"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"ajv": "^8.12.0",
|
|
41
|
-
"axios": "^1.3.
|
|
41
|
+
"axios": "^1.3.4",
|
|
42
42
|
"colors": "^1.4.0",
|
|
43
43
|
"debug": "^4.3.4"
|
|
44
44
|
}
|
package/src/errorhandling.ts
CHANGED
|
@@ -13,12 +13,12 @@ export type errorPayload = {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export function GetErrorPayload(errorCode: errorCode, details: unknown = null): errorPayload {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
return {
|
|
17
|
+
error: errorCode.code,
|
|
18
|
+
error_description: errorCode.description,
|
|
19
|
+
timestamp: Date.now(),
|
|
20
|
+
//trace_id: "255d1aef-8c98-452f-ac51-23d051240864", //@@
|
|
21
|
+
//correlation_id: "fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7", //@@
|
|
22
|
+
details: details
|
|
23
|
+
}
|
|
24
24
|
}
|
package/src/index.ts
CHANGED
package/src/oauth2terms.ts
CHANGED
|
@@ -62,37 +62,37 @@ export enum OIDCAddressClaim {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
export class OAuth2ParameterErrorType {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
65
|
+
static readonly NOT_EQUAL: errorCode = {
|
|
66
|
+
code: 'STS_OAUTH2_ERR_0001',
|
|
67
|
+
description: 'Parameter values not equal.'
|
|
68
|
+
}
|
|
69
|
+
static readonly NOT_PRESENT: errorCode = {
|
|
70
|
+
code: 'STS_OAUTH2_ERR_0002',
|
|
71
|
+
description: 'Parameter not provided.'
|
|
72
|
+
}
|
|
73
|
+
static readonly INVALID_FORMAT: errorCode = {
|
|
74
|
+
code: 'STS_OAUTH2_ERR_0003',
|
|
75
|
+
description: 'Parameter value format invalid.'
|
|
76
|
+
}
|
|
77
|
+
static readonly EXPIRED: errorCode = {
|
|
78
|
+
code: 'STS_OAUTH2_ERR_0004',
|
|
79
|
+
description: 'Parameter value expired.'
|
|
80
|
+
}
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
export function compareParameterTypes(source1: string[], source2: string[], authParameterTypes: OAuth2ParameterType[]): errorPayload[] {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
84
|
+
const errors: errorPayload[] = [ ];
|
|
85
|
+
for (let i=0 ; i < authParameterTypes.length; i++) {
|
|
86
|
+
const authParameterType = authParameterTypes[i];
|
|
87
|
+
if (source1[i].localeCompare(source2[i]) !== 0) {
|
|
88
|
+
const error: errorPayload = {
|
|
89
|
+
error: OAuth2ParameterErrorType.NOT_EQUAL.code,
|
|
90
|
+
error_description: OAuth2ParameterErrorType.NOT_EQUAL.description,
|
|
91
|
+
timestamp: Date.now(),
|
|
92
|
+
details: `${OAuth2ParameterErrorType.NOT_EQUAL.description}: Parameter: [${authParameterType}]`
|
|
93
|
+
}
|
|
94
|
+
errors.push(error);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return errors;
|
|
98
98
|
}
|
package/src/sleep.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export async function Sleep(milliseconds = 1000): Promise<void> {
|
|
2
|
-
|
|
2
|
+
return new Promise(resolve => setTimeout(resolve, milliseconds))
|
|
3
3
|
}
|
|
4
4
|
|
|
5
5
|
// poolsleep is required to avoid JEST reporting unclosed handles during shutdown of all tests
|
|
6
6
|
export async function JestSleep(): Promise<void> {
|
|
7
|
-
|
|
7
|
+
return Sleep(100);
|
|
8
8
|
}
|
package/src/stsoptionsbase.ts
CHANGED
|
@@ -4,24 +4,24 @@ import { JSONObject } from './index'
|
|
|
4
4
|
|
|
5
5
|
export class STSOptionsBase
|
|
6
6
|
{
|
|
7
|
-
|
|
7
|
+
private _options: JSONObject | null;
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
constructor(options: JSONObject | null = null)
|
|
10
|
+
{
|
|
11
|
+
this._options = options;
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
13
|
+
if (options !== null) {
|
|
14
|
+
if (typeof options.validator === 'undefined') {
|
|
15
|
+
//console.log(JSON.stringify(options));
|
|
16
|
+
//console.trace("Options Here ------------------------------------------------------------------------------------------")
|
|
17
|
+
} else {
|
|
18
|
+
Validate(options.validator as string, options);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
get options()
|
|
24
|
+
{
|
|
25
|
+
return this._options;
|
|
26
|
+
}
|
|
27
27
|
}
|
package/src/stsutils.test.js
CHANGED
package/src/validate.ts
CHANGED
|
@@ -6,13 +6,13 @@ import { AnyValidateFunction } from 'ajv/dist/core';
|
|
|
6
6
|
const ajv = new Ajv();
|
|
7
7
|
|
|
8
8
|
const _Validate = (validator: AnyValidateFunction<unknown>, payload: JSONObject): unknown | null => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
const valid: boolean = validator(payload) as boolean;
|
|
10
|
+
if (!valid) {
|
|
11
|
+
return validator.errors;
|
|
12
|
+
} else {
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
/*
|
|
16
16
|
console.error(validator.errors);
|
|
17
17
|
console.trace('Invalid Schema');
|
|
18
18
|
console.log('Payload:-');
|
|
@@ -22,8 +22,8 @@ const _Validate = (validator: AnyValidateFunction<unknown>, payload: JSONObject)
|
|
|
22
22
|
};
|
|
23
23
|
|
|
24
24
|
export function AddSchema(name: string, schema: Schema): void {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
ajv.addSchema(schema, name);
|
|
26
|
+
/*
|
|
27
27
|
return (payload) => {
|
|
28
28
|
const validator = ajv.getSchema(name)
|
|
29
29
|
_Validate(validator, payload)
|
|
@@ -32,8 +32,8 @@ export function AddSchema(name: string, schema: Schema): void {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export function Validate(name: string, payload: JSONObject): unknown {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
const validator: AnyValidateFunction<unknown> | undefined = ajv.getSchema(name)
|
|
36
|
+
if (validator) {
|
|
37
|
+
return _Validate(validator, payload);
|
|
38
|
+
}
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;IACjC,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;CACJ;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,YAAY,EAAE,CAerI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,qBAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../src/stsoptionsbase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAoB;gBAExB,OAAO,GAAE,UAAU,GAAG,IAAW;IAc7C,IAAI,OAAO,sBAGV;CACJ"}
|