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

3.3.5; fixes 2fa login issue in 3.3.4

Browse Source
This commit is contained in:
Mo Bitar
2020-04-01 18:51:51 -05:00
parent b79c366ee9
commit b075d1b7fb
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,9 @@ class AccountMenuCtrl extends PureCtrl {
); );
const hasError = !response || response.error; const hasError = !response || response.error;
if (!hasError) { if (!hasError) {
this.setFormDataState({
user_password: null
});
await this.onAuthSuccess(); await this.onAuthSuccess();
this.syncManager.unlockSyncing(); this.syncManager.unlockSyncing();
this.syncManager.sync({ performIntegrityCheck: true }); this.syncManager.sync({ performIntegrityCheck: true });
@@ -167,8 +170,7 @@ class AccountMenuCtrl extends PureCtrl {
} }
this.syncManager.unlockSyncing(); this.syncManager.unlockSyncing();
await this.setFormDataState({ await this.setFormDataState({
status: null, status: null
user_password: null
}); });
const error = response const error = response
? response.error ? response.error

2
dist/javascripts/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/javascripts/app.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.3.4", "version": "3.3.5",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -10502,8 +10502,9 @@
} }
}, },
"snjs": { "snjs": {
"version": "github:standardnotes/snjs#0714da7bbef114173dbb23b5e41b7f705fe4a0cb", "version": "1.0.7",
"from": "github:standardnotes/snjs#0714da7bbef114173dbb23b5e41b7f705fe4a0cb", "resolved": "https://registry.npmjs.org/snjs/-/snjs-1.0.7.tgz",
"integrity": "sha512-61OkFgjvhfr21EvpdYtSHp+cFmhyx71etr8J7a6T5XqKHLG4zuBV9LaRd6Wb4eYYlrh6GbG0Bui/kDsvdHTZyw==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.15" "lodash": "^4.17.15"

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.3.4", "version": "3.3.5",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -47,7 +47,7 @@
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"serve-static": "^1.14.1", "serve-static": "^1.14.1",
"sn-stylekit": "2.0.22", "sn-stylekit": "2.0.22",
"snjs": "github:standardnotes/snjs#0714da7bbef114173dbb23b5e41b7f705fe4a0cb", "snjs": "1.0.7",
"webpack": "^4.41.5", "webpack": "^4.41.5",
"webpack-cli": "^3.3.10", "webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.3" "webpack-dev-server": "^3.10.3"