diff --git a/apps/server/src/utils/parser.ts b/apps/server/src/utils/parser.ts index c19c8c51b..94431631a 100644 --- a/apps/server/src/utils/parser.ts +++ b/apps/server/src/utils/parser.ts @@ -276,7 +276,7 @@ export const parseJson = async (jsonData): Promise => { // Import OSC settings if any returnData.osc = parseOsc(jsonData) ?? dbModel.osc; // Import HTTP settings if any - returnData.http = parseHttp(jsonData, enforce); + returnData.http = parseHttp(jsonData) ?? dbModel.http; return returnData as DatabaseModel; }; diff --git a/apps/server/src/utils/parserFunctions.ts b/apps/server/src/utils/parserFunctions.ts index b880dc56d..1aac6d486 100644 --- a/apps/server/src/utils/parserFunctions.ts +++ b/apps/server/src/utils/parserFunctions.ts @@ -245,12 +245,7 @@ export const validateHttpObject = (data: Subscription): boolean => { * @param {boolean} enforce - whether to create a definition if one is missing * @returns {object} - event object data */ -export const parseHttp = ( - data: { - http?: Partial; - }, - enforce: boolean, -): HTTPSettings | Record => { +export const parseHttp = (data: { http?: Partial }): HTTPSettings => { if ('http' in data) { console.log('Found HTTP definition, importing...'); @@ -263,15 +258,9 @@ export const parseHttp = ( enabledOut: loadedConfig.enabledOut ?? dbModel.http.enabledOut, subscriptions: validatedSubscriptions, }; - } else if (enforce) { - console.log('Created HTTP object in db'); - return { ...dbModel.http }; - } else return {}; + } }; - - - /** * Parse aliases portion of an entry * @param {object} data - data object