Add rpc and ipc calls for listing and removing devices

2 files changed, 19 insertions, 8 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 3b0f7774d3..61a068c08e 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -105,7 +105,7 @@ export type DaemonEvent =
   | { settings: ISettings }
   | { relayList: IRelayList }
   | { appVersionInfo: IAppVersionInfo }
-  | { deviceConfig: IDeviceConfig };
+  | { deviceConfig: DeviceConfig };
 
 export interface ITunnelStateRelayInfo {
   endpoint: ITunnelEndpoint;
@@ -321,16 +321,23 @@ export interface IAppVersionInfo {
   suggestedIsBeta?: boolean;
 }
 
-export interface IDeviceConfig {
-  accountToken?: AccountToken;
-  device?: IDevice;
-}
+export type DeviceConfig =
+  | undefined
+  | {
+      accountToken: AccountToken;
+      device?: IDevice;
+    };
 
 export interface IDevice {
   id: string;
   name: string;
 }
 
+export interface IDeviceRemoval {
+  accountToken: string;
+  deviceId: string;
+}
+
 export interface ISettings {
   allowLan: boolean;
   autoConnect: boolean;
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 6b3082cdd7..6ea154bf89 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -6,7 +6,9 @@ import {
   BridgeState,
   IAccountData,
   IAppVersionInfo,
-  IDeviceConfig,
+  IDevice,
+  DeviceConfig,
+  IDeviceRemoval,
   IDnsOptions,
   ILocation,
   IRelayList,
@@ -51,7 +53,7 @@ export interface IAppStateSnapshot {
   accountHistory?: AccountToken;
   tunnelState: TunnelState;
   settings: ISettings;
-  deviceConfig: IDeviceConfig;
+  deviceConfig: DeviceConfig;
   relayListPair: IRelayListPair;
   currentVersion: ICurrentAppVersionInfo;
   upgradeVersion: IAppVersionInfo;
@@ -165,13 +167,15 @@ export const ipcSchema = {
   },
   account: {
     '': notifyRenderer<IAccountData | undefined>(),
-    device: notifyRenderer<IDeviceConfig>(),
+    device: notifyRenderer<DeviceConfig>(),
     create: invoke<void, string>(),
     login: invoke<AccountToken, void>(),
     logout: invoke<void, void>(),
     getWwwAuthToken: invoke<void, string>(),
     submitVoucher: invoke<string, VoucherResponse>(),
     updateData: send<void>(),
+    listDevices: invoke<AccountToken, Array<IDevice>>(),
+    removeDevice: invoke<IDeviceRemoval, void>(),
   },
   accountHistory: {
     '': notifyRenderer<AccountToken | undefined>(),