@meistrari/data-token 1.0.3 → 1.2.0

package/dist/adapters/elysia.d.mts

@@ -33,6 +33,7 @@ declare function createDataTokenPlugin(url: string, skipOnError?: boolean, getTo
                 id: string;
                 email: string;
                 uuid: string | null;
+                roles?: string[] | null | undefined;
             } | undefined;
         } | null;
     };

package/dist/adapters/elysia.d.ts

@@ -33,6 +33,7 @@ declare function createDataTokenPlugin(url: string, skipOnError?: boolean, getTo
                 id: string;
                 email: string;
                 uuid: string | null;
+                roles?: string[] | null | undefined;
             } | undefined;
         } | null;
     };

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.d.mts

@@ -1,6 +1,6 @@
 import * as hono from 'hono';
 import { Context } from 'hono';
-import { D as DataToken } from '../shared/data-token.1d70cb5e.mjs';
+import { D as DataToken } from '../shared/data-token.f2fe9a18.mjs';
 import 'zod';
 
 type DataTokenContext = {

package/dist/adapters/hono.d.ts

@@ -1,6 +1,6 @@
 import * as hono from 'hono';
 import { Context } from 'hono';
-import { D as DataToken } from '../shared/data-token.1d70cb5e.js';
+import { D as DataToken } from '../shared/data-token.f2fe9a18.js';
 import 'zod';
 
 type DataTokenContext = {

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

@@ -1,7 +1,7 @@
 import * as jose from 'jose';
 import { RemoteJWKSetOptions, errors } from 'jose';
 import * as zod from 'zod';
-export { D as DataToken, V as ValidatorConfig } from './shared/data-token.1d70cb5e.mjs';
+export { D as DataToken, V as ValidatorConfig } from './shared/data-token.f2fe9a18.mjs';
 
 /**
  * Get a validator function that can validate a data token.
@@ -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: {
@@ -27,6 +26,7 @@ declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions,
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 /**
@@ -54,6 +54,7 @@ declare function safeParse(jwt: string): zod.SafeParseReturnType<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }, {
     requestId: string;
@@ -65,6 +66,7 @@ declare function safeParse(jwt: string): zod.SafeParseReturnType<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 /**
@@ -85,6 +87,7 @@ declare function unsafeDecode(jwt: string): {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 } & jose.JWTPayload;
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as jose from 'jose';
 import { RemoteJWKSetOptions, errors } from 'jose';
 import * as zod from 'zod';
-export { D as DataToken, V as ValidatorConfig } from './shared/data-token.1d70cb5e.js';
+export { D as DataToken, V as ValidatorConfig } from './shared/data-token.f2fe9a18.js';
 
 /**
  * Get a validator function that can validate a data token.
@@ -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: {
@@ -27,6 +26,7 @@ declare function getValidator(jwksUrl: string, { algorithms, remoteJwksOptions,
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 /**
@@ -54,6 +54,7 @@ declare function safeParse(jwt: string): zod.SafeParseReturnType<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }, {
     requestId: string;
@@ -65,6 +66,7 @@ declare function safeParse(jwt: string): zod.SafeParseReturnType<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 /**
@@ -85,6 +87,7 @@ declare function unsafeDecode(jwt: string): {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 } & jose.JWTPayload;
 

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;
@@ -49,7 +56,8 @@ const DataToken = z.object({
   user: z.object({
     id: z.string(),
     email: z.string(),
-    uuid: z.string().nullable()
+    uuid: z.string().nullable(),
+    roles: z.array(z.string()).optional().nullable()
   }).optional()
 });
 
@@ -59,8 +67,7 @@ const retry = createExponentialBackoff({
 });
 function getValidator(jwksUrl, {
   algorithms = ["RS256"],
-  remoteJwksOptions = {},
-  logger = console
+  remoteJwksOptions = {}
 } = {}) {
   let JWKS;
   return async (token) => {
@@ -88,7 +95,6 @@ function getValidator(jwksUrl, {
       const jwksResponse = await fetch(jwksUrl);
       const jwksText = await jwksResponse.json();
       logger.error({
-        level: "error",
         error,
         jwksUrl,
         algorithms,

package/dist/shared/{data-token.1d70cb5e.d.mts → data-token.f2fe9a18.d.mts}

@@ -16,14 +16,17 @@ declare const DataToken: z.ZodObject<{
         id: z.ZodString;
         email: z.ZodString;
         uuid: z.ZodNullable<z.ZodString>;
+        roles: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
     }, "strip", z.ZodTypeAny, {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     }, {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     requestId: string;
@@ -35,6 +38,7 @@ declare const DataToken: z.ZodObject<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }, {
     requestId: string;
@@ -46,6 +50,7 @@ declare const DataToken: z.ZodObject<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 type DataToken = z.infer<typeof DataToken>;

package/dist/shared/{data-token.1d70cb5e.d.ts → data-token.f2fe9a18.d.ts}

@@ -16,14 +16,17 @@ declare const DataToken: z.ZodObject<{
         id: z.ZodString;
         email: z.ZodString;
         uuid: z.ZodNullable<z.ZodString>;
+        roles: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
     }, "strip", z.ZodTypeAny, {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     }, {
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     requestId: string;
@@ -35,6 +38,7 @@ declare const DataToken: z.ZodObject<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }, {
     requestId: string;
@@ -46,6 +50,7 @@ declare const DataToken: z.ZodObject<{
         id: string;
         email: string;
         uuid: string | null;
+        roles?: string[] | null | undefined;
     } | undefined;
 }>;
 type DataToken = z.infer<typeof DataToken>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meistrari/data-token",
   "type": "module",
-  "version": "1.0.3",
+  "version": "1.2.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"