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

pusher/src/Controller/IoSocketController.ts

@@ -37,7 +37,7 @@ import { InvalidTokenError } from "../Controller/InvalidTokenError";
 import HyperExpress from "hyper-express";
 import { localWokaService } from "../Services/LocalWokaService";
 import { WebSocket } from "uWebSockets.js";
-import { WokaDetail } from "../Enum/PlayerTextures";
+import { WokaDetail } from "../Messages/JsonMessages/PlayerTextures";
 
 /**
  * The object passed between the "open" and the "upgrade" methods when opening a websocket

pusher/src/Controller/MapController.ts

@@ -88,6 +88,14 @@ export class MapController extends BaseHttpController {
          *                   type: boolean|undefined
          *                   description: Whether the "report" feature is enabled or not on this room
          *                   example: true
+         *                 loadingLogo:
+         *                   type: string
+         *                   description: The URL of the image to be used on the loading page
+         *                   example: https://example.com/logo.png
+         *                 loginSceneLogo:
+         *                   type: string
+         *                   description: The URL of the image to be used on the LoginScene
+         *                   example: https://example.com/logo_login.png
          *
          */
         this.app.get("/map", (req, res) => {

pusher/src/Enum/PlayerTextures.ts

@@ -1,48 +0,0 @@
-import * as tg from "generic-type-guard";
-import { z } from "zod";
-
-//The list of all the player textures, both the default models and the partial textures used for customization
-
-const wokaTexture = z.object({
-    id: z.string(),
-    name: z.string(),
-    url: z.string(),
-    tags: z.array(z.string()).optional(),
-    tintable: z.boolean().optional(),
-});
-
-export type WokaTexture = z.infer<typeof wokaTexture>;
-
-const wokaTextureCollection = z.object({
-    name: z.string(),
-    textures: z.array(wokaTexture),
-});
-
-export type WokaTextureCollection = z.infer<typeof wokaTextureCollection>;
-
-const wokaPartType = z.object({
-    collections: z.array(wokaTextureCollection),
-    required: z.boolean().optional(),
-});
-
-export type WokaPartType = z.infer<typeof wokaPartType>;
-
-export const wokaList = z.record(wokaPartType);
-
-export type WokaList = z.infer<typeof wokaList>;
-
-export const wokaPartNames = ["woka", "body", "eyes", "hair", "clothes", "hat", "accessory"];
-
-export const isWokaDetail = new tg.IsInterface()
-    .withProperties({
-        id: tg.isString,
-    })
-    .withOptionalProperties({
-        url: tg.isString,
-        layer: tg.isString,
-    })
-    .get();
-
-export type WokaDetail = tg.GuardedType<typeof isWokaDetail>;
-
-export type WokaDetailsResult = WokaDetail[];

pusher/src/Model/PositionDispatcher.ts

@@ -92,8 +92,10 @@ export class PositionDispatcher {
 
     public removeViewport(socket: ExSocketInterface): void {
         // Also, let's stop listening on viewports
-        for (const zone of socket.listenedZones) {
-            this.stopListening(zone, socket);
+        if (socket.listenedZones) {
+            for (const zone of socket.listenedZones) {
+                this.stopListening(zone, socket);
+            }
         }
     }
 

pusher/src/Model/Websocket/ExSocketInterface.ts

@@ -11,7 +11,7 @@ import {
 import { ClientDuplexStream } from "grpc";
 import { Zone } from "_Model/Zone";
 import { compressors } from "hyper-express";
-import { WokaDetail } from "_Enum/PlayerTextures";
+import { WokaDetail } from "../../Messages/JsonMessages/PlayerTextures";
 
 export type BackConnection = ClientDuplexStream<PusherToBackMessage, ServerToClientMessage>;
 

pusher/src/Model/Websocket/ProtobufUtils.ts

@@ -9,7 +9,7 @@ import { ExSocketInterface } from "_Model/Websocket/ExSocketInterface";
 import Direction = PositionMessage.Direction;
 import { ItemEventMessageInterface } from "_Model/Websocket/ItemEventMessage";
 import { PositionInterface } from "_Model/PositionInterface";
-import { WokaDetail } from "_Enum/PlayerTextures";
+import { WokaDetail } from "../../Messages/JsonMessages/PlayerTextures";
 
 export class ProtobufUtils {
     public static toPositionMessage(point: PointInterface): PositionMessage {

pusher/src/Services/AdminApi.ts

@@ -1,11 +1,11 @@
 import { ADMIN_API_TOKEN, ADMIN_API_URL, ADMIN_URL, OPID_PROFILE_SCREEN_PROVIDER } from "../Enum/EnvironmentVariable";
 import Axios, { AxiosResponse } from "axios";
-import { MapDetailsData } from "../Messages/JsonMessages/MapDetailsData";
-import { RoomRedirect } from "../Messages/JsonMessages/RoomRedirect";
+import { isMapDetailsData, MapDetailsData } from "../Messages/JsonMessages/MapDetailsData";
+import { isRoomRedirect, RoomRedirect } from "../Messages/JsonMessages/RoomRedirect";
 import { AdminApiData, isAdminApiData } from "../Messages/JsonMessages/AdminApiData";
 import * as tg from "generic-type-guard";
 import { isNumber } from "generic-type-guard";
-import { isWokaDetail } from "../Enum/PlayerTextures";
+import { isWokaDetail } from "../Messages/JsonMessages/PlayerTextures";
 import qs from "qs";
 
 export interface AdminBannedData {
@@ -46,10 +46,16 @@ class AdminApi {
             userId,
         };
 
-        const res = await Axios.get(ADMIN_API_URL + "/api/map", {
+        const res = await Axios.get<unknown, AxiosResponse<unknown>>(ADMIN_API_URL + "/api/map", {
             headers: { Authorization: `${ADMIN_API_TOKEN}` },
             params,
         });
+        if (!isMapDetailsData(res.data) && !isRoomRedirect(res.data)) {
+            throw new Error(
+                "Invalid answer received from the admin for the /api/map endpoint. Received: " +
+                    JSON.stringify(res.data)
+            );
+        }
         return res.data;
     }
 

pusher/src/Services/AdminWokaService.ts

@@ -1,6 +1,6 @@
 import axios, { AxiosResponse } from "axios";
 import { ADMIN_API_TOKEN, ADMIN_API_URL } from "../Enum/EnvironmentVariable";
-import { wokaList, WokaList } from "../Enum/PlayerTextures";
+import { wokaList, WokaList } from "../Messages/JsonMessages/PlayerTextures";
 import { WokaServiceInterface } from "./WokaServiceInterface";
 
 class AdminWokaService implements WokaServiceInterface {

pusher/src/Services/LocalWokaService.ts

@@ -1,4 +1,4 @@
-import { WokaDetail, WokaDetailsResult, WokaList, wokaPartNames } from "../Enum/PlayerTextures";
+import { WokaDetail, WokaDetailsResult, WokaList, wokaPartNames } from "../Messages/JsonMessages/PlayerTextures";
 import { WokaServiceInterface } from "./WokaServiceInterface";
 
 class LocalWokaService implements WokaServiceInterface {

pusher/src/Services/WokaServiceInterface.ts

@@ -1,4 +1,4 @@
-import { WokaDetailsResult, WokaList } from "../Enum/PlayerTextures";
+import { WokaList } from "../Messages/JsonMessages/PlayerTextures";
 
 export interface WokaServiceInterface {
     /**