diff --git a/client/clientauth.js b/client/clientauth.js index 74305a9..92192c3 100644 --- a/client/clientauth.js +++ b/client/clientauth.js @@ -109,7 +109,7 @@ module.exports = ( fastify, opts, done ) => { method: "POST", host: server.ip, port: server.authPort, - path: `/authenticate_incoming_player?id=${request.query.id}&authToken=${authToken}` + path: `/authenticate_incoming_player?id=${request.query.id}&authToken=${authToken}&serverAuthToken=${server.serverAuthToken}` }, pdata ) if ( !authResponse ) diff --git a/client/serverlist.js b/client/serverlist.js index 2f51d96..8aeb6fe 100644 --- a/client/serverlist.js +++ b/client/serverlist.js @@ -31,6 +31,7 @@ module.exports = ( fastify, opts, done ) => { delete copy.port delete copy.authPort delete copy.password + delete copy.serverAuthToken displayServerArray.push( copy ) } diff --git a/server/gameserver.js b/server/gameserver.js index 4005aec..477795d 100644 --- a/server/gameserver.js +++ b/server/gameserver.js @@ -85,7 +85,8 @@ module.exports = ( fastify, opts, done ) => { return { success: true, - id: newServer.id + id: newServer.id, + serverAuthToken: newServer.serverAuthToken } }) diff --git a/shared/gameserver.js b/shared/gameserver.js index 5abb857..4e22897 100644 --- a/shared/gameserver.js +++ b/shared/gameserver.js @@ -26,6 +26,7 @@ class GameServer this.lastHeartbeat = nameOrServer.lastHeartbeat this.id = nameOrServer.id + this.serverAuthToken = nameOrServer.serverAuthToken this.updateValues( nameOrServer.name, nameOrServer.description, nameOrServer.playerCount, nameOrServer.maxPlayers, nameOrServer.map, nameOrServer.playlist, nameOrServer.ip, nameOrServer.port, nameOrServer.authPort, nameOrServer.password, nameOrServer.modInfo, nameOrServer.pdiffs ) } else // normal constructor @@ -33,6 +34,7 @@ class GameServer this.lastHeartbeat = Date.now() this.id = crypto.randomBytes(16).toString( "hex" ) + this.serverAuthToken = crypto.randomBytes(16).toString( "hex" ) this.updateValues( nameOrServer, description, playerCount, maxPlayers, map, playlist, ip, port, authPort, password, modInfo ) } }