Merge pull request #1563 from thecodingmachine/HotFixConnexionManager

HotFix connexion manager

front/src/Connexion/ConnectionManager.ts

@@ -314,7 +314,7 @@ class ConnectionManager {
             }
         }
         const { authToken, userUuid, textures, email } = await Axios.get(`${PUSHER_URL}/login-callback`, {
-            params: { code, nonce, token },
+            params: { code, nonce, token, playUri: this.currentRoom?.key },
         }).then((res) => res.data);
         localUserStore.setAuthToken(authToken);
         this.localUser = new LocalUser(userUuid, textures, email);

front/src/Connexion/Room.ts

@@ -14,7 +14,7 @@ export interface RoomRedirect {
 export class Room {
     public readonly id: string;
     public readonly isPublic: boolean;
-    private _authenticationMandatory: boolean = DISABLE_ANONYMOUS as boolean;
+    private _authenticationMandatory: boolean = DISABLE_ANONYMOUS;
     private _iframeAuthentication?: string = OPID_LOGIN_SCREEN_PROVIDER;
     private _mapUrl: string | undefined;
     private _textures: CharacterTexture[] | undefined;
@@ -107,7 +107,7 @@ export class Room {
             this._mapUrl = data.mapUrl;
             this._textures = data.textures;
             this._group = data.group;
-            this._authenticationMandatory = data.authenticationMandatory || (DISABLE_ANONYMOUS as boolean);
+            this._authenticationMandatory = data.authenticationMandatory || DISABLE_ANONYMOUS;
             this._iframeAuthentication = data.iframeAuthentication || OPID_LOGIN_SCREEN_PROVIDER;
             this._contactPage = data.contactPage || CONTACT_URL;
             return new MapDetail(data.mapUrl, data.textures);

front/src/Enum/EnvironmentVariable.ts

@@ -23,7 +23,7 @@ export const CONTACT_URL = process.env.CONTACT_URL || undefined;
 export const PROFILE_URL = process.env.PROFILE_URL || undefined;
 export const POSTHOG_API_KEY: string = (process.env.POSTHOG_API_KEY as string) || "";
 export const POSTHOG_URL = process.env.POSTHOG_URL || undefined;
-export const DISABLE_ANONYMOUS = process.env.DISABLE_ANONYMOUS || false;
+export const DISABLE_ANONYMOUS: boolean = process.env.DISABLE_ANONYMOUS === "true";
 export const OPID_LOGIN_SCREEN_PROVIDER = process.env.OPID_LOGIN_SCREEN_PROVIDER;
 
 export const isMobile = (): boolean => window.innerWidth <= 800 || window.innerHeight <= 600;

front/src/Phaser/Game/GameScene.ts

@@ -88,6 +88,7 @@ import { analyticsClient } from "../../Administration/AnalyticsClient";
 import { get } from "svelte/store";
 import { contactPageStore } from "../../Stores/MenuStore";
 import { GameMapProperties } from "./GameMapProperties";
+import SpriteSheetFile = Phaser.Loader.FileTypes.SpriteSheetFile;
 
 export interface GameSceneInitInterface {
     initPosition: PointInterface | null;
@@ -293,7 +294,8 @@ export class GameScene extends DirtyScene {
             }
 
             //once preloading is over, we don't want loading errors to crash the game, so we need to disable this behavior after preloading.
-            if (this.preloading) {
+            //if SpriteSheetFile (WOKA file) don't display error and give an access for user
+            if (this.preloading && !(file instanceof SpriteSheetFile)) {
                 //remove loader in progress
                 removeLoader(this);
 

pusher/src/Controller/AuthenticateController.ts

@@ -64,6 +64,18 @@ export class AuthenticateController extends BaseController {
                     try {
                         const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
                         if (authTokenData.accessToken == undefined) {
+                            //if not nonce and code, user connected in anonymous
+                            //get data with identifier and return token
+                            if (!code && !nonce) {
+                                const data = await this.getUserByUserIdentifier(
+                                    authTokenData.identifier,
+                                    playUri as string,
+                                    IPAddress
+                                );
+                                res.writeStatus("200");
+                                this.addCorsHeaders(res);
+                                return res.end(JSON.stringify({ ...data, authToken: token }));
+                            }
                             throw Error("Token cannot to be check on Hydra");
                         }
                         const resCheckTokenAuth = await openIDClient.checkTokenAuth(authTokenData.accessToken);
@@ -81,7 +93,7 @@ export class AuthenticateController extends BaseController {
                 if (!email) {
                     throw new Error("No email in the response");
                 }
-                const authToken = jwtTokenManager.createAuthToken(email, userInfo.access_token);
+                const authToken = jwtTokenManager.createAuthToken(email, userInfo?.access_token);
 
                 //Get user data from Admin Back Office
                 //This is very important to create User Local in LocalStorage in WorkAdventure

pusher/src/Enum/EnvironmentVariable.ts

@@ -18,7 +18,7 @@ export const OPID_CLIENT_SECRET = process.env.OPID_CLIENT_SECRET || "";
 export const OPID_CLIENT_ISSUER = process.env.OPID_CLIENT_ISSUER || "";
 export const OPID_CLIENT_REDIRECT_URL = process.env.OPID_CLIENT_REDIRECT_URL || FRONT_URL + "/jwt";
 export const OPID_PROFILE_SCREEN_PROVIDER = process.env.OPID_PROFILE_SCREEN_PROVIDER || ADMIN_URL + "/profile";
-export const DISABLE_ANONYMOUS = process.env.DISABLE_ANONYMOUS || false;
+export const DISABLE_ANONYMOUS: boolean = process.env.DISABLE_ANONYMOUS === "true";
 
 export {
     SECRET_KEY,