PR comments

Author: deansheather

App/Models/CredentialModel.cs

@@ -14,12 +14,12 @@ public enum CredentialState
 
 public class CredentialModel
 {
-    public CredentialState State { get; set; } = CredentialState.Unknown;
+    public CredentialState State { get; init; } = CredentialState.Unknown;
 
-    public string? CoderUrl { get; set; }
-    public string? ApiToken { get; set; }
+    public string? CoderUrl { get; init; }
+    public string? ApiToken { get; init; }
 
-    public string? Username { get; set; }
+    public string? Username { get; init; }
 
     public CredentialModel Clone()
     {

App/Services/CredentialManager.cs

@@ -95,7 +95,7 @@ public async Task<CredentialModel> LoadCredentials(CancellationToken ct = defaul
             var raw = ReadCredentials();
             model = await PopulateModel(raw, ct);
         }
-        catch (Exception e)
+        catch
         {
             // We don't need to clear the credentials here, the app will think
             // they're unset and any subsequent SetCredentials call after the

Tests.Vpn/Utilities/ServerVersionUtilitiesTest.cs

@@ -0,0 +1,73 @@
+using Coder.Desktop.Vpn.Utilities;
+using Semver;
+
+namespace Coder.Desktop.Tests.Vpn.Utilities;
+
+[TestFixture]
+public class ServerVersionUtilitiesTest
+{
+    [Test(Description = "Test invalid versions")]
+    public void InvalidVersions()
+    {
+        var invalidVersions = new List<(string, string)>
+        {
+            (null!, "Server version is empty"),
+            ("", "Server version is empty"),
+            (" ", "Server version is empty"),
+            ("v", "Could not parse server version"),
+            ("1", "Could not parse server version"),
+            ("v1", "Could not parse server version"),
+            ("1.2", "Could not parse server version"),
+            ("v1.2", "Could not parse server version"),
+            ("1.2.3.4", "Could not parse server version"),
+            ("v1.2.3.4", "Could not parse server version"),
+
+            ("1.2.3", "not within required server version range"),
+            ("v1.2.3", "not within required server version range"),
+            ("2.19.0-devel", "not within required server version range"),
+            ("v2.19.0-devel", "not within required server version range"),
+        };
+
+        foreach (var (version, expectedErrorMessage) in invalidVersions)
+        {
+            var ex = Assert.Throws<ArgumentException>(() => ServerVersionUtilities.ParseAndValidateServerVersion(version));
+            Assert.That(ex.Message, Does.Contain(expectedErrorMessage));
+        }
+    }
+
+    [Test(Description = "Test valid versions")]
+    public void ValidVersions()
+    {
+        var validVersions = new List<ServerVersion>
+        {
+            new()
+            {
+                RawString = "2.20.0-devel+17f8e93d0",
+                SemVersion = new SemVersion(2, 20, 0, ["devel"], ["17f8e93d0"]),
+            },
+            new()
+            {
+                RawString = "2.20.0",
+                SemVersion = new SemVersion(2, 20, 0),
+            },
+            new()
+            {
+                RawString = "2.21.3",
+                SemVersion = new SemVersion(2, 21, 3),
+            },
+            new()
+            {
+                RawString = "3.0.0",
+                SemVersion = new SemVersion(3, 0, 0),
+            },
+        };
+
+        foreach (var version in validVersions)
+            foreach (var prefix in new[] { "", "v" })
+            {
+                var result = ServerVersionUtilities.ParseAndValidateServerVersion(prefix + version.RawString);
+                Assert.That(result.RawString, Is.EqualTo(prefix + version.RawString), version.RawString);
+                Assert.That(result.SemVersion, Is.EqualTo(version.SemVersion), version.RawString);
+            }
+    }
+}

Vpn/Utilities/ServerVersionUtilities.cs

@@ -11,7 +11,7 @@ public class ServerVersion
 public static class ServerVersionUtilities
 {
     // The -0 allows pre-release versions.
-    private static readonly SemVersionRange ServerVersionRange = SemVersionRange.Parse("^2.20.0-0",
+    private static readonly SemVersionRange ServerVersionRange = SemVersionRange.Parse(">= 2.20.0-0",
         SemVersionRangeOptions.IncludeAllPrerelease | SemVersionRangeOptions.AllowV |
         SemVersionRangeOptions.AllowMetadata);