Skip to content

Commit bb521a2

Browse files
committed
fix: improve IP address and user-agent handling
- Updated get-ip decorator to return 'Unknown' if the IP address cannot be determined. - Simplified user-agent decorator to return the user-agent header directly without redundancy. - Adjusted webhook event serialization to correctly reference event data.
1 parent 180d83e commit bb521a2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/common/decorators/get-ip/get-ip.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ export const IpAddress = createParamDecorator((data, ctx: ExecutionContext) => {
99
return request.clientIp;
1010
}
1111

12-
return requestIp.getClientIp(request);
12+
const ip = requestIp.getClientIp(request);
13+
return ip || 'Unknown';
1314
});

src/common/decorators/get-useragent/get-useragent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const UserAgent = createParamDecorator((data, ctx: ExecutionContext) => {
44
const request = ctx.switchToHttp().getRequest();
55

66
if (request.headers['user-agent']) {
7-
return request.headers['user-agent'] || 'Unknown';
7+
return request.headers['user-agent'];
88
}
99

1010
return 'Unknown';

src/integration-modules/webhook-module/events/webhook.events.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class WebhookEvents {
6464
const payload = {
6565
event: event.eventName,
6666
timestamp: dayjs().toISOString(),
67-
data: instanceToPlain(event),
67+
data: instanceToPlain(event.data),
6868
};
6969

7070
const { json } = serialize(payload);

src/modules/remnawave-service/remnawave-service.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
1+
import { Injectable, OnApplicationBootstrap } from '@nestjs/common';
22
import { EventEmitter2 } from '@nestjs/event-emitter';
33

44
import { EVENTS } from '@libs/contracts/constants';
@@ -7,7 +7,6 @@ import { ServiceEvent } from '@integration-modules/telegram-bot/events/service/i
77

88
@Injectable()
99
export class RemnawaveServiceService implements OnApplicationBootstrap {
10-
private readonly logger = new Logger(RemnawaveServiceService.name);
1110
constructor(private readonly eventEmitter: EventEmitter2) {}
1211

1312
public async onApplicationBootstrap(): Promise<void> {

0 commit comments

Comments
 (0)