rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show import error sooner

Browse Source
This commit is contained in:
Baptiste Grob
2020-09-07 11:20:45 +02:00
parent 7f03922b67
commit a1727b1b1e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/directives/views/accountMenu.js
View File

@@ -346,6 +346,12 @@ class AccountMenuCtrl extends PureCtrl {
if (!data) { if (!data) {
return; return;
} }
const version = data?.auth_params?.version || data?.keyParams?.version;
if (!protocolManager.supportedVersions().includes(version)) {
this.setState({ importData: null });
this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP });
return;
}
if (data.auth_params) { if (data.auth_params) {
await this.setState({ await this.setState({
importData: { importData: {
@@ -378,15 +384,6 @@ class AccountMenuCtrl extends PureCtrl {
} }
async performImport(data, password) { async performImport(data, password) {
if (
data.keyParams ||
(data.auth_params && Number(data.auth_params.version) > protocolManager.version())
) {
this.setState({ importData: null });
this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP });
return;
}
await this.setState({ await this.setState({
importData: { importData: {
...this.state.importData, ...this.state.importData,