fix: download backup later in the change password process

This commit is contained in:
Baptiste Grob
2021-03-03 14:30:24 +01:00
parent a22a95e928
commit 9541886a2c
3 changed files with 7 additions and 3 deletions

View File

@@ -173,12 +173,13 @@ class PasswordWizardCtrl extends PureViewCtrl<Props, State> implements PasswordW
} }
async processPasswordChange() { async processPasswordChange() {
await this.application.downloadBackup();
await this.setState({ await this.setState({
lockContinue: true, lockContinue: true,
processing: true processing: true
}); });
await this.setFormDataState({ await this.setFormDataState({
status: "Processing encryption keys..." status: "Processing encryption keys"
}); });
const newPassword = this.props.securityUpdate const newPassword = this.props.securityUpdate
? this.state.formData.currentPassword ? this.state.formData.currentPassword

View File

@@ -18,5 +18,5 @@ export interface Bridge {
onMajorDataChange(): void; onMajorDataChange(): void;
onInitialDataLoad(): void; onInitialDataLoad(): void;
onSearch(text?: string): void; onSearch(text?: string): void;
downloadBackup(): void; downloadBackup(): Promise<void>;
} }

View File

@@ -147,7 +147,6 @@ export class WebApplication extends SNApplication {
} }
presentPasswordWizard(type: PasswordWizardType) { presentPasswordWizard(type: PasswordWizardType) {
this.bridge.downloadBackup();
const scope = this.scope!.$new(true) as PasswordWizardScope; const scope = this.scope!.$new(true) as PasswordWizardScope;
scope.type = type; scope.type = type;
scope.application = this; scope.application = this;
@@ -157,6 +156,10 @@ export class WebApplication extends SNApplication {
this.applicationElement.append(el); this.applicationElement.append(el);
} }
downloadBackup(): Promise<void> {
return this.bridge.downloadBackup();
}
authenticationInProgress() { authenticationInProgress() {
return this.currentAuthenticationElement != null; return this.currentAuthenticationElement != null;
} }