Replace thrown error in account data fetch with typed values

2 files changed, 10 insertions, 1 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index f8c9fa5fff..a1997d06ad 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -1,6 +1,14 @@
 export interface IAccountData {
   expiry: string;
 }
+
+export type AccountDataError = {
+  type: 'error';
+  error: 'invalid-account' | 'too-many-devices' | 'list-devices' | 'communication';
+};
+
+export type AccountDataResponse = ({ type: 'success' } & IAccountData) | AccountDataError;
+
 export type AccountToken = string;
 export type Ip = string;
 export interface ILocation {
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 1dc7d82701..5a50fa315a 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -2,6 +2,7 @@ import { GetTextTranslations } from 'gettext-parser';
 
 import { ILinuxSplitTunnelingApplication, IWindowsApplication } from './application-types';
 import {
+  AccountDataError,
   AccountToken,
   BridgeSettings,
   BridgeState,
@@ -183,7 +184,7 @@ export const ipcSchema = {
     device: notifyRenderer<DeviceEvent>(),
     devices: notifyRenderer<Array<IDevice>>(),
     create: invoke<void, string>(),
-    login: invoke<AccountToken, void>(),
+    login: invoke<AccountToken, AccountDataError | undefined>(),
     logout: invoke<void, void>(),
     getWwwAuthToken: invoke<void, string>(),
     submitVoucher: invoke<string, VoucherResponse>(),