Fix prettier and change last use of adminAPI to Service way

pusher/src/Controller/AuthenticateController.ts

@@ -1,6 +1,6 @@
 import { v4 } from "uuid";
 import { BaseHttpController } from "./BaseHttpController";
-import { adminApi, FetchMemberDataByUuidResponse } from "../Services/AdminApi";
+import { FetchMemberDataByUuidResponse } from "../Services/AdminApi";
 import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager";
 import { parse } from "query-string";
 import { openIDClient } from "../Services/OpenIDClient";
@@ -508,7 +508,7 @@ export class AuthenticateController extends BaseHttpController {
             userRoomToken: undefined,
         };
         try {
-            data = await adminApi.fetchMemberDataByUuid(email, playUri, IPAddress, []);
+            data = await adminService.fetchMemberDataByUuid(email, playUri, IPAddress, []);
         } catch (err) {
             console.error("openIDCallback => fetchMemberDataByUuid", err);
         }

pusher/src/Services/AdminApi.ts

@@ -46,13 +46,13 @@ class AdminApi implements AdminInterface {
                     console.info("JWT expire, but decoded", userId);
                 } catch (e) {
                     if (e instanceof InvalidTokenError) {
-                        throw new Error('Token decrypted error');
+                        throw new Error("Token decrypted error");
                         // The token was not good, redirect user on login page
                         //res.status(401);
                         //res.send("Token decrypted error");
                         //return;
                     } else {
-                        throw new Error('Error on decryption of token :' + e);
+                        throw new Error("Error on decryption of token :" + e);
                         //this.castErrorToResponse(e, res);
                         //return;
                     }

pusher/src/Services/AdminInterface.ts

@@ -25,20 +25,14 @@ export interface AdminInterface {
      * @var userId: can to be undefined or email or uuid
      * @return MapDetailsData|RoomRedirect
      */
-    fetchMapDetails(
+    fetchMapDetails(playUri: string, authToken?: string): Promise<MapDetailsData | RoomRedirect>;
-        playUri: string,
-        authToken?: string
-    ): Promise<MapDetailsData | RoomRedirect>;
 
     /**
      * @param organizationMemberToken
      * @param playUri
      * @return AdminApiData
      */
-    fetchMemberDataByToken(
+    fetchMemberDataByToken(organizationMemberToken: string, playUri: string | null): Promise<AdminApiData>;
-        organizationMemberToken: string,
-        playUri: string | null
-    ): Promise<AdminApiData>;
 
     /**
      * @param reportedUserUuid
@@ -59,32 +53,22 @@ export interface AdminInterface {
      * @param roomUrl
      * @return AdminBannedData
      */
-    verifyBanUser(
+    verifyBanUser(userUuid: string, ipAddress: string, roomUrl: string): Promise<AdminBannedData>;
-        userUuid: string,
-        ipAddress: string,
-        roomUrl: string
-    ): Promise<AdminBannedData>;
 
     /**
      * @param roomUrl
      * @return string[]
      */
-    getUrlRoomsFromSameWorld(
+    getUrlRoomsFromSameWorld(roomUrl: string): Promise<string[]>;
-        roomUrl: string
-    ): Promise<string[]>;
 
     /**
      * @param accessToken
      * @return string
      */
-    getProfileUrl(
+    getProfileUrl(accessToken: string): string;
-        accessToken: string
-    ): string;
 
     /**
      * @param token
      */
-    logoutOauth(
+    logoutOauth(token: string): Promise<void>;
-        token: string
-    ): Promise<void>;
 }

pusher/src/Services/LocalAdmin.ts

@@ -3,9 +3,8 @@ import {AdminInterface} from "./AdminInterface";
 import { MapDetailsData } from "../Messages/JsonMessages/MapDetailsData";
 import { RoomRedirect } from "../Messages/JsonMessages/RoomRedirect";
 import { GameRoomPolicyTypes } from "../Model/PusherRoom";
-import {ADMIN_API_URL, DISABLE_ANONYMOUS, OPID_PROFILE_SCREEN_PROVIDER} from "../Enum/EnvironmentVariable";
+import { DISABLE_ANONYMOUS } from "../Enum/EnvironmentVariable";
 import { AdminApiData } from "../Messages/JsonMessages/AdminApiData";
-import Axios from "axios";
 
 /**
  * A local class mocking a real admin if no admin is configured.
@@ -38,7 +37,6 @@ class LocalAdmin implements AdminInterface {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         authToken?: string
     ): Promise<MapDetailsData | RoomRedirect> {
-
         const roomUrl = new URL(playUri);
 
         const match = /\/_\/[^/]+\/(.+)/.exec(roomUrl.pathname);
@@ -58,7 +56,7 @@ class LocalAdmin implements AdminInterface {
             group: null,
             iframeAuthentication: null,
             loadingLogo: null,
-            loginSceneLogo: null
+            loginSceneLogo: null,
         });
     }