@meistrari/data-token 1.0.2 → 1.1.0

package/dist/adapters/elysia.mjs

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

package/dist/adapters/hono.mjs

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

package/dist/index.d.mts

@@ -13,10 +13,9 @@ export { D as DataToken, V as ValidatorConfig } from './shared/data-token.1d70cb
  * @param options.logger - The logger to use for logging errors.
  * @returns A function that can validate a data token.
  */
-declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions, logger, }?: {
+declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions, }?: {
     algorithms?: string[] | undefined;
     remoteJwksOptions?: RemoteJWKSetOptions | undefined;
-    logger?: any;
 }): (token: string) => Promise<{
     requestId: string;
     workspace: {

package/dist/index.d.ts

@@ -13,10 +13,9 @@ export { D as DataToken, V as ValidatorConfig } from './shared/data-token.1d70cb
  * @param options.logger - The logger to use for logging errors.
  * @returns A function that can validate a data token.
  */
-declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions, logger, }?: {
+declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions, }?: {
     algorithms?: string[] | undefined;
     remoteJwksOptions?: RemoteJWKSetOptions | undefined;
-    logger?: any;
 }): (token: string) => Promise<{
     requestId: string;
     workspace: {

package/dist/index.mjs

@@ -1,7 +1,14 @@
 import { Buffer } from 'node:buffer';
 import { createRemoteJWKSet, jwtVerify, errors, decodeJwt } from 'jose';
+import pino from '@meistrari/logger';
 import { z } from 'zod';
 
+const logger = pino({
+  base: {
+    module: "@meistrari/data-token"
+  }
+});
+
 const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 function calculateDelay(options, attempt) {
   let delay = options.baseDelay * options.factor ** attempt;
@@ -59,8 +66,7 @@ const retry = createExponentialBackoff({
 });
 function getValidator(jwksUrl, {
   algorithms = ["RS256"],
-  remoteJwksOptions = {},
-  logger = console
+  remoteJwksOptions = {}
 } = {}) {
   let JWKS;
   return async (token) => {
@@ -80,20 +86,20 @@ function getValidator(jwksUrl, {
       );
       return DataToken.parse(payload);
     } catch (error) {
-      if (error instanceof errors.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({
+        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.2",
+  "version": "1.1.0",
   "description": "Internal library to verify and decode the API Gateway data token",
   "author": "Roz <roz@meistrari.com>",
   "license": "UNLICENSED",
@@ -41,6 +41,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
+    "@meistrari/logger": "2.0.1",
     "cockatiel": "^3.2.1",
     "jose": "^5.8.0",
     "zod": "^3.23.8"