Minor refactoring to extract common function to deduce icon url

3 files changed, 12 insertions, 17 deletions

diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index 26571323d..8be5aa9c5 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -1,15 +1,10 @@
 const Service = use('App/Models/Service');
 const { validateAll } = use('Validator');
-const Env = use('Env');
 
 const { v4: uuid } = require('uuid');
-const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } = require('../../../../config');
+const { DEFAULT_SERVICE_ORDER, DEFAULT_SERVICE_SETTINGS } = require('../../../../config');
 const { convertToJSON } = require('../../../../jsUtils');
-const { API_VERSION } = require('../../../../environment-remote');
-const moveIcon = require('../../ImageHelper');
-
-const hostname = LOCAL_HOSTNAME;
-const port = Env.get('PORT');
+const { deduceIconUrl, moveIcon } = require('../../ImageHelper');
 
 class ServiceController {
   // Create a new service for user
@@ -91,9 +86,7 @@ class ServiceController {
         // Overwrite previous default settings with what's obtained from the db
         ...settings,
         // Overwrite even after the spread operator with specific values
-        iconUrl: settings.iconId
-          ? `http://${hostname}:${port}/${API_VERSION}/icon/${settings.iconId}`
-          : null,
+        iconUrl: deduceIconUrl(settings.iconId),
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
@@ -144,7 +137,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${newSettings.iconId}`,
+          iconUrl: deduceIconUrl(newSettings.iconId),
           userId: 1,
         },
         status: ['updated'],
@@ -182,7 +175,7 @@ class ServiceController {
         id,
         name: service.name,
         ...settings,
-        iconUrl: `${Env.get('APP_URL')}/${API_VERSION}/icon/${settings.iconId}`,
+        iconUrl: deduceIconUrl(settings.iconId),
         userId: 1,
       },
       status: ['updated'],
@@ -236,9 +229,7 @@ class ServiceController {
         // Overwrite previous default settings with what's obtained from the db
         ...settings,
         // Overwrite even after the spread operator with specific values
-        iconUrl: settings.iconId
-          ? `http://${hostname}:${port}/${API_VERSION}/icon/${settings.iconId}`
-          : null,
+        iconUrl: deduceIconUrl(settings.iconId),
         id: service.serviceId,
         name: service.name,
         recipeId: service.recipeId,
diff --git a/src/internal-server/app/ImageHelper.js b/src/internal-server/app/ImageHelper.js
index b399d08c4..e7c981a1d 100644
--- a/src/internal-server/app/ImageHelper.js
+++ b/src/internal-server/app/ImageHelper.js
@@ -4,8 +4,9 @@ const { v4: uuid } = require('uuid');
 
 const path = require('path');
 const fs = require('fs-extra');
+const { API_VERSION } = require('../../environment-remote');
 
-module.exports = async (icon) => {
+const moveIcon = async (icon) => {
   const iconsPath = path.join(Env.get('USER_PATH'), 'icons');
   await fs.ensureDir(iconsPath);
 
@@ -22,3 +23,7 @@ module.exports = async (icon) => {
   });
   return !icon.moved() ? '-1' : iconId;
 };
+
+const deduceIconUrl = (iconId) => iconId ? `http://${Env.get('HOST')}:${Env.get('PORT')}/${API_VERSION}/icon/${iconId}` : null
+
+module.exports = { moveIcon, deduceIconUrl };
diff --git a/src/internal-server/env.ini b/src/internal-server/env.ini
index 87a347921..d8224e91e 100644
--- a/src/internal-server/env.ini
+++ b/src/internal-server/env.ini
@@ -2,7 +2,6 @@ HOST=localhost
 PORT=45569
 NODE_ENV=development
 APP_NAME=Ferdium Internal Server
-APP_URL=http://${HOST}:${PORT}
 CACHE_VIEWS=false
 APP_KEY=FERDIUMINTERNALSERVER
 DB_CONNECTION=sqlite