From c441ff7ff51783ecd4101041742f79a2ae072248 Mon Sep 17 00:00:00 2001 From: Guilherme Werner Date: Fri, 2 Aug 2024 17:41:09 -0300 Subject: [PATCH] Fix client headers --- examples/client.js | 7 ++----- src/api.ts | 2 +- src/client.ts | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/examples/client.js b/examples/client.js index e2a428a..026d208 100644 --- a/examples/client.js +++ b/examples/client.js @@ -8,11 +8,8 @@ dotenv.config(); async function main() { const client = TribufuClient.fromEnv("TRIBUFU"); - - if (await client.passwordLogin("", "")) { - const userInfo = await client.getUserInfo(); - console.log(userInfo); - } + const games = await client.getServers(); + console.log(games); } main(); diff --git a/src/api.ts b/src/api.ts index 9bd6d0c..6061d02 100644 --- a/src/api.ts +++ b/src/api.ts @@ -136,7 +136,7 @@ export class TribufuApi { * Get the default headers for the Tribufu API. * @returns HeaderMap */ - private static defaultHeaders(): HttpHeaders { + protected static defaultHeaders(): HttpHeaders { const headers = new HttpHeaders(); headers.set("X-Tribufu-Language", "javascript"); headers.set("X-Tribufu-Version", TRIBUFU_VERSION); diff --git a/src/client.ts b/src/client.ts index c7c526a..6725759 100644 --- a/src/client.ts +++ b/src/client.ts @@ -126,6 +126,22 @@ export class TribufuClient extends TribufuApi { return headers; } + /** + * Get current headers with the api key or access token. + * @returns HeaderMap + */ + protected override getHeaders(): HttpHeaders { + let headers = TribufuClient.defaultHeaders(); + headers.set("Authorization", `Basic ${Buffer.from(`${this.clientId}:${this.clientSecret}`, "binary").toString("base64")}`); + + if (this.options.accessToken) { + headers.set("Authorization", `Bearer ${this.options.accessToken}`); + return headers; + } + + return headers; + } + /** * Get the client id. * @returns string