Merge pull request #34 from WorldHealthOrganization/2.50.3

feat: update version and dependencies, add API key functionality

Author: silviaemorreale

app/settings.js

@@ -114,6 +114,7 @@ const configureIPCMain = () => {
                     (callback) => {
                         // retrieve again api settings
                         const currentApiSettings = settingsController.retrieveAPISettings();
+                        const currentClientSettings = settingsController.retrieveClientSettings();
 
                         // enable config rewrite
                         currentApiSettings.enableConfigRewrite = apiSettings.enableConfigRewrite;
@@ -125,12 +126,23 @@ const configureIPCMain = () => {
                             currentApiSettings.public.port = apiSettings.public.port ?
                                 parseInt(apiSettings.public.port) :
                                 '';
+                            const url = `${apiSettings.public.protocol}://${apiSettings.public.host}${apiSettings.public.port ? ':' + apiSettings.public.port : ''}`;
+
+                                // Ensure it's not already in the whitelist before adding
+                                if (!currentApiSettings.cors.whitelist.includes(url)) {
+                                    currentApiSettings.cors.whitelist.push(url);
+                                }
+                            currentApiSettings.apiKey = apiSettings.apiKey;
+                            currentClientSettings.apiKey = apiSettings.apiKey;
                         }
 
                         // save settings
                         if (!settingsController.updateAPISettings(currentApiSettings)) {
                             return callback('Error updating api settings...');
                         }
+                        if (!settingsController.updateClientSettings(currentClientSettings)) {
+                            return callback('Error updating client settings...');
+                        }
 
                         // finished
                         callback();

controllers/ipcMain.js

@@ -55,7 +55,8 @@ const initSettingsEvents = (events) => {
         const apiSettings = settings.retrieveAPISettings() || {};
         event.sender.send('getPublicInfo-reply', {
             enableConfigRewrite: apiSettings.enableConfigRewrite,
-            public: apiSettings.public
+            public: apiSettings.public,
+            apiKey: apiSettings.apiKey || ''
         });
     });
 

controllers/settings.js

@@ -10,6 +10,7 @@ const AppPaths = require('./../utils/paths');
 const settingsFile = AppPaths.desktopApp.settingsFile;
 const winCfgPath = AppPaths.desktopApp.winCfgPath;
 const apiConfigPath = AppPaths.apiConfigPath;
+const clientConfigPath = AppPaths.clientConfigPath;
 
 const encryptionController = require('./encryption');
 
@@ -254,6 +255,32 @@ const retrieveWinSettings = () => {
     return cachedWinSettings;
 };
 
+/**
+ * Retrieve client settings ( runtime-config.json )
+ */
+const retrieveClientSettings = () => {
+    // no api settings ?
+    if (!clientConfigPath) {
+        return {};
+    }
+
+    // load settings
+    let clientConfig = {};
+    try {
+        // check if api config file exists and
+        if (fs.existsSync(clientConfigPath)) {
+            // read api settings
+            const clientConfigData = fs.readFileSync(clientConfigPath, 'utf8');
+            clientConfig = JSON.parse(clientConfigData);
+        }
+    } catch (e) {
+        // NOTHING
+    }
+
+    // finished loading api settings
+    return clientConfig;
+};
+
 /**
  * Retrieve api settings ( config.json )
  */
@@ -280,6 +307,36 @@ const retrieveAPISettings = () => {
     return apiConfig;
 };
 
+/**
+ * Update client settings ( runtime-config.json )
+ * @return {boolean} True if saved with success, false otherwise
+ */
+const updateClientSettings = (settings) => {
+    // no  settings ?
+    if (!clientConfigPath) {
+        return false;
+    }
+
+    // convert settings to string if necessary
+    settings = typeof settings === 'string' ?
+        settings :
+        JSON.stringify(settings, null, 2);
+
+    // save settings
+    try {
+        fs.writeFileSync(clientConfigPath, settings);
+    } catch (e) {
+        // log error
+        logger.error(`Error saving client settings: ${e}`);
+
+        // an error occurred
+        return false;
+    }
+
+    // settings saved
+    return true;
+};
+
 /**
  * Update api settings ( config.json )
  * @return {boolean} True if saved with success, false otherwise
@@ -355,7 +412,9 @@ module.exports = {
     getEncryptionCapability,
     retrieveWinSettings,
     retrieveAPISettings,
+    retrieveClientSettings,
     updateAPISettings,
+    updateClientSettings,
     runMongoAsAService,
     runGoDataAPIAsAService
 };