chore: prompt for sign in when turning VPN on if signed out (#114)

ethanndickson · web-flow · commit 2603ace63cbd · 2025-03-19T18:52:31.000+11:00
Closes #106.
diff --git a/Coder-Desktop/Coder-Desktop/Preview Content/PreviewVPN.swift b/Coder-Desktop/Coder-Desktop/Preview Content/PreviewVPN.swift
@@ -78,4 +78,6 @@ final class PreviewVPN: Coder_Desktop.VPNService {
     func configureTunnelProviderProtocol(proto _: NETunnelProviderProtocol?) {
         state = .connecting
     }
+
+    var startWhenReady: Bool = false
 }
diff --git a/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift b/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift
@@ -10,6 +10,7 @@ protocol VPNService: ObservableObject {
     func start() async
     func stop() async
     func configureTunnelProviderProtocol(proto: NETunnelProviderProtocol?)
+    var startWhenReady: Bool { get set }
 }
 
 enum VPNServiceState: Equatable {
diff --git a/Coder-Desktop/Coder-Desktop/Views/VPNMenu.swift b/Coder-Desktop/Coder-Desktop/Views/VPNMenu.swift
@@ -4,6 +4,7 @@ struct VPNMenu<VPN: VPNService>: View {
     @EnvironmentObject var vpn: VPN
     @EnvironmentObject var state: AppState
     @Environment(\.openSettings) private var openSettings
+    @Environment(\.openWindow) private var openWindow
 
     let inspection = Inspection<Self>()
 
@@ -16,7 +17,18 @@ struct VPNMenu<VPN: VPNService>: View {
                     Toggle(isOn: Binding(
                         get: { vpn.state == .connected || vpn.state == .connecting },
                         set: { isOn in Task {
-                            if isOn { await vpn.start() } else { await vpn.stop() }
+                            if isOn {
+                                // Clicking the toggle while logged out should
+                                // open the login window, then start the VPN asap
+                                if !state.hasSession {
+                                    vpn.startWhenReady = true
+                                    openWindow(id: .login)
+                                } else {
+                                    await vpn.start()
+                                }
+                            } else {
+                                await vpn.stop()
+                            }
                         }
                         }
                     )) {
@@ -86,8 +98,7 @@ struct VPNMenu<VPN: VPNService>: View {
     }
 
     private var vpnDisabled: Bool {
-        !state.hasSession ||
-            vpn.state == .connecting ||
+        vpn.state == .connecting ||
             vpn.state == .disconnecting ||
             // Prevent starting the VPN before the user has approved the system extension.
             vpn.state == .failed(.systemExtensionError(.needsUserApproval))
diff --git a/Coder-Desktop/Coder-DesktopTests/Util.swift b/Coder-Desktop/Coder-DesktopTests/Util.swift
@@ -23,6 +23,7 @@ class MockVPNService: VPNService, ObservableObject {
     }
 
     func configureTunnelProviderProtocol(proto _: NETunnelProviderProtocol?) {}
+    var startWhenReady: Bool = false
 }
 
 extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}
diff --git a/Coder-Desktop/Coder-DesktopTests/VPNMenuTests.swift b/Coder-Desktop/Coder-DesktopTests/VPNMenuTests.swift
@@ -23,7 +23,7 @@ struct VPNMenuTests {
         try await ViewHosting.host(view) {
             try await sut.inspection.inspect { view in
                 let toggle = try view.find(ViewType.Toggle.self)
-                #expect(toggle.isDisabled())
+                #expect(!toggle.isDisabled())
                 #expect(throws: Never.self) { try view.find(text: "Sign in to use Coder Desktop") }
                 #expect(throws: Never.self) { try view.find(button: "Sign in") }
             }

Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,6 @@ final class PreviewVPN: Coder_Desktop.VPNService {`
`78`	`78`	`func configureTunnelProviderProtocol(proto _: NETunnelProviderProtocol?) {`
`79`	`79`	`state = .connecting`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ var startWhenReady: Bool = false`
`81`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ protocol VPNService: ObservableObject {`
`10`	`10`	`func start() async`
`11`	`11`	`func stop() async`
`12`	`12`	`func configureTunnelProviderProtocol(proto: NETunnelProviderProtocol?)`
	`13`	`+ var startWhenReady: Bool { get set }`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`enum VPNServiceState: Equatable {`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ class MockVPNService: VPNService, ObservableObject {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func configureTunnelProviderProtocol(proto _: NETunnelProviderProtocol?) {}`
	`26`	`+ var startWhenReady: Bool = false`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct VPNMenuTests {`
`23`	`23`	`try await ViewHosting.host(view) {`
`24`	`24`	`try await sut.inspection.inspect { view in`
`25`	`25`	`let toggle = try view.find(ViewType.Toggle.self)`
`26`		`- #expect(toggle.isDisabled())`
	`26`	`+ #expect(!toggle.isDisabled())`
`27`	`27`	`#expect(throws: Never.self) { try view.find(text: "Sign in to use Coder Desktop") }`
`28`	`28`	`#expect(throws: Never.self) { try view.find(button: "Sign in") }`
`29`	`29`	`}`