Merge branch 'develop' of github.com:thecodingmachine/workadventure

pusher/src/Controller/AuthenticateController.ts

@@ -63,13 +63,30 @@ export class AuthenticateController extends BaseController {
                 if (token != undefined) {
                     try {
                         const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
+
+                        //Get user data from Admin Back Office
+                        //This is very important to create User Local in LocalStorage in WorkAdventure
+                        const resUserData = await this.getUserByUserIdentifier(
+                            authTokenData.identifier,
+                            playUri as string,
+                            IPAddress
+                        );
+
                         if (authTokenData.accessToken == undefined) {
+                            //if not nonce and code, user connected in anonymous
+                            //get data with identifier and return token
+                            if (!code && !nonce) {
+                                res.writeStatus("200");
+                                this.addCorsHeaders(res);
+                                return res.end(JSON.stringify({ ...resUserData, authToken: token }));
+                            }
                             throw Error("Token cannot to be check on Hydra");
                         }
+
                         const resCheckTokenAuth = await openIDClient.checkTokenAuth(authTokenData.accessToken);
                         res.writeStatus("200");
                         this.addCorsHeaders(res);
-                        return res.end(JSON.stringify({ ...resCheckTokenAuth, username: authTokenData.username, authToken: token }));
+                        return res.end(JSON.stringify({ ...resCheckTokenAuth, ...resUserData, username: authTokenData.username, authToken: token }));
                     } catch (err) {
                         console.info("User was not connected", err);
                     }
@@ -81,7 +98,7 @@ export class AuthenticateController extends BaseController {
                 if (!sub) {
                     throw new Error("No sub in the response");
                 }
-                const authToken = jwtTokenManager.createAuthToken(sub, userInfo.access_token, userInfo.username);
+                const authToken = jwtTokenManager.createAuthToken(sub, userInfo?.access_token, userInfo?.username);
 
                 //Get user data from Admin Back Office
                 //This is very important to create User Local in LocalStorage in WorkAdventure
@@ -249,7 +266,14 @@ export class AuthenticateController extends BaseController {
         playUri: string,
         IPAddress: string
     ): Promise<FetchMemberDataByUuidResponse | object> {
-        let data: FetchMemberDataByUuidResponse | object = {};
+        let data: FetchMemberDataByUuidResponse = {
+            email: email,
+            userUuid: email,
+            tags: [],
+            messages: [],
+            visitCardUrl: null,
+            textures: [],
+        };
         try {
             data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress);
         } catch (err) {

pusher/src/Controller/BaseController.ts

@@ -1,10 +1,11 @@
 import { HttpResponse } from "uWebSockets.js";
+import { FRONT_URL } from "../Enum/EnvironmentVariable";
 
 export class BaseController {
     protected addCorsHeaders(res: HttpResponse): void {
         res.writeHeader("access-control-allow-headers", "Origin, X-Requested-With, Content-Type, Accept");
         res.writeHeader("access-control-allow-methods", "GET, POST, OPTIONS, PUT, PATCH, DELETE");
-        res.writeHeader("access-control-allow-origin", "*");
+        res.writeHeader("access-control-allow-origin", FRONT_URL);
     }
 
     /**

pusher/src/Controller/IoSocketController.ts

@@ -189,6 +189,7 @@ export class IoSocketController {
                         let memberTextures: CharacterTexture[] = [];
                         const room = await socketManager.getOrCreateRoom(roomId);
                         let userData: FetchMemberDataByUuidResponse = {
+                            email: userIdentifier,
                             userUuid: userIdentifier,
                             tags: [],
                             visitCardUrl: null,

pusher/src/Controller/MapController.ts

@@ -2,7 +2,7 @@ import { HttpRequest, HttpResponse, TemplatedApp } from "uWebSockets.js";
 import { BaseController } from "./BaseController";
 import { parse } from "query-string";
 import { adminApi } from "../Services/AdminApi";
-import { ADMIN_API_URL, DISABLE_ANONYMOUS } from "../Enum/EnvironmentVariable";
+import { ADMIN_API_URL, DISABLE_ANONYMOUS, FRONT_URL } from "../Enum/EnvironmentVariable";
 import { GameRoomPolicyTypes } from "../Model/PusherRoom";
 import { isMapDetailsData, MapDetailsData } from "../Services/AdminApi/MapDetailsData";
 import { socketManager } from "../Services/SocketManager";
@@ -21,7 +21,6 @@ export class MapController extends BaseController {
     getMapUrl() {
         this.App.options("/map", (res: HttpResponse, req: HttpRequest) => {
             this.addCorsHeaders(res);
-
             res.end();
         });
 
@@ -81,10 +80,18 @@ export class MapController extends BaseController {
                             authTokenData = jwtTokenManager.verifyJWTToken(query.authToken as string);
                             userId = authTokenData.identifier;
                         } catch (e) {
-                            // Decode token, in this case we don't need to create new token.
-                            authTokenData = jwtTokenManager.verifyJWTToken(query.authToken as string, true);
-                            userId = authTokenData.identifier;
-                            console.info("JWT expire, but decoded", userId);
+                            try {
+                                // Decode token, in this case we don't need to create new token.
+                                authTokenData = jwtTokenManager.verifyJWTToken(query.authToken as string, true);
+                                userId = authTokenData.identifier;
+                                console.info("JWT expire, but decoded", userId);
+                            } catch (e) {
+                                // The token was not good, redirect user on login page
+                                res.writeStatus("500");
+                                res.writeHeader("Access-Control-Allow-Origin", FRONT_URL);
+                                res.end("Token decrypted error");
+                                return;
+                            }
                         }
                     }
                     const mapDetails = await adminApi.fetchMapDetails(query.playUri as string, userId);