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

Fix feedback on PR

Browse Source 
Change locale as parameter on adminInterface
This commit is contained in:
CEC
2022-04-20 16:30:16 +02:00
parent f1a93fea88
commit 5466bd1d68
7 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pusher/src/Services/AdminApi.ts
+12 -12
View File
@@ -29,9 +29,7 @@ export const isFetchMemberDataByUuidResponse = z.object({
export type FetchMemberDataByUuidResponse = z.infer<typeof isFetchMemberDataByUuidResponse>;
class AdminApi implements AdminInterface {
locale: string = "en";
async fetchMapDetails(playUri: string, authToken?: string): Promise<MapDetailsData | RoomRedirect> {
async fetchMapDetails(locale: string, playUri: string, authToken?: string): Promise<MapDetailsData | RoomRedirect> {
let userId: string | undefined = undefined;
if (authToken != undefined) {
let authTokenData: AuthTokenData;
@@ -66,7 +64,7 @@ class AdminApi implements AdminInterface {
};
const res = await Axios.get<unknown, AxiosResponse<unknown>>(ADMIN_API_URL + "/api/map", {
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale },
params,
});
@@ -89,6 +87,7 @@ class AdminApi implements AdminInterface {
}
async fetchMemberDataByUuid(
locale: string,
userIdentifier: string,
playUri: string,
ipAddress: string,
@@ -101,7 +100,7 @@ class AdminApi implements AdminInterface {
ipAddress,
characterLayers,
},
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale },
paramsSerializer: (p) => {
return qs.stringify(p, { arrayFormat: "brackets" });
},
@@ -120,11 +119,11 @@ class AdminApi implements AdminInterface {
);
}
async fetchMemberDataByToken(organizationMemberToken: string, playUri: string | null): Promise<AdminApiData> {
async fetchMemberDataByToken(locale: string, organizationMemberToken: string, playUri: string | null): Promise<AdminApiData> {
//todo: this call can fail if the corresponding world is not activated or if the token is invalid. Handle that case.
const res = await Axios.get(ADMIN_API_URL + "/api/login-url/" + organizationMemberToken, {
params: { playUri },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale },
});
const adminApiData = isAdminApiData.safeParse(res.data);
@@ -139,6 +138,7 @@ class AdminApi implements AdminInterface {
}
reportPlayer(
locale: string,
reportedUserUuid: string,
reportedUserComment: string,
reporterUserUuid: string,
@@ -153,12 +153,12 @@ class AdminApi implements AdminInterface {
reportWorldSlug,
},
{
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale },
}
);
}
async verifyBanUser(userUuid: string, ipAddress: string, roomUrl: string): Promise<AdminBannedData> {
async verifyBanUser(locale: string, userUuid: string, ipAddress: string, roomUrl: string): Promise<AdminBannedData> {
//todo: this call can fail if the corresponding world is not activated or if the token is invalid. Handle that case.
return Axios.get(
ADMIN_API_URL +
@@ -169,15 +169,15 @@ class AdminApi implements AdminInterface {
encodeURIComponent(userUuid) +
"&roomUrl=" +
encodeURIComponent(roomUrl),
{ headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale } }
{ headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale } }
).then((data) => {
return data.data;
});
}
async getUrlRoomsFromSameWorld(roomUrl: string): Promise<string[]> {
async getUrlRoomsFromSameWorld(locale: string, roomUrl: string): Promise<string[]> {
return Axios.get(ADMIN_API_URL + "/api/room/sameWorld" + "?roomUrl=" + encodeURIComponent(roomUrl), {
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": this.locale },
headers: { Authorization: `${ADMIN_API_TOKEN}`, "Accept-Language": locale },
}).then((data) => {
return data.data;
});