_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaning commented code

Browse Source
This commit is contained in:
David Négrier 2022-02-24 12:06:43 +01:00
parent 8e11c4445b
commit 1b286002ff
7 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/JsonMessages/AdminApiData.ts
View File

@ -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),

2
messages/JsonMessages/MapDetailsData.ts
View File

@ -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),

6
pusher/src/Controller/AuthenticateController.ts
View File

@ -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);
}

7
pusher/src/Controller/IoSocketController.ts
View File

@ -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) {

9
pusher/src/Controller/MapController.ts
View File

@ -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);

2
pusher/src/Model/Websocket/ExSocketInterface.ts
View File

@ -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";

9
pusher/src/Services/AdminApi.ts
View File

@ -57,16 +57,17 @@ class AdminApi {
userIdentifier: string | null,
roomId: string,
ipAddress: string,
characterLayers: string[]): Promise<FetchMemberDataByUuidResponse> {
characterLayers: string[]
): Promise<FetchMemberDataByUuidResponse> {
if (!ADMIN_API_URL) {
return Promise.reject(new Error("No admin backoffice set!"));
}
const res = await Axios.get<unknown, AxiosResponse<unknown>>(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(