diff --git a/messages/JsonMessages/AdminApiData.ts b/messages/JsonMessages/AdminApiData.ts index 1fd7765e..236c6355 100644 --- a/messages/JsonMessages/AdminApiData.ts +++ b/messages/JsonMessages/AdminApiData.ts @@ -1,5 +1,4 @@ import * as tg from "generic-type-guard"; -//import { isCharacterTexture } from "./CharacterTexture"; /* * WARNING! The original file is in /messages/JsonMessages. @@ -12,7 +11,6 @@ export const isAdminApiData = new tg.IsInterface() email: tg.isNullable(tg.isString), roomUrl: tg.isString, mapUrlStart: tg.isString, -// textures: tg.isArray(isCharacterTexture), }) .withOptionalProperties({ messages: tg.isArray(tg.isUnknown), diff --git a/messages/JsonMessages/MapDetailsData.ts b/messages/JsonMessages/MapDetailsData.ts index 87b2b95a..09500b80 100644 --- a/messages/JsonMessages/MapDetailsData.ts +++ b/messages/JsonMessages/MapDetailsData.ts @@ -1,5 +1,4 @@ import * as tg from "generic-type-guard"; -//import { isCharacterTexture } from "./CharacterTexture"; import { isNumber } from "generic-type-guard"; /* @@ -12,7 +11,6 @@ export const isMapDetailsData = new tg.IsInterface() mapUrl: tg.isString, policy_type: isNumber, //isNumericEnum(GameRoomPolicyTypes), tags: tg.isArray(tg.isString), -// textures: tg.isArray(isCharacterTexture), authenticationMandatory: tg.isUnion(tg.isNullable(tg.isBoolean), tg.isUndefined), roomSlug: tg.isNullable(tg.isString), // deprecated contactPage: tg.isNullable(tg.isString), diff --git a/pusher/src/Controller/AuthenticateController.ts b/pusher/src/Controller/AuthenticateController.ts index c1003609..658367b4 100644 --- a/pusher/src/Controller/AuthenticateController.ts +++ b/pusher/src/Controller/AuthenticateController.ts @@ -249,10 +249,6 @@ export class AuthenticateController extends BaseHttpController { * type: string * description: TODO- unclear. I cannot find any use of this * example: ??? - * textures: - * type: string - * description: TODO - document this is still needed - * example: ??? * messages: * type: array * description: The list of messages to be displayed when the user logs? @@ -397,7 +393,7 @@ export class AuthenticateController extends BaseHttpController { userRoomToken: undefined, }; try { - data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress, characterLayers); + data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress, []); } catch (err) { console.error("openIDCallback => fetchMemberDataByUuid", err); } diff --git a/pusher/src/Controller/IoSocketController.ts b/pusher/src/Controller/IoSocketController.ts index 5f37d708..f07ec6b8 100644 --- a/pusher/src/Controller/IoSocketController.ts +++ b/pusher/src/Controller/IoSocketController.ts @@ -297,7 +297,12 @@ export class IoSocketController { if (ADMIN_API_URL) { try { try { - userData = await adminApi.fetchMemberDataByUuid(userIdentifier, roomId, IPAddress, characterLayers); + userData = await adminApi.fetchMemberDataByUuid( + userIdentifier, + roomId, + IPAddress, + characterLayers + ); } catch (err) { if (Axios.isAxiosError(err)) { if (err?.response?.status == 404) { diff --git a/pusher/src/Controller/MapController.ts b/pusher/src/Controller/MapController.ts index 1e709cc0..208efd48 100644 --- a/pusher/src/Controller/MapController.ts +++ b/pusher/src/Controller/MapController.ts @@ -59,14 +59,6 @@ export class MapController extends BaseHttpController { * items: * type: string * example: speaker - * textures: - * type: array - * description: The list of public textures for this map (TODO remove this) - * items: - * type: object - * properties: - * todo: - * type: string * authenticationMandatory: * type: boolean|null * description: Whether the authentication is mandatory or not for this map. @@ -126,7 +118,6 @@ export class MapController extends BaseHttpController { roomSlug: null, // Deprecated group: null, tags: [], - textures: [], contactPage: null, authenticationMandatory: DISABLE_ANONYMOUS, } as MapDetailsData); diff --git a/pusher/src/Model/Websocket/ExSocketInterface.ts b/pusher/src/Model/Websocket/ExSocketInterface.ts index b5815635..2b5d6225 100644 --- a/pusher/src/Model/Websocket/ExSocketInterface.ts +++ b/pusher/src/Model/Websocket/ExSocketInterface.ts @@ -8,10 +8,8 @@ import { ServerToClientMessage, SubMessage, } from "../../Messages/generated/messages_pb"; -import { WebSocket } from "uWebSockets.js"; import { ClientDuplexStream } from "grpc"; import { Zone } from "_Model/Zone"; -import { CharacterTexture } from "../../Messages/JsonMessages/CharacterTexture"; import { compressors } from "hyper-express"; import { WokaDetail } from "_Enum/PlayerTextures"; diff --git a/pusher/src/Services/AdminApi.ts b/pusher/src/Services/AdminApi.ts index 51ad61b6..5db9dc69 100644 --- a/pusher/src/Services/AdminApi.ts +++ b/pusher/src/Services/AdminApi.ts @@ -57,16 +57,17 @@ class AdminApi { userIdentifier: string | null, roomId: string, ipAddress: string, - characterLayers: string[]): Promise { + characterLayers: string[] + ): Promise { if (!ADMIN_API_URL) { return Promise.reject(new Error("No admin backoffice set!")); } const res = await Axios.get>(ADMIN_API_URL + "/api/room/access", { params: { userIdentifier, roomId, ipAddress, characterLayers }, headers: { Authorization: `${ADMIN_API_TOKEN}` }, - paramsSerializer: p => { - return qs.stringify(p, {arrayFormat: 'brackets'}) - } + paramsSerializer: (p) => { + return qs.stringify(p, { arrayFormat: "brackets" }); + }, }); if (!isFetchMemberDataByUuidResponse(res.data)) { throw new Error(