Release 0.9.9.5 (#531)

* Remove character name from credentials
Update vulnerable packages

* Update SharpCompress

Daybreak.7ZipExtractor/Daybreak.7ZipExtractor.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpCompress" Version="0.35.0" />
+    <PackageReference Include="SharpCompress" Version="0.36.0" />
   </ItemGroup>
 
 </Project>

Daybreak/Controls/Templates/AccountTemplate.xaml

@@ -23,7 +23,6 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"></RowDefinition>
                 <RowDefinition Height="auto"></RowDefinition>
-                <RowDefinition Height="auto"></RowDefinition>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"></ColumnDefinition>
@@ -31,7 +30,6 @@
             </Grid.ColumnDefinitions>
             <TextBlock FontSize="16" Text="Username:" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="5" Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
             <TextBlock FontSize="16" Text="Password:" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="5" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
-            <TextBlock FontSize="16" Text="Character name:" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Margin="5" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
             <TextBox Text="{Binding ElementName=_this, Path=Username, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Background="Transparent"
                                               BorderThickness="1" HorizontalAlignment="Stretch" Grid.Row="0" Grid.Column="1"
                                               FontSize="16" TextChanged="UsernameTextbox_TextChanged" Margin="5"
@@ -40,10 +38,6 @@
                          BorderThickness="1" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="1"
                          FontSize="16" PasswordChanged="Passwordbox_PasswordChanged" Margin="5"
                          ToolTip="Password" />
-            <TextBox Text="{Binding ElementName=_this, Path=CharacterName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" Background="Transparent"
-                                              BorderThickness="1" HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="1"
-                                              FontSize="16" TextChanged="CharacterNameTextbox_TextChanged" Margin="5"
-                                              ToolTip="Character name" />
         </Grid>
         <buttons:BinButton Grid.Column="2" Height="30" Width="30" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" VerticalAlignment="Center" Margin="5, 5, 5, 5"
                            Clicked="BinButton_Clicked"

Daybreak/Controls/Templates/AccountTemplate.xaml.cs

@@ -21,8 +21,6 @@ public partial class AccountTemplate : UserControl
     private string username = string.Empty;
     [GenerateDependencyProperty]
     private string password = string.Empty;
-    [GenerateDependencyProperty]
-    private string characterName = string.Empty;
 
     public AccountTemplate()
     {
@@ -36,7 +34,6 @@ public partial class AccountTemplate : UserControl
         {
             this.PasswordBox.Password = loginCredentials.Password;
             this.Username = loginCredentials.Username;
-            this.CharacterName = loginCredentials.CharacterName;
         }
     }
 
@@ -50,11 +47,6 @@ public partial class AccountTemplate : UserControl
         this.DataContext.As<LoginCredentials>()!.Username = this.Username;
     }
 
-    private void CharacterNameTextbox_TextChanged(object sender, EventArgs e)
-    {
-        this.DataContext.As<LoginCredentials>()!.CharacterName = this.CharacterName;
-    }
-
     private void Passwordbox_PasswordChanged(object sender, EventArgs e)
     {
         this.Password = sender.As<PasswordBox>()?.Password;

Daybreak/Controls/Templates/LaunchButtonTemplate.xaml

@@ -33,9 +33,6 @@
                            Foreground="{StaticResource MahApps.Brushes.Accent}"
                            Visibility="{Binding ElementName=_this, Path=GameRunning, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             </WrapPanel>
-            <TextBlock Text="{Binding Credentials.CharacterName}"
-                               FontSize="16"
-                               Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>
             <TextBlock Text="{Binding ExecutablePath}"
                        Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
                        FontSize="12"
@@ -52,9 +49,6 @@
                            FontSize="22"
                            Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>
             </WrapPanel>
-            <TextBlock Text="{Binding Credentials.CharacterName}"
-                       FontSize="16"
-                       Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>
             <TextBlock Text="{Binding ExecutablePath}"
                Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
                FontSize="12"

Daybreak/Daybreak.csproj

@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.9.4</Version>
+    <Version>0.9.9.5</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -89,7 +89,7 @@
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="DiffPlex" Version="1.7.2" />
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.55" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-rc2" />
@@ -108,8 +108,10 @@
     <PackageReference Include="Slim" Version="1.9.2" />
     <PackageReference Include="Svg" Version="3.4.6" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="SystemExtensions.NetCore" Version="1.0.1" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.6.2" />
     <PackageReference Include="SystemExtensions.NetStandard.DependencyInjection" Version="1.3.1" />

Daybreak/Models/LoginCredentials.cs

@@ -7,14 +7,12 @@ public sealed class LoginCredentials : IEquatable<LoginCredentials>
     public string? Identifier { get; set; }
     public string? Username { get; set; }
     public string? Password { get; set; }
-    public string? CharacterName { get; set; }
 
     public bool Equals(LoginCredentials? other)
     {
         return this?.Identifier?.Equals(other?.Identifier) is true &&
             this?.Username?.Equals(other?.Username) is true &&
-            this?.Password?.Equals(other?.Password) is true &&
-            this?.CharacterName?.Equals(other?.CharacterName) is true;
+            this?.Password?.Equals(other?.Password) is true;
     }
 
     public override bool Equals(object? obj)
@@ -24,6 +22,6 @@ public sealed class LoginCredentials : IEquatable<LoginCredentials>
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(this.Identifier, this.Username, this.Password, this.CharacterName);
+        return HashCode.Combine(this.Identifier, this.Username, this.Password);
     }
 }

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -86,7 +86,6 @@ internal sealed class ApplicationLauncher : IApplicationLauncher
         var gwProcess = await this.LaunchGuildwarsProcess(
             credentials.Username!.ThrowIfNull(),
             credentials.Password!.ThrowIfNull(),
-            credentials.CharacterName!.ThrowIfNull(),
             launchConfigurationWithCredentials.ExecutablePath!.ThrowIfNull());
         if (gwProcess is null)
         {
@@ -164,7 +163,7 @@ internal sealed class ApplicationLauncher : IApplicationLauncher
         Application.Current.Shutdown();
     }
 
-    private async Task<Process?> LaunchGuildwarsProcess(string email, Models.SecureString password, string character, string executable)
+    private async Task<Process?> LaunchGuildwarsProcess(string email, Models.SecureString password, string executable)
     {
         if (File.Exists(executable) is false)
         {
@@ -176,13 +175,10 @@ internal sealed class ApplicationLauncher : IApplicationLauncher
             "-email",
             $"\"{email}\"",
             "-password",
-            $"\"{password}\""
+            $"\"{password}\"",
+            "-character",
+            "\"\""
         };
-        if (!string.IsNullOrWhiteSpace(character))
-        {
-            args.Add("-character");
-            args.Add($"\"{character}\"");
-        }
 
         var mods = this.modsManager.GetMods().Where(m => m.IsEnabled && m.IsInstalled).ToList();
         var disabledmods = this.modsManager.GetMods().Where(m => !m.IsEnabled && m.IsInstalled).ToList();

Daybreak/Services/Credentials/CredentialManager.cs

@@ -70,7 +70,6 @@ internal sealed class CredentialManager : ICredentialManager
     {
         return new LoginCredentials
         {
-            CharacterName = string.Empty,
             Username = string.Empty,
             Password = string.Empty,
             Identifier = Guid.NewGuid().ToString()
@@ -88,7 +87,6 @@ internal sealed class CredentialManager : ICredentialManager
                 Identifier = protectedLoginCredentials.Identifier,
                 Username = Encoding.UTF8.GetString(ProtectedData.Unprotect(usrbytes, Entropy, DataProtectionScope.LocalMachine)),
                 Password = Encoding.UTF8.GetString(ProtectedData.Unprotect(psdBytes, Entropy, DataProtectionScope.LocalMachine)),
-                CharacterName = protectedLoginCredentials.CharacterName,
             };
         }
         catch (Exception e)
@@ -109,7 +107,6 @@ internal sealed class CredentialManager : ICredentialManager
                 Identifier = loginCredentials.Identifier,
                 ProtectedUsername = Convert.ToBase64String(ProtectedData.Protect(usrBytes, Entropy, DataProtectionScope.LocalMachine)),
                 ProtectedPassword = Convert.ToBase64String(ProtectedData.Protect(psdBytes, Entropy, DataProtectionScope.LocalMachine)),
-                CharacterName = loginCredentials.CharacterName,
             };
         }
         catch

Daybreak/Views/Launch/AccountsView.xaml

@@ -26,7 +26,6 @@
                 <DataTemplate>
                     <controls:AccountTemplate Username="{Binding Username, Mode=TwoWay}"
                                               Password="{Binding Password, Mode=TwoWay}"
-                                              CharacterName="{Binding CharacterName, Mode=TwoWay}"
                                               RemoveClicked="AccountTemplate_RemoveClicked"/>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>

Daybreak/Views/Launch/LaunchConfigurationsView.xaml

@@ -62,9 +62,6 @@
                                     <TextBlock Text="{Binding Credentials.Username}"
                                                FontSize="16"
                                                Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>
-                                    <TextBlock Text="{Binding Credentials.CharacterName}"
-                                               FontSize="12"
-                                               Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>
                                     <TextBlock Text="{Binding ExecutablePath}"
                                                FontSize="12"
                                                Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"/>