From 291ff6818da464af697d320d65e2c1b0c8404af3 Mon Sep 17 00:00:00 2001
From: Conner Dassen <connerdassen@gmail.com>
Date: Wed, 26 Oct 2022 01:59:19 +0200
Subject: [PATCH] remote auth uses client user agent and ws props

---
 src/client/Client.js   |  2 ++
 src/rest/APIRequest.js |  5 -----
 src/util/RemoteAuth.js | 19 +++++++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/client/Client.js b/src/client/Client.js
index 84c5be8..c461217 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -466,6 +466,8 @@ class Client extends BaseClient {
         autoLogin: false,
         debug: false,
         failIfError: false,
+        userAgent: this.options.http.headers['User-Agent'],
+        wsProperties: this.options.ws.properties,
       });
       // Step 2: Add event
       QR.on('ready', async (_, url) => {
diff --git a/src/rest/APIRequest.js b/src/rest/APIRequest.js
index f58ced6..b863100 100644
--- a/src/rest/APIRequest.js
+++ b/src/rest/APIRequest.js
@@ -52,11 +52,6 @@ class APIRequest {
       'Accept-Language': 'en-US,en;q=0.9',
       'Cache-Control': 'no-cache',
       Pragma: 'no-cache',
-      'Sec-Ch-Ua': `"Not A;Brand";v="99", "Chromium";v="${
-        this.client.options.ws.properties.browser_version.split('.')[0]
-      }", "Google Chrome";v="${this.client.options.ws.properties.browser_version.split('.')[0]}`,
-      'Sec-Ch-Ua-Mobile': '?0',
-      'Sec-Ch-Ua-Platform': '"Windows"',
       'Sec-Fetch-Dest': 'empty',
       'Sec-Fetch-Mode': 'cors',
       'Sec-Fetch-Site': 'same-origin',
diff --git a/src/util/RemoteAuth.js b/src/util/RemoteAuth.js
index c9e270d..ed076b6 100644
--- a/src/util/RemoteAuth.js
+++ b/src/util/RemoteAuth.js
@@ -51,6 +51,8 @@ const Event = {
  * @property {?boolean} [failIfError=true] Throw error ?
  * @property {?boolean} [generateQR=true] Create QR Code ?
  * @property {?number} [apiVersion=9] API Version
+ * @property {?string} [userAgent] User Agent
+ * @property {?Object.<string,string>} [wsProperties]  Web Socket Properties
  */
 
 /**
@@ -119,6 +121,8 @@ class DiscordAuthWebsocket extends EventEmitter {
       failIfError: true,
       generateQR: true,
       apiVersion: 9,
+      userAgent: randomUA(),
+      wsProperties: defaultClientOptions.ws.properties,
     };
     if (typeof options == 'object') {
       if (typeof options.debug == 'boolean') this.options.debug = options.debug;
@@ -127,13 +131,15 @@ class DiscordAuthWebsocket extends EventEmitter {
       if (typeof options.failIfError == 'boolean') this.options.failIfError = options.failIfError;
       if (typeof options.generateQR == 'boolean') this.options.generateQR = options.generateQR;
       if (typeof options.apiVersion == 'number') this.options.apiVersion = options.apiVersion;
+      if (typeof options.userAgent == 'string') this.options.userAgent = options.userAgent;
+      if (typeof options.wsProperties == 'object') this.options.wsProperties = options.wsProperties;
     }
   }
   _createWebSocket(url) {
     this.ws = new WebSocket(url, {
       headers: {
         Origin: 'https://discord.com',
-        'User-Agent': randomUA(),
+        'User-Agent': this.options.userAgent,
       },
     });
     this._handleWebSocket();
@@ -387,20 +393,13 @@ class DiscordAuthWebsocket extends EventEmitter {
           'Accept-Language': 'en-US,en;q=0.9',
           'Cache-Control': 'no-cache',
           Pragma: 'no-cache',
-          'Sec-Ch-Ua': `"Not A;Brand";v="99", "Chromium";v="${
-            defaultClientOptions.ws.properties.browser_version.split('.')[0]
-          }", "Google Chrome";v="${defaultClientOptions.ws.properties.browser_version.split('.')[0]}`,
-          'Sec-Ch-Ua-Mobile': '?0',
-          'Sec-Ch-Ua-Platform': '"Windows"',
           'Sec-Fetch-Dest': 'empty',
           'Sec-Fetch-Mode': 'cors',
           'Sec-Fetch-Site': 'same-origin',
           'X-Debug-Options': 'bugReporterEnabled',
-          'X-Super-Properties': `${Buffer.from(JSON.stringify(defaultClientOptions.ws.properties), 'ascii').toString(
-            'base64',
-          )}`,
+          'X-Super-Properties': `${Buffer.from(JSON.stringify(this.options.wsProperties), 'ascii').toString('base64')}`,
           'X-Discord-Locale': 'en-US',
-          'User-Agent': randomUA(),
+          'User-Agent': this.options.userAgent,
         },
       },
     );