From c199a6525f781af28175460b0aff3dfb9e78491c Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Thu, 7 Oct 2021 19:31:45 -0600
Subject: [PATCH] recovery-drive not logicalname

---
 setup-wizard/docs.txt                              | 2 +-
 setup-wizard/src/app/pages/embassy/embassy.page.ts | 2 +-
 setup-wizard/src/app/services/api/api.service.ts   | 2 +-
 setup-wizard/src/app/services/state.service.ts     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup-wizard/docs.txt b/setup-wizard/docs.txt
index a3385943e..51a78c25d 100644
--- a/setup-wizard/docs.txt
+++ b/setup-wizard/docs.txt
@@ -38,7 +38,7 @@ setup.execute
     Request
       embassy-logicalname   : string,
       embassy-password      : string
-      recovery-logicalname? : string,
+      recovery-drive?       : DiskInfo,
       recovery-password?    : string
 
     Response
diff --git a/setup-wizard/src/app/pages/embassy/embassy.page.ts b/setup-wizard/src/app/pages/embassy/embassy.page.ts
index cc618f975..994209e7f 100644
--- a/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -38,7 +38,7 @@ export class EmbassyPage {
 
   async getDrives () {
     try {
-      this.storageDrives = await this.apiService.getDrives()
+      this.storageDrives = (await this.apiService.getDrives()).filter(d => d.logicalname !== this.stateService.recoveryDrive?.logicalname)
     } catch (e) {
       this.errorToastService.present(e.message)
     } finally {
diff --git a/setup-wizard/src/app/services/api/api.service.ts b/setup-wizard/src/app/services/api/api.service.ts
index d9ac8455a..620df2f64 100644
--- a/setup-wizard/src/app/services/api/api.service.ts
+++ b/setup-wizard/src/app/services/api/api.service.ts
@@ -19,7 +19,7 @@ export interface GetStatusRes {
 export interface SetupEmbassyReq {
   'embassy-logicalname': string
   'embassy-password': string
-  'recovery-logicalname'?: string
+  'recovery-drive'?: DiskInfo
   'recovery-password'?: string
 }
 
diff --git a/setup-wizard/src/app/services/state.service.ts b/setup-wizard/src/app/services/state.service.ts
index 7873b1bc1..d39dc732b 100644
--- a/setup-wizard/src/app/services/state.service.ts
+++ b/setup-wizard/src/app/services/state.service.ts
@@ -60,7 +60,7 @@ export class StateService {
     const ret = await this.apiService.setupEmbassy({
       'embassy-logicalname': this.storageDrive.logicalname,
       'embassy-password': this.embassyPassword,
-      'recovery-logicalname': this.recoveryDrive?.logicalname,
+      'recovery-drive': this.recoveryDrive,
       'recovery-password': this.recoveryPassword,
     })
     return { torAddress: ret }