@devmoods/express-extras 0.51.0 → 0.52.1

package/dist/auth/passwordless.d.ts

@@ -1,6 +1,6 @@
 import { type AnyUser, type AuthProvider } from './types.js';
 export interface PasswordlessAuthProviderOptions<UserModel = AnyUser> {
-    getUserByEmail(email: string): Promise<UserModel>;
+    getUserByEmail(email: string): Promise<UserModel | null>;
     onLoginRequest(user: UserModel, temporaryToken: string): Promise<void>;
 }
 export declare function PasswordlessAuthProvider<UserModel extends AnyUser>(options: PasswordlessAuthProviderOptions<UserModel>): AuthProvider<UserModel>;

package/dist/auth/passwordless.js

@@ -3,9 +3,21 @@ import {} from './types.js';
 import { Unauthorized } from '../errors.js';
 import { getLogger } from '../logger.js';
 import { route } from '../middleware.js';
+import { DoesNotExistError } from '../postgres.js';
 import { validateBody } from '../validate.js';
 const logger = getLogger('auth');
 export function PasswordlessAuthProvider(options) {
+    const getUserOrNull = async (email) => {
+        try {
+            return await options.getUserByEmail(email);
+        }
+        catch (error) {
+            if (error instanceof DoesNotExistError) {
+                return null;
+            }
+            throw error;
+        }
+    };
     return {
         setupRoutes(router, context) {
             router.post('/passwordless/login/:token', route(async (req, res) => {
@@ -16,10 +28,11 @@ export function PasswordlessAuthProvider(options) {
                     await context.verifyTemporaryToken(temporaryToken, user);
                 }
                 catch {
+                    logger.warn('passwordless: invalid temp token', { uid: user.id });
                     throw Unauthorized('Invalid token');
                 }
                 const accessToken = await context.login(req, res, user);
-                logger.info('passwordless login');
+                logger.info('passwordless login', { uid: user.id });
                 if (req.accepts('html')) {
                     return res.redirect('/');
                 }
@@ -36,7 +49,11 @@ export function PasswordlessAuthProvider(options) {
                 required: ['email'],
             }), route(async (req) => {
                 const { email } = req.body;
-                const user = await options.getUserByEmail(email);
+                const user = await getUserOrNull(email);
+                if (!user) {
+                    logger.warn('passwordless: user not found', { email });
+                    return 202;
+                }
                 const token = await context.createTemporaryToken(user);
                 await options.onLoginRequest(user, token);
                 logger.info('passwordless login requested', { email });

package/dist/auth/token.js

@@ -98,14 +98,14 @@ export function setAccessTokenCookie(res, token) {
     if (token == null) {
         res.cookie(ACCESS_TOKEN_COOKIE_NAME, v4(), {
             expires: new Date(1970, 0, 1),
-            sameSite: 'strict',
+            sameSite: config.value.AUTH_COOKIE_SAME_SITE,
             secure: process.env.NODE_ENV === 'production',
         });
     }
     else {
         res.cookie(ACCESS_TOKEN_COOKIE_NAME, token, {
             httpOnly: true,
-            sameSite: 'strict',
+            sameSite: config.value.AUTH_COOKIE_SAME_SITE,
             secure: process.env.NODE_ENV === 'production',
         });
     }

package/dist/cache.d.ts

@@ -19,5 +19,8 @@ export declare function createCache(adapter: CacheAdapter): {
     get: (key: string) => Promise<any>;
     clear: (key?: string) => Promise<void>;
     wrap: <T>(key: string, options: CacheOptions | number | null, fn: () => Promise<T>) => Promise<T>;
-    decorate: <T, Arguments extends any[]>(options: CacheOptions | number | null, fn: (...args: Arguments) => T | Promise<T>) => (...args: Arguments) => Promise<T>;
+    decorate: <T, Arguments extends any[]>(options: CacheOptions | number | null, fn: (...args: Arguments) => T | Promise<T>) => {
+        (...args: Arguments): Promise<T>;
+        clear(...args: Arguments): Promise<void>;
+    };
 };

package/dist/cache.js

@@ -69,11 +69,14 @@ export function createCache(adapter) {
         return result;
     }
     function cachedFn(options, fn) {
-        return async (...args) => {
+        const getCacheKey = (...args) => {
             const baseKey = typeof options === 'object' && options != null
                 ? options.key
                 : undefined;
-            const cacheKey = `${baseKey ?? Buffer.from(fn.toString()).toString('hex')}-${JSON.stringify(args)}`;
+            return `${baseKey ?? Buffer.from(fn.toString()).toString('hex')}-${hashKey(args)}`;
+        };
+        const wrapped = async (...args) => {
+            const cacheKey = getCacheKey(...args);
             const cachedValue = await adapter.get(cacheKey);
             if (cachedValue != null) {
                 return cachedValue;
@@ -85,6 +88,8 @@ export function createCache(adapter) {
             await adapter.set(cacheKey, result, expiresMs);
             return result;
         };
+        wrapped.clear = (...args) => adapter.clear(getCacheKey(...args));
+        return wrapped;
     }
     return {
         set: adapter.set.bind(adapter),
@@ -94,3 +99,22 @@ export function createCache(adapter) {
         decorate: cachedFn,
     };
 }
+function hashKey(obj) {
+    return JSON.stringify(obj, (key, value) => {
+        if (value === null || value === undefined) {
+            return String(value);
+        }
+        if (typeof value === 'object') {
+            if (Array.isArray(value)) {
+                return value;
+            }
+            return Object.keys(value)
+                .sort()
+                .reduce((result, item) => {
+                result[item] = value[item];
+                return result;
+            }, {});
+        }
+        return value;
+    });
+}

package/dist/config.d.ts

@@ -6,6 +6,7 @@ export declare const config: {
         AUTH_TOKEN_EXPIRES_IN: number;
         AUTH_TEMP_TOKEN_EXPIRES_IN: number;
         AUTH_SECRET: string;
+        AUTH_COOKIE_SAME_SITE: string;
         REDIS_URL: string;
         REDIS_KEY_PREFIX: string;
         POSTGRES_URL: string;
@@ -37,6 +38,7 @@ export declare function extendConfig<T extends Record<string, unknown>>(appConfi
         AUTH_TOKEN_EXPIRES_IN: number;
         AUTH_TEMP_TOKEN_EXPIRES_IN: number;
         AUTH_SECRET: string;
+        AUTH_COOKIE_SAME_SITE: string;
         REDIS_URL: string;
         REDIS_KEY_PREFIX: string;
         POSTGRES_URL: string;

package/dist/config.js

@@ -9,6 +9,7 @@ const baseConfig = {
     AUTH_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TOKEN_EXPIRES', 3600 * 24 * 30), // 30 days
     AUTH_TEMP_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TEMP_TOKEN_EXPIRES', 3600),
     AUTH_SECRET: readEnv('AUTH_JWT_SECRET', ''),
+    AUTH_COOKIE_SAME_SITE: readEnv('AUTH_COOKIE_SAME_SITE', 'strict'),
     REDIS_URL: readEnv('REDIS_URL', ''),
     REDIS_KEY_PREFIX: readEnv('REDIS_KEY_PREFIX', ''),
     POSTGRES_URL: readEnv('POSTGRES_URL', ''),

package/dist/cookie-consent.d.ts

@@ -0,0 +1,3 @@
+export declare function cookieConsent({ onConsent, }: {
+    onConsent: (consents: string[]) => Promise<void> | void;
+}): import("express-serve-static-core").Router;

package/dist/cookie-consent.js

@@ -0,0 +1,33 @@
+import { Router } from 'express';
+import { getLogger } from './logger.js';
+import { route } from './middleware.js';
+import { validateBody } from './validate.js';
+const logger = getLogger();
+export function cookieConsent({ onConsent, }) {
+    const router = Router();
+    router.get('/', route(() => {
+        return {
+            consents: [],
+        };
+    }));
+    router.post('/', validateBody({
+        type: 'object',
+        properties: {
+            consents: {
+                type: 'array',
+                items: { type: 'string' },
+            },
+        },
+    }), route(async (req, res) => {
+        const { consents } = req.body;
+        res.cookie('cookie_consent', consents.join(',') || '1', {
+            expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000),
+            sameSite: 'strict',
+            secure: process.env.NODE_ENV === 'production',
+        });
+        await onConsent?.(consents);
+        logger.info('cookie consent');
+        return { consents };
+    }));
+    return router;
+}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from './auth.js';
 export * from './cache.js';
+export * from './cookie-consent.js';
 export * from './channels.js';
 export * from './cli.js';
 export * from './config.js';

package/dist/index.js

@@ -1,6 +1,7 @@
 /* c8 ignore next 100 */
 export * from './auth.js';
 export * from './cache.js';
+export * from './cookie-consent.js';
 export * from './channels.js';
 export * from './cli.js';
 export * from './config.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.51.0",
+  "version": "0.52.1",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,15 +44,15 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "arktype": "^2.0.2",
     "@devmoods/eslint-config": "^2.6.0",
     "@types/koa-compose": "^3.2.8",
-    "@types/node": "22.10.10",
+    "@types/node": "22.13.0",
     "@types/supertest": "^6.0.2",
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/coverage-v8": "^3.0.4",
+    "arktype": "^2.0.4",
     "cookiejar": "^2.1.4",
-    "eslint": "^9.18.0",
+    "eslint": "^9.19.0",
     "faktory-worker": "^4.6.0",
     "prettier": "3.4.2",
     "supertest": "7.0.0",
@@ -65,8 +65,8 @@
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^8.51.0",
-    "@sentry/profiling-node": "^8.51.0",
+    "@sentry/node": "^8.53.0",
+    "@sentry/profiling-node": "^8.53.0",
     "@types/bcrypt": "^5.0.2",
     "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.0",
@@ -90,7 +90,7 @@
     "pg": "^8.13.1",
     "redis": "^4.7.0",
     "sonda": "^0.7.1",
-    "sql-formatter": "^15.4.9",
+    "sql-formatter": "^15.4.10",
     "uuid": "^11.0.5"
   },
   "prettier": {
@@ -98,9 +98,9 @@
   },
   "peerDependencies": {
     "@vitejs/plugin-react": ">=4.3.4",
+    "arktype": ">=2.0.0",
     "faktory-worker": ">=4.5.1",
-    "vite": ">=6.0.5",
-    "arktype": ">=2.0.2"
+    "vite": ">=6.0.5"
   },
   "engines": {
     "node": ">=20 <24"