From c7901f754d91609b80445fd9d460a77edf5c598e Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Tue, 15 Sep 2020 11:31:05 -0500 Subject: [PATCH] chore(deps): upgrade snjs --- .../directives/views/accountMenu.ts | 19 ++++++++++++++----- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts index 5c0fc6ec0..d435099b6 100644 --- a/app/assets/javascripts/directives/views/accountMenu.ts +++ b/app/assets/javascripts/directives/views/accountMenu.ts @@ -26,6 +26,7 @@ import { SyncOpStatus } from 'snjs/dist/@types/services/sync/sync_op_status'; import { PasswordWizardType } from '@/types'; import { BackupFile } from 'snjs/dist/@types/services/protocol_service'; import { confirmDialog, alertDialog } from '@/services/alertService'; +import { HttpResponse } from 'snjs/dist/@types/services/api/http_service'; const ELEMENT_ID_IMPORT_PASSWORD_INPUT = 'import-password-request'; @@ -43,7 +44,7 @@ type FormData = { showPasscodeForm: boolean strictSignin?: boolean ephemeral: boolean - mfa: { payload: any } + mfa: HttpResponse userMfaCode?: string mergeLocal?: boolean url: string @@ -233,8 +234,12 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> { return; } const error = response - ? response.error - : { message: "An unknown error occured." }; + ? response.error! + : { + message: "An unknown error occured.", + tag: undefined, + status: 500 + } as HttpResponse; if (error.tag === 'mfa-required' || error.tag === 'mfa-invalid') { await this.setFormDataState({ showLogin: false, @@ -281,8 +286,12 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> { status: undefined }); const error = response - ? response.error - : { message: "An unknown error occured." }; + ? response.error! + : { + message: "An unknown error occured.", + tag: undefined, + status: 500 + } as HttpResponse; await this.setFormDataState({ authenticating: false }); diff --git a/package-lock.json b/package-lock.json index e339395dc..142ee29a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10956,8 +10956,8 @@ "from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad" }, "snjs": { - "version": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a", - "from": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a" + "version": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301", + "from": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301" }, "sockjs": { "version": "0.3.20", diff --git a/package.json b/package.json index c599bf531..d42546daa 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,6 @@ }, "dependencies": { "sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad", - "snjs": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a" + "snjs": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301" } }