Merge branch 'release/3.1.1'

ProtonVPN · Sep 8, 2023 · c99be0b · c99be0b
2 parents 9e73ea4 + d58c126
commit c99be0b
Show file tree

Hide file tree

Showing 83 changed files with 1,345 additions and 781 deletions.
diff --git a/.gitlab-ci-templates.yml b/.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:

diff --git a/.gitlab-ci.yml b/.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:

diff --git a/ci/test-scripts/install-prod-app.ps1 b/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
diff --git a/ci/test-scripts/uninstall-app.ps1 b/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
 }
diff --git a/src/Api/ProtonVPN.Api.Contracts/Events/EventResponse.cs b/src/Api/ProtonVPN.Api.Contracts/Events/EventResponse.cs
diff --git a/src/Api/ProtonVPN.Api.Contracts/IApiClient.cs b/src/Api/ProtonVPN.Api.Contracts/IApiClient.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);

diff --git a/src/Api/ProtonVPN.Api.Contracts/Servers/LogicalServerResponse.cs b/src/Api/ProtonVPN.Api.Contracts/Servers/LogicalServerResponse.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; }

diff --git a/src/Api/ProtonVPN.Api/ApiClient.cs b/src/Api/ProtonVPN.Api/ApiClient.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,

diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.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")]
diff --git a/src/HumanVerification/ProtonVPN.HumanVerification.Gui/WebView.xaml b/src/HumanVerification/ProtonVPN.HumanVerification.Gui/WebView.xaml
@@ -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>

diff --git a/src/HumanVerification/ProtonVPN.HumanVerification.Gui/WebViewViewModel.cs b/src/HumanVerification/ProtonVPN.HumanVerification.Gui/WebViewViewModel.cs
@@ -33,6 +33,8 @@ namespace ProtonVPN.HumanVerification.Gui
 {
     public class WebViewViewModel : ViewModelBase, IWebViewViewModel
     {
+        private const int WEBVIEW_ADDED_HEIGHT = 124;
+
         private readonly ILogger _logger;
         private readonly ICaptchaUrlProvider _captchaUrlProvider;
 
@@ -75,7 +77,7 @@ private void OnWebMessageReceived(CoreWebView2WebMessageReceivedEventArgs e)
                 switch (message.Type)
                 {
                     case CaptchaMessageTypes.Height:
-                        Height = message.Height;
+                        Height = message.Height + WEBVIEW_ADDED_HEIGHT;
                         break;
                     case CaptchaMessageTypes.TokenResponse:
                         OnHumanVerificationTokenReceived?.Invoke(this, message.Token);

diff --git a/src/HumanVerification/ProtonVPN.HumanVerification/CaptchaUrlProvider.cs b/src/HumanVerification/ProtonVPN.HumanVerification/CaptchaUrlProvider.cs
@@ -33,7 +33,7 @@ public CaptchaUrlProvider(IApiHostProvider apiHostProvider)
 
         public string GetCaptchaUrl(string token)
         {
-            return $"https://{_apiHostProvider.GetHost()}/core/v4/captcha?Token={token}";
+            return $"https://{_apiHostProvider.GetHost()}/core/v4/captcha?Token={token}&Dark=1";
         }
     }
 }
diff --git a/src/ProtonVPN.App/Account/AccountModalViewModel.cs b/src/ProtonVPN.App/Account/AccountModalViewModel.cs
@@ -55,7 +55,7 @@ public string ActionMessage
 
         public PromoCodeViewModel PromoCodeViewModel { get; }
 
-        public bool IsToShowVpnPlans => !_userStorage.GetUser().IsBusiness();
+        public bool IsToShowVpnPlans => !_userStorage.GetUser().IsB2B();
         public bool IsToShowUseCoupon => _appSettings.FeaturePromoCodeEnabled && _userStorage.GetUser().CanUsePromoCode();
 
         public AccountModalViewModel(

diff --git a/src/ProtonVPN.App/App.config b/src/ProtonVPN.App/App.config
@@ -210,9 +210,6 @@
             <setting name="Ipv6LeakProtection" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="UserLastEventId" serializeAs="String">
-                <value />
-            </setting>
             <setting name="CustomDnsEnabled" serializeAs="String">
                 <value>False</value>
             </setting>

diff --git a/src/ProtonVPN.App/Core/AppSettings.cs b/src/ProtonVPN.App/Core/AppSettings.cs
@@ -255,12 +255,6 @@ public int OnboardingStep
             set => SetPerUser(value);
         }
 
-        public string LastEventId
-        {
-            get => GetPerUser<string>();
-            set => SetPerUser(value);
-        }
-
         public int AppStartCounter
         {
             get => Get<int>();

diff --git a/src/ProtonVPN.App/Core/Bootstraper.cs b/src/ProtonVPN.App/Core/Bootstraper.cs
@@ -482,15 +482,6 @@ private void RegisterEvents()
                 }
             };
 
-            Resolve<EventClient>().ApiDataChanged += async (_, e) =>
-            {
-                IEnumerable<IApiDataChangeAware> instances = Resolve<IEnumerable<IApiDataChangeAware>>();
-                foreach (IApiDataChangeAware instance in instances)
-                {
-                    await instance.OnApiDataChanged(e);
-                }
-            };
-
             Resolve<ITokenClient>().RefreshTokenExpired += (_, _) =>
             {
                 Resolve<ExpiredSessionHandler>().Execute();
@@ -574,8 +565,6 @@ private async Task SwitchToAppWindow(bool autoLogin)
             await Resolve<SystemTimeValidator>().Validate();
             await Resolve<AutoConnect>().LoadAsync(autoLogin);
             Resolve<INetworkClient>().CheckForInsecureWiFi();
-            await Resolve<EventClient>().StoreLatestEvent();
-            Resolve<EventTimer>().Start();
         }
 
         private void LoadViewModels()

diff --git a/src/ProtonVPN.App/Core/Ioc/CoreModule.cs b/src/ProtonVPN.App/Core/Ioc/CoreModule.cs
@@ -20,7 +20,6 @@
 using Autofac;
 using ProtonVPN.Api;
 using ProtonVPN.Common.Configuration;
-using ProtonVPN.Common.Extensions;
 using ProtonVPN.Common.OS.Net;
 using ProtonVPN.Common.OS.Net.Http;
 using ProtonVPN.Common.OS.Net.NetworkInterface;
@@ -32,7 +31,6 @@
 using ProtonVPN.Config.Url;
 using ProtonVPN.Core.Auth;
 using ProtonVPN.Core.Config;
-using ProtonVPN.Core.Events;
 using ProtonVPN.Core.Network;
 using ProtonVPN.Core.OS;
 using ProtonVPN.Core.OS.Net.Dns;
@@ -91,16 +89,7 @@ protected override void Load(ContainerBuilder builder)
                             c.Resolve<INetworkInterfaces>())))
                 .As<IDnsClient>().SingleInstance();
 
-            builder.RegisterType<EventClient>().SingleInstance();
-            builder.RegisterType<UserInfoHandler>().AsImplementedInterfaces().SingleInstance();
-
             builder.RegisterType<VpnCredentialProvider>().As<IVpnCredentialProvider>().SingleInstance();
-            builder.Register(c => new EventTimer(
-                    c.Resolve<EventClient>(),
-                    c.Resolve<IConfiguration>().EventCheckInterval.RandomizedWithDeviation(0.2))) // REMOVE THIS CUSTOM REGISTRATION
-                .AsSelf()
-                .AsImplementedInterfaces()
-                .SingleInstance();
             builder.Register(c => new SafeSystemProxy(c.Resolve<ILogger>(), new SystemProxy()))
                 .AsImplementedInterfaces()
                 .SingleInstance();

diff --git a/src/ProtonVPN.App/Core/Service/Vpn/SimilarServerCandidatesGenerator.cs b/src/ProtonVPN.App/Core/Service/Vpn/SimilarServerCandidatesGenerator.cs
@@ -84,7 +84,7 @@ private Profile CreateProfile(Server originalServer, Profile originalProfile)
                 profile = _profileFactory.Create();
                 profile.VpnProtocol = VpnProtocol.Smart;
                 profile.ProfileType = ProfileType.Fastest;
-                profile.Features = (Features)(originalServer?.Features ?? (sbyte)Features.None);
+                profile.Features = (Features)(originalServer?.Features ?? (ulong)Features.None);
                 profile.EntryCountryCode = originalServer?.EntryCountry;
                 profile.CountryCode = originalServer?.ExitCountry;
                 profile.City = originalServer?.City;
@@ -109,13 +109,13 @@ private IList<Server> GetSimilarServers(bool isToIncludeOriginalServer, Server o
             IList<Server> servers = new List<Server>();
             servers.AddIfNotNull(GetOriginalServerIfRequired(isToIncludeOriginalServer, originalServer));
 
-            if (ServerFeatures.IsSecureCore((int)baseProfile.Features))
+            if (ServerFeatures.IsSecureCore((ulong)baseProfile.Features))
             {
                 servers.AddIfNotNull(GetBestServerForSameExitCountryAndDifferentEntryCountry(originalServer, servers, baseProfile));
                 servers.AddIfNotNull(GetBestServerForSameEntryCountryAndDifferentExitCountry(originalServer, servers, baseProfile));
                 servers.AddIfNotNull(GetBestServerForDifferentEntryAndExitCountries(originalServer, servers, baseProfile));
             }
-            else if (ServerFeatures.IsB2B((int)baseProfile.Features))
+            else if (ServerFeatures.IsB2B((ulong)baseProfile.Features))
             {
                 baseProfile.City = null;
                 baseProfile.CountryCode = null;

diff --git a/src/ProtonVPN.App/Core/Service/Vpn/VpnReconnector.cs b/src/ProtonVPN.App/Core/Service/Vpn/VpnReconnector.cs
@@ -280,7 +280,7 @@ private async Task ExecuteReconnectionAsync(VpnReconnectionSteps reconnectionSte
         private async Task ConnectToSimilarServerOrQuickConnectAsync(bool isToTryLastServer, VpnProtocol vpnProtocol)
         {
             IList<Server> serverCandidates = _similarServerCandidatesGenerator.Generate(isToTryLastServer, _targetServer, _targetProfile);
-            if (!ServerFeatures.IsB2B((int)_targetProfile.Features))
+            if (!ServerFeatures.IsB2B((ulong)_targetProfile.Features))
             {
                 IEnumerable<Server> quickConnectServers = (await _vpnConnector.GetSortedAndValidQuickConnectServersAsync(
                     _config.MaxQuickConnectServersOnReconnection)).Except(serverCandidates);

diff --git a/src/ProtonVPN.App/HumanVerification/HumanVerificationView.xaml b/src/ProtonVPN.App/HumanVerification/HumanVerificationView.xaml
@@ -32,7 +32,7 @@ along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
                           Style="{StaticResource BaseWindowStyle}"
                           x:Name="UserControl"
                           mc:Ignorable="d">
-    <Grid Width="320">
+    <Grid Margin="52,47,52,0">
         <ContentPresenter Content="{Binding WebView}" />
     </Grid>
 </resource:BaseModalWindow>