Don't expect name in auth response, we don't use it anyways

Tripperful · Feb 12, 2024 · 53564ed · 53564ed
1 parent 769a77a
commit 53564ed
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/packages/client/src/components/MatchMenu/MatchPlayers.tsx b/packages/client/src/components/MatchMenu/MatchPlayers.tsx
@@ -118,7 +118,7 @@ const MatchPlayerItem: FC<{
   return (
     <div className={c.playerItem}>
       <span className={c.teamColor}>
-        {player.steamProfile?.name ?? player.name}
+        {player.steamProfile?.name ?? player.steamId}
       </span>
       <span className={c.playerTeamButtons}>
         {teams

diff --git a/packages/client/src/srcds-mock/index.tsx b/packages/client/src/srcds-mock/index.tsx
@@ -56,7 +56,6 @@ const App: FC = () => {
       token,
       userId,
       steamId,
-      name,
     };
 
     setPlayers((cur) => [...cur, newPlayer]);
@@ -109,7 +108,7 @@ const App: FC = () => {
               rel="noreferrer"
               href={`${location.protocol}//${location.host}?guid=test&token=${p.token}`}
             >
-              {p.name}
+              {p.steamId}
             </a>
             &nbsp;
             <button onClick={() => onDeletePlayer(p.token)}>X</button>

diff --git a/packages/common/src/types/players.ts b/packages/common/src/types/players.ts
@@ -2,7 +2,6 @@ import { SteamPlayerData } from './steam';
 
 export interface OnlinePlayerInfo {
   steamId: string;
-  name: string;
   userId: number;
   steamProfile?: SteamPlayerData;
 }

diff --git a/packages/server/src/api/log.ts b/packages/server/src/api/log.ts
@@ -14,15 +14,15 @@ logApi.post('/:severity', async (req, res) => {
   try {
     const { sessionData } = res.locals;
 
-    const { token, name, steamId } = sessionData ?? {};
+    const { token, steamId } = sessionData ?? {};
 
     const severity = req.params.severity as Severity;
     const log = req.body;
 
     const logFunc = logFuncMap[severity];
 
     logFunc?.(
-      `@@@ Client ${severity} from player ${name} (token: ${token}, steamid: ${steamId}):`,
+      `@@@ Client ${severity} from player (token: ${token}, steamid: ${steamId}):`,
       '\n' + log,
     );
 

diff --git a/packages/server/src/auth.ts b/packages/server/src/auth.ts
@@ -3,13 +3,12 @@ import { RequestHandler } from 'express';
 import { db } from './db';
 import { getSrcdsApi } from './srcdsApi';
 import { SrcdsApi } from './srcdsApi/SrcdsApi';
-import { dbgInfo, dbgWarn } from './util';
+import { dbgWarn } from './util';
 
 export interface MotdSessionData {
   protocol: SrcdsProtocol;
   remoteId: string;
   token: string;
-  name: string;
   userId: number;
   steamId: string;
   permissions: Permission[];
@@ -26,7 +25,7 @@ const getUserCredentials = async (
   if (!authCache[token]) {
     const auth = await srcdsApi.auth(token);
 
-    if (!(auth.name && auth.userId && auth.steamId)) {
+    if (!(auth.userId && auth.steamId)) {
       delete authCache[token];
 
       throw 'Unauthorized';
@@ -78,14 +77,13 @@ export const authMiddleware: RequestHandler = async (req, res, next) => {
     const srcdsApi = getSrcdsApi({ protocol, remoteId });
     res.locals.srcdsApi = srcdsApi;
 
-    const { steamId, name, userId } = await getUserCredentials(token, srcdsApi);
+    const { steamId, userId } = await getUserCredentials(token, srcdsApi);
     const permissions = await db.permissions.get(steamId);
 
     res.locals.sessionData = {
       protocol,
       remoteId,
       token,
-      name,
       userId,
       steamId,
       permissions,
@@ -95,7 +93,6 @@ export const authMiddleware: RequestHandler = async (req, res, next) => {
     res.cookie('protocol', protocol);
     res.cookie('remoteId', remoteId);
     res.cookie('token', token, { httpOnly: true });
-    res.cookie('name', name);
     res.cookie('userId', userId);
     res.cookie('steamId', steamId);
     res.cookie('permissions', JSON.stringify(permissions));
@@ -106,7 +103,6 @@ export const authMiddleware: RequestHandler = async (req, res, next) => {
     res.clearCookie('token');
     res.clearCookie('protocol');
     res.clearCookie('remoteId');
-    res.clearCookie('name');
     res.clearCookie('userId');
     res.clearCookie('steamId');
     res.clearCookie('permissions');