Reset password through setup wizard (#1490)

* closes FE portion of  #1470

* remove accidental commit of local script

* add reset password option (#1560)

* fix error code for incorrect password and clarify codes with comments

Co-authored-by: Matt Hill <matthill@Matt-M1.local>
Co-authored-by: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts

@@ -32,7 +32,7 @@ export class RecoverPage {
     private readonly loadingCtrl: LoadingController,
     private readonly errorToastService: ErrorToastService,
     public readonly stateService: StateService,
-  ) {}
+  ) { }
 
   async ngOnInit() {
     await this.getDrives()
@@ -99,8 +99,7 @@ export class RecoverPage {
         const alert = await this.alertCtrl.create({
           header: 'Embassy Data Drive Detected',
           message: new IonicSafeString(
-            `${importableDrive.vendor || 'Unknown Vendor'} - ${
-              importableDrive.model || 'Unknown Model'
+            `${importableDrive.vendor || 'Unknown Vendor'} - ${importableDrive.model || 'Unknown Model'
             } contains Embassy data. To use this drive and its data <i>as-is</i>, click "Use Drive". This will complete the setup process.<br /><br /><b>Important</b>. If you are trying to restore from backup or update from 0.2.x, DO NOT click "Use Drive". Instead, click "Cancel" and follow instructions.`,
           ),
           buttons: [
@@ -111,8 +110,16 @@ export class RecoverPage {
             {
               text: 'Use Drive',
               handler: async () => {
-                if (importableDrive.guid)
-                  await this.importDrive(importableDrive.guid)
+                const modal = await this.modalController.create({
+                  component: PasswordPage,
+                  componentProps: { storageDrive: importableDrive },
+                })
+                modal.onDidDismiss().then(res => {
+                  if (res.data && res.data.password) {
+                    this.importDrive(importableDrive.guid!, res.data.password)
+                  }
+                })
+                await modal.present()
               },
             },
           ],
@@ -201,13 +208,13 @@ export class RecoverPage {
     }
   }
 
-  private async importDrive(guid: string) {
+  private async importDrive(guid: string, password: string) {
     const loader = await this.loadingCtrl.create({
       message: 'Importing Drive',
     })
     await loader.present()
     try {
-      await this.stateService.importDrive(guid)
+      await this.stateService.importDrive(guid, password)
       await this.navCtrl.navigateForward(`/success`)
     } catch (e: any) {
       this.errorToastService.present(e)

frontend/projects/setup-wizard/src/app/services/api/api.service.ts

@@ -8,7 +8,7 @@ export abstract class ApiService {
   // encrypted
   abstract verifyCifs(cifs: CifsRecoverySource): Promise<EmbassyOSRecoveryInfo> // setup.cifs.verify
   abstract verifyProductKey(): Promise<void> // echo - throws error if invalid
-  abstract importDrive(guid: string): Promise<SetupEmbassyRes> // setup.execute
+  abstract importDrive(importInfo: ImportDriveReq): Promise<SetupEmbassyRes> // setup.attach
   abstract setupEmbassy(setupInfo: SetupEmbassyReq): Promise<SetupEmbassyRes> // setup.execute
   abstract setupComplete(): Promise<SetupEmbassyRes> // setup.complete
 }
@@ -18,6 +18,11 @@ export interface GetStatusRes {
   migrating: boolean
 }
 
+export interface ImportDriveReq {
+  guid: string
+  'embassy-password': string
+}
+
 export interface SetupEmbassyReq {
   'embassy-logicalname': string
   'embassy-password': string

frontend/projects/setup-wizard/src/app/services/api/live-api.service.ts

@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'
 import {
   ApiService,
   CifsRecoverySource,
-  DiskInfo,
   DiskListResponse,
   DiskRecoverySource,
   EmbassyOSRecoveryInfo,
   GetStatusRes,
+  ImportDriveReq,
   RecoveryStatusRes,
   SetupEmbassyReq,
   SetupEmbassyRes,
@@ -80,10 +80,10 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async importDrive(guid: string) {
+  async importDrive(params: ImportDriveReq) {
     const res = await this.http.rpcRequest<SetupEmbassyRes>({
       method: 'setup.attach',
-      params: { guid },
+      params: params as any,
     })
 
     return {

frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts

@@ -1,6 +1,11 @@
 import { Injectable } from '@angular/core'
 import { pauseFor } from '@start9labs/shared'
-import { ApiService, CifsRecoverySource, SetupEmbassyReq } from './api.service'
+import {
+  ApiService,
+  CifsRecoverySource,
+  ImportDriveReq,
+  SetupEmbassyReq,
+} from './api.service'
 
 let tries = 0
 
@@ -84,7 +89,7 @@ export class MockApiService extends ApiService {
     return
   }
 
-  async importDrive(guid: string) {
+  async importDrive(params: ImportDriveReq) {
     await pauseFor(3000)
     return setupRes
   }

frontend/projects/setup-wizard/src/app/services/state.service.ts

@@ -69,8 +69,11 @@ export class StateService {
     setTimeout(() => this.pollDataTransferProgress(), 0) // prevent call stack from growing
   }
 
-  async importDrive(guid: string): Promise<void> {
-    const ret = await this.apiService.importDrive(guid)
+  async importDrive(guid: string, password: string): Promise<void> {
+    const ret = await this.apiService.importDrive({
+      guid,
+      'embassy-password': password,
+    })
     this.torAddress = ret['tor-address']
     this.lanAddress = ret['lan-address']
     this.cert = ret['root-ca']