summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-01-31 13:11:59 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-01-31 13:11:59 +0100
commit0d9abfd26b0d0e2151eaebaae1bd01f2f439466b (patch)
tree6f7c6c6fd29bcf69cd5906a56a14c3cdeeab3d45 /gui/src/shared
parent9b9da3ebbd90d52cec84c17edb4d99a472fd9a61 (diff)
parent87cb3b634dd7b9a5e173637dff956f9544aaccd3 (diff)
downloadmullvadvpn-0d9abfd26b0d0e2151eaebaae1bd01f2f439466b.tar.xz
mullvadvpn-0d9abfd26b0d0e2151eaebaae1bd01f2f439466b.zip
Merge branch 'correctly-handle-removal-disabling-of-access-method-des-561'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/daemon-rpc-types.ts6
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 71f6936804..f048549b7a 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -533,7 +533,11 @@ export type AccessMethodSetting = NewAccessMethodSetting & {
id: string;
};
-export type ApiAccessMethodSettings = Array<AccessMethodSetting>;
+export type ApiAccessMethodSettings = {
+ direct: AccessMethodSetting;
+ mullvadBridges: AccessMethodSetting;
+ custom: Array<AccessMethodSetting>;
+};
export function parseSocketAddress(socketAddrStr: string): ISocketAddress {
const re = new RegExp(/(.+):(\d+)$/);