Settings API should return null instead of ""

refs #10345

- We are standardising on returning null from the Content API for any empty values

core/server/services/settings/cache.js

@@ -29,19 +29,19 @@ const doGet = (key, options) => {
 
     // Don't try to resolve to the value of the setting
     if (options && options.resolve === false) {
-        return settingsCache[key];
+        return settingsCache[key] || null;
     }
 
     // Default behaviour is to try to resolve the value and return that
     try {
         // CASE: if a string contains a number e.g. "1", JSON.parse will auto convert into integer
         if (!isNaN(Number(settingsCache[key].value))) {
-            return settingsCache[key].value;
+            return settingsCache[key].value || null;
         }
 
-        return JSON.parse(settingsCache[key].value);
+        return JSON.parse(settingsCache[key].value) || null;
     } catch (err) {
-        return settingsCache[key].value;
+        return settingsCache[key].value || null;
     }
 };
 
@@ -100,7 +100,7 @@ module.exports = {
         let settings = {};
 
         _.each(publicSettings, (newKey, key) => {
-            settings[newKey] = doGet(key) || '';
+            settings[newKey] = doGet(key) || null;
         });
 
         return settings;

core/test/functional/api/v2/content/settings_spec.js

@@ -49,11 +49,14 @@ describe('Settings', function () {
                     let defaultKey = _.findKey(publicSettings, (v) => v === key);
                     let defaultValue = _.find(defaultSettings, (setting) => setting.key === defaultKey).defaultValue;
 
+                    // Convert empty strings to null
+                    defaultValue = defaultValue || null;
+
                     if (defaultKey === 'navigation') {
                         defaultValue = JSON.parse(defaultValue);
                     }
 
-                    value.should.eql(defaultValue);
+                    should(value).eql(defaultValue);
                 });
             });
     });

core/test/unit/services/settings/cache_spec.js

@@ -47,7 +47,7 @@ describe('UNIT: settings cache', function () {
             active_timezone: {value: 'PST'}
         });
 
-        let values = _.zipObject(_.values(publicSettings), _.fill(Array(_.size(publicSettings)), ''));
+        let values = _.zipObject(_.values(publicSettings), _.fill(Array(_.size(publicSettings)), null));
         values.title = 'hello world';
         values.timezone = 'PST';