univapay-node 4.0.4 → 4.0.5

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 (5) hide show
  1. package/dist/cjs/api/utils/JWT.js +14 -8
  2. package/dist/cjs/api/utils/JWT.js.map +1 -1
  3. package/dist/esm/api/utils/JWT.js +14 -8
  4. package/dist/esm/api/utils/JWT.js.map +1 -1
  5. package/package.json +1 -1
package/dist/cjs/api/utils/JWT.js CHANGED
@@ -34,18 +34,24 @@ const safeParseJWT = (jwt) => {
34
34
  }
35
35
  };
36
36
  const BearerRegexp = /^Bearer (.*)$/i;
37
+ const getHeaderJwt = (header) => {
38
+ if (!header) {
39
+ return null;
40
+ }
41
+ const trimmedHeader = header.replace("Bearer", "").trim();
42
+ if (safeParseJWT(trimmedHeader)) {
43
+ return trimmedHeader;
44
+ }
45
+ // Support bearer match for hammerhead
46
+ const matches = header.match(BearerRegexp);
47
+ return matches ? matches[1] : null;
48
+ };
37
49
  /**
38
50
  * @internal
39
51
  */
40
52
  const extractJWT = (response) => {
41
- const headerNames = ["authorization", "x-amzn-remapped-authorization", "X-REFRESH-AUTHORIZATION"];
42
- const header = headerNames.reduce((acc, name) => {
43
- const header = response.headers.get(name);
44
- // The bearer regex matches fixes hammerhead and safe parse ensure that valid jwt are used even without bearer
45
- return header?.match(BearerRegexp)?.[1] || safeParseJWT(header?.replace("Bearer", "")?.trim()) ? header : acc;
46
- }, null);
47
- // Support both with and without the `Bearer` keyword, only the token part interest us here
48
- return header?.match(BearerRegexp)?.[1]?.trim() || header?.replace("Bearer", "").trim() || null;
53
+ const headerName = ["X-REFRESH-AUTHORIZATION", "x-amzn-remapped-authorization", "authorization"].find((name) => !!getHeaderJwt(response.headers.get(name)));
54
+ return getHeaderJwt(response.headers.get(headerName));
49
55
  };
50
56
  exports.extractJWT = extractJWT;
51
57
  //# sourceMappingURL=JWT.js.map
package/dist/cjs/api/utils/JWT.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JWT.js","sourceRoot":"","sources":["../../../../src/api/utils/JWT.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,oEAAgC;AAEhC,0DAAoD;AACpD,qDAAmE;AAc5D,MAAM,QAAQ,GAAG,CAAU,GAAmB,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IACnG,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,IAAI,CAAC;KACf;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,MAAM,IAAI,sBAAQ,EAAE,CAAC;KACxB;IAED,IAAI;QACA,MAAM,OAAO,GAAG,IAAA,oBAAM,EAAU,GAAG,CAAC,CAAC;QACrC,OAAO,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,yBAAa,EAAC,OAAO,EAAE,uBAAW,CAAC,CAAC;KAClG;IAAC,MAAM;QACJ,MAAM,IAAI,sBAAQ,EAAE,CAAC;KACxB;AACL,CAAC,CAAC;AAfW,QAAA,QAAQ,YAenB;AAEF,MAAM,YAAY,GAAG,CAAU,GAAmB,EAA8B,EAAE;IAC9E,IAAI;QACA,OAAO,GAAG,CAAC,CAAC,CAAC,IAAA,oBAAM,EAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAiB,EAAE;IAC5D,MAAM,WAAW,GAAG,CAAC,eAAe,EAAE,+BAA+B,EAAE,yBAAyB,CAAC,CAAC;IAClG,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;QAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE1C,8GAA8G;QAC9G,OAAO,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;IAClH,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,2FAA2F;IAC3F,OAAO,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACpG,CAAC,CAAC;AAXW,QAAA,UAAU,cAWrB"}
1
+ {"version":3,"file":"JWT.js","sourceRoot":"","sources":["../../../../src/api/utils/JWT.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,oEAAgC;AAEhC,0DAAoD;AACpD,qDAAmE;AAc5D,MAAM,QAAQ,GAAG,CAAU,GAAmB,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IACnG,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,IAAI,CAAC;KACf;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,MAAM,IAAI,sBAAQ,EAAE,CAAC;KACxB;IAED,IAAI;QACA,MAAM,OAAO,GAAG,IAAA,oBAAM,EAAU,GAAG,CAAC,CAAC;QACrC,OAAO,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,yBAAa,EAAC,OAAO,EAAE,uBAAW,CAAC,CAAC;KAClG;IAAC,MAAM;QACJ,MAAM,IAAI,sBAAQ,EAAE,CAAC;KACxB;AACL,CAAC,CAAC;AAfW,QAAA,QAAQ,YAenB;AAEF,MAAM,YAAY,GAAG,CAAU,GAAmB,EAA8B,EAAE;IAC9E,IAAI;QACA,OAAO,GAAG,CAAC,CAAC,CAAC,IAAA,oBAAM,EAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC,MAAM,YAAY,GAAG,CAAC,MAAc,EAAiB,EAAE;IACnD,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,IAAI,CAAC;KACf;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1D,IAAI,YAAY,CAAC,aAAa,CAAC,EAAE;QAC7B,OAAO,aAAa,CAAC;KACxB;IAED,sCAAsC;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAiB,EAAE;IAC5D,MAAM,UAAU,GAAG,CAAC,yBAAyB,EAAE,+BAA+B,EAAE,eAAe,CAAC,CAAC,IAAI,CACjG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAC/D,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB"}
package/dist/esm/api/utils/JWT.js CHANGED
@@ -29,17 +29,23 @@ const safeParseJWT = (jwt) => {
29
29
  }
30
30
  };
31
31
  const BearerRegexp = /^Bearer (.*)$/i;
32
+ const getHeaderJwt = (header) => {
33
+ if (!header) {
34
+ return null;
35
+ }
36
+ const trimmedHeader = header.replace("Bearer", "").trim();
37
+ if (safeParseJWT(trimmedHeader)) {
38
+ return trimmedHeader;
39
+ }
40
+ // Support bearer match for hammerhead
41
+ const matches = header.match(BearerRegexp);
42
+ return matches ? matches[1] : null;
43
+ };
32
44
  /**
33
45
  * @internal
34
46
  */
35
47
  export const extractJWT = (response) => {
36
- const headerNames = ["authorization", "x-amzn-remapped-authorization", "X-REFRESH-AUTHORIZATION"];
37
- const header = headerNames.reduce((acc, name) => {
38
- const header = response.headers.get(name);
39
- // The bearer regex matches fixes hammerhead and safe parse ensure that valid jwt are used even without bearer
40
- return header?.match(BearerRegexp)?.[1] || safeParseJWT(header?.replace("Bearer", "")?.trim()) ? header : acc;
41
- }, null);
42
- // Support both with and without the `Bearer` keyword, only the token part interest us here
43
- return header?.match(BearerRegexp)?.[1]?.trim() || header?.replace("Bearer", "").trim() || null;
48
+ const headerName = ["X-REFRESH-AUTHORIZATION", "x-amzn-remapped-authorization", "authorization"].find((name) => !!getHeaderJwt(response.headers.get(name)));
49
+ return getHeaderJwt(response.headers.get(headerName));
44
50
  };
45
51
  //# sourceMappingURL=JWT.js.map
package/dist/esm/api/utils/JWT.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JWT.js","sourceRoot":"","sources":["../../../../src/api/utils/JWT.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAcnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAU,GAAmB,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IACnG,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,IAAI,CAAC;KACf;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,MAAM,IAAI,QAAQ,EAAE,CAAC;KACxB;IAED,IAAI;QACA,MAAM,OAAO,GAAG,MAAM,CAAU,GAAG,CAAC,CAAC;QACrC,OAAO,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KAClG;IAAC,MAAM;QACJ,MAAM,IAAI,QAAQ,EAAE,CAAC;KACxB;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAU,GAAmB,EAA8B,EAAE;IAC9E,IAAI;QACA,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAiB,EAAE;IAC5D,MAAM,WAAW,GAAG,CAAC,eAAe,EAAE,+BAA+B,EAAE,yBAAyB,CAAC,CAAC;IAClG,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;QAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE1C,8GAA8G;QAC9G,OAAO,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC;IAClH,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,2FAA2F;IAC3F,OAAO,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACpG,CAAC,CAAC"}
1
+ {"version":3,"file":"JWT.js","sourceRoot":"","sources":["../../../../src/api/utils/JWT.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,MAAM,MAAM,YAAY,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAcnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAU,GAAmB,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IACnG,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,IAAI,CAAC;KACf;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,MAAM,IAAI,QAAQ,EAAE,CAAC;KACxB;IAED,IAAI;QACA,MAAM,OAAO,GAAG,MAAM,CAAU,GAAG,CAAC,CAAC;QACrC,OAAO,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KAClG;IAAC,MAAM;QACJ,MAAM,IAAI,QAAQ,EAAE,CAAC;KACxB;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAU,GAAmB,EAA8B,EAAE;IAC9E,IAAI;QACA,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC,MAAM,YAAY,GAAG,CAAC,MAAc,EAAiB,EAAE;IACnD,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,IAAI,CAAC;KACf;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1D,IAAI,YAAY,CAAC,aAAa,CAAC,EAAE;QAC7B,OAAO,aAAa,CAAC;KACxB;IAED,sCAAsC;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAiB,EAAE;IAC5D,MAAM,UAAU,GAAG,CAAC,yBAAyB,EAAE,+BAA+B,EAAE,eAAe,CAAC,CAAC,IAAI,CACjG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAC/D,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "univapay-node",
3
- "version": "4.0.4",
3
+ "version": "4.0.5",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",