Update to new device state rpc calls

3 files changed, 21 insertions, 22 deletions

diff --git a/gui/src/shared/connect-helper.ts b/gui/src/shared/connect-helper.ts
index b1421cd8ef..d5c563c7ca 100644
--- a/gui/src/shared/connect-helper.ts
+++ b/gui/src/shared/connect-helper.ts
@@ -1,28 +1,24 @@
-import { AccountToken, TunnelState } from './daemon-rpc-types';
+import { TunnelState } from './daemon-rpc-types';
 
 export function connectEnabled(
   connectedToDaemon: boolean,
-  accountToken: AccountToken | undefined,
+  loggedIn: boolean,
   tunnelState: TunnelState['state'],
 ) {
   return (
     connectedToDaemon &&
-    accountToken !== undefined &&
-    accountToken !== '' &&
+    loggedIn &&
     (tunnelState === 'disconnected' || tunnelState === 'disconnecting' || tunnelState === 'error')
   );
 }
 
 export function reconnectEnabled(
   connectedToDaemon: boolean,
-  accountToken: AccountToken | undefined,
+  loggedIn: boolean,
   tunnelState: TunnelState['state'],
 ) {
   return (
-    connectedToDaemon &&
-    accountToken !== undefined &&
-    accountToken !== '' &&
-    (tunnelState === 'connected' || tunnelState === 'connecting')
+    connectedToDaemon && loggedIn && (tunnelState === 'connected' || tunnelState === 'connecting')
   );
 }
 
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index d1eab9cdce..aad35a01f4 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -114,7 +114,7 @@ export type DaemonEvent =
   | { settings: ISettings }
   | { relayList: IRelayList }
   | { appVersionInfo: IAppVersionInfo }
-  | { device: IDeviceEvent }
+  | { device: DeviceEvent }
   | { deviceRemoval: Array<IDevice> };
 
 export interface ITunnelStateRelayInfo {
@@ -333,16 +333,20 @@ export interface IAppVersionInfo {
   suggestedIsBeta?: boolean;
 }
 
-export interface IDeviceEvent {
-  deviceConfig?: IDeviceConfig;
-  remote?: boolean;
-}
-
-export interface IDeviceConfig {
+export interface IAccountAndDevice {
   accountToken: AccountToken;
   device?: IDevice;
 }
 
+export type LoggedInDeviceState = { type: 'logged in'; accountAndDevice: IAccountAndDevice };
+export type LoggedOutDeviceState = { type: 'logged out' | 'revoked' };
+
+export type DeviceState = LoggedInDeviceState | LoggedOutDeviceState;
+
+export type DeviceEvent =
+  | { type: 'logged in' | 'updated' | 'rotated_key'; deviceState: LoggedInDeviceState }
+  | { type: 'logged out' | 'revoked'; deviceState: LoggedOutDeviceState };
+
 export interface IDevice {
   id: string;
   name: string;
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index e09d552c25..cbe29ee783 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -5,11 +5,11 @@ import {
   AccountToken,
   BridgeSettings,
   BridgeState,
+  DeviceEvent,
+  DeviceState,
   IAccountData,
   IAppVersionInfo,
   IDevice,
-  IDeviceConfig,
-  IDeviceEvent,
   IDeviceRemoval,
   IDnsOptions,
   ILocation,
@@ -62,8 +62,7 @@ export interface IAppStateSnapshot {
   tunnelState: TunnelState;
   settings: ISettings;
   isPerformingPostUpgrade: boolean;
-  deviceConfig?: IDeviceConfig;
-  hasReceivedDeviceConfig: boolean;
+  deviceState?: DeviceState;
   relayListPair: IRelayListPair;
   currentVersion: ICurrentAppVersionInfo;
   upgradeVersion: IAppVersionInfo;
@@ -182,7 +181,7 @@ export const ipcSchema = {
   },
   account: {
     '': notifyRenderer<IAccountData | undefined>(),
-    device: notifyRenderer<IDeviceEvent>(),
+    device: notifyRenderer<DeviceEvent>(),
     devices: notifyRenderer<Array<IDevice>>(),
     create: invoke<void, string>(),
     login: invoke<AccountToken, void>(),
@@ -190,7 +189,7 @@ export const ipcSchema = {
     getWwwAuthToken: invoke<void, string>(),
     submitVoucher: invoke<string, VoucherResponse>(),
     updateData: send<void>(),
-    getDevice: invoke<void, IDevice | undefined>(),
+    getDeviceState: invoke<void, DeviceState>(),
     listDevices: invoke<AccountToken, Array<IDevice>>(),
     removeDevice: invoke<IDeviceRemoval, void>(),
   },