@devmoods/express-extras 0.67.0 → 0.68.0

package/dist/auth/emailAndPassword.js

@@ -1,7 +1,6 @@
 import { startTimer } from '@devmoods/observability';
 import argon2 from 'argon2';
 import bcrypt from 'bcrypt';
-import {} from 'express';
 import { createTokenResponse, tokenSchema } from './token.js';
 import {} from './types.js';
 import { Unauthorized } from '../errors.js';

package/dist/auth/google.js

@@ -1,6 +1,5 @@
 import { config } from '@devmoods/config';
 import { type } from 'arktype';
-import {} from 'express';
 import { OAuth2Client } from 'google-auth-library';
 import { BadRequest, Unauthorized } from '../errors.js';
 import { getLogger } from '../logger.js';

package/dist/auth/passwordless.js

@@ -1,5 +1,4 @@
 import { DoesNotExistError } from '@devmoods/postgres';
-import {} from 'express';
 import { createTokenResponse } from './token.js';
 import {} from './types.js';
 import { getLogger } from '../logger.js';

package/dist/auth/token.d.ts

@@ -6,28 +6,28 @@ export declare function createTokenResponse(accessToken: AccessToken): readonly
 }, {
     readonly 'Cache-Control': "no-store";
 }];
-export type AccessToken = ReturnType<typeof createAccessToken>;
+export type AccessToken = Awaited<ReturnType<typeof createAccessToken>>;
 /**
  * Returns a signed JWT token.
  */
-export declare function createAccessToken(payload: any, version?: string, secret?: string): {
+export declare function createAccessToken(payload: any, version?: string, secret?: string): Promise<{
     token: string;
     tokenType: "Bearer";
     expiresIn: number;
-};
+}>;
 /**
  * Decode the given JWT token.
  */
-export declare function decodeAccessToken(token: string, secret?: string): {
-    [key: string]: any;
-    iss?: string | undefined;
-    sub?: string | undefined;
-    aud?: string | string[] | undefined;
-    exp?: number | undefined;
-    nbf?: number | undefined;
-    iat?: number | undefined;
-    jti?: string | undefined;
-};
+export declare function decodeAccessToken(token: string, secret?: string): Promise<{
+    [propName: string]: unknown;
+    iss?: string;
+    sub?: string;
+    aud?: string | string[];
+    jti?: string;
+    nbf?: number;
+    exp?: number;
+    iat?: number;
+}>;
 /**
  * Extract a Bearer token from the HTTP Authorization header
  * of `req`.

package/dist/auth/token.js

@@ -1,6 +1,6 @@
 import { config } from '@devmoods/config';
 import {} from 'express';
-import jwt from 'jsonwebtoken';
+import { SignJWT, jwtVerify } from 'jose';
 import { v4 } from 'uuid';
 import { InvalidToken } from './errors.js';
 import {} from '../validate.js';
@@ -24,24 +24,24 @@ export function createTokenResponse(accessToken) {
 /**
  * Returns a signed JWT token.
  */
-export function createAccessToken(payload, version = '1', secret = config.AUTH_JWT_SECRET) {
+export async function createAccessToken(payload, version = '1', secret = config.AUTH_JWT_SECRET) {
     const expiresIn = config.AUTH_TOKEN_EXPIRES;
-    const token = jwt.sign({ v: version, ...payload }, secret, {
-        expiresIn,
-    });
+    const secretKey = new TextEncoder().encode(secret);
+    const token = await new SignJWT({ v: version, ...payload })
+        .setProtectedHeader({ alg: 'HS256' })
+        .setExpirationTime(`${expiresIn}s`)
+        .setIssuedAt(new Date())
+        .sign(secretKey);
     return { token, tokenType: 'Bearer', expiresIn };
 }
 /**
  * Decode the given JWT token.
  */
-export function decodeAccessToken(token, secret = config.AUTH_JWT_SECRET) {
+export async function decodeAccessToken(token, secret = config.AUTH_JWT_SECRET) {
     try {
-        const decoded = jwt.verify(token.trim(), secret);
-        /* c8 ignore next 3 */
-        if (typeof decoded === 'string') {
-            throw new Error('decoded value not an object');
-        }
-        return { ...decoded };
+        const secretKey = new TextEncoder().encode(secret);
+        const { payload } = await jwtVerify(token.trim(), secretKey);
+        return { ...payload };
     }
     catch (error) {
         throw new InvalidToken(`Failed to decode auth token: ${error.message}`, {

package/dist/auth.js

@@ -22,7 +22,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
     const useCurrentUser = () => useRequestContext('currentUser');
     const setCurrentUser = (user) => setRequestContext('currentUser', user);
     const login = async (req, res, user, isRefresh = false) => {
-        const accessToken = createAccessToken({ uid: user.id }, sessionTokenVersion);
+        const accessToken = await createAccessToken({ uid: user.id }, sessionTokenVersion);
         const sessionId = sha256(accessToken.token);
         await tokenStorage.set(sessionId, String(user.id), accessToken.expiresIn);
         setAccessTokenCookie(res, accessToken.token);
@@ -138,7 +138,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
                     await logout(req, res);
                     throw new InvalidToken('session token expired');
                 }
-                const decoded = decodeAccessToken(token);
+                const decoded = await decodeAccessToken(token);
                 if (decoded.v !== sessionTokenVersion) {
                     await logout(req, res);
                     throw new InvalidToken('Invalid token version');

package/dist/router.d.ts

@@ -12,7 +12,7 @@ export type ExtractParams<Path extends string> = Prettify<Path extends `${string
 } & ExtractParams<`/${Rest}`> : Path extends `${string}:${infer Param}` ? {
     [K in Param extends `${infer P}?` ? P : Param]: string;
 } : {}>;
-export type TypedRequestHandler<Params, ResponseBodySchema extends StandardSchemaV1 | undefined, RequestBodySchema extends StandardSchemaV1 | undefined, RequestQuery extends StandardSchemaV1 | undefined, RequestParamsSchema extends StandardSchemaV1 | undefined = undefined> = (req: Request<Params, never, RequestBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestBodySchema> : unknown, RequestQuery extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestQuery> : Record<string, string | string[]>>, res: Response<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>, next: NextFunction) => ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown> | Promise<ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>>;
+export type TypedRequestHandler<Params, ResponseBodySchema extends StandardSchemaV1 | undefined, RequestBodySchema extends StandardSchemaV1 | undefined, RequestQuery extends StandardSchemaV1 | undefined, RequestParamsSchema extends StandardSchemaV1 | undefined = undefined> = (req: Request<Params, any, RequestBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestBodySchema> : unknown, RequestQuery extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestQuery> : Record<string, string | string[]>>, res: Response<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>, next: NextFunction) => ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown> | Promise<ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>>;
 export declare class TypedRouter {
     #private;
     router: import("express-serve-static-core").Router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.67.0",
+  "version": "0.68.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -65,22 +65,21 @@
     "faktory-worker": "^4.7.1",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "vite": "^7.1.10"
+    "vite": "^7.1.11"
   },
   "dependencies": {
     "@devmoods/config": "0.2.0",
     "@devmoods/fetch": "^4.2.0",
     "@devmoods/observability": "0.1.1",
     "@devmoods/postgres": "0.2.1",
-    "@hey-api/openapi-ts": "^0.86.0",
-    "@sentry/node": "^10.20.0",
-    "@sentry/node-native": "^10.20.0",
-    "@sentry/profiling-node": "^10.20.0",
+    "@hey-api/openapi-ts": "^0.86.1",
+    "@sentry/node": "^10.21.0",
+    "@sentry/node-native": "^10.21.0",
+    "@sentry/profiling-node": "^10.21.0",
     "@standard-schema/spec": "^1.0.0",
     "@types/bcrypt": "^6.0.0",
     "@types/cookie-parser": "^1.4.9",
     "@types/express": "^5.0.3",
-    "@types/jsonwebtoken": "^9.0.10",
     "@types/koa-compose": "^3.2.8",
     "@types/nodemailer": "^7.0.2",
     "@types/qs": "^6.14.0",
@@ -94,7 +93,7 @@
     "express": "^4.21.2",
     "google-auth-library": "^10.4.1",
     "helmet": "^8.1.0",
-    "jsonwebtoken": "^9.0.2",
+    "jose": "^6.1.0",
     "nodemailer": "^7.0.9",
     "redis": "^5.8.3",
     "sonda": "^0.9.0",
@@ -112,5 +111,5 @@
   "engines": {
     "node": ">=20 <25"
   },
-  "gitHead": "ddc79e0157d354d9c25cfbb0ba86d8e61d560fbc"
+  "gitHead": "721a709c087904a5cc1332d28a62857a82295fea"
 }