colin/browserpass-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading store settings when "configure" failed (#97)

Browse Source
This commit is contained in:
Maxim Baz
2019-04-13 19:32:58 +02:00
committed by GitHub
parent 2ad7675c8b
commit a1106ee381
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/background.js
View File

@@ -395,6 +395,9 @@ async function getFullSettings() {
settings.hostError = response; settings.hostError = response;
} }
settings.version = response.version; settings.version = response.version;
// Fill store settings, only makes sense if 'configure' succeeded
if (response.status === "ok") {
if (Object.keys(settings.stores).length > 0) { if (Object.keys(settings.stores).length > 0) {
// there are user-configured stores present // there are user-configured stores present
for (var storeId in settings.stores) { for (var storeId in settings.stores) {
@@ -411,7 +414,7 @@ async function getFullSettings() {
} }
} }
} }
} else if (response.status == "ok") { } else {
// no user-configured stores, so use the default store // no user-configured stores, so use the default store
settings.stores.default = { settings.stores.default = {
id: "default", id: "default",
@@ -429,6 +432,7 @@ async function getFullSettings() {
} }
} }
} }
}
// Fill recent data // Fill recent data
for (var storeId in settings.stores) { for (var storeId in settings.stores) {