Merge remote-tracking branch 'benma/manualbackup'

Author: benma

backend/devices/bitbox02/handlers/handlers.go

@@ -161,8 +161,21 @@ func (handlers *Handlers) postSetPassword(r *http.Request) (interface{}, error)
 }
 
 func (handlers *Handlers) postCreateBackup(r *http.Request) (interface{}, error) {
-	if err := handlers.device.CreateBackup(); err != nil {
-		return maybeBB02Err(err, handlers.log), nil
+	var backupMethod string
+	if err := json.NewDecoder(r.Body).Decode(&backupMethod); err != nil {
+		return nil, errp.WithStack(err)
+	}
+	switch backupMethod {
+	case "sdcard":
+		if err := handlers.device.CreateBackup(); err != nil {
+			return maybeBB02Err(err, handlers.log), nil
+		}
+	case "recovery-words":
+		if err := handlers.device.ShowMnemonic(); err != nil {
+			return maybeBB02Err(err, handlers.log), nil
+		}
+	default:
+		return map[string]interface{}{"success": false}, nil
 	}
 	return map[string]interface{}{"success": true}, nil
 }
@@ -284,11 +297,20 @@ func (handlers *Handlers) getVersionHandler(_ *http.Request) (interface{}, error
 		NewVersion             string `json:"newVersion"`
 		CanUpgrade             bool   `json:"canUpgrade"`
 		CanGotoStartupSettings bool   `json:"canGotoStartupSettings"`
+		// If true, creating a backup using the mnemonic recovery words instead of the microSD card
+		// is supported in the initial setup.
+		//
+		// If false, the backup must be performed using the microSD card in the initial setup.
+		//
+		// This has no influence over whether one can display the recovery words after the initial
+		// setup - that is always possible regardless of this value.
+		CanBackupWithRecoveryWords bool `json:"canBackupWithRecoveryWords"`
 	}{
-		CurrentVersion:         currentVersion.String(),
-		NewVersion:             newVersion.String(),
-		CanUpgrade:             newVersion.AtLeast(currentVersion) && currentVersion.String() != newVersion.String(),
-		CanGotoStartupSettings: currentVersion.AtLeast(semver.NewSemVer(9, 6, 0)),
+		CurrentVersion:             currentVersion.String(),
+		NewVersion:                 newVersion.String(),
+		CanUpgrade:                 newVersion.AtLeast(currentVersion) && currentVersion.String() != newVersion.String(),
+		CanGotoStartupSettings:     currentVersion.AtLeast(semver.NewSemVer(9, 6, 0)),
+		CanBackupWithRecoveryWords: currentVersion.AtLeast(semver.NewSemVer(9, 13, 0)),
 	}, nil
 }
 

frontends/web/src/api/bitbox02.ts

@@ -68,6 +68,14 @@ export type VersionInfo = {
     currentVersion: string;
     canUpgrade: boolean;
     canGotoStartupSettings: boolean;
+    // If true, creating a backup using the mnemonic recovery words instead of the microSD card
+    // is supported in the initial setup.
+    //
+    // If false, the backup must be performed using the microSD card in the initial setup.
+    //
+    // This has no influence over whether one can display the recovery words after the initial
+    // setup - that is always possible regardless of this value.
+    canBackupWithRecoveryWords: boolean;
 }
 
 export const getVersion = (
@@ -96,10 +104,13 @@ export const checkBackup = (
   return apiPost(`devices/bitbox02/${deviceID}/backups/check`, { silent });
 };
 
+// The 'recovery-words' method is only allowed if `canBackupWithRecoveryWords` returned by
+// `getVersion()` is true.
 export const createBackup = (
   deviceID: string,
+  method: 'sdcard' | 'recovery-words',
 ): Promise<FailResponse | SuccessResponse> => {
-  return apiPost(`devices/bitbox02/${deviceID}/backups/create`);
+  return apiPost(`devices/bitbox02/${deviceID}/backups/create`, method);
 };
 
 export const restoreBackup = (

frontends/web/src/routes/device/bitbox02/bitbox02.tsx

@@ -309,8 +309,7 @@ class BitBox02 extends Component<Props, State> {
         title: this.props.t('bitbox02Interact.confirmDate'),
         text: this.props.t('bitbox02Interact.confirmDateText'),
       } });
-
-      createBackup(this.props.deviceID)
+      createBackup(this.props.deviceID, 'sdcard')
         .then(() => this.setState({ creatingBackup: false, waitDialog: undefined }))
         .catch(() => {
           alertUser(this.props.t('bitbox02Wizard.createBackupFailed'), { asDialog: false });

frontends/web/src/routes/device/bitbox02/createbackup.tsx

@@ -34,7 +34,7 @@ export const Create = ({ deviceID }: TProps) => {
 
   const createBackup = () => {
     setCreatingBackup(true);
-    createBackupAPI(deviceID)
+    createBackupAPI(deviceID, 'sdcard')
       .then((result) => {
         setCreatingBackup(false);
         setDisabled(false);
@@ -80,4 +80,4 @@ export const Create = ({ deviceID }: TProps) => {
       )}
     </span>
   );
-};
+};