diff --git a/libs/auth-nest-tools/src/lib/auth.middleware.ts b/libs/auth-nest-tools/src/lib/auth.middleware.ts index 3e6ac6db8699..98324231620c 100644 --- a/libs/auth-nest-tools/src/lib/auth.middleware.ts +++ b/libs/auth-nest-tools/src/lib/auth.middleware.ts @@ -64,7 +64,7 @@ export class AuthMiddleware implements Middleware { if (this.options.forwardUserInfo) { context.init.headers = Object.assign({}, context.init.headers, { 'User-Agent': this.auth.userAgent, - 'X-Real-IP': this.auth.ip, + 'X-Forwarded-For': this.auth.ip, }) } } diff --git a/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts b/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts index ad13d19012ff..2cb8fa75a6b4 100644 --- a/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts +++ b/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts @@ -85,7 +85,7 @@ describe('JwtStrategy#validate', () => { headers: { authorization: 'authorization', 'user-agent': 'test user agent', - 'x-real-ip': '2.2.2.2', + 'x-forwarded-for': '2.2.2.2, 3.3.3.3', }, ip: '1.1.1.1', } as unknown) as Request @@ -98,7 +98,7 @@ describe('JwtStrategy#validate', () => { expect(user.scope).toEqual(payload.scope) expect(user.client).toEqual(payload.client_id) expect(user.authorization).toEqual(request.headers.authorization) - expect(user.ip).toEqual(request.headers['x-real-ip']) + expect(user.ip).toEqual(request.headers['x-forwarded-for']) expect(user.userAgent).toEqual(request.headers['user-agent']) expect(user.actor!.nationalId).toEqual(payload.act!.nationalId) expect(user.actor!.scope).toEqual(payload.act!.scope) diff --git a/libs/auth-nest-tools/src/lib/jwt.strategy.ts b/libs/auth-nest-tools/src/lib/jwt.strategy.ts index c8f5005168a3..dc93eb41646b 100644 --- a/libs/auth-nest-tools/src/lib/jwt.strategy.ts +++ b/libs/auth-nest-tools/src/lib/jwt.strategy.ts @@ -54,7 +54,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) { nationalId: actor.nationalId, scope: this.parseScopes(actor.scope), }, - ip: String(request.headers['x-real-ip']) ?? request.ip, + ip: String(request.headers['x-forwarded-for'] ?? request.ip), userAgent: request.headers['user-agent'], } } diff --git a/libs/clients/middlewares/src/lib/withAuth.ts b/libs/clients/middlewares/src/lib/withAuth.ts index f94caef7db19..806c075205f7 100644 --- a/libs/clients/middlewares/src/lib/withAuth.ts +++ b/libs/clients/middlewares/src/lib/withAuth.ts @@ -21,7 +21,7 @@ export const withAuth = ({ headers.set('user-agent', auth.userAgent) } if (forwardAuthUserAgent && auth.ip) { - headers.set('x-real-ip', auth.ip) + headers.set('x-forwarded-for', auth.ip) } return fetch(input, { ...init, headers }) }