fix login once again

Author: ComputerElite

Assets/html/index.html

@@ -258,7 +258,7 @@ <h2>Libraries</h2>
                 <div class="contentHeader headerMargin">
                     Login info
                 </div>
-                To login we'll open oculus.com for you. Accept the cookies when Oculus ask you to. We'll then redirect you to the login. Consenting to cookies is needed so you are allowed to log in.
+                To login we'll open auth.meta.com for you. Accept the cookies when Meta or Oculus ask you to. We'll then redirect you to the login. Consenting to cookies is needed so you can log in.
                 <div id="step9box" class="textBox"></div>
                 <div class="buttonSelectionContainer">
                     <div class="buttonContainer">

Assets/html/script.js

@@ -244,7 +244,7 @@ function PatchGame() {
 
 UpdateUI()
 TokenUIUpdate()
-const oculusLink = "https://auth.oculus.com/login/?redirect_uri=https%3A%2F%2Fsecure.oculus.com%2F&reason=page_require_login"
+const oculusLink = "https://auth.meta.com/"
 const params = new URLSearchParams(window.location.search)
 var config = {}
 var selectedBackup = ""

CoreService.cs

@@ -43,7 +43,7 @@ public async void Start()
             browser.Focusable = true;
             browser.Settings.MediaPlaybackRequiresUserGesture = false;
             browser.Settings.DomStorageEnabled = true;
-            browser.Settings.UserAgentString = "Mozilla/5.0 (X11; Linux x86_64; Quest) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/21.2.0.1.37.371181431 SamsungBrowser/4.0 Chrome/100.0.4896.160 VR Safari/537.36";
+            browser.Settings.UserAgentString = "Mozilla/5.0 (X11; Linux x86_64; Quest) AppleWebKit/537.36 (KHTML, like Gecko) OculusBrowser/23.2.0.4.49.401374055 SamsungBrowser/4.0 Chrome/104.0.5112.111 VR Safari/537.36";
             browser.Settings.DatabaseEnabled = true;
             browser.Settings.DatabasePath = "/data/data/" + browser.Context.PackageName + "/databases/";
             browser.Settings.LoadWithOverviewMode = true;

Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.4" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="24">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.5" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="25">
 	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29" />
 	<uses-permission android:name="oculus.permission.handtracking" />
 	<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

Properties/AssemblyInfo.cs

@@ -22,5 +22,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("1.6.4.0")]
-[assembly: AssemblyFileVersion("1.6.4.0")]
+[assembly: AssemblyVersion("1.6.5.0")]
+[assembly: AssemblyFileVersion("1.6.5.0")]

WebServer.cs

@@ -32,31 +32,41 @@ namespace QuestAppVersionSwitcher
 {
     public class QAVSWebViewClient : WebViewClient
     {
-        public bool wasOnFacebook = false;
+        public bool wasOnOculus = false;
         // Grab token
         public override void OnPageFinished(WebView view, string url)
         {
             CookieManager.Instance.Flush();
             Logger.Log(url);
             if (url.Split("?")[0].Contains("oculus.com"))
             {
-                if (wasOnFacebook)
+                if (wasOnOculus)
                 {
-                    // Restart app here
-                    CoreService.coreVars.loginStep = 1;
-                    CoreService.coreVars.Save();
-                    MainThread.BeginInvokeOnMainThread(() =>
-                    {
-                        view.EvaluateJavascript("location = 'http://127.0.0.1:" + CoreService.coreVars.serverPort + "?restart=true'", null);
-                    });
-                   
-                    wasOnFacebook = false;
+                    view.EvaluateJavascript("var mySpans = document.getElementsByTagName(\"svg\");for(var i=0;i<mySpans.length;i++){if(mySpans[i].ariaLabel == 'Open Side Navigation Menu'){mySpans[i].parentElement.click();break;}}setTimeout(() => { mySpans = document.getElementsByTagName(\"h6\"); for (var i = 0; i < mySpans.length; i++) { if (mySpans[i].innerHTML == 'Log in / Sign up') { mySpans[i].click(); break; } } }, 600)", null);
                 }
+                wasOnOculus = true;
+                
                 view.EvaluateJavascript("var ws = new WebSocket('ws://localhost:" + CoreService.coreVars.serverPort + "/' + document.body.innerHTML.substr(document.body.innerHTML.indexOf(\"accessToken\"), 200).split('\"')[2]);", null);
             }
-            if (url.Split("?")[0].Contains("facebook.com"))
+            if (url.Split("?")[0] == "https://auth.meta.com/settings/")
+            {
+                wasOnOculus = false;
+                view.LoadUrl("https://oculus.com/experiences/quest");
+                // Restart app here
+                /*
+                CoreService.coreVars.loginStep = 1;
+                CoreService.coreVars.Save();
+                MainThread.BeginInvokeOnMainThread(() =>
+                {
+                    view.EvaluateJavascript("location = 'http://127.0.0.1:" + CoreService.coreVars.serverPort + "?restart=true'", null);
+                });
+                wasOnFacebook = false;
+                */
+                
+            }
+            if (url.Split("?")[0] == "https://auth.meta.com/settings/")
             {
-                wasOnFacebook = true;
+                //wasOnFacebook = true;
             }
         }
 
@@ -65,8 +75,8 @@ public override void OnPageFinished(WebView view, string url)
             ["sec-fetch-mode"] = "navigate",
             ["sec-fetch-site"] = "same-origin",
             ["sec-fetch-dest"] = "document",
-            ["sec-ch-ua-platform"] = "\"Windows\"",
-            ["sec-ch-ua"] = "\" Not A; Brand\";v=\"99\", \"Chromium\";v=\"102\", \"Microsoft Edge\";v=\"102\"",
+            ["sec-ch-ua-platform"] = "\"Linux\"",
+            ["sec-ch-ua"] = "\" Not A; Brand\";v=\"99\", \"Chromium\";v=\"104\"",
             ["sec-ch-ua-mobile"] = "?0",
             ["sec-fetch-user"] = "?1"
         };
@@ -79,6 +89,9 @@ public override WebResourceResponse ShouldInterceptRequest(WebView view, IWebRes
                 if(!request.RequestHeaders.ContainsKey(p.Key)) request.RequestHeaders.Add(p.Key, p.Value);
                 else request.RequestHeaders[p.Key] = p.Value;
             }
+            if (request.RequestHeaders.ContainsKey("document-policy")) request.RequestHeaders.Remove("document-policy");
+
+            if (request.RequestHeaders.ContainsKey("document-domain")) request.RequestHeaders.Remove("document-domain");
             string cookie = CookieManager.Instance.GetCookie(request.Url.ToString());
             if (cookie != null) request.RequestHeaders["cookie"] = cookie;
             if (request.Method == "POST")