Add /settings/user end point

This commit is contained in:
Nick O'Leary
2017-12-04 17:15:17 +00:00
parent a7e14f1093
commit fff0b15ae5
8 changed files with 102 additions and 41 deletions

View File

@@ -20,22 +20,29 @@ var assert = require("assert");
var log = require("./log");
var util = require("./util");
var userSettings = null;
// localSettings are those provided in the runtime settings.js file
var localSettings = null;
// globalSettings are provided by storage - .config.json on localfilesystem
var globalSettings = null;
// nodeSettings are those settings that a node module defines as being available
var nodeSettings = null;
// A subset of globalSettings that deal with per-user settings
var userSettings = null;
var disableNodeSettings = null;
var storage = null;
var persistentSettings = {
init: function(settings) {
userSettings = settings;
localSettings = settings;
for (var i in settings) {
/* istanbul ignore else */
if (settings.hasOwnProperty(i) && i !== 'load' && i !== 'get' && i !== 'set' && i !== 'available' && i !== 'reset') {
// Don't allow any of the core functions get replaced via settings
(function() {
var j = i;
persistentSettings.__defineGetter__(j,function() { return userSettings[j]; });
persistentSettings.__defineGetter__(j,function() { return localSettings[j]; });
persistentSettings.__defineSetter__(j,function() { throw new Error("Property '"+j+"' is read-only"); });
})();
}
@@ -48,11 +55,15 @@ var persistentSettings = {
storage = _storage;
return storage.getSettings().then(function(_settings) {
globalSettings = _settings;
userSettings = globalSettings.users || {};
});
},
get: function(prop) {
if (userSettings.hasOwnProperty(prop)) {
return clone(userSettings[prop]);
if (prop === 'users') {
throw new Error("Do not access user settings directly. Use settings.getUserSettings");
}
if (localSettings.hasOwnProperty(prop)) {
return clone(localSettings[prop]);
}
if (globalSettings === null) {
throw new Error(log._("settings.not-available"));
@@ -61,7 +72,10 @@ var persistentSettings = {
},
set: function(prop,value) {
if (userSettings.hasOwnProperty(prop)) {
if (prop === 'users') {
throw new Error("Do not access user settings directly. Use settings.setUserSettings");
}
if (localSettings.hasOwnProperty(prop)) {
throw new Error(log._("settings.property-read-only", {prop:prop}));
}
if (globalSettings === null) {
@@ -77,7 +91,7 @@ var persistentSettings = {
}
},
delete: function(prop) {
if (userSettings.hasOwnProperty(prop)) {
if (localSettings.hasOwnProperty(prop)) {
throw new Error(log._("settings.property-read-only", {prop:prop}));
}
if (globalSettings === null) {
@@ -95,14 +109,15 @@ var persistentSettings = {
},
reset: function() {
for (var i in userSettings) {
for (var i in localSettings) {
/* istanbul ignore else */
if (userSettings.hasOwnProperty(i)) {
if (localSettings.hasOwnProperty(i)) {
delete persistentSettings[i];
}
}
userSettings = null;
localSettings = null;
globalSettings = null;
userSettings = null;
storage = null;
},
registerNodeSettings: function(type, opts) {
@@ -126,8 +141,8 @@ var persistentSettings = {
if (setting.exportable) {
if (safeSettings.hasOwnProperty(property)) {
// Cannot overwrite existing setting
} else if (userSettings.hasOwnProperty(property)) {
safeSettings[property] = userSettings[property];
} else if (localSettings.hasOwnProperty(property)) {
safeSettings[property] = localSettings[property];
} else if (setting.hasOwnProperty('value')) {
safeSettings[property] = setting.value;
}
@@ -148,6 +163,21 @@ var persistentSettings = {
types.forEach(function(type) {
disableNodeSettings[type] = true;
});
},
getUserSettings: function(username) {
console.log(username);
return userSettings[username];
},
setUserSettings: function(username,settings) {
var current = userSettings[username];
userSettings[username] = settings;
try {
assert.deepEqual(current,settings);
return when.resolve();
} catch(err) {
globalSettings.user = userSettings;
return storage.saveSettings(globalSettings);
}
}
}