diff --git a/back/src/Controller/AuthenticateController.ts b/back/src/Controller/AuthenticateController.ts index 55036a0e..4d950815 100644 --- a/back/src/Controller/AuthenticateController.ts +++ b/back/src/Controller/AuthenticateController.ts @@ -77,20 +77,18 @@ export class AuthenticateController extends BaseController { }); this.App.post("/anonymLogin", (res: HttpResponse, req: HttpRequest) => { - (async () => { - this.addCorsHeaders(res); + this.addCorsHeaders(res); - res.onAborted(() => { - console.warn('Login request was aborted'); - }) + res.onAborted(() => { + console.warn('Login request was aborted'); + }) - const userUuid = v4(); - const authToken = jwtTokenManager.createJWTToken(userUuid); - res.writeStatus("200 OK").end(JSON.stringify({ - authToken, - userUuid, - })); - })(); + const userUuid = v4(); + const authToken = jwtTokenManager.createJWTToken(userUuid); + res.writeStatus("200 OK").end(JSON.stringify({ + authToken, + userUuid, + })); }); } } diff --git a/back/src/Model/RoomIdentifier.ts b/back/src/Model/RoomIdentifier.ts index 9bb58bb9..2cba16fd 100644 --- a/back/src/Model/RoomIdentifier.ts +++ b/back/src/Model/RoomIdentifier.ts @@ -2,9 +2,9 @@ export class RoomIdentifier { public anonymous: boolean; public id:string constructor(roomID: string) { - if (roomID.indexOf('_/') === 0) { + if (roomID.startsWith('_/')) { this.anonymous = true; - } else if(roomID.indexOf('@/') === 0) { + } else if(roomID.startsWith('@/')) { this.anonymous = false; } else { throw new Error('Incorrect room ID: '+roomID); diff --git a/front/src/Administration/ConsoleGlobalMessageManager.ts b/front/src/Administration/ConsoleGlobalMessageManager.ts index 64e417a0..8258d0ed 100644 --- a/front/src/Administration/ConsoleGlobalMessageManager.ts +++ b/front/src/Administration/ConsoleGlobalMessageManager.ts @@ -6,7 +6,6 @@ import {PlayGlobalMessageInterface} from "../Connexion/ConnexionModels"; export const CLASS_CONSOLE_MESSAGE = 'main-console'; export const INPUT_CONSOLE_MESSAGE = 'input-send-text'; export const UPLOAD_CONSOLE_MESSAGE = 'input-upload-music'; -export const BUTTON_CONSOLE_SEND = 'button-send'; export const INPUT_TYPE_CONSOLE = 'input-type'; export const AUDIO_TYPE = 'audio'; @@ -124,7 +123,7 @@ export class ConsoleGlobalMessageManager { // Start loading CSS const cssPromise = ConsoleGlobalMessageManager.loadCss(); // Import quill - const Quill = await import("quill") as any; + const Quill:any = await import("quill"); // eslint-disable-line @typescript-eslint/no-explicit-any // Wait for CSS to be loaded await cssPromise; diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts index 615f75b9..9fb7cbdb 100644 --- a/front/src/Connexion/ConnectionManager.ts +++ b/front/src/Connexion/ConnectionManager.ts @@ -18,7 +18,7 @@ class ConnectionManager { const connexionType = urlManager.getGameConnexionType(); if(connexionType === GameConnexionTypes.register) { const organizationMemberToken = urlManager.getOrganizationToken(); - const data:any = await Axios.post(`${API_URL}/register`, {organizationMemberToken}).then(res => res.data); + const data = await Axios.post(`${API_URL}/register`, {organizationMemberToken}).then(res => res.data); this.localUser = new LocalUser(data.userUuid, data.authToken); localUserStore.saveUser(this.localUser); @@ -35,7 +35,7 @@ class ConnectionManager { if (localUser) { this.localUser = localUser } else { - const data:any = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data); + const data = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data); this.localUser = new LocalUser(data.userUuid, data.authToken); localUserStore.saveUser(this.localUser); } diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts index 22123d1c..01eee687 100644 --- a/front/src/Phaser/Game/GameManager.ts +++ b/front/src/Phaser/Game/GameManager.ts @@ -58,7 +58,7 @@ export class GameManager { return mapUrlStart.substring(startPos, endPos); } - public async goToStartingMap(scenePlugin: Phaser.Scenes.ScenePlugin) { + public goToStartingMap(scenePlugin: Phaser.Scenes.ScenePlugin) { console.log('Starting scene '+this.startRoom.url); scenePlugin.start(this.startRoom.url, {startLayerName: 'global'}); } diff --git a/front/src/Phaser/Login/EnableCameraScene.ts b/front/src/Phaser/Login/EnableCameraScene.ts index 3916587a..1d8bf3d3 100644 --- a/front/src/Phaser/Login/EnableCameraScene.ts +++ b/front/src/Phaser/Login/EnableCameraScene.ts @@ -258,7 +258,7 @@ export class EnableCameraScene extends Phaser.Scene { this.soundMeterSprite.setVolume(this.soundMeter.getVolume()); } - private async login(): Promise { + private login(): void { this.getElementByIdOrFail('webRtcSetup').style.display = 'none'; this.soundMeter.stop(); window.removeEventListener('resize', this.repositionCallback); diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts index ae8725bc..0199bf75 100644 --- a/front/src/Url/UrlManager.ts +++ b/front/src/Url/UrlManager.ts @@ -12,11 +12,11 @@ class UrlManager { //todo: use that to detect if we can find a token in localstorage public getGameConnexionType(): GameConnexionTypes { const url = window.location.pathname.toString(); - if (url.indexOf('_/') > -1) { + if (url.includes('_/')) { return GameConnexionTypes.anonymous; - } else if (url.indexOf('@/') > -1) { + } else if (url.includes('@/')) { return GameConnexionTypes.organization; - } else if(url.indexOf('register/') > -1) { + } else if(url.includes('register/')) { return GameConnexionTypes.register } else { return GameConnexionTypes.unknown