jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

We can have toplevel arrays just fine

Browse Source
This commit is contained in:
Johannes Zellner
2021-05-04 20:30:52 +02:00
parent fed8ba95f0
commit aa86174d6b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/userdb.js
View File

@@ -42,9 +42,8 @@ function postProcess(result) {
result.twoFactorAuthenticationEnabled = !!result.twoFactorAuthenticationEnabled;
result.active = !!result.active;
// we have a locations property to not store top-level array
const loginLocations = safe.JSON.parse(result.loginLocationsJson) || {};
result.loginLocations = loginLocations.locations || [];
result.loginLocations = safe.JSON.parse(result.loginLocationsJson) || [];
if (!Array.isArray(result.loginLocations)) result.loginLocations = [];
delete result.loginLocationsJson;
return result;
@@ -254,7 +253,7 @@ function update(userId, user, callback) {
args.push(user[k] ? 1 : 0);
} else if (k === 'loginLocations') {
fields.push('loginLocationsJson = ?');
args.push(JSON.stringify({ locations: user[k] }));
args.push(JSON.stringify(user[k]));
} else {
fields.push(k + ' = ?');
args.push(user[k]);