unjwt 0.5.29 → 0.5.30

package/dist/adapters/h3.d.mts

@@ -14,6 +14,7 @@ interface SessionManager<T extends JWTClaims = JWTClaims, ConfigMaxAge extends E
     readonly createdAt: number;
     readonly expiresAt: ConfigMaxAge extends ExpiresIn ? number : T["exp"];
     readonly data: SessionData<T>;
+    readonly token: string | undefined;
     update: (update: SessionUpdate<T>) => Promise<SessionManager<T>>;
     clear: () => Promise<SessionManager<T>>;
 }
@@ -107,6 +108,7 @@ declare function useJWESession<T extends JWTClaims = JWTClaims, MaxAge extends E
  * Get (and lazily initialize) the session for the current request.
  */
 declare function getJWESession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: H3Event | CompatEvent$1, config: SessionConfigJWE<T, MaxAge>): Promise<SessionJWE<T, MaxAge>>;
+declare function getJWESessionToken<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: H3Event | CompatEvent$1, config: SessionConfigJWE<T, MaxAge>): string | undefined;
 /**
  * Update the session (optionally mutating the session data) and re-issue the JWE token.
  */
@@ -242,5 +244,5 @@ declare function verifyJWSSession<T extends JWTClaims = JWTClaims, MaxAge extend
  */
 declare function clearJWSSession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: H3Event, config: Partial<SessionConfigJWS<T, MaxAge>>): Promise<void>;
 
-export { JWEEncryptOptions, JWKSet, JWK_Private, JWK_Public, JWK_Symmetric, JWTClaimValidationOptions, JWTClaims, clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
+export { JWEEncryptOptions, JWKSet, JWK_Private, JWK_Public, JWK_Symmetric, JWTClaimValidationOptions, JWTClaims, clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
 export type { SessionConfigJWE, SessionConfigJWS, SessionData, SessionHooksJWE, SessionHooksJWS, SessionJWE, SessionJWEConfig, SessionJWS, SessionJWSConfig, SessionManager, SessionUpdate };

package/dist/adapters/h3.mjs

@@ -33,6 +33,9 @@ async function useJWESession(event, config) {
     get data() {
       return event.context.sessions?.[sessionName]?.data || {};
     },
+    get token() {
+      return getJWESessionToken(event, config);
+    },
     update: async (update) => {
       if (!isEvent(event)) {
         throw new Error("[h3] Cannot update read-only session.");
@@ -84,20 +87,7 @@ async function getJWESession(event, config) {
     data: /* @__PURE__ */ Object.create(null)
   };
   event.context.sessions[sessionName] = session;
-  let token;
-  if (config.sessionHeader !== false) {
-    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
-    const headerValue = _getReqHeader$1(event, headerName);
-    if (typeof headerValue === "string") {
-      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
-    }
-  }
-  if (!token) {
-    const cookieHeader = _getReqHeader$1(event, "cookie");
-    if (cookieHeader) {
-      token = parse(String(cookieHeader))[sessionName];
-    }
-  }
+  const token = getJWESessionToken(event, config);
   if (token) {
     const promise = unsealJWESession(event, config, token).catch(async (error_) => {
       if (error_ instanceof Error && (error_.message.includes("Token has expired") || error_.message.includes("Token is too old"))) {
@@ -142,6 +132,24 @@ async function getJWESession(event, config) {
   });
   return session;
 }
+function getJWESessionToken(event, config) {
+  const sessionName = config.name || DEFAULT_NAME$1;
+  let token;
+  if (config.sessionHeader !== false) {
+    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
+    const headerValue = _getReqHeader$1(event, headerName);
+    if (typeof headerValue === "string") {
+      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
+    }
+  }
+  if (!token) {
+    const cookieHeader = _getReqHeader$1(event, "cookie");
+    if (cookieHeader) {
+      token = parse(String(cookieHeader))[sessionName];
+    }
+  }
+  return token;
+}
 function _getReqHeader$1(event, name) {
   if (event.node) {
     return event.node?.req.headers[name];
@@ -337,6 +345,9 @@ async function useJWSSession(event, config) {
     get data() {
       return event.context.sessions?.[sessionName]?.data || {};
     },
+    get token() {
+      return getJWSSessionToken(event, config);
+    },
     update: async (update) => {
       if (!isEvent(event)) {
         throw new Error("[h3] Cannot update read-only session.");
@@ -388,20 +399,7 @@ async function getJWSSession(event, config) {
     data: /* @__PURE__ */ Object.create(null)
   };
   event.context.sessions[sessionName] = session;
-  let token;
-  if (config.sessionHeader !== false) {
-    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
-    const headerValue = _getReqHeader(event, headerName);
-    if (typeof headerValue === "string") {
-      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
-    }
-  }
-  if (!token) {
-    const cookieHeader = _getReqHeader(event, "cookie");
-    if (cookieHeader) {
-      token = parse(String(cookieHeader))[sessionName];
-    }
-  }
+  const token = getJWSSessionToken(event, config);
   if (token) {
     const promise = verifyJWSSession(event, config, token).catch(async (error_) => {
       if (error_ instanceof Error && (error_.message.includes("Token has expired") || error_.message.includes("Token is too old"))) {
@@ -446,6 +444,24 @@ async function getJWSSession(event, config) {
   });
   return session;
 }
+function getJWSSessionToken(event, config) {
+  const sessionName = config.name || DEFAULT_NAME;
+  let token;
+  if (config.sessionHeader !== false) {
+    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
+    const headerValue = _getReqHeader(event, headerName);
+    if (typeof headerValue === "string") {
+      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
+    }
+  }
+  if (!token) {
+    const cookieHeader = _getReqHeader(event, "cookie");
+    if (cookieHeader) {
+      token = parse(String(cookieHeader))[sessionName];
+    }
+  }
+  return token;
+}
 function _getReqHeader(event, name) {
   if (event.node) {
     return event.node.req.headers[name];
@@ -605,4 +621,4 @@ function getVerifyKey(key) {
   return _key;
 }
 
-export { clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
+export { clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };

package/dist/adapters/h3v1.d.mts

@@ -1,6 +1,6 @@
 export { d as JWEDecryptOptions, e as JWEDecryptResult, b as JWEEncryptOptions, J as JWEHeaderParameters, c as JWEKeyLookupFunction, a as JWEKeyManagementHeaderParameters } from '../shared/unjwt.9mL1vSFP.mjs';
 export { C as CompositeKey, f as ContentEncryptionAlgorithm, D as DeriveKeyOptions, e as DeriveKeyReturn, c as GenerateJWKOptions, d as GenerateJWKReturn, G as GenerateKeyAlgorithm, a as GenerateKeyOptions, b as GenerateKeyReturn, v as JWK, S as JWKAlgorithm, T as JWKPEMAlgorithm, J as JWKParameters, w as JWKSet, I as JWK_AES_CBC_HMAC, L as JWK_AES_GCM, H as JWK_AES_GCM_KW, F as JWK_AES_KW, s as JWK_Asymmetric, R as JWK_Asymmetric_Algorithm, j as JWK_EC, O as JWK_ECDH_ES, A as JWK_ECDSA, i as JWK_EC_Private, h as JWK_EC_Public, x as JWK_HMAC, p as JWK_OKP, o as JWK_OKP_Private, n as JWK_OKP_Public, P as JWK_OKP_SIGN, N as JWK_PBES2, u as JWK_Private, t as JWK_Public, m as JWK_RSA, B as JWK_RSA_ENC, z as JWK_RSA_PSS, l as JWK_RSA_Private, k as JWK_RSA_Public, y as JWK_RSA_SIGN, r as JWK_Symmetric, Q as JWK_Symmetric_Algorithm, q as JWK_oct, Y as JWT, Z as JWTClaimValidationOptions, X as JWTClaims, V as JoseHeaderParameters, K as KeyManagementAlgorithm, U as UnwrapKeyOptions, W as WrapKeyOptions, g as WrapKeyResult } from '../shared/unjwt.CtHrClHc.mjs';
-export { SessionConfigJWE, SessionConfigJWS, SessionData, SessionHooksJWE, SessionHooksJWS, SessionJWE, SessionJWEConfig, SessionJWS, SessionJWSConfig, SessionManager, SessionUpdate, clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession } from './h3.mjs';
+export { SessionConfigJWE, SessionConfigJWS, SessionData, SessionHooksJWE, SessionHooksJWS, SessionJWE, SessionJWEConfig, SessionJWS, SessionJWSConfig, SessionManager, SessionUpdate, clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession } from './h3.mjs';
 export { d as deriveJWKFromPassword, e as exportJWKToPEM, g as generateJWK, i as importJWKFromPEM } from '../shared/unjwt.BjP_dGnX.mjs';
 import 'cookie-es';
 import 'h3';

package/dist/adapters/h3v1.mjs

@@ -1,5 +1,5 @@
 export { k as deriveJWKFromPassword, h as exportJWKToPEM, c as generateJWK, f as importJWKFromPEM } from '../shared/unjwt.DyouTtLD.mjs';
-export { clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession } from './h3.mjs';
+export { clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession } from './h3.mjs';
 import '../shared/unjwt.Be8NxwFK.mjs';
 import 'h3';
 import 'cookie-es';

package/dist/adapters/h3v2.d.mts

@@ -14,6 +14,7 @@ interface SessionManager<T extends JWTClaims = JWTClaims, ConfigMaxAge extends E
     readonly createdAt: number;
     readonly expiresAt: ConfigMaxAge extends ExpiresIn ? number : T["exp"];
     readonly data: SessionData<T>;
+    readonly token: string | undefined;
     update: (update: SessionUpdate<T>) => Promise<SessionManager<T>>;
     clear: () => Promise<SessionManager<T>>;
 }
@@ -85,6 +86,7 @@ declare function useJWESession<T extends JWTClaims = JWTClaims, MaxAge extends E
  * Get the session for the current request.
  */
 declare function getJWESession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWE<T, MaxAge>): Promise<SessionJWE<T, MaxAge>>;
+declare function getJWESessionToken<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWE<T, MaxAge>): string | undefined;
 /**
  * Update the session data for the current request.
  */
@@ -156,10 +158,11 @@ interface SessionConfigJWS<T extends JWTClaims = JWTClaims, MaxAge extends Expir
 }
 declare function useJWSSession<T extends JWTClaims, MaxAge extends ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>): Promise<SessionManager<T, MaxAge>>;
 declare function getJWSSession<T extends JWTClaims, MaxAge extends ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>): Promise<SessionJWS<T, MaxAge>>;
+declare function getJWSSessionToken<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>): string | undefined;
 declare function updateJWSSession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>, update?: SessionUpdate<T>): Promise<SessionJWS<T, MaxAge>>;
 declare function signJWSSession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>): Promise<string>;
 declare function verifyJWSSession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(_event: HTTPEvent, config: SessionConfigJWS<T, MaxAge>, token: string): Promise<Partial<SessionJWS<T, MaxAge>>>;
 declare function clearJWSSession<T extends JWTClaims = JWTClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined>(event: HTTPEvent, config: Partial<SessionConfigJWS<T, MaxAge>>): Promise<void>;
 
-export { JWEEncryptOptions, JWKSet, JWK_Private, JWK_Public, JWK_Symmetric, JWTClaimValidationOptions, JWTClaims, clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
+export { JWEEncryptOptions, JWKSet, JWK_Private, JWK_Public, JWK_Symmetric, JWTClaimValidationOptions, JWTClaims, clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, getJWSSessionToken, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
 export type { SessionConfigJWE, SessionConfigJWS, SessionData, SessionHooksJWE, SessionHooksJWS, SessionJWE, SessionJWS, SessionManager, SessionUpdate };

package/dist/adapters/h3v2.mjs

@@ -28,6 +28,9 @@ async function useJWESession(event, config) {
     get data() {
       return getSessionFromContext$1(event, sessionName)?.data || {};
     },
+    get token() {
+      return getJWESessionToken(event, config);
+    },
     update: async (update) => {
       await updateJWESession(event, config, update);
       return sessionManager;
@@ -74,17 +77,7 @@ async function getJWESession(event, config) {
     data: new NullProtoObj()
   };
   context.sessions[sessionName] = session;
-  let token;
-  if (config.sessionHeader !== false) {
-    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
-    const headerValue = event.req.headers.get(headerName);
-    if (typeof headerValue === "string") {
-      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
-    }
-  }
-  if (!token) {
-    token = getChunkedCookie(event, sessionName);
-  }
+  const token = getJWESessionToken(event, config);
   if (token) {
     const promise = unsealJWESession(event, config, token).catch(async (error_) => {
       if (error_ instanceof Error) {
@@ -127,6 +120,21 @@ async function getJWESession(event, config) {
   });
   return session;
 }
+function getJWESessionToken(event, config) {
+  const sessionName = config.name || DEFAULT_NAME$1;
+  let token;
+  if (config.sessionHeader !== false) {
+    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
+    const headerValue = event.req.headers.get(headerName);
+    if (typeof headerValue === "string") {
+      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
+    }
+  }
+  if (!token) {
+    token = getChunkedCookie(event, sessionName);
+  }
+  return token;
+}
 async function updateJWESession(event, config, update) {
   const sessionName = config.name || DEFAULT_NAME$1;
   const context = getEventContext(event);
@@ -314,6 +322,9 @@ async function useJWSSession(event, config) {
     get data() {
       return getSessionFromContext(event, sessionName)?.data || {};
     },
+    get token() {
+      return getJWSSessionToken(event, config);
+    },
     update: async (update) => {
       await updateJWSSession(event, config, update);
       return sessionManager;
@@ -360,17 +371,7 @@ async function getJWSSession(event, config) {
     data: new NullProtoObj()
   };
   context.sessions[sessionName] = session;
-  let token;
-  if (config.sessionHeader !== false) {
-    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
-    const headerValue = event.req.headers.get(headerName);
-    if (typeof headerValue === "string") {
-      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
-    }
-  }
-  if (!token) {
-    token = getChunkedCookie(event, sessionName);
-  }
+  const token = getJWSSessionToken(event, config);
   if (token) {
     const promise = verifyJWSSession(event, config, token).catch(async (error_) => {
       if (error_ instanceof Error && (error_.message.includes("Token has expired") || error_.message.includes("Token is too old"))) {
@@ -410,6 +411,21 @@ async function getJWSSession(event, config) {
   });
   return session;
 }
+function getJWSSessionToken(event, config) {
+  const sessionName = config.name || DEFAULT_NAME;
+  let token;
+  if (config.sessionHeader !== false) {
+    const headerName = typeof config.sessionHeader === "string" ? config.sessionHeader.toLowerCase() : `x-${sessionName.toLowerCase()}-session`;
+    const headerValue = event.req.headers.get(headerName);
+    if (typeof headerValue === "string") {
+      token = headerValue.startsWith("Bearer ") ? headerValue.slice(7).trim() : headerValue;
+    }
+  }
+  if (!token) {
+    token = getChunkedCookie(event, sessionName);
+  }
+  return token;
+}
 async function updateJWSSession(event, config, update) {
   const sessionName = config.name || DEFAULT_NAME;
   const context = getEventContext(event);
@@ -581,4 +597,4 @@ function getVerifyKey(key) {
   return _key;
 }
 
-export { clearJWESession, clearJWSSession, getJWESession, getJWSSession, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };
+export { clearJWESession, clearJWSSession, getJWESession, getJWESessionToken, getJWSSession, getJWSSessionToken, sealJWESession, signJWSSession, unsealJWESession, updateJWESession, updateJWSSession, useJWESession, useJWSSession, verifyJWSSession };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unjwt",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "description": "Low-level JWT utilities",
   "repository": "sandros94/unjwt",
   "license": "MIT",