@meistrari/data-token 1.0.1 → 1.0.3

package/dist/adapters/elysia.mjs

@@ -2,7 +2,6 @@ import Elysia from 'elysia';
 import { getValidator } from '../index.mjs';
 import 'node:buffer';
 import 'jose';
-import 'jose/dist/types/util/errors';
 import 'zod';
 
 function createDataTokenPlugin(url, skipOnError = false, getToken = (c) => c.headers["x-data-token"] ?? "") {

package/dist/adapters/hono.mjs

@@ -2,7 +2,6 @@ import { createMiddleware } from 'hono/factory';
 import { getValidator } from '../index.mjs';
 import 'node:buffer';
 import 'jose';
-import 'jose/dist/types/util/errors';
 import 'zod';
 
 function createDataTokenMiddleware(url, skipOnError = false, getToken = (c) => c.req.header("x-data-token") ?? "") {

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { Buffer } from 'node:buffer';
 import { createRemoteJWKSet, jwtVerify, errors, decodeJwt } from 'jose';
-import { JWKSNoMatchingKey } from 'jose/dist/types/util/errors';
 import { z } from 'zod';
 
 const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -81,20 +80,21 @@ function getValidator(jwksUrl, {
       );
       return DataToken.parse(payload);
     } catch (error) {
-      if (error instanceof JWKSNoMatchingKey) {
-        const [header] = token.split(".");
-        const tokenHeader = JSON.parse(Buffer.from(header, "base64").toString("utf-8"));
-        const jwksResponse = await fetch(jwksUrl);
-        const jwksText = await jwksResponse.json();
-        logger.error({
-          level: "error",
-          message: "No matching key found in JWKS for token",
-          jwksUrl,
-          algorithms,
-          jwks: jwksText,
-          tokenHeader
-        });
+      if (error instanceof errors.JWTExpired) {
+        throw error;
       }
+      const [header] = token.split(".");
+      const tokenHeader = JSON.parse(Buffer.from(header, "base64").toString("utf-8"));
+      const jwksResponse = await fetch(jwksUrl);
+      const jwksText = await jwksResponse.json();
+      logger.error({
+        level: "error",
+        error,
+        jwksUrl,
+        algorithms,
+        jwks: jwksText,
+        tokenHeader
+      }, "Failed to validate data token");
       throw error;
     }
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meistrari/data-token",
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Internal library to verify and decode the API Gateway data token",
   "author": "Roz <roz@meistrari.com>",
   "license": "UNLICENSED",