From ceac5de6f1ab0f9b6d6bf0ed70a9b363b778564b Mon Sep 17 00:00:00 2001
From: weedeej <devildjoseph666@gmail.com>
Date: Mon, 7 Feb 2022 16:57:52 +0800
Subject: [PATCH] async & profiles window search bug fix.

---
 ValorantCC/MainWindow.xaml                  | 11 +++--
 ValorantCC/MainWindow.xaml.cs               | 10 ++---
 ValorantCC/SubWindow/ProfilesWindow.xaml    |  2 +-
 ValorantCC/SubWindow/ProfilesWindow.xaml.cs | 11 +++--
 ValorantCC/ValorantCC.csproj                |  3 +-
 ValorantCC/src/API.cs                       | 13 +++---
 ValorantCC/src/Auth.cs                      | 48 ++++++---------------
 ValorantCC/src/BackgroundAuth.cs            | 11 ++++-
 ValorantCC/src/Processor.cs                 | 35 ++++++++-------
 9 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/ValorantCC/MainWindow.xaml b/ValorantCC/MainWindow.xaml
index 8400e16..f9cbb06 100644
--- a/ValorantCC/MainWindow.xaml
+++ b/ValorantCC/MainWindow.xaml
@@ -5,8 +5,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ValorantCC" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:Controls="clr-namespace:Xceed.Wpf.AvalonDock.Themes.Controls;assembly=Xceed.Wpf.AvalonDock.Themes.Aero" x:Class="ValorantCC.MainWindow"
+        xmlns:fa="http://schemas.fontawesome.io/icons/"
         mc:Ignorable="d"
-        Title="vTools - ValorantCC" Height="423 " Width="500" SizeToContent="Manual" AllowsTransparency="True" WindowStartupLocation="CenterScreen" WindowState="Normal" ResizeMode="CanMinimize" WindowStyle="None" Icon="Resources/vtools-colored.ico"
+        Title="vTools - ValorantCC" Height="0" Width="500" SizeToContent="Height" AllowsTransparency="True" WindowStartupLocation="CenterScreen" WindowState="Normal" ResizeMode="CanMinimize" WindowStyle="None" Icon="Resources/vtools-colored.ico"
         Background="Transparent"
         RenderOptions.BitmapScalingMode="Fant">
     <Window.Resources>
@@ -64,7 +65,9 @@
                     </TextBlock>
                     <ComboBox x:Name="profiles" Grid.Column="2" SelectionChanged="profiles_SelectionChanged" SelectedIndex="0" IsEditable="True" IsReadOnly="True" Text="Profiles" TextBoxBase.TextChanged="profiles_TextChanged" Background="#FF232429" Foreground="White" Margin="0,-1,2,1" FontFamily="Quicksand" TextBlock.FontFamily="Segoe UI Semibold" TextBlock.FontWeight="Bold"/>
                 </Grid>
-                <Grid MaxWidth="500" MaxHeight="411">
+                <fa:ImageAwesome Icon="CircleOutlineNotch" Spin="True" Height="48" Width="48" Foreground="White" Name="spinner" Margin="0,0,0,5"/>
+                <Grid Name="ch_display" MaxWidth="500" MaxHeight="411">
+                    
                     <Image x:Name="CrosshairBG" Source="{StaticResource crosshairBG0}" Margin="1,3,-1,3"/>
 
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
@@ -177,7 +180,7 @@
 
                 <Path Data="M28,378 L573,378" MaxWidth="500" MaxHeight="411" Fill="#16171B" Height="1" Stretch="Fill" Stroke="White" Width="500"/>
 
-                <Grid Margin="3" Height="26" RenderTransformOrigin="0.5,0.5" Width="494" MaxWidth="500" MaxHeight="411">
+                <Grid Name="buttons_group" Margin="3" Height="26" RenderTransformOrigin="0.5,0.5" Width="494" MaxWidth="500" MaxHeight="411">
                     <Grid.RenderTransform>
                         <TransformGroup>
                             <ScaleTransform ScaleY="1"/>
@@ -200,7 +203,7 @@
                     <Button x:Name="btnShare" Style="{DynamicResource RoundButton}"  Content="Share" HorizontalContentAlignment="Left" Click="btnShare_Click" Cursor="Hand" Height="25" VerticalContentAlignment="Top" HorizontalAlignment="Left" VerticalAlignment="Center" Width="124"  FontFamily="Quicksand" FontSize="11" FontWeight="DemiBold" TextBlock.FontFamily="Segoe UI Semibold" TextBlock.FontWeight="Bold" Margin="0,0,0,0"/>
 
                 </Grid>
-                <Grid Width="495" MaxWidth="495" MaxHeight="411">
+                <Grid Name="controls_group" Width="495" MaxWidth="495" MaxHeight="411">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="119*"/>
                         <ColumnDefinition Width="46*"/>
diff --git a/ValorantCC/MainWindow.xaml.cs b/ValorantCC/MainWindow.xaml.cs
index c9dbe7a..1501610 100644
--- a/ValorantCC/MainWindow.xaml.cs
+++ b/ValorantCC/MainWindow.xaml.cs
@@ -52,7 +52,7 @@ private async void Grid_Loaded(object sender, RoutedEventArgs e)
             }
         }
 
-        private void btnSave_Click(object sender, RoutedEventArgs e)
+        private async void btnSave_Click(object sender, RoutedEventArgs e)
         {
             if (!LoggedIn)
             {
@@ -67,9 +67,9 @@ private void btnSave_Click(object sender, RoutedEventArgs e)
             {
                 SelectedColors = new List<Color> { (Color)primary_color.SelectedColor };
             }
-            if (DataProcessor.SaveNewColor(SelectedColors, profiles.SelectedIndex, profiles.Text))
+            if (await DataProcessor.SaveNewColor(SelectedColors, profiles.SelectedIndex, profiles.Text))
             {
-                DataProcessor.Construct();
+                await DataProcessor.Construct();
                 profiles.Items.Refresh();
                 profiles.SelectedIndex = DataProcessor.CurrentProfile;
                 MessageTxt.Foreground = Brushes.Lime;
@@ -110,7 +110,7 @@ private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
             if (e.LeftButton == MouseButtonState.Pressed) DragMove();
         }
 
-        private void btnReload_Click(object sender, RoutedEventArgs e)
+        private async void btnReload_Click(object sender, RoutedEventArgs e)
         {
             if (!LoggedIn)
             {
@@ -118,7 +118,7 @@ private void btnReload_Click(object sender, RoutedEventArgs e)
                 return;
             }
             Utils.Log("Reload Clicked > Reconstructing Processor.");
-            DataProcessor.Construct();
+            await DataProcessor.Construct();
             profiles.ItemsSource = DataProcessor.ProfileNames;
             profiles.Items.Refresh();
             profiles.SelectedIndex = DataProcessor.CurrentProfile;
diff --git a/ValorantCC/SubWindow/ProfilesWindow.xaml b/ValorantCC/SubWindow/ProfilesWindow.xaml
index 9e3d0f9..de0c065 100644
--- a/ValorantCC/SubWindow/ProfilesWindow.xaml
+++ b/ValorantCC/SubWindow/ProfilesWindow.xaml
@@ -29,10 +29,10 @@
                     <TextBox Style="{StaticResource LineTextBox}" Name="SearchCode" MinWidth="128" MaxWidth="128" Background="#FF393B44" Margin="65,25,5,0" Foreground="White" Height="22"/>
                     <Button Style="{DynamicResource SearchCodeButtonStyle}" Name="btnSearchCode" Content="Search Code" MinWidth="85" Background="#FF393B44" Margin="0,25,5,0" Foreground="White" Cursor="Hand"  Click="btnSearchCode_Click" BorderBrush="#FF393B44"/>
                 </StackPanel>
+                <Image gif:ImageBehavior.AnimatedSource="../Resources/vtspinner.gif" Width="50" Height="52" Margin="0,155,0,0" x:Name="LoadingPlaceHolder"/>
                 <ScrollViewer  VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="0,5,0,0" Height="388" Width="338">
 
                     <StackPanel Name="ShareablesContainer" HorizontalAlignment="Center">
-                        <Image gif:ImageBehavior.AnimatedSource="../Resources/vtspinner.gif" Width="50" Height="52" Margin="0,155,0,0" x:Name="LoadingPlaceHolder"/>
                     </StackPanel>
                 </ScrollViewer>
             </StackPanel>
diff --git a/ValorantCC/SubWindow/ProfilesWindow.xaml.cs b/ValorantCC/SubWindow/ProfilesWindow.xaml.cs
index 707540d..0521561 100644
--- a/ValorantCC/SubWindow/ProfilesWindow.xaml.cs
+++ b/ValorantCC/SubWindow/ProfilesWindow.xaml.cs
@@ -50,11 +50,12 @@ private async void Border_Loaded(object sender, RoutedEventArgs e)
         /// Returns the searched sharecode or the list of shareables depending if sharecode is provided or not.
         /// </summary>
         /// <param name="sharecode">Nullable. Searched Code</param>
-        private static async Task<bool> InitialFetch(String sharecode = null)
+        private async Task<bool> InitialFetch(String sharecode = null)
         {
             PublicProfiles.Clear();
+            ShareablesContainer.Children.Clear();
             List<ShareableProfile> Shareables;
-            if (sharecode != null)
+            if (!string.IsNullOrEmpty(sharecode) || !string.IsNullOrWhiteSpace(sharecode))
             {
                 ValCCApi.Action = 3;
                 Shareables = (await ValCCApi.Fetch(sharecode)).data;
@@ -81,9 +82,6 @@ private static async Task<bool> InitialFetch(String sharecode = null)
                 }
                 PublicProfiles.Add(new PublicProfile() { owner = currentShareable.displayName, settings = profile, sharecode = currentShareable.shareCode, ID = i });
             }
-
-            //Change this delay for the async backend
-            await Task.Delay(1);
             return true;
         }
 
@@ -105,8 +103,9 @@ private async Task<bool> RenderProfiles()
         }
         private async void btnSearchCode_Click(object sender, RoutedEventArgs e)
         {
-            if (SearchCode.Text == null || SearchCode.Text == "") return;
+            LoadingPlaceHolder.Visibility = Visibility.Visible;
             await InitialFetch(SearchCode.Text);
+            LoadingPlaceHolder.Visibility = Visibility.Collapsed;
             await RenderProfiles();
         }
 
diff --git a/ValorantCC/ValorantCC.csproj b/ValorantCC/ValorantCC.csproj
index 60e205e..634d43f 100644
--- a/ValorantCC/ValorantCC.csproj
+++ b/ValorantCC/ValorantCC.csproj
@@ -76,8 +76,9 @@
 
   <ItemGroup>
     <PackageReference Include="EZ_Updater" Version="0.5.0.4" />
+    <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="106.15.0" />
+    <PackageReference Include="RestSharp" Version="107.2.1" />
     <PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
   </ItemGroup>
 
diff --git a/ValorantCC/src/API.cs b/ValorantCC/src/API.cs
index dd7cb81..1996082 100644
--- a/ValorantCC/src/API.cs
+++ b/ValorantCC/src/API.cs
@@ -64,11 +64,11 @@ public async Task<FetchResponse> Fetch(String sharecode = null)
                 payload.sharecode = sharecode;
                 payload.action = Action;
             }
-            RestRequest request = new RestRequest() { Method = Method.POST };
+            RestRequest request = new RestRequest() { Method = Method.Post };
             request.AddJsonBody(payload);
-            RestResponse response = (RestResponse)await client.ExecuteAsync(request);
+            RestResponse response = await client.ExecuteAsync(request);
+            if (!response.IsSuccessful) return new FetchResponse() { success = false };
 
-            if (response.StatusCode != System.Net.HttpStatusCode.OK) return new FetchResponse() { success = false };
             return JsonConvert.DeserializeObject<FetchResponse>(response.Content);
         }
 
@@ -81,13 +81,12 @@ public async Task<VoidCallResponse> Set()
                 shareable = Shareable,
                 action = 1
             };
-            RestRequest request = new RestRequest() { Method = Method.POST };
-            //client.Authenticator = new JwtAuthenticator(AuthTokens.AccessToken);
+            RestRequest request = new RestRequest() { Method = Method.Post };
             request.RequestFormat = DataFormat.Json;
             request.AddJsonBody(payload);
             request.AddOrUpdateHeader("Authorization", $"Bearer {AuthTokens.AccessToken}"); // Pass to server so nobody can set somebody's saved profile.
-            RestResponse response = (RestResponse)await client.ExecuteAsync(request);
-            if (response.StatusCode != System.Net.HttpStatusCode.OK) return new VoidCallResponse() { success = false };
+            RestResponse response = await client.ExecuteAsync(request);
+            if (!response.IsSuccessful) return new VoidCallResponse() { success = false };
             return JsonConvert.DeserializeObject<VoidCallResponse>(response.Content);
         }
 
diff --git a/ValorantCC/src/Auth.cs b/ValorantCC/src/Auth.cs
index 4b63a0f..bc05aae 100644
--- a/ValorantCC/src/Auth.cs
+++ b/ValorantCC/src/Auth.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Utilities;
+using RestSharp;
 namespace ValorantCC
 {
     public partial class AuthTokens
@@ -53,6 +54,7 @@ public partial class VersionData
     public class AuthObj
     {
         LockfileData LocalCredentials;
+        static RestClient client = new RestClient(new RestClientOptions() { RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true });
         public async Task<AuthResponse> StartAuth()
         {
             string LockfilePath = Environment.GetEnvironmentVariable("LocalAppData") + "\\Riot Games\\Riot Client\\Config\\lockfile";
@@ -104,49 +106,27 @@ public static LockfileData ObtainLockfileData(string LockfilePath)
 
         private async Task<AuthTokens> ObtainAuthTokens()
         {
-            await Task.Delay(1);
             Utils.Log("Creating Auth Request");
+            RestRequest request = new RestRequest($"https://127.0.0.1:{LocalCredentials.Port}/entitlements/v1/token", Method.Get);
+            request.AddHeader("Authorization", $"Basic {LocalCredentials.Basic}");
 
-            HttpWebRequest request = HttpWebRequest.CreateHttp($"https://127.0.0.1:{LocalCredentials.Port}/entitlements/v1/token");
-            request.Method = "GET";
-            request.Headers.Add("Authorization", $"Basic {LocalCredentials.Basic}");
-            request.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
-            WebResponse resp;
-            try
-            {
-                Utils.Log("Sending Auth Request");
-                Task<WebResponse> taskResp = Task.Factory.FromAsync(
-                    request.BeginGetResponse, request.EndGetResponse,
-                    (object)null);
-                resp = await taskResp;
-            }
-            catch (WebException ex)
-            {
-                Utils.Log($"Auth Error {ex}");
-                return new AuthTokens();
-            }
+            RestResponse response = await client.ExecuteAsync(request);
+            if (!response.IsSuccessful) return new AuthTokens();
 
-            StreamReader sr = new StreamReader(resp.GetResponseStream());
-            AuthTokens tokens = JsonConvert.DeserializeObject<AuthTokens>(sr.ReadToEnd());
+            AuthTokens tokens = JsonConvert.DeserializeObject<AuthTokens>(response.Content.ToString());
             tokens.Success = true;
             return tokens;
         }
 
         private async static Task<String> GetVersion()
         {
-            await Task.Delay(1);
-            HttpWebRequest request = HttpWebRequest.CreateHttp("https://valorant-api.com/v1/version");
-            request.Method = "GET";
-            Task<WebResponse> taskResp = Task.Factory.FromAsync(
-                    request.BeginGetResponse,
-                    asyncResult => request.EndGetResponse(asyncResult),
-                    (object)null);
-            VersionResponse RespData = await taskResp.ContinueWith(r =>
-            {
-                WebResponse response = (WebResponse)r.Result;
-                StreamReader sr = new StreamReader(response.GetResponseStream());
-                return JsonConvert.DeserializeObject<VersionResponse>(sr.ReadToEnd());
-            });
+            Utils.Log("Obtaining Client Version info");
+            RestRequest request = new RestRequest("https://valorant-api.com/v1/version", Method.Get);
+
+            RestResponse response = await client.ExecuteAsync(request);
+            if (!response.IsSuccessful) return "0.0.0";
+
+            VersionResponse RespData = JsonConvert.DeserializeObject<VersionResponse>(response.Content.ToString());
             return RespData.Data.RiotClientVersion;
         }
     }
diff --git a/ValorantCC/src/BackgroundAuth.cs b/ValorantCC/src/BackgroundAuth.cs
index 1a2b270..8481d53 100644
--- a/ValorantCC/src/BackgroundAuth.cs
+++ b/ValorantCC/src/BackgroundAuth.cs
@@ -20,6 +20,9 @@ public async void LoopCheck()
         {
             string LockfilePath = Environment.GetEnvironmentVariable("LocalAppData") + "\\Riot Games\\Riot Client\\Config\\lockfile"; //Copy pasted from Auth.cs because why not?
             bool lockfilexists = false;
+            main.ch_display.Visibility = Visibility.Collapsed;
+            main.buttons_group.Visibility = Visibility.Collapsed;
+            main.controls_group.Visibility = Visibility.Collapsed;
             while (true)
             {
                 if (AuthObj.CheckLockFile(LockfilePath) && !lockfilexists)
@@ -36,8 +39,7 @@ public async void LoopCheck()
                 if (lockfilexists && AuthObj.ObtainLockfileData(LockfilePath).Success)
                 {
                     main.StatusTxt.Text = "Logging in. . .";
-                    processor.Login();
-                    AuthResponse AuthResponse = processor.Login();
+                    AuthResponse AuthResponse = await processor.Login();
                     main.DataProcessor = processor;
                     main.LoggedIn = AuthResponse.Success;
                     if (!main.LoggedIn)
@@ -56,6 +58,11 @@ public async void LoopCheck()
                     main.MessageTxt.Foreground = Brushes.Lime;
                     main.MessageTxt.Text = Utils.LoginResponse(processor);
                     main.StatusTxt.Text = "Logged In!";
+
+                    main.ch_display.Visibility = Visibility.Visible;
+                    main.buttons_group.Visibility = Visibility.Visible;
+                    main.controls_group.Visibility = Visibility.Visible;
+                    main.spinner.Visibility = Visibility.Collapsed;
                     return;
                 }
                 await Task.Delay(1500);
diff --git a/ValorantCC/src/Processor.cs b/ValorantCC/src/Processor.cs
index 42e96eb..ceeaf06 100644
--- a/ValorantCC/src/Processor.cs
+++ b/ValorantCC/src/Processor.cs
@@ -21,23 +21,22 @@ public class Processor
         private ProfileList FetchedProfiles;
         public int CurrentProfile;
 
-        public AuthResponse Login()
+        public async Task <AuthResponse> Login()
         {
             Utils.Log("Login started");
             AuthObj AuthObj = new AuthObj();
-            AuthResponse = Task.Run(AuthObj.StartAuth).Result;
+            AuthResponse = await AuthObj.StartAuth();
             if (!AuthResponse.Success) return AuthResponse;
             Utils.Log("Auth Success");
-            Construct();
+            await Construct();
             return AuthResponse;
         }
 
-        public void Construct()
+        public async Task<bool> Construct()
         {
             Utils.Log("Constructing Properties -->");
 
-            client.AddDefaultHeaders(Utils.ConstructHeaders(AuthResponse));
-            UserSettings = FetchUserSettings();
+            UserSettings = await FetchUserSettings();
             ProfileListed = CheckIfList(UserSettings);
             Utils.Log($"Multiple Profiles: {ProfileListed}");
             if (ProfileListed)
@@ -66,6 +65,7 @@ public void Construct()
 
             isLoggedIn = true;
             Utils.Log("<-- Constructing Properties");
+            return true;
         }
 
         private bool CheckIfList(Data settings)
@@ -74,23 +74,26 @@ private bool CheckIfList(Data settings)
             return settings.stringSettings.Any(setting => setting.settingEnum == "EAresStringSettingName::SavedCrosshairProfileData");
         }
 
-        private Data FetchUserSettings()
+        private async Task<Data> FetchUserSettings()
         {
             Utils.Log("Obtaining User Settings");
-            RestRequest request = new RestRequest("/playerPref/v3/getPreference/Ares.PlayerSettings");
-            string responseContext = client.Get(request).Content;
+            RestRequest request = new RestRequest("/playerPref/v3/getPreference/Ares.PlayerSettings", Method.Get);
+            request.AddHeaders(Utils.ConstructHeaders(AuthResponse));
+            string responseContext = (await client.ExecuteAsync(request)).Content;
             Dictionary<string, object> response = JsonConvert.DeserializeObject<Dictionary<string, object>>(responseContext);
             Data settings = Utils.Decompress(Convert.ToString(response["data"]));
             return settings;
         }
 
-        private bool putUserSettings(Data newData)
+        private async Task<bool> putUserSettings(Data newData)
         {
             Utils.Log("Saving New Data: (BACKUP) " + JsonConvert.SerializeObject(newData));
 
-            IRestRequest request = new RestRequest("/playerPref/v3/savePreference");
+            RestRequest request = new RestRequest("/playerPref/v3/savePreference", Method.Put);
+            request.AddHeaders(Utils.ConstructHeaders(AuthResponse));
             request.AddJsonBody(new { type = "Ares.PlayerSettings", data = Utils.Compress(newData) });
-            IRestResponse response = client.Put(request);
+
+            RestResponse response = await client.ExecuteAsync(request);
             if (!response.IsSuccessful) return false;
 
             Dictionary<string, object> responseDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(response.Content);
@@ -194,7 +197,7 @@ private void SaveListedSettings(List<Color> Colors, int SelectedIndex)
             else
                 FetchedProfiles.Profiles[SelectedIndex].Sniper.CenterDotColor = new CrosshairColor { R = Colors[4].R, G = Colors[4].G, B = Colors[4].B, A = 255 };
         }
-        public bool SaveNewColor(List<Color> Colors, int SelectedIndex, string ProfileName)
+        public async Task<bool> SaveNewColor(List<Color> Colors, int SelectedIndex, string ProfileName)
         {
             Utils.Log("Save button clicked. Saving...");
             if (ProfileListed)
@@ -212,12 +215,12 @@ public bool SaveNewColor(List<Color> Colors, int SelectedIndex, string ProfileNa
                 UserSettings.stringSettings[SavedProfilesIndex].value = Utils.ColorToString(Colors[0]);
                 UserSettings.stringSettings[NameIndex].value = ProfileName;
             }
-            if (putUserSettings(UserSettings))
+            if (await putUserSettings(UserSettings))
             {
                 Utils.Log("Reconstructing Data");
-                Construct();
+                await Construct();
                 return true;
-            }
+            }    
             return false;
         }
     }