From b0109e60d34817465b2ee6e6eb29470b097fac90 Mon Sep 17 00:00:00 2001 From: Natsumi Date: Fri, 29 Jul 2022 06:54:08 +1200 Subject: [PATCH] Remove Steam auth --- AppApi.cs | 12 ++------ VRCX.csproj | 5 ++-- VRChatRPC.cs | 63 ---------------------------------------- VRChatRPC/README.txt | 3 -- VRChatRPC/VRChatRPC.dll | Bin 14336 -> 0 bytes html/src/app.js | 27 ----------------- 6 files changed, 4 insertions(+), 106 deletions(-) delete mode 100644 VRChatRPC.cs delete mode 100644 VRChatRPC/README.txt delete mode 100644 VRChatRPC/VRChatRPC.dll diff --git a/AppApi.cs b/AppApi.cs index ed3ae28b..271d4b46 100644 --- a/AppApi.cs +++ b/AppApi.cs @@ -86,14 +86,6 @@ namespace VRCX Cef.GetGlobalCookieManager().DeleteCookies(); } - public string LoginWithSteam() - { - var rpc = VRChatRPC.Instance; - return rpc.Update() == true - ? rpc.GetAuthSessionTicket() - : string.Empty; - } - public bool[] CheckGameRunning() { var isGameRunning = false; @@ -200,8 +192,8 @@ namespace VRCX Process.Start(new ProcessStartInfo { WorkingDirectory = Path.GetDirectoryName(path), - FileName = path, - UseShellExecute = false, + FileName = path, + UseShellExecute = false, Arguments = arguments }).Close(); } diff --git a/VRCX.csproj b/VRCX.csproj index 442269b0..88c99ba9 100644 --- a/VRCX.csproj +++ b/VRCX.csproj @@ -1,4 +1,4 @@ - + @@ -212,7 +212,6 @@ - xcopy /y "$(ProjectDir)VRChatRPC\VRChatRPC.dll" . -xcopy /y "$(ProjectDir)OpenVR\win64\openvr_api.dll" + xcopy /y "$(ProjectDir)OpenVR\win64\openvr_api.dll" \ No newline at end of file diff --git a/VRChatRPC.cs b/VRChatRPC.cs deleted file mode 100644 index 5a283425..00000000 --- a/VRChatRPC.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright(c) 2019-2022 pypy, Natsumi and individual contributors. -// All rights reserved. -// -// This work is licensed under the terms of the MIT license. -// For a copy, see . - -using System; -using System.Runtime.InteropServices; -using System.Text; - -namespace VRCX -{ - public class VRChatRPC - { - public static readonly VRChatRPC Instance; - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern bool VRChatRPC_000(); - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern int VRChatRPC_001([Out] byte[] data, int size); - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr VRChatRPC_002(); - - static VRChatRPC() - { - Instance = new VRChatRPC(); - } - - public bool Update() - { - return VRChatRPC_000(); - } - - public string GetAuthSessionTicket() - { - var a = new byte[1024]; - var n = VRChatRPC_001(a, 1024); - return BitConverter.ToString(a, 0, n).Replace("-", string.Empty); - } - - public string GetPersonaName() - { - var ptr = VRChatRPC_002(); - if (ptr != IntPtr.Zero) - { - int n = 0; - while (Marshal.ReadByte(ptr, n) != 0) - { - ++n; - } - if (n > 0) - { - var a = new byte[n]; - Marshal.Copy(ptr, a, 0, a.Length); - return Encoding.UTF8.GetString(a); - } - } - return string.Empty; - } - } -} diff --git a/VRChatRPC/README.txt b/VRChatRPC/README.txt deleted file mode 100644 index c9ec1e37..00000000 --- a/VRChatRPC/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -it grabs some data from VRChat process.. use at own risk. - -by pypy (mina#5656) \ No newline at end of file diff --git a/VRChatRPC/VRChatRPC.dll b/VRChatRPC/VRChatRPC.dll deleted file mode 100644 index 0a2df93a3512744ffb4583aeeafa6faec5365a11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14336 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 { - var args = { - json, - params, - origin: true - }; - if (json.requiresTwoFactorAuth) { - this.$emit('USER:2FA', args); - } else { - this.$emit('USER:CURRENT', args); - } - return args; - }); - }; - /* params: { code: string