[bug] Handle missing runtime.json gracefully

Author: konovalovsergey

Common/sources/runtimeConfigManager.js

@@ -89,7 +89,7 @@ async function getConfig(ctx) {
 async function saveConfig(ctx, config) {
   await fs.mkdir(path.dirname(configFilePath), { recursive: true });
   let newConfig = await getConfig(ctx);
-  newConfig = utils.deepMergeObjects(newConfig, config);
+  newConfig = utils.deepMergeObjects(newConfig || {}, config);
   await fs.writeFile(configFilePath, JSON.stringify(newConfig, null, 2), 'utf8');
   nodeCache.set(configFileName, newConfig);
   return newConfig;

Common/sources/tenantManager.js

@@ -132,7 +132,7 @@ async function getTenantConfig(ctx) {
 async function setTenantConfig(ctx, config) {
   let newConfig = await getTenantConfig(ctx);
   if (isMultitenantMode(ctx) && !isDefaultTenant(ctx)) {
-    newConfig = utils.deepMergeObjects(newConfig, config);
+    newConfig = utils.deepMergeObjects(newConfig || {}, config);
     let tenantPath = utils.removeIllegalCharacters(ctx.tenant);
     let configPath = path.join(cfgTenantsBaseDir, tenantPath, cfgTenantsFilenameConfig);
     await writeFile(configPath, JSON.stringify(newConfig, null, 2), 'utf8');

DocService/sources/DocsCoServer.js

@@ -3487,19 +3487,7 @@ exports.install = function(server, callbackFunction) {
 				}
 
 				let [licenseInfo] = yield tenantManager.getTenantLicense(ctx);
-				let pluginSettings = yield aiProxyHandler.getPluginSettings(ctx);
-				//check empty settings
-				if (pluginSettings && pluginSettings.actions) {
-					let isEmptySettings = true;
-					for (let key in pluginSettings.actions) {
-						if (pluginSettings.actions[key].model) {
-							isEmptySettings = false;
-						}
-					}
-					if (isEmptySettings) {
-						pluginSettings = undefined;
-					}
-				}
+				let pluginSettings = yield aiProxyHandler.getPluginSettingsForInterface(ctx);
 				sendData(ctx, conn, {
 					type: 'license',
 					license: {

DocService/sources/ai/aiProxyHandler.js

@@ -343,6 +343,29 @@ async function getPluginSettings(ctx) {
   return result;
 }
 
+async function getPluginSettingsForInterface(ctx) {
+  let pluginSettings = await getPluginSettings(ctx);
+  //check empty settings
+  if (pluginSettings && pluginSettings.actions) {
+    let isEmptySettings = true;
+    for (let key in pluginSettings.actions) {
+      if (pluginSettings.actions[key].model) {
+        isEmptySettings = false;
+      }
+    }
+    if (isEmptySettings) {
+      pluginSettings = undefined;
+    }
+  }
+  //remove keys from providers
+  if (pluginSettings && pluginSettings.providers) {
+    for (let key in pluginSettings.providers) {
+      pluginSettings.providers[key].key = "";
+    }
+  }
+  return pluginSettings;
+}
+
 async function requestSettings(req, res) {
   const ctx = new operationContext.Context();
 	ctx.initFromRequest(req);
@@ -378,6 +401,7 @@ async function requestModels(req, res) {
 module.exports = {
   proxyRequest,
   getPluginSettings,
+  getPluginSettingsForInterface,
   requestSettings,
   requestModels
 };