Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CD

Browse source
This commit is contained in:
Gregoire Parant 2020-10-19 21:04:16 +02:00
parent dfa6d2cc66
commit ba9f9dcbe1
5 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
back/src/Controller/IoSocketController.ts
View file

@ -73,12 +73,12 @@ export class IoSocketController {
message: (ws, arrayBuffer, isBinary): void => {
try {
//TODO refactor message type and data
let message: {event: string, message: {type: string, message: unknown, userUuid: string}} =
const message: {event: string, message: {type: string, message: unknown, userUuid: string}} =
JSON.parse(new TextDecoder("utf-8").decode(new Uint8Array(arrayBuffer)));
if(message.event === 'user-message') {
if (message.message.type === 'ban') {
let messageToEmit = (message.message as {message: string, type: string, userUuid: string});
const messageToEmit = (message.message as {message: string, type: string, userUuid: string});
socketManager.emitSendUserMessage(messageToEmit);
}
}

5
back/src/Services/JWTTokenManager.ts
View file

@ -49,12 +49,13 @@ class JWTTokenManager {
}
//verify user in admin
return adminApi.fetchCheckUserByToken(tokenInterface.userUuid).then(() => {
adminApi.fetchCheckUserByToken(tokenInterface.userUuid).then(() => {
resolve(tokenInterface.userUuid);
}).catch((err) => {
//anonymous user
if(err.response && err.response.status && err.response.status === 404){
return resolve(tokenInterface.userUuid);
resolve(tokenInterface.userUuid);
return;
}
reject(new Error('Authentication error, invalid token structure. ' + err));
});

2
back/src/Services/SocketManager.ts
View file

@ -674,7 +674,7 @@ class SocketManager {
}
public emitSendUserMessage(messageToSend: {userUuid: string, message: string, type: string}): void {
let socket = this.searchClientByUuid(messageToSend.userUuid);
const socket = this.searchClientByUuid(messageToSend.userUuid);
if(!socket){
throw 'socket was not found';
}