Fix/backend/strict null check

backend/src/chat/chat.gateway.ts

@@ -55,6 +55,11 @@ export class ChatGateway {
       this.logger.error('invalid userId');
       return;
     }
+    const user = this.chatService.getUser(client);
+    if (!user) {
+      this.logger.error('invalid user');
+      return;
+    }
 
     const MutedUsers = await this.muteService.findAll(data.roomId);
     if (MutedUsers.some((user) => user.id === data.userId)) {
@@ -68,44 +73,67 @@ export class ChatGateway {
     const room = this.server
       .to(data.roomId.toString())
       .except('block' + data.userId);
-    room.emit(
-      'message',
-      new MessageEntity(data, this.chatService.getUser(client)),
-    );
+    room.emit('message', new MessageEntity(data, user));
   }
 
   @SubscribeMessage('request-match')
   async handleRequestMatch(
     @MessageBody() data: { userId: number },
     @ConnectedSocket() client: Socket,
   ) {
-    const inviteUser = this.chatService.getUser(client);
-    const invitedUserWsId = this.chatService.getWsFromUserId(data.userId)?.id;
-    if (!invitedUserWsId) {
+    // Check if the requesting user is valid
+    const requestingUser = this.chatService.getUser(client);
+    if (!requestingUser) {
+      this.logger.error('invalid requesting user');
+      return;
+    }
+    // Check if the requested user is connected
+    const requestedUserWsId = this.chatService.getWsFromUserId(data.userId)?.id;
+    if (!requestedUserWsId) {
+      this.logger.error('invalid requested user');
       return;
-    } else {
-      const blockings = await this.chatService.getUsersBlockedBy(data.userId);
-      if (blockings.some((user) => user.id === inviteUser.id)) return;
-      const blocked = await this.chatService.getUsersBlockedBy(inviteUser.id);
-      if (blocked.some((user) => user.id === data.userId)) return;
-      this.server
-        .to(invitedUserWsId)
-        .emit('request-match', { userId: inviteUser.id });
-      this.chatService.addInvite(inviteUser.id, data.userId);
     }
+    // Check if the requesting user is blocked by the requested user
+    const blockings = await this.chatService.getUsersBlockedBy(data.userId);
+    if (blockings.some((user) => user.id === requestingUser.id)) return;
+    // Check if the requested user is blocked by the requesting user
+    const blocked = await this.chatService.getUsersBlockedBy(requestingUser.id);
+    if (blocked.some((user) => user.id === data.userId)) return;
+    // Send the request
+    this.server
+      .to(requestedUserWsId)
+      .emit('request-match', { userId: requestingUser.id });
+    // Save the request
+    this.chatService.addMatchRequest(requestingUser.id, data.userId);
   }
 
   @SubscribeMessage('cancel-request-match')
   handleCancelRequestMatch(@ConnectedSocket() client: Socket) {
-    const inviteUser = this.chatService.getUser(client);
-    const invitee = this.chatService.getInvite(inviteUser.id);
-    if (!invitee) {
+    // Check if the requesting user is valid
+    const requestingUser = this.chatService.getUser(client);
+    if (!requestingUser) {
+      this.logger.error('invalid requesting user');
+      return;
+    }
+    // Check if the request exists
+    const requestedUser = this.chatService.getMatchRequest(requestingUser.id);
+    if (!requestedUser) {
+      this.logger.error('invalid requested user');
       this.server.to(client.id).emit('error-pong', 'No pending invite found.');
       return;
     }
-    const inviteeWsId = this.chatService.getWsFromUserId(invitee)?.id;
-    this.chatService.removeInvite(inviteUser.id);
-    this.server.to(inviteeWsId).emit('cancel-request-match', inviteUser);
+    // Cancel the request
+    this.chatService.removeMatchRequest(requestingUser.id);
+    // Check if the requested user is connected
+    const requestedUserWsId =
+      this.chatService.getWsFromUserId(requestedUser)?.id;
+    if (!requestedUserWsId) {
+      return;
+    }
+    // Send the cancel request
+    this.server
+      .to(requestedUserWsId)
+      .emit('cancel-request-match', requestingUser);
   }
 
   @SubscribeMessage('approve-pong')
@@ -118,7 +146,7 @@ export class ChatGateway {
       return;
     } else {
       if (
-        this.chatService.getInvite(data.userId) !==
+        this.chatService.getMatchRequest(data.userId) !==
         this.chatService.getUserId(client)
       ) {
         this.server
@@ -129,7 +157,7 @@ export class ChatGateway {
       const emitData = { roomId: v4() };
       this.server.to(client.id).emit('match-pong', emitData);
       this.server.to(approvedUserWsId).emit('match-pong', emitData);
-      this.chatService.removeInvite(data.userId);
+      this.chatService.removeMatchRequest(data.userId);
     }
   }
 
@@ -143,7 +171,7 @@ export class ChatGateway {
       return;
     } else {
       if (
-        this.chatService.getInvite(data.userId) !==
+        this.chatService.getMatchRequest(data.userId) !==
         this.chatService.getUserId(client)
       ) {
         this.server
@@ -152,7 +180,7 @@ export class ChatGateway {
         return;
       }
       this.server.to(deniedUserWsId).emit('deny-pong');
-      this.chatService.removeInvite(data.userId);
+      this.chatService.removeMatchRequest(data.userId);
     }
   }
 

backend/src/chat/chat.service.ts

@@ -11,7 +11,7 @@ import { UnblockEvent } from 'src/common/events/unblock.event';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { UserService } from 'src/user/user.service';
 import { CreateMessageDto } from './dto/create-message.dto';
-import { PublicUserEntity } from './entities/message.entity';
+import { WsPublicUserEntity } from './entities/message.entity';
 
 export enum UserStatus {
   Offline = 0b0,
@@ -35,9 +35,9 @@ export class ChatService {
 
   // Map<User.id, Socket>
   private clients = new Map<User['id'], Socket>();
-  // key: inviter, value: invitee
-  private users = new Map<Socket['id'], PublicUserEntity>();
-  private invite = new Map<User['id'], User['id']>();
+  private users = new Map<Socket['id'], WsPublicUserEntity>();
+  // key: requestingUserId, value: requestedUserId
+  private matchRequests = new Map<User['id'], User['id']>();
   private statuses = new Map<User['id'], UserStatus>();
 
   getUser(client: Socket) {
@@ -58,7 +58,7 @@ export class ChatService {
 
   addClient(user: User, client: Socket) {
     this.clients.set(user.id, client);
-    this.users.set(client.id, new PublicUserEntity(user));
+    this.users.set(client.id, new WsPublicUserEntity(user));
   }
 
   removeClient(client: Socket) {
@@ -67,20 +67,20 @@ export class ChatService {
       this.statuses.delete(user.id);
       this.clients.delete(user.id);
       this.users.delete(client.id);
-      this.removeInvite(user.id);
+      this.removeMatchRequest(user.id);
     }
   }
 
-  addInvite(inviterId: number, inviteeId: number) {
-    this.invite.set(inviterId, inviteeId);
+  addMatchRequest(requestingUserId: number, requestedUserId: number) {
+    this.matchRequests.set(requestingUserId, requestedUserId);
   }
 
-  getInvite(inviterId: number) {
-    return this.invite.get(inviterId);
+  getMatchRequest(requestingUserId: number) {
+    return this.matchRequests.get(requestingUserId);
   }
 
-  removeInvite(inviterId: number) {
-    this.invite.delete(inviterId);
+  removeMatchRequest(requestingUserId: number) {
+    this.matchRequests.delete(requestingUserId);
   }
 
   addUserToRoom(roomId: number, userId: number) {
@@ -215,7 +215,7 @@ export class ChatService {
     const emitData = {
       userId: this.getUserId(client),
       status: UserStatus.Offline,
-      name: this.getUser(client).name,
+      name: this.getUser(client)?.name,
     };
     if (emitData.userId) {
       client.broadcast.emit('online-status', [emitData]);

backend/src/chat/entities/message.entity.ts

@@ -1,21 +1,21 @@
-export class PublicUserEntity {
-  constructor(partial: Partial<PublicUserEntity>) {
-    this.id = partial.id;
-    this.name = partial.name;
-    this.avatarURL = partial.avatarURL;
+export class WsPublicUserEntity {
+  constructor(user: WsPublicUserEntity) {
+    this.id = user.id;
+    this.name = user.name;
+    this.avatarURL = user.avatarURL;
   }
   id: number;
   name: string;
-  avatarURL?: string;
+  avatarURL: string | null;
 }
 
 export class MessageEntity {
-  constructor(partial: Partial<MessageEntity>, user: PublicUserEntity) {
-    this.content = partial.content;
-    this.roomId = partial.roomId;
+  constructor(message: Omit<MessageEntity, 'user'>, user: WsPublicUserEntity) {
+    this.content = message.content;
+    this.roomId = message.roomId;
     this.user = user;
   }
   content: string;
   roomId: number;
-  user: PublicUserEntity;
+  user: WsPublicUserEntity;
 }

backend/tsconfig.json

@@ -12,7 +12,7 @@
     "baseUrl": "./",
     "incremental": true,
     "skipLibCheck": true,
-    "strictNullChecks": false,
+    "strictNullChecks": true,
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,