Merge branch 'release/3.1.1'

Author: Mindaugas Veblauskas

.gitlab-ci-templates.yml

@@ -18,7 +18,7 @@
     when: always
     name: "result-ui"
     paths:
-      - $SCREENSHOT_PATH
+      - $TEST_ARTIFACT_PATH
     expire_in: 1 weeks
 
 .build-script:

.gitlab-ci.yml

@@ -11,7 +11,7 @@ include:
 
 variables:
   PUBLIC_REPO_URL: [email protected]:ProtonVPN/win-app.git
-  SCREENSHOT_PATH: src/bin/TestFailureData/
+  TEST_ARTIFACT_PATH: src/bin/TestArtifactData/
   TEST_REPORT_PATH: results/
   PROJECT_ID: "13"
   MILESTONE: "Windows"
@@ -77,7 +77,7 @@ tests:
     - cmd.exe /c BuildDependencies.bat bin gosrponly
     - dotnet restore ProtonVpn.sln
     - dotnet build ProtonVpn.sln
-    - coverlet src\bin --target "dotnet" --targetargs "test ProtonVpn.sln -l ""console;verbosity=normal"" --filter ""TestCategory!=UI&TestCategory!=Connection"" --no-restore --no-build" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[*.Installers]*"
+    - coverlet src\bin --target "dotnet" --targetargs "test ProtonVpn.sln -l ""console;verbosity=normal"" --filter ""TestCategory!=UI&TestCategory!=Connection&TestCategory!=Performance"" --no-restore --no-build" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[*.Installers]*"
     - powershell -Command "(gc coverage-reports.cobertura.xml) -replace '\\', '/' | Out-File -encoding UTF8 cobertura.xml"
     - ReportGenerator.exe "-reports:cobertura.xml" "-targetdir:.\code-coverage-report-html"
   artifacts:

ci/test-scripts/install-prod-app.ps1

@@ -0,0 +1,23 @@
+$response = Invoke-RestMethod -Uri "https://protonvpn.com/download/windows-releases.json"
+$documentsFolderPath = [Environment]::GetFolderPath("MyDocuments")
+$installersFolderPath = Join-Path $documentsFolderPath "Installers"
+
+if (-not (Test-Path -Path $installersFolderPath -PathType Container)) {
+    New-Item -Path $installersFolderPath -ItemType Directory
+}
+
+$mostRecentStableVersion = $response.Categories | Where-Object { $_.Name -eq "Stable" } | 
+    Select-Object -ExpandProperty Releases | 
+    Sort-Object { [version]::Parse($_.Version) } -Descending | 
+    Select-Object -First 1
+
+$mostRecentStableVersionUrl = $mostRecentStableVersion.File.Url
+$executableName = [System.IO.Path]::GetFileName($mostRecentStableVersionUrl)
+
+$executablePath = Join-Path $installersFolderPath $executableName
+
+if (-not (Test-Path -Path $executablePath)) {
+    Invoke-WebRequest -Uri $mostRecentStableVersionUrl -OutFile $executablePath
+}
+
+Start-Process -FilePath $executablePath -ArgumentList "/verysilent" -PassThru -Wait

ci/test-scripts/uninstall-app.ps1

@@ -1,6 +1,8 @@
 $protonFolder = "C:\Program Files\Proton\VPN"
 $protonUninstallExe = $protonFolder + "\unins000.exe"
-if (Test-Path -Path $protonFolder) {
+if(Test-Path -Path $protonUninstallExe) {
     Start-Process -FilePath $protonUninstallExe -ArgumentList "/verysilent" -Wait -ErrorAction Ignore
+}
+if (Test-Path -Path $protonFolder) {
     Remove-Item $protonFolder -Recurse -ErrorAction Ignore
 }

src/Api/ProtonVPN.Api.Contracts/Events/EventResponse.cs

@@ -23,7 +23,6 @@
 using ProtonVPN.Api.Contracts.Auth;
 using ProtonVPN.Api.Contracts.Certificates;
 using ProtonVPN.Api.Contracts.Common;
-using ProtonVPN.Api.Contracts.Events;
 using ProtonVPN.Api.Contracts.Geographical;
 using ProtonVPN.Api.Contracts.Partners;
 using ProtonVPN.Api.Contracts.ReportAnIssue;
@@ -41,7 +40,6 @@ public interface IApiClient : IClientBase
         Task<ApiResponseResult<PhysicalServerWrapperResponse>> GetServerAsync(string serverId);
         Task<ApiResponseResult<VpnInfoWrapperResponse>> GetVpnInfoResponse();
         Task<ApiResponseResult<BaseResponse>> GetLogoutResponse();
-        Task<ApiResponseResult<EventResponse>> GetEventResponse(string lastId = default);
         Task<ApiResponseResult<ServersResponse>> GetServersAsync(string ip);
         Task<ApiResponseResult<ReportAnIssueFormResponse>> GetReportAnIssueFormData();
         Task<ApiResponseResult<ServersResponse>> GetServerLoadsAsync(string ip);

src/Api/ProtonVPN.Api.Contracts/IApiClient.cs

@@ -33,7 +33,7 @@ public class LogicalServerResponse
         public string ExitCountry { get; set; }
         public string Domain { get; set; }
         public sbyte Tier { get; set; }
-        public sbyte Features { get; set; }
+        public ulong Features { get; set; }
         public LocationResponse LocationResponse { get; set; }
         public sbyte Status { get; set; }
         public sbyte Load { get; set; }

src/Api/ProtonVPN.Api.Contracts/Servers/LogicalServerResponse.cs

@@ -26,7 +26,6 @@
 using ProtonVPN.Api.Contracts.Auth;
 using ProtonVPN.Api.Contracts.Certificates;
 using ProtonVPN.Api.Contracts.Common;
-using ProtonVPN.Api.Contracts.Events;
 using ProtonVPN.Api.Contracts.Geographical;
 using ProtonVPN.Api.Contracts.Partners;
 using ProtonVPN.Api.Contracts.ReportAnIssue;
@@ -35,10 +34,10 @@
 using ProtonVPN.Api.Contracts.VpnConfig;
 using ProtonVPN.Api.Contracts.VpnSessions;
 using ProtonVPN.Common.Configuration;
-using ProtonVPN.Logging.Contracts;
-using ProtonVPN.Logging.Contracts.Events.ApiLogs;
 using ProtonVPN.Common.OS.Net.Http;
 using ProtonVPN.Core.Settings;
+using ProtonVPN.Logging.Contracts;
+using ProtonVPN.Logging.Contracts.Events.ApiLogs;
 
 namespace ProtonVPN.Api
 {
@@ -95,13 +94,6 @@ public async Task<ApiResponseResult<BaseResponse>> GetLogoutResponse()
             return await SendRequest<BaseResponse>(request, "Logout");
         }
 
-        public async Task<ApiResponseResult<EventResponse>> GetEventResponse(string lastId)
-        {
-            string id = string.IsNullOrEmpty(lastId) ? "latest" : lastId;
-            HttpRequestMessage request = GetAuthorizedRequest(HttpMethod.Get, "events/" + id);
-            return await SendRequest<EventResponse>(request, "Get events");
-        }
-
         public async Task<ApiResponseResult<ServersResponse>> GetServersAsync(string ip)
         {
             HttpRequestMessage request = GetAuthorizedRequest(HttpMethod.Get,

src/Api/ProtonVPN.Api/ApiClient.cs

@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.1.0")]
+[assembly: AssemblyFileVersion("3.1.1.0")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyInformationalVersion("$AssemblyVersion")]
 [assembly: SupportedOSPlatform("windows")]

src/GlobalAssemblyInfo.cs

@@ -8,10 +8,11 @@
              xmlns:gui="clr-namespace:ProtonVPN.HumanVerification.Gui"
              d:DataContext="{d:DesignInstance gui:WebViewViewModel}"
              mc:Ignorable="d">
-    <wpf:WebView2 DefaultBackgroundColor="Black"
-                  MinHeight="100"
+    <wpf:WebView2 MinHeight="100"
+                  Width="370"
                   Name="WebView2"
-                  Height="{Binding Height}">
+                  Height="{Binding Height}"
+                  DefaultBackgroundColor="#1C1B23">
         <wpf:WebView2.CreationProperties>
             <Binding RelativeSource="{RelativeSource Self}" Path="DataContext.WebView2CreationProperties" />
         </wpf:WebView2.CreationProperties>