univapay-node 4.0.3 → 4.0.4

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 +6 -4
  2. package/dist/cjs/api/utils/JWT.js.map +1 -1
  3. package/dist/esm/api/utils/JWT.js +6 -4
  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
@@ -25,14 +25,15 @@ const parseJWT = (jwt, keepKeys = false) => {
25
25
  }
26
26
  };
27
27
  exports.parseJWT = parseJWT;
28
- const safeParseJWT = (jwt, keepKeys = false) => {
28
+ const safeParseJWT = (jwt) => {
29
29
  try {
30
- return (0, exports.parseJWT)(jwt, keepKeys);
30
+ return jwt ? (0, jwt_decode_1.default)(jwt) : null;
31
31
  }
32
32
  catch (error) {
33
33
  return null;
34
34
  }
35
35
  };
36
+ const BearerRegexp = /^Bearer (.*)$/i;
36
37
  /**
37
38
  * @internal
38
39
  */
@@ -40,10 +41,11 @@ const extractJWT = (response) => {
40
41
  const headerNames = ["authorization", "x-amzn-remapped-authorization", "X-REFRESH-AUTHORIZATION"];
41
42
  const header = headerNames.reduce((acc, name) => {
42
43
  const header = response.headers.get(name);
43
- return !safeParseJWT(header?.replace("Bearer", "")?.trim()) ? acc : header;
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;
44
46
  }, null);
45
47
  // Support both with and without the `Bearer` keyword, only the token part interest us here
46
- return header?.replace("Bearer", "").trim() || null;
48
+ return header?.match(BearerRegexp)?.[1]?.trim() || header?.replace("Bearer", "").trim() || null;
47
49
  };
48
50
  exports.extractJWT = extractJWT;
49
51
  //# 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,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IAChG,IAAI;QACA,OAAO,IAAA,gBAAQ,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;KAClC;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF;;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;QAC1C,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/E,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,2FAA2F;IAC3F,OAAO,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACxD,CAAC,CAAC;AATW,QAAA,UAAU,cASrB"}
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"}
package/dist/esm/api/utils/JWT.js CHANGED
@@ -20,14 +20,15 @@ export const parseJWT = (jwt, keepKeys = false) => {
20
20
  throw new JWTError();
21
21
  }
22
22
  };
23
- const safeParseJWT = (jwt, keepKeys = false) => {
23
+ const safeParseJWT = (jwt) => {
24
24
  try {
25
- return parseJWT(jwt, keepKeys);
25
+ return jwt ? decode(jwt) : null;
26
26
  }
27
27
  catch (error) {
28
28
  return null;
29
29
  }
30
30
  };
31
+ const BearerRegexp = /^Bearer (.*)$/i;
31
32
  /**
32
33
  * @internal
33
34
  */
@@ -35,9 +36,10 @@ export const extractJWT = (response) => {
35
36
  const headerNames = ["authorization", "x-amzn-remapped-authorization", "X-REFRESH-AUTHORIZATION"];
36
37
  const header = headerNames.reduce((acc, name) => {
37
38
  const header = response.headers.get(name);
38
- return !safeParseJWT(header?.replace("Bearer", "")?.trim()) ? acc : header;
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;
39
41
  }, null);
40
42
  // Support both with and without the `Bearer` keyword, only the token part interest us here
41
- return header?.replace("Bearer", "").trim() || null;
43
+ return header?.match(BearerRegexp)?.[1]?.trim() || header?.replace("Bearer", "").trim() || null;
42
44
  };
43
45
  //# 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,EAAE,QAAQ,GAAG,KAAK,EAA8B,EAAE;IAChG,IAAI;QACA,OAAO,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;KAClC;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAC;AAEF;;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;QAC1C,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/E,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,2FAA2F;IAC3F,OAAO,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;AACxD,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;;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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "univapay-node",
3
- "version": "4.0.3",
3
+ "version": "4.0.4",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",