From d606ccc1deb5589c95c26768a5f80787a5749b92 Mon Sep 17 00:00:00 2001
From: Sinan Akkoyun <akkoyunsinan2@gmx.de>
Date: Fri, 30 Aug 2024 09:24:15 +0200
Subject: [PATCH] Added MSA bearer token support

---
 index.d.ts               |  1 +
 src/MicrosoftAuthFlow.js | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index e559164..2a2fcb1 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -26,6 +26,7 @@ declare module 'prismarine-auth' {
       fetchCertificates?: boolean,
       fetchEntitlements?: boolean
       fetchProfile?: boolean
+      msaToken?: string
     }): Promise<{ token: string, entitlements: MinecraftJavaLicenses, profile: MinecraftJavaProfile, certificates: MinecraftJavaCertificates }>
     // Returns a Minecraft Bedrock Edition auth token. Public key parameter must be a KeyLike object.
     getMinecraftBedrockToken(publicKey: KeyObject): Promise<string>
diff --git a/src/MicrosoftAuthFlow.js b/src/MicrosoftAuthFlow.js
index 234b27b..f157d50 100644
--- a/src/MicrosoftAuthFlow.js
+++ b/src/MicrosoftAuthFlow.js
@@ -153,17 +153,23 @@ class MicrosoftAuthFlow {
 
   async getMinecraftJavaToken (options = {}) {
     const response = { token: '', entitlements: {}, profile: {} }
-    if (await this.mca.verifyTokens()) {
-      debug('[mc] Using existing tokens')
-      const { token } = await this.mca.getCachedAccessToken()
-      response.token = token
+
+    if(options.msaToken) {
+      response.token = options.msaToken
+      debug('[mc] Using MSA token directly')
     } else {
-      debug('[mc] Need to obtain tokens')
-      await retry(async () => {
-        const xsts = await this.getXboxToken(Endpoints.PCXSTSRelyingParty)
-        debug('[xbl] xsts data', xsts)
-        response.token = await this.mca.getAccessToken(xsts)
-      }, () => { this.xbl.forceRefresh = true }, 2)
+      if (await this.mca.verifyTokens()) {
+        debug('[mc] Using existing tokens')
+        const { token } = await this.mca.getCachedAccessToken()
+        response.token = token
+      } else {
+        debug('[mc] Need to obtain tokens')
+        await retry(async () => {
+          const xsts = await this.getXboxToken(Endpoints.PCXSTSRelyingParty)
+          debug('[xbl] xsts data', xsts)
+          response.token = await this.mca.getAccessToken(xsts)
+        }, () => { this.xbl.forceRefresh = true }, 2)
+      }
     }
 
     if (options.fetchEntitlements) {
@@ -183,9 +189,6 @@ class MicrosoftAuthFlow {
     // TODO: Fix cache, in order to do cache we also need to cache the ECDH keys so disable it
     // is this even a good idea to cache?
     if (await this.mba.verifyTokens() && false) { // eslint-disable-line
-      debug('[mc] Using existing tokens')
-      const { chain } = this.mba.getCachedAccessToken()
-      return chain
     } else {
       if (!publicKey) throw new Error('Need to specifiy a ECDH x509 URL encoded public key')
       debug('[mc] Need to obtain tokens')