From 2cef8df9998cced6b8d46cd3b5e54f492a4c86d8 Mon Sep 17 00:00:00 2001
From: Mikko Piuhola <mikko.piuhola@polarsquad.com>
Date: Thu, 18 Jan 2024 16:08:23 +0200
Subject: [PATCH] Upgrade to jwt-decode@4.0.0, drop ESM workaround

---
 package-lock.json | 11 +++++++----
 package.json      |  2 +-
 src/client.ts     |  7 ++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31bb2e2..b859048 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "bottleneck": "^2.19.5",
         "expiry-map": "^2.0.0",
         "got": "^13.0.0",
-        "jwt-decode": "^3.1.2",
+        "jwt-decode": "^4.0.0",
         "moment": "^2.29.4",
         "p-memoize": "^7.1.1",
         "urlify": "^0.3.6"
@@ -5544,9 +5544,12 @@
       }
     },
     "node_modules/jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+      "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/keyv": {
       "version": "4.5.3",
diff --git a/package.json b/package.json
index 02b70c2..0bb5f6b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "bottleneck": "^2.19.5",
     "expiry-map": "^2.0.0",
     "got": "^13.0.0",
-    "jwt-decode": "^3.1.2",
+    "jwt-decode": "^4.0.0",
     "moment": "^2.29.4",
     "p-memoize": "^7.1.1",
     "urlify": "^0.3.6"
diff --git a/src/client.ts b/src/client.ts
index 06a6c3a..00f72f1 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -5,10 +5,7 @@ import got, {
   Options,
   RequestError,
 } from 'got';
-import _jwt_decode, { JwtPayload } from 'jwt-decode';
-// TODO: Drop workaround when upstream in jwt-decode, context: https://github.com/microsoft/TypeScript/issues/50690#issuecomment-1241464619
-const jwt_decode = _jwt_decode as unknown as typeof _jwt_decode.default;
-
+import { jwtDecode, JwtPayload } from 'jwt-decode';
 import moment from 'moment';
 
 const CINODE_API_URL = 'https://api.cinode.app';
@@ -30,7 +27,7 @@ const limiter = new Bottleneck({
 
 function isValidJwtToken(token: string): boolean {
   try {
-    return moment.unix(jwt_decode<JwtPayload>(token).exp || 0).isAfter();
+    return moment.unix(jwtDecode<JwtPayload>(token).exp || 0).isAfter();
   } catch (e) {
     return false;
   }