Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/middleware/errorHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ export function errorHandler(

// Security: In production, mask the message for unexpected (non-AppError) errors
let finalMessage = message;
const isKnownError = isAppError(err) || statusCode < 500;

if (isProduction && !isKnownError) {
if (isProduction && !isAppError(err)) {
finalMessage = 'Internal server error';
}

Expand Down
6 changes: 4 additions & 2 deletions src/middleware/requireAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ export const requireAuth = (
return;
}

const uid = (decoded as Record<string, unknown>).userId;
const payload = decoded as Record<string, unknown>;
const uid = payload.userId || payload.sub;

if (typeof uid !== "string" || uid.trim() === "") {
logger.warn("[requireAuth] Token missing required userId claim");
logger.warn("[requireAuth] Token missing required userId or sub claim");
next(
new UnauthorizedError(
"Token missing required claims",
Expand Down
75 changes: 74 additions & 1 deletion tests/integration/auth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import request from 'supertest';
import express from 'express';
import jwt from 'jsonwebtoken';
import { createTestDb } from '../helpers/db.js';
import { TEST_JWT_SECRET } from '../helpers/jwt.js';
import { TEST_JWT_SECRET, signTokenMissingClaims } from '../helpers/jwt.js';
import { requireAuth } from '../../src/middleware/requireAuth.js';
import { errorHandler } from '../../src/middleware/errorHandler.js';

const mockVerifySignature = jest.fn();

Expand Down Expand Up @@ -41,6 +43,12 @@ function buildAuthApp(pool: any) {
return res.status(200).json({ token, user });
});

app.get('/protected', requireAuth, (req, res) => {
res.status(200).json({ message: 'Success', user: res.locals.authenticatedUser });
});

app.use(errorHandler);

return app;
}

Expand Down Expand Up @@ -105,3 +113,68 @@ describe('POST /auth/wallet', () => {
expect(res1.body.user.id).toBe(res2.body.user.id);
});
});

describe('requireAuth middleware integration', () => {
let db: any;
let app: express.Express;

beforeEach(() => {
db = createTestDb();
app = buildAuthApp(db.pool);
process.env.JWT_SECRET = TEST_JWT_SECRET;
});

afterEach(async () => {
await db.end();
});

it('rejects token with missing both userId and sub', async () => {
const token = signTokenMissingClaims({ foo: 'bar' });
const res = await request(app)
.get('/protected')
.set('Authorization', `Bearer ${token}`);

expect(res.status).toBe(401);
expect(res.body.code).toBe('MISSING_CLAIMS');
});

it('rejects token with empty userId', async () => {
const token = signTokenMissingClaims({ userId: '' });
const res = await request(app)
.get('/protected')
.set('Authorization', `Bearer ${token}`);

expect(res.status).toBe(401);
expect(res.body.code).toBe('MISSING_CLAIMS');
});

it('rejects token with empty sub', async () => {
const token = signTokenMissingClaims({ sub: '' });
const res = await request(app)
.get('/protected')
.set('Authorization', `Bearer ${token}`);

expect(res.status).toBe(401);
expect(res.body.code).toBe('MISSING_CLAIMS');
});

it('accepts token with userId', async () => {
const token = signTokenMissingClaims({ userId: 'user-123' });
const res = await request(app)
.get('/protected')
.set('Authorization', `Bearer ${token}`);

expect(res.status).toBe(200);
expect(res.body.user.id).toBe('user-123');
});

it('accepts token with sub (subject) as fallback', async () => {
const token = signTokenMissingClaims({ sub: 'user-456' });
const res = await request(app)
.get('/protected')
.set('Authorization', `Bearer ${token}`);

expect(res.status).toBe(200);
expect(res.body.user.id).toBe('user-456');
});
});