summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-03-06 15:07:54 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-03-10 10:14:20 +0100
commit0c0d94cf964361760334c9a9b436006aa4fcfd80 (patch)
treead80e9e8e71d14c39e9732d93a4036f94333fad4
parent559ac69dbe7c51edcd3c7897410eefe8202544bd (diff)
downloadmullvadvpn-0c0d94cf964361760334c9a9b436006aa4fcfd80.tar.xz
mullvadvpn-0c0d94cf964361760334c9a9b436006aa4fcfd80.zip
Remove "any" for TunnelType
-rw-r--r--desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts5
-rw-r--r--desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts4
2 files changed, 2 insertions, 7 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
index 11da55b6bf..0403e66d18 100644
--- a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
+++ b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
@@ -498,10 +498,7 @@ function convertFromRelaySettings(
const normal = relaySettings.getNormal()!;
const locationConstraint = convertFromLocationConstraint(normal.getLocation());
const location = wrapConstraint(locationConstraint);
- // `getTunnelType()` is not falsy if type is 'any'
- const tunnelProtocol = convertFromTunnelTypeConstraint(
- normal.hasTunnelType() ? normal.getTunnelType() : undefined,
- );
+ const tunnelProtocol = convertFromTunnelType(normal.getTunnelType());
const providers = normal.getProvidersList();
const ownership = convertFromOwnership(normal.getOwnership());
const openvpnConstraints = convertFromOpenVpnConstraints(normal.getOpenvpnConstraints()!);
diff --git a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
index 1522d43b39..5faacf3963 100644
--- a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
@@ -99,15 +99,13 @@ export type ErrorStateDetails =
export type AfterDisconnect = 'nothing' | 'block' | 'reconnect';
-export type TunnelType = 'any' | 'wireguard' | 'openvpn';
+export type TunnelType = 'wireguard' | 'openvpn';
export function tunnelTypeToString(tunnel: TunnelType): string {
switch (tunnel) {
case 'wireguard':
return 'WireGuard';
case 'openvpn':
return 'OpenVPN';
- case 'any':
- return '';
}
}