Merge branch 'develop' into localAdmin

front/src/Administration/AnalyticsClient.ts

@@ -9,7 +9,7 @@ class AnalyticsClient {
     constructor() {
         if (POSTHOG_API_KEY && POSTHOG_URL) {
             this.posthogPromise = import("posthog-js").then(({ default: posthog }) => {
-                posthog.init(POSTHOG_API_KEY, { api_host: POSTHOG_URL, disable_cookie: true });
+                posthog.init(POSTHOG_API_KEY, { api_host: POSTHOG_URL });
                 //the posthog toolbar need a reference in window to be able to work
                 window.posthog = posthog;
                 return posthog;

front/src/Components/Menu/ProfileSubMenu.svelte

@@ -1,7 +1,13 @@
 <script lang="ts">
     import { gameManager } from "../../Phaser/Game/GameManager";
     import { SelectCompanionScene, SelectCompanionSceneName } from "../../Phaser/Login/SelectCompanionScene";
-    import { menuIconVisiblilityStore, menuVisiblilityStore, userIsConnected } from "../../Stores/MenuStore";
+    import {
+        menuIconVisiblilityStore,
+        menuVisiblilityStore,
+        userIsConnected,
+        profileAvailable,
+        getProfileUrl,
+    } from "../../Stores/MenuStore";
     import { selectCompanionSceneVisibleStore } from "../../Stores/SelectCompanionStore";
     import { LoginScene, LoginSceneName } from "../../Phaser/Login/LoginScene";
     import { loginSceneVisibleStore } from "../../Stores/LoginSceneStore";
@@ -9,7 +15,6 @@
     import { SelectCharacterScene, SelectCharacterSceneName } from "../../Phaser/Login/SelectCharacterScene";
     import { connectionManager } from "../../Connexion/ConnectionManager";
     import { PROFILE_URL } from "../../Enum/EnvironmentVariable";
-    import { localUserStore } from "../../Connexion/LocalUserStore";
     import { EnableCameraScene, EnableCameraSceneName } from "../../Phaser/Login/EnableCameraScene";
     import { enableCameraSceneVisibilityStore } from "../../Stores/MediaStore";
     import btnProfileSubMenuCamera from "../images/btn-menu-profile-camera.svg";
@@ -47,10 +52,6 @@
         return connectionManager.logout();
     }
 
-    function getProfileUrl() {
-        return PROFILE_URL + `?token=${localUserStore.getAuthToken()}`;
-    }
-
     function openEnableCameraScene() {
         disableMenuStores();
         enableCameraSceneVisibilityStore.showEnableCameraScene();
@@ -81,7 +82,7 @@
     </div>
 
     <div class="content">
-        {#if $userIsConnected}
+        {#if $userIsConnected && $profileAvailable}
             <section>
                 {#if PROFILE_URL != undefined}
                     <iframe title="profile" src={getProfileUrl()} />

front/src/Connexion/ConnectionManager.ts

@@ -290,12 +290,12 @@ class ConnectionManager {
             );
 
             connection.onConnectError((error: object) => {
-                console.log("An error occurred while connecting to socket server. Retrying");
+                console.log("onConnectError => An error occurred while connecting to socket server. Retrying");
                 reject(error);
             });
 
             connection.connectionErrorStream.subscribe((event: CloseEvent) => {
-                console.log("An error occurred while connecting to socket server. Retrying");
+                console.log("connectionErrorStream => An error occurred while connecting to socket server. Retrying");
                 reject(
                     new Error(
                         "An error occurred while connecting to socket server. Retrying. Code: " +

front/src/Enum/EnvironmentVariable.ts

@@ -23,6 +23,7 @@ export const DISPLAY_TERMS_OF_USE = getEnvConfig("DISPLAY_TERMS_OF_USE") == "tru
 export const NODE_ENV = getEnvConfig("NODE_ENV") || "development";
 export const CONTACT_URL = getEnvConfig("CONTACT_URL") || undefined;
 export const PROFILE_URL = getEnvConfig("PROFILE_URL") || undefined;
+export const IDENTITY_URL = getEnvConfig("IDENTITY_URL") || undefined;
 export const POSTHOG_API_KEY: string = (getEnvConfig("POSTHOG_API_KEY") as string) || "";
 export const POSTHOG_URL = getEnvConfig("POSTHOG_URL") || undefined;
 export const DISABLE_ANONYMOUS: boolean = getEnvConfig("DISABLE_ANONYMOUS") === "true";

front/src/Stores/MenuStore.ts

@@ -1,17 +1,27 @@
 import { get, writable } from "svelte/store";
 import Timeout = NodeJS.Timeout;
 import { userIsAdminStore } from "./GameStore";
-import { CONTACT_URL } from "../Enum/EnvironmentVariable";
+import { CONTACT_URL, IDENTITY_URL, PROFILE_URL } from "../Enum/EnvironmentVariable";
 import { analyticsClient } from "../Administration/AnalyticsClient";
 import type { Translation } from "../i18n/i18n-types";
+import axios from "axios";
+import { localUserStore } from "../Connexion/LocalUserStore";
 
 export const menuIconVisiblilityStore = writable(false);
 export const menuVisiblilityStore = writable(false);
-menuVisiblilityStore.subscribe((value) => {
-    if (value) analyticsClient.openedMenu();
-});
 export const menuInputFocusStore = writable(false);
 export const userIsConnected = writable(false);
+export const profileAvailable = writable(true);
+
+menuVisiblilityStore.subscribe((value) => {
+    if (value) analyticsClient.openedMenu();
+    if (userIsConnected && value && IDENTITY_URL != null) {
+        axios.get(getMeUrl()).catch((err) => {
+            console.error("menuVisiblilityStore => err => ", err);
+            profileAvailable.set(false);
+        });
+    }
+});
 
 let warningContainerTimeout: Timeout | null = null;
 function createWarningContainerStore() {
@@ -173,3 +183,11 @@ export function handleMenuUnregisterEvent(menuName: string) {
     subMenusStore.removeScriptingMenu(menuName);
     customMenuIframe.delete(menuName);
 }
+
+export function getProfileUrl() {
+    return PROFILE_URL + `?token=${localUserStore.getAuthToken()}`;
+}
+
+export function getMeUrl() {
+    return IDENTITY_URL + `?token=${localUserStore.getAuthToken()}`;
+}

front/vite.config.ts

@@ -28,6 +28,7 @@ export default defineConfig({
                 "ADMIN_URL",
                 "CONTACT_URL",
                 "PROFILE_URL",
+                "IDENTITY_URL",
                 "ICON_URL",
                 "DEBUG_MODE",
                 "STUN_SERVER",

pusher/src/Controller/AuthenticateController.ts

@@ -1,5 +1,6 @@
 import { v4 } from "uuid";
 import { BaseHttpController } from "./BaseHttpController";
+import { adminApi, FetchMemberDataByUuidResponse } from "../Services/AdminApi";
 import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager";
 import { parse } from "query-string";
 import { openIDClient } from "../Services/OpenIDClient";
@@ -18,6 +19,7 @@ export class AuthenticateController extends BaseHttpController {
         this.register();
         this.anonymLogin();
         this.profileCallback();
+        this.me();
     }
 
     openIDLogin() {
@@ -179,7 +181,7 @@ export class AuthenticateController extends BaseHttpController {
                             if (!code && !nonce) {
                                 return res.json({ ...resUserData, authToken: token });
                             }
-                            console.error("Token cannot to be check on OpenId provider");
+                            console.error("Token cannot be checked on OpenId provider");
                             res.status(500);
                             res.send("User cannot to be connected on openid provider");
                             return;
@@ -254,7 +256,7 @@ export class AuthenticateController extends BaseHttpController {
             try {
                 const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
                 if (authTokenData.accessToken == undefined) {
-                    throw Error("Token cannot to be logout on Hydra");
+                    throw Error("Token cannot be logout on Hydra");
                 }
                 await openIDClient.logoutUser(authTokenData.accessToken);
             } catch (error) {
@@ -415,7 +417,7 @@ export class AuthenticateController extends BaseHttpController {
                     try {
                         const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
                         if (authTokenData.accessToken == undefined) {
-                            throw Error("Token cannot to be check on Hydra");
+                            throw Error("Token cannot be checked on OpenID connect provider");
                         }
                         await openIDClient.checkTokenAuth(authTokenData.accessToken);
 
@@ -435,4 +437,81 @@ export class AuthenticateController extends BaseHttpController {
             }
         });
     }
+
+    /**
+     * @openapi
+     * /me:
+     *   get:
+     *     description: ???
+     *     parameters:
+     *      - name: "token"
+     *        in: "query"
+     *        description: "A JWT authentication token ???"
+     *        required: true
+     *        type: "string"
+     *     responses:
+     *       200:
+     *         description: Data of user connected
+     */
+    me() {
+        // @ts-ignore
+        this.app.get("/me", async (req, res): void => {
+            const { token } = parse(req.path_query);
+            try {
+                //verify connected by token
+                if (token != undefined) {
+                    try {
+                        const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
+                        if (authTokenData.accessToken == undefined) {
+                            throw Error("Token cannot to be checked on Hydra");
+                        }
+                        const me = await openIDClient.checkTokenAuth(authTokenData.accessToken);
+
+                        //get login profile
+                        res.status(200);
+                        res.json({ ...me });
+                        return;
+                    } catch (error) {
+                        this.castErrorToResponse(error, res);
+                        return;
+                    }
+                }
+            } catch (error) {
+                console.error("me => ERROR", error);
+                this.castErrorToResponse(error, res);
+                return;
+            }
+        });
+    }
+
+    /**
+     *
+     * @param email
+     * @param playUri
+     * @param IPAddress
+     * @return 
+     |object
+     * @private
+     */
+    private async getUserByUserIdentifier(
+        email: string,
+        playUri: string,
+        IPAddress: string
+    ): Promise<FetchMemberDataByUuidResponse | object> {
+        let data: FetchMemberDataByUuidResponse = {
+            email: email,
+            userUuid: email,
+            tags: [],
+            messages: [],
+            visitCardUrl: null,
+            textures: [],
+            userRoomToken: undefined,
+        };
+        try {
+            data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress, []);
+        } catch (err) {
+            console.error("openIDCallback => fetchMemberDataByUuid", err);
+        }
+        return data;
+    }
 }