change axios header type

CalumW1 · Aug 29, 2024 · 1b6e12d · 1b6e12d
1 parent b9b413c
commit 1b6e12d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/src/methods/apiClient.ts b/src/methods/apiClient.ts
@@ -1,6 +1,10 @@
-import axios, { AxiosRequestHeaders, Method } from 'axios';
+import axios, { Method, RawAxiosRequestHeaders } from 'axios';
 
-export const ApiClient = async (url: string, header: AxiosRequestHeaders, method: Method): Promise<any> => {
+export const ApiClient = async (
+  url: string,
+  header: RawAxiosRequestHeaders,
+  method: Method
+): Promise<any> => {
   try {
     const response = await axios({
       url: url,

diff --git a/src/methods/getOperator.ts b/src/methods/getOperator.ts
@@ -7,6 +7,7 @@ import {
   UBI_GETSTATS,
   RANKED_UBI_SPACEIDS,
 } from '../constants';
+import { AxiosHeaders, AxiosRequestHeaders, RawAxiosRequestHeaders } from 'axios';
 
 export interface GameModes {
   ranked: Operators;
@@ -72,11 +73,11 @@ export const GetOperator = async (
   var token = await CheckToken();
   var expiration = await GetExperation();
 
-  const headers = {
+  const header = {
+    'Content-Type': 'application/json',
     Authorization: `ubi_v1 t=${token}`,
     'Ubi-SessionId': UBI_RANKED_SESSIONID,
     'Ubi-AppId': UBI_DATADEV_APPID,
-    'Content-Type': 'application/json',
     expiration: expiration,
   };
 
@@ -90,16 +91,10 @@ export const GetOperator = async (
 
   // https://prod.datadev.ubisoft.com/v1/users/488cd0dd-b8e0-4718-a9da-2767ea44c399/playerstats?spaceId=05bfb3f7-6c21-4c42-be1f-97a33fb5cf66&view=current&aggregation=operators&gameMode=all,ranked,casual,unranked&platformGroup=CONSOLE&teamRole=attacker,defender&seasons=Y9S2
   // https://prod.datadev.ubisoft.com/v1/users/488cd0dd-b8e0-4718-a9da-2767ea44c399/playerstats?spaceId=05bfb3f7-6c21-4c42-be1f-97a33fb5cf66&view=current&aggregation=operators&gameMode=ranked,casual&platformGroup=CONSOLE&teamRole=defender,attacker&seasons=Y9S2
-  console.log(URI);
 
-  const data = await ApiClient(URI, headers, 'GET');
+  const data = await ApiClient(URI, header, 'GET');
 
-  const operators: GameModes = await ExtractOperators(
-    await data.json(),
-    userId,
-    gameMode,
-    platformChange
-  );
+  const operators: GameModes = await ExtractOperators(await data, userId, gameMode, platformChange);
 
   return operators;
 };

diff --git a/src/methods/getServerStatus.ts b/src/methods/getServerStatus.ts
@@ -32,7 +32,7 @@ export const GetServerStatus = async (platform: string): Promise<ServerStatus> =
 
   const response = await ApiClient(URI, headers, 'GET');
 
-  const data = await response.json();
+  const data = await response;
 
   const serverStatus: ServerStatus = {
     MDM: data[0].MDM,

diff --git a/src/methods/getUserByUserId.ts b/src/methods/getUserByUserId.ts
@@ -34,7 +34,7 @@ export const GetUserByUserId = async (userId: string): Promise<User[] | []> => {
 
   const response = await ApiClient(URI, headers, 'GET');
 
-  const data = (await response.json()) as Profiles;
+  const data = (await response) as Profiles;
 
   data.profiles = data.profiles.map(profile => ({
     ...profile,

diff --git a/src/methods/getUserByUsername.ts b/src/methods/getUserByUsername.ts
@@ -35,7 +35,7 @@ export const GetUserByUsername = async (username: string, platform: string): Pro
 
   const response = await ApiClient(URI, headers, 'GET');
 
-  const data = (await response.json()) as Profiles;
+  const data = (await response) as Profiles;
 
   data.profiles = data.profiles.map(profile => ({
     ...profile,

diff --git a/src/methods/getUserProgression.ts b/src/methods/getUserProgression.ts
@@ -27,5 +27,5 @@ export const GetUserProgression = async (userId: string): Promise<Progression> =
 
   const response = await ApiClient(URI, headers, 'GET');
 
-  return (await response.json()) as Progression;
+  return (await response) as Progression;
 };
diff --git a/src/methods/getUserRank.ts b/src/methods/getUserRank.ts
@@ -44,7 +44,7 @@ export const GetUserRank = async (userId: string, platform: string): Promise<Use
 
   const response = await ApiClient(URI, headers, 'GET');
 
-  const result: UserRank = await extractValues(await response.json());
+  const result: UserRank = await extractValues(await response);
 
   return result;
 };

diff --git a/src/methods/getUserStats.ts b/src/methods/getUserStats.ts
@@ -105,7 +105,7 @@ export const GetUserStats = async (
   const response = await ApiClient(URI, headers, 'GET');
 
   const usersStats: UserStats = await BuildUserStats(
-    await response.json(),
+    await response,
     user,
     platformTransformation,
     platform