Handle daemon error when adding an api access method

2 files changed, 20 insertions, 6 deletions

diff --git a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
index 5c8e6de6e1..90496f4e29 100644
--- a/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
+++ b/desktop/packages/mullvad-vpn/src/main/daemon-rpc.ts
@@ -4,6 +4,7 @@ import { BoolValue, StringValue } from 'google-protobuf/google/protobuf/wrappers
 import { types as grpcTypes } from 'management-interface';
 
 import {
+  AccessMethodExistsError,
   AccessMethodSetting,
   AccountDataError,
   AccountDataResponse,
@@ -601,12 +602,23 @@ export class DaemonRpc extends GrpcClient {
     }
   }
 
-  public async addApiAccessMethod(method: NewAccessMethodSetting): Promise<string> {
-    const result = await this.call<grpcTypes.NewAccessMethodSetting, grpcTypes.UUID>(
-      this.client.addApiAccessMethod,
-      convertToNewApiAccessMethodSetting(method),
-    );
-    return result.getValue();
+  public async addApiAccessMethod(
+    method: NewAccessMethodSetting,
+  ): Promise<string | AccessMethodExistsError> {
+    try {
+      const result = await this.call<grpcTypes.NewAccessMethodSetting, grpcTypes.UUID>(
+        this.client.addApiAccessMethod,
+        convertToNewApiAccessMethodSetting(method),
+      );
+      return result.getValue();
+    } catch (e) {
+      const error = e as grpc.ServiceError;
+      if (error.code === 6) {
+        return { type: 'name already exists' };
+      } else {
+        throw error;
+      }
+    }
   }
 
   public async updateApiAccessMethod(method: AccessMethodSetting) {
diff --git a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
index 117f002289..026df6d189 100644
--- a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
@@ -487,6 +487,8 @@ export type NewCustomList = Pick<ICustomList, 'name' | 'locations'>;
 
 export type CustomListError = { type: 'name already exists' };
 
+export type AccessMethodExistsError = { type: 'name already exists' };
+
 export interface ISettings {
   allowLan: boolean;
   autoConnect: boolean;