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

chore(deps): upgrade snjs

Browse Source
This commit is contained in:
Mo Bitar
2020-09-15 11:31:05 -05:00
parent 2b6abeebfc
commit c7901f754d
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/directives/views/accountMenu.ts
View File

@@ -26,6 +26,7 @@ import { SyncOpStatus } from 'snjs/dist/@types/services/sync/sync_op_status';
import { PasswordWizardType } from '@/types'; import { PasswordWizardType } from '@/types';
import { BackupFile } from 'snjs/dist/@types/services/protocol_service'; import { BackupFile } from 'snjs/dist/@types/services/protocol_service';
import { confirmDialog, alertDialog } from '@/services/alertService'; 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'; const ELEMENT_ID_IMPORT_PASSWORD_INPUT = 'import-password-request';
@@ -43,7 +44,7 @@ type FormData = {
showPasscodeForm: boolean showPasscodeForm: boolean
strictSignin?: boolean strictSignin?: boolean
ephemeral: boolean ephemeral: boolean
mfa: { payload: any } mfa: HttpResponse
userMfaCode?: string userMfaCode?: string
mergeLocal?: boolean mergeLocal?: boolean
url: string url: string
@@ -233,8 +234,12 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
return; return;
} }
const error = response const error = response
? response.error ? response.error!
: { message: "An unknown error occured." }; : {
message: "An unknown error occured.",
tag: undefined,
status: 500
} as HttpResponse;
if (error.tag === 'mfa-required' || error.tag === 'mfa-invalid') { if (error.tag === 'mfa-required' || error.tag === 'mfa-invalid') {
await this.setFormDataState({ await this.setFormDataState({
showLogin: false, showLogin: false,
@@ -281,8 +286,12 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
status: undefined status: undefined
}); });
const error = response const error = response
? response.error ? response.error!
: { message: "An unknown error occured." }; : {
message: "An unknown error occured.",
tag: undefined,
status: 500
} as HttpResponse;
await this.setFormDataState({ await this.setFormDataState({
authenticating: false authenticating: false
}); });

4
package-lock.json generated
View File

@@ -10956,8 +10956,8 @@
"from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad" "from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad"
}, },
"snjs": { "snjs": {
"version": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a", "version": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301",
"from": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a" "from": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301"
}, },
"sockjs": { "sockjs": {
"version": "0.3.20", "version": "0.3.20",

2
package.json
View File

@@ -67,6 +67,6 @@
}, },
"dependencies": { "dependencies": {
"sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad", "sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad",
"snjs": "github:standardnotes/snjs#b029e6f7da367fecc40acab6e378e40ce247505a" "snjs": "github:standardnotes/snjs#9003251047822f4353bcb83ec4dca59d9aebb301"
} }
} }