Merge branch 'develop' into changeRegisterAccess

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	pusher/src/Services/AdminApi.ts

pusher/src/Services/AdminApi.ts

@@ -1,26 +1,34 @@
 import { ADMIN_API_TOKEN, ADMIN_API_URL, ADMIN_URL, OPID_PROFILE_SCREEN_PROVIDER } from "../Enum/EnvironmentVariable";
-import Axios from "axios";
-import { GameRoomPolicyTypes } from "_Model/PusherRoom";
-import { CharacterTexture } from "../Messages/JsonMessages/CharacterTexture";
+import Axios, { AxiosResponse } from "axios";
 import { MapDetailsData } from "../Messages/JsonMessages/MapDetailsData";
 import { 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 qs from "qs";
 
 export interface AdminBannedData {
     is_banned: boolean;
     message: string;
 }
 
-export interface FetchMemberDataByUuidResponse {
-    email: string;
-    userUuid: string;
-    tags: string[];
-    visitCardUrl: string | null;
-    textures: CharacterTexture[];
-    messages: unknown[];
-    anonymous?: boolean;
-    userRoomToken: string | undefined;
-}
+const isFetchMemberDataByUuidResponse = new tg.IsInterface()
+    .withProperties({
+        email: tg.isString,
+        userUuid: tg.isString,
+        tags: tg.isArray(tg.isString),
+        visitCardUrl: tg.isNullable(tg.isString),
+        textures: tg.isArray(isWokaDetail),
+        messages: tg.isArray(tg.isUnknown),
+    })
+    .withOptionalProperties({
+        anonymous: tg.isBoolean,
+        userRoomToken: tg.isString,
+    })
+    .get();
+
+export type FetchMemberDataByUuidResponse = tg.GuardedType<typeof isFetchMemberDataByUuidResponse>;
 
 class AdminApi {
     /**
@@ -48,20 +56,30 @@ class AdminApi {
     async fetchMemberDataByUuid(
         userIdentifier: string | null,
         playUri: string,
-        ipAddress: string
+        ipAddress: string,
+        characterLayers: string[]
     ): Promise<FetchMemberDataByUuidResponse> {
         if (!ADMIN_API_URL) {
             return Promise.reject(new Error("No admin backoffice set!"));
         }
-        const res = await Axios.get(ADMIN_API_URL + "/api/room/access", {
+        const res = await Axios.get<unknown, AxiosResponse<unknown>>(ADMIN_API_URL + "/api/room/access", {
             params: {
                 userIdentifier,
-                roomId: playUri /* @deprecated */,
-                playUri,
+                roomId: playUri,
                 ipAddress,
+                characterLayers,
             },
             headers: { Authorization: `${ADMIN_API_TOKEN}` },
+            paramsSerializer: (p) => {
+                return qs.stringify(p, { arrayFormat: "brackets" });
+            },
         });
+        if (!isFetchMemberDataByUuidResponse(res.data)) {
+            throw new Error(
+                "Invalid answer received from the admin for the /api/room/access endpoint. Received: " +
+                    JSON.stringify(res.data)
+            );
+        }
         return res.data;
     }