Ensure userId in payload and socket match

Author: evanyan13

backend/gateway-service/src/modules/match/match.controller.ts

@@ -67,12 +67,7 @@ export class MatchGateway implements OnGatewayInit {
       return;
     }
 
-    // Retrieve the userId associated with the current socket
-    const storedUserId = [...this.userSockets.entries()].find(
-      ([, socketId]) => socketId === client.id,
-    )?.[0];
-    if (!storedUserId || storedUserId !== payload.userId) {
-      client.emit(EXCEPTION, 'UserId does not match the current socket.');
+    if (!this.validateUserId(client, payload.userId)) {
       return;
     }
 
@@ -107,6 +102,10 @@ export class MatchGateway implements OnGatewayInit {
       return;
     }
 
+    if (!this.validateUserId(client, payload.userId)) {
+      return;
+    }
+
     try {
       const result = await firstValueFrom(
         this.matchingClient.send('match-cancel', { userId: payload.userId }),
@@ -239,4 +238,16 @@ export class MatchGateway implements OnGatewayInit {
     client.emit(EXCEPTION, `Error connecting to /match socket: ${message}`);
     client.disconnect();
   }
+
+  // Method to validate the userId associated with the current socket
+  private validateUserId(client: Socket, userId: string): boolean {
+    const storedUserId = [...this.userSockets.entries()].find(
+      ([, socketId]) => socketId === client.id,
+    )?.[0];
+    if (!storedUserId || storedUserId !== userId) {
+      client.emit(EXCEPTION, 'UserId does not match the current socket.');
+      return false;
+    }
+    return true;
+  }
 }