I can't remember whether auto-auth even works no remove it for now

Heath123 · Mar 16, 2023 · 41c6a76 · 41c6a76
1 parent 1404e85
commit 41c6a76
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/html/startPage/index.html b/html/startPage/index.html
@@ -102,15 +102,15 @@ <h1 class='title'>pakkit</h1>
             <label for="listen-port">Listen port:</label>
             <input id="listen-port" name="listen-port" placeholder="25566" type="text" value="25566"/>
         </li>
-        <li class="form-row" id="consent-row" style="display: none;">
+        <!-- <li class="form-row" id="consent-row" style="display: none;">
             <label for="consent">Consent:<br>
                 <label class="switch" style="padding: 0;">
                     <input id="consent" type="checkbox" value="consent"/>
                     <span class="slider round"></span>
                 </label>
             </label>
             <p>Allow pakkit to use my auth token from launcher_profiles.json for logging in to online mode servers.</p>
-        </li>
+        </li> -->
         <li class="form-row">
             <label></label>
             <span class="start"><input id="start" type="submit" value="Start!"/></span>

diff --git a/html/startPage/script.js b/html/startPage/script.js
@@ -9,9 +9,9 @@ new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#FFF')
 }); */
 
-if (!store.get('authConsentGiven')) {
-  document.getElementById('consent-row').style.display = 'flex'
-}
+// if (!store.get('authConsentGiven')) {
+//   document.getElementById('consent-row').style.display = 'flex'
+// }
 
 let isLoading = false
 let connectAddress
@@ -107,9 +107,10 @@ window.startProxy = function (event)
     connectPort = (connectPort === '') ? '25565' : connectPort
     listenPort = (listenPort === '') ? '25566' : listenPort
   }
-  if (document.getElementById('consent').checked) {
-    store.set('authConsentGiven', true)
-  }
+  // if (document.getElementById('consent').checked) {
+  //   store.set('authConsentGiven', true)
+  // }
+  store.set('authConsentGiven', false)
   // TODO: Validate data (e.g. port range)
   ipcRenderer.send('startProxy', JSON.stringify({
     consent: store.get('authConsentGiven'),

diff --git a/src/proxy/java/proxy.js b/src/proxy/java/proxy.js
@@ -45,6 +45,7 @@ let authWindowOpen = false
 exports.startProxy = function (host, port, listenPort, version, onlineMode, authConsent, callback, messageCallback, dataFolder,
                                updateFilteringCallback, authCodeCallback) {
   storedCallback = callback
+  authConsent = false
 
   // . cannot be in a JSON property name with electron-store
   exports.capabilities.versionId = 'java-node-minecraft-protocol-' + version.split('.').join('-')
@@ -107,11 +108,11 @@ exports.startProxy = function (host, port, listenPort, version, onlineMode, auth
           console.log(err.stack)
           if (!endedTargetClient) { targetClient.end('Error') }
         })
-        if (authConsent) {
-          console.log('Will attempt to use launcher_profiles.json for online mode login data')
-        } else {
-          console.warn('Consent not given to use launcher_profiles.json - automatic online mode will not work')
-        }
+        // if (authConsent) {
+        //   console.log('Will attempt to use launcher_profiles.json for online mode login data')
+        // } else {
+        //   console.warn('Consent not given to use launcher_profiles.json - automatic online mode will not work')
+        // }
         const clientOptions = {
           host: host,
           port: port,