@nitrotool/jwt 0.0.4 → 0.0.5

package/dist/jwt.mjs

@@ -1,7 +1,7 @@
 import jwt from '@tsndr/cloudflare-worker-jwt';
 import { createError } from 'h3';
 
-const encodeJwtRaw = async (payload = {}, secret, ttl = 60) => {
+const encodeJwtRaw = async (payload, secret, ttl = 60) => {
   return await jwt.sign(
     {
       exp: Date.now() / 1e3 + ttl,
@@ -10,7 +10,7 @@ const encodeJwtRaw = async (payload = {}, secret, ttl = 60) => {
     secret
   );
 };
-const encodeJwt = async (payload = {}) => {
+const encodeJwt = async (payload) => {
   const secret = (
     //@ts-expect-error Expected.
     typeof useRuntimeConfig === "function" ? useRuntimeConfig()?.jwtSecret : ""
@@ -33,18 +33,16 @@ const verifyJwt = async (token) => {
   return verifyJwtRaw(token, secret);
 };
 const decodeJwtRaw = async (token, secret, { verify } = { verify: true }) => {
-  if (!secret && verify) {
-    throw new Error("Cannot check signature without secret.");
-  }
+  if (!secret && verify) throw new Error("Cannot check signature without secret.");
   if (secret && verify && !await verifyJwtRaw(token, secret)) {
-    throw createError(`Invalid JWT token.`);
+    throw createError("Invalid JWT token.");
   }
   const { payload } = jwt.decode(token);
   return payload;
 };
 const decodeJwt = async (token, { verify } = { verify: true }) => {
   if (verify && !await verifyJwt(token)) {
-    throw createError(`Invalid JWT token.`);
+    throw createError("Invalid JWT token.");
   }
   const { payload } = jwt.decode(token);
   return payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrotool/jwt",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "dist/index.mjs",
   "type": "module",
   "exports": {
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@tsndr/cloudflare-worker-jwt": "^3.2.0",
-    "@nitrotool/errors": "0.0.4"
+    "@nitrotool/errors": "0.0.5"
   },
   "peerDependencies": {
     "h3": "^1.15.3"

package/src/index.ts

@@ -2,3 +2,4 @@
 export * from './h3';
 // @ts-ignore
 export * from './jwt';
+

package/src/jwt.ts

@@ -1,79 +1,80 @@
-import jwt from '@tsndr/cloudflare-worker-jwt';
+import jwt, {JwtPayload} from '@tsndr/cloudflare-worker-jwt';
+
 import { createError } from 'h3';
+export type ExtendableJwtPayload<T extends Record<string, any> = {}> =
+    Partial<JwtPayload> & T;
 
 export const encodeJwtRaw = async <
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = {},
 >(
-  payload: T = {} as T,
-  secret: string,
-  ttl = 60,
+    payload: ExtendableJwtPayload<T>,
+    secret: string,
+    ttl = 60,
 ): Promise<string> => {
-  return await jwt.sign(
-    {
-      exp: Date.now() / 1000 + ttl,
-      ...payload,
-    },
-    secret,
-  );
+    return await jwt.sign(
+        {
+            exp: Date.now() / 1000 + ttl,
+            ...payload,
+        },
+        secret,
+    );
 };
 
 export const encodeJwt = async <
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = {},
 >(
-  payload: T = {} as T,
+    payload: ExtendableJwtPayload<T>,
 ): Promise<string> => {
-  const secret =
-    //@ts-expect-error Expected.
-    typeof useRuntimeConfig === 'function' ? useRuntimeConfig()?.jwtSecret : '';
-  return encodeJwtRaw(payload, secret);
+    const secret =
+        //@ts-expect-error Expected.
+        typeof useRuntimeConfig === 'function' ? useRuntimeConfig()?.jwtSecret : '';
+    return encodeJwtRaw(payload, secret);
 };
 
 export const verifyJwtRaw = async (
-  token: string,
-  secret: string,
+    token: string,
+    secret: string,
 ): Promise<boolean> => {
-  return new Promise(async (resolve) => {
-    if (await jwt.verify(token, secret, { throwError: false })) {
-      return resolve(true);
-    }
+    return new Promise(async (resolve) => {
+        if (await jwt.verify(token, secret, {throwError: false})) {
+            return resolve(true);
+        }
 
-    return resolve(false);
-  });
+        return resolve(false);
+    });
 };
 
 export const verifyJwt = async (token: string): Promise<boolean> => {
-  const secret =
-    //@ts-expect-error Expected.
-    typeof useRuntimeConfig === 'function' ? useRuntimeConfig()?.jwtSecret : '';
-  return verifyJwtRaw(token, secret);
+    const secret =
+        //@ts-expect-error Expected.
+        typeof useRuntimeConfig === 'function' ? useRuntimeConfig()?.jwtSecret : '';
+    return verifyJwtRaw(token, secret);
 };
 
 export const decodeJwtRaw = async <
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = {},
 >(
-  token: string,
-  secret: string,
-  { verify }: { verify?: boolean } = { verify: true },
-) => {
-  if (!secret && verify) {
-    throw new Error('Cannot check signature without secret.');
-  }
-  if (secret && verify && !(await verifyJwtRaw(token, secret))) {
-    throw createError(`Invalid JWT token.`);
-  }
-  const { payload } = jwt.decode<T>(token);
-  return payload;
+    token: string,
+    secret: string,
+    { verify }: { verify?: boolean } = { verify: true },
+): Promise<ExtendableJwtPayload<T>> => {
+    if (!secret && verify) throw new Error('Cannot check signature without secret.');
+    if (secret && verify && !(await verifyJwtRaw(token, secret))) {
+        throw createError('Invalid JWT token.');
+    }
+    const { payload } = jwt.decode<ExtendableJwtPayload<T>>(token);
+    return payload;
 };
 
 export const decodeJwt = async <
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = {},
 >(
-  token: string,
-  { verify }: { verify?: boolean } = { verify: true },
-) => {
-  if (verify && !(await verifyJwt(token))) {
-    throw createError(`Invalid JWT token.`);
-  }
-  const { payload } = jwt.decode<T>(token);
-  return payload;
+    token: string,
+    { verify }: { verify?: boolean } = { verify: true },
+): Promise<ExtendableJwtPayload<T>> => {
+    if (verify && !(await verifyJwt(token))) {
+        throw createError('Invalid JWT token.');
+    }
+    const { payload } = jwt.decode<ExtendableJwtPayload<T>>(token);
+    return payload;
 };