Update login code to use cookies and developer.oculus.com, make logout and login more reliable

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/flows/beat_saber_modding.html

@@ -291,7 +291,7 @@ <h2>Upload logs</h2>
         }).then(res => {
             // open logout page for webview
             localStorage.redirect = start + `/flows/beat_saber_modding?tab=downgrade&checkdowngrade=true`
-            location = `https://oculus.com/experiences/quest?logout=true`
+            location = `https://secure.oculus.com/logout/`
         })
     }
 

QuestAppVersionSwitcher/Assets/html/index.html

@@ -508,7 +508,7 @@ <h2>Downloads</h2>
                 </div>
                 Now that you got the old version uninstalled, we can restore your backup!
                 <br>
-                We are going to install the your app next.
+                We are going to install the app next.
                 <br>Press the install button to start the installation.
                 <br>If your Quest says <code>Package Installer isn't responding</code> simply press <code>close</code>
                 <div id="step3box" class="textBox"></div>
@@ -571,7 +571,7 @@ <h2>Downloads</h2>
                 <div class="contentHeader headerMargin">
                     Step 2.4
                 </div>
-                Press continue after the installation finished. We'll then validate, whether the backup was successfully restored.
+                Press continue. We'll then validate, whether the backup was successfully restored.
                 <div id="step5box" class="textBox"></div>
                 <div class="buttonSelectionContainer">
                     <div class="buttonContainer buttonMargin">

QuestAppVersionSwitcher/Assets/html/qavs_inject.js

@@ -87,28 +87,6 @@
     var qavsQueryparams = new URLSearchParams(location.search);
 
 
-    if(location.href.startsWith("https://auth.meta.com/settings")) {
-        // Open oculus store after logging in
-        location = "https://oculus.com/experiences/quest"
-    }
-    if(location.host == "www.oculus.com") {
-        console.log("oculus.com")
-        if(qavsQueryparams.get("logout")) {
-            console.log("logging out")
-            setTimeout(() => {
-                location = 'https://secure.oculus.com/logout/'
-            }, 3000)
-        } else {
-            // Click login button
-            setTimeout(() => {
-                location = 'https://auth.oculus.com/login/?redirect_uri=https%3A%2F%2Fwww.oculus.com%2Fexperiences%2Fquest%2F'
-            }, 3000)
-
-            // Send token to qavs
-            var ws = new WebSocket('ws://localhost:' + qavsPort + '/' + document.body.innerHTML.substr(document.body.innerHTML.indexOf("accessToken"), 200).split('"')[2]);
-        }
-    }
-
 // Modify sign in options on auth.meta.com
     if(location.host.includes("auth.meta.com")) {
         console.log("auth.meta.com")

QuestAppVersionSwitcher/Assets/html/script.js

@@ -531,7 +531,7 @@ function PatchGame() {
 
 UpdateUI()
 TokenUIUpdate()
-const oculusLink = "https://auth.meta.com/"
+const oculusLink = "https://auth.oculus.com/login/?redirect_uri=https%3A%2F%2Fdeveloper.oculus.com%2Fmanage%2F"
 const params = new URLSearchParams(window.location.search)
 var afterRestore = ""
 var afterDownload = ""
@@ -1321,7 +1321,7 @@ function Logout() {
         method: "POST"
     }).then(res => {
         // open logout page for webview
-        location = `https://oculus.com/experiences/quest?logout=true`
+        location = `https://secure.oculus.com/logout/`
     })
 }
 

QuestAppVersionSwitcher/QAVSWebViewClient.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using Android.Webkit;
+using AndroidX.Work;
 using ComputerUtils.Android;
 using QuestAppVersionSwitcher.Core;
 
@@ -12,6 +13,7 @@ public class QAVSWebViewClient : WebViewClient
                                    CoreService.coreVars.serverPort + "/inject.js';document.head.appendChild(tag)";
 
         public string injectedJs = "";
+        private bool isLoggingOut = false;
 
         // Grab token
         public override void OnPageFinished(WebView view, string url)
@@ -27,10 +29,45 @@ public override void OnPageFinished(WebView view, string url)
                 view.EvaluateJavascript(injectedJs.Replace("{0}", CoreService.coreVars.serverPort.ToString()), null);
             }
 
+
+            if (!url.ToLower().Contains("logout"))
+            {
+                string cookie = CookieManager.Instance.GetCookie(url);
+                // extract cookie oc_ac_at
+                if (cookie != null)
+                {
+                    string[] cookies = cookie.Split(';');
+                    foreach (string c in cookies)
+                    {
+                        if (c.Contains("oc_ac_at"))
+                        {
+                            string token = c.Split('=')[1];
+                            if (token.Length > 15)
+                            {
+                                CoreService.browser.LoadUrl("http://127.0.0.1:" + CoreService.coreVars.serverPort + "?token=" + token);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                isLoggingOut = true;
+            }
+
+            if (url.Contains("auth.meta.com") && isLoggingOut)
+            {
+                // go to QAVS UI once logged out
+                CoreService.browser.LoadUrl("http://127.0.0.1:" + CoreService.coreVars.serverPort);
+                isLoggingOut = false;
+            }
+            
+
             if (url.ToLower().StartsWith("https://auth.meta.com/settings"))
             {
                 // redirect to oculus page
-                view.LoadUrl("https://oculus.com/experiences/quest");
+                view.LoadUrl("https://developer.oculus.com/manage");
             }
         }
 

QuestAppVersionSwitcher/WebServer.cs

@@ -143,15 +143,6 @@ public void Start()
                 clients.Remove(socket);
             };
             wsServer.StartServer(CoreService.coreVars.wsPort);
-            server.onWebsocketConnectRequest = uRL =>
-            {
-                if (uRL.Length <= 10) return;
-                string token = uRL.Substring(1);
-                MainThread.BeginInvokeOnMainThread(() =>
-                {
-                    CoreService.browser.LoadUrl("http://127.0.0.1:" + CoreService.coreVars.serverPort + "?token=" + token);
-                });
-            };
             server.AddRoute("GET", "/api/proxy", request =>
             {
                 WebClient c = new WebClient();