BugFix: IP Adresse & Subject instead of BehaviourSubject

bizmatch-server/src/app.module.ts

@@ -1,7 +1,7 @@
-import { MiddlewareConsumer, Module } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext, MiddlewareConsumer, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { PassportModule } from '@nestjs/passport';
-import { WinstonModule, utilities as nestWinstonModuleUtilities } from 'nest-winston';
+import { utilities as nestWinstonModuleUtilities, WinstonModule } from 'nest-winston';
 import * as winston from 'winston';
 import { AiModule } from './ai/ai.module';
 import { AppController } from './app.controller';
@@ -18,11 +18,17 @@ import dotenvFlow from 'dotenv-flow';
 import { EventModule } from './event/event.module';
 import { JwtStrategy } from './jwt.strategy';
 import { MailModule } from './mail/mail.module';
+import { RealIpInfo } from './models/main.model';
 import { PaymentModule } from './payment/payment.module';
 import { RequestDurationMiddleware } from './request-duration/request-duration.middleware';
 import { SelectOptionsModule } from './select-options/select-options.module';
 import { UserModule } from './user/user.module';
-
+export const RealIp = createParamDecorator((data: unknown, ctx: ExecutionContext): RealIpInfo => {
+  const request = ctx.switchToHttp().getRequest();
+  const ip = request.headers['cf-connecting-ip'] || request.headers['x-real-ip'] || request.headers['x-forwarded-for']?.split(',')[0] || request.connection.remoteAddress;
+  const countryCode = request.headers['cf-ipcountry'];
+  return { ip, countryCode };
+});
 // function loadEnvFiles() {
 //   // Determine which additional env file to load
 //   let envFilePath = '';

bizmatch-server/src/event/event.controller.ts

@@ -1,5 +1,7 @@
-import { Body, Controller, Headers, Ip, Post } from '@nestjs/common';
+import { Body, Controller, Headers, Post } from '@nestjs/common';
+import { RealIp } from 'src/app.module';
 import { ListingEvent } from 'src/models/db.model';
+import { RealIpInfo } from 'src/models/main.model';
 import { EventService } from './event.service';
 
 @Controller('event')
@@ -8,10 +10,10 @@ export class EventController {
   @Post()
   async createEvent(
     @Body() event: ListingEvent, // Struktur des Body-Objekts entsprechend anpassen
-    @Ip() userIp: string, // IP Adresse des Clients
+    @RealIp() ipInfo: RealIpInfo, // IP Adresse des Clients
     @Headers('user-agent') userAgent: string, // User-Agent des Clients
   ) {
-    event.userIp = userIp;
+    event.userIp = ipInfo.ip;
     event.userAgent = userAgent;
     await this.eventService.createEvent(event);
     return { message: 'Event gespeichert' };

bizmatch-server/src/geo/geo.controller.ts

@@ -1,17 +1,9 @@
-import { Body, Controller, createParamDecorator, ExecutionContext, Get, Param, Post } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { RealIp } from 'src/app.module';
+import { RealIpInfo } from 'src/models/main.model';
 import { CountyRequest } from 'src/models/server.model';
 import { GeoService } from './geo.service';
-export interface RealIpInfo {
-  ip: string;
-  countryCode?: string;
-}
 
-export const RealIp = createParamDecorator((data: unknown, ctx: ExecutionContext): RealIpInfo => {
-  const request = ctx.switchToHttp().getRequest();
-  const ip = request.headers['cf-connecting-ip'] || request.headers['x-real-ip'] || request.headers['x-forwarded-for']?.split(',')[0] || request.connection.remoteAddress;
-  const countryCode = request.headers['cf-ipcountry'];
-  return { ip, countryCode };
-});
 @Controller('geo')
 export class GeoController {
   constructor(private geoService: GeoService) {}

bizmatch-server/src/models/main.model.ts

@@ -408,3 +408,7 @@ export interface CombinedUser {
   stripeUser?: StripeUser;
   stripeSubscription?: StripeSubscription;
 }
+export interface RealIpInfo {
+  ip: string;
+  countryCode?: string;
+}