summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-10-23 15:13:51 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-10-23 15:13:51 +0200
commit7774933e9513204db53c6191af3fa46458454027 (patch)
tree4167cdc8361ebf0312b347d014ad209a2e27cb9a /gui/src/shared
parent6e86b6fe22df51725e45133d3467df94815970f4 (diff)
parentc018d97ac770bfbd1169e544ea63359c9b932afc (diff)
downloadmullvadvpn-7774933e9513204db53c6191af3fa46458454027.tar.xz
mullvadvpn-7774933e9513204db53c6191af3fa46458454027.zip
Merge branch 'add-encrypted-dns-as-an-access-method-in-the-daemon-des-1319'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/daemon-rpc-types.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index bd8f99711b..1522d43b39 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -524,7 +524,8 @@ export type NamedCustomProxy = CustomProxy & { name: string };
export type DirectMethod = { type: 'direct' };
export type BridgesMethod = { type: 'bridges' };
-export type AccessMethod = DirectMethod | BridgesMethod | CustomProxy;
+export type EncryptedDnsProxy = { type: 'encrypted-dns-proxy' };
+export type AccessMethod = DirectMethod | BridgesMethod | EncryptedDnsProxy | CustomProxy;
export type NamedAccessMethod<T extends AccessMethod> = T & { name: string };
@@ -540,6 +541,7 @@ export type AccessMethodSetting<T extends AccessMethod = AccessMethod> =
export type ApiAccessMethodSettings = {
direct: AccessMethodSetting<DirectMethod>;
mullvadBridges: AccessMethodSetting<BridgesMethod>;
+ encryptedDnsProxy: AccessMethodSetting<EncryptedDnsProxy>;
custom: Array<AccessMethodSetting<CustomProxy>>;
};