fix: update handler for critical error while parsing game token

iaurg · Dec 6, 2023 · eef0a60 · eef0a60
1 parent e40d01e
commit eef0a60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/backend/src/game/game.gateway.ts b/backend/src/game/game.gateway.ts
@@ -46,13 +46,16 @@ export class GameGateway implements OnGatewayConnection, OnGatewayDisconnect {
 
   handleConnection(client: Socket) {
     // Get user from cookie coming from client
-    const user = client.handshake.auth.token;
 
     // Decode user from JWT
-    const decodedUser = this.jwtService.decode(user).sub;
-
+    const user = client.handshake.auth.token;
+    const decodedUser = this.jwtService.decode(user)?.sub;
+    if (!decodedUser) {
+      this.logger.error('Token invalid or expired');
+      client.disconnect();
+      return;
+    }
     this.pool.set(decodedUser, client);
-
     this.logger.log(`Client ${decodedUser} connected`);
   }
 

diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx
@@ -2,7 +2,6 @@
 import nookies from "nookies";
 import React, { createContext, useEffect, useState } from "react";
 import { api } from "@/services/apiClient";
-import { redirect } from "next/navigation";
 import { User } from "@/types/user";
 import { useGetMe } from "@/services/queries/user/getMe";
 
@@ -32,7 +31,8 @@ export const AuthContext = createContext<AuthContextType>(
 export function signOut() {
   nookies.destroy(null, "accesssToken");
   nookies.destroy(null, "refreshToken");
-  redirect("/login");
+  api.defaults.headers["Authorization"] = "";
+  window.location.replace("/");
 }
 
 export const AuthProvider = ({ children }: AuthProviderProps) => {