3 files changed, 28 insertions, 24 deletions

diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 8a6b4f684..1a7595a9d 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -6,8 +6,11 @@ const {
 const Env = use('Env');
 
 const fetch = require('node-fetch');
+const debug = require('debug')('Ferdi:internalServer:RecipeController');
+const { LIVE_FERDI_API } = require('../../../../config');
+const { API_VERSION } = require('../../../../environment');
 
-const RECIPES_URL = 'https://api.getferdi.com/v1/recipes';
+const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 
 class RecipeController {
   // List official and custom recipes
@@ -64,6 +67,9 @@ class RecipeController {
       if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
         remoteResults = JSON.parse(await (await fetch(`${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`)).text());
       }
+
+      debug('remoteResults:', remoteResults);
+
       const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
       const localResults = localResultsArray.map(recipe => ({
         id: recipe.recipeId,
@@ -71,6 +77,8 @@ class RecipeController {
         ...JSON.parse(recipe.data),
       }));
 
+      debug('localResults:', localResults);
+
       results = [
         ...localResults,
         ...remoteResults || [],
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index c76a287f7..f2af9d411 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -5,7 +5,8 @@ const Env = use('Env');
 const uuid = require('uuid/v4');
 const path = require('path');
 const fs = require('fs-extra');
-const { LOCAL_HOSTNAME } = require('../../../../config');
+const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
+const { API_VERSION } = require('../../../../environment');
 
 const hostname = LOCAL_HOSTNAME;
 const port = Env.get('PORT');
@@ -54,7 +55,7 @@ class ServiceController {
         isMuted: false,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         spellcheckerLanguage: '',
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         customRecipe: false,
         hasCustomIcon: false,
         workspaces: [],
@@ -83,12 +84,12 @@ class ServiceController {
         isEnabled: true,
         isMuted: false,
         isNotificationEnabled: true,
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
         iconUrl: settings.iconId
-          ? `http://${hostname}:${port}/v1/icon/${settings.iconId}`
+          ? `http://${hostname}:${port}/${API_VERSION}/icon/${settings.iconId}`
           : null,
         id: service.serviceId,
         name: service.name,
@@ -156,7 +157,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/v1/icon/${
+          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${
             newSettings.iconId
           }`,
           userId: 1,
@@ -196,7 +197,7 @@ class ServiceController {
         id,
         name: service.name,
         ...settings,
-        iconUrl: `${Env.get('APP_URL')}/v1/icon/${settings.iconId}`,
+        iconUrl: `${Env.get('APP_URL')}/${API_VERSION}/icon/${settings.iconId}`,
         userId: 1,
       },
       status: ['updated'],
@@ -257,12 +258,12 @@ class ServiceController {
         isEnabled: true,
         isMuted: false,
         isNotificationEnabled: true,
-        order: 1,
+        order: DEFAULT_SERVICE_ORDER,
         spellcheckerLanguage: '',
         workspaces: [],
         ...JSON.parse(service.settings),
         iconUrl: settings.iconId
-          ? `http://${hostname}:${port}/v1/icon/${settings.iconId}`
+          ? `http://${hostname}:${port}/${API_VERSION}/icon/${settings.iconId}`
           : null,
         id: service.serviceId,
         name: service.name,
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index a3ad736fa..57aea6fc1 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -9,18 +9,16 @@ const btoa = require('btoa');
 const fetch = require('node-fetch');
 const uuid = require('uuid/v4');
 const crypto = require('crypto');
-const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
+const { DEFAULT_APP_SETTINGS, API_VERSION } = require('../../../../environment');
+const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
 const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
-  const base = `${url}/v1/`;
-  const user = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
-
   try {
-    fetch(base + route, {
+    fetch(`${url}/${API_VERSION}/${route}`, {
       method,
       headers: {
         Authorization: `Bearer ${auth}`,
-        'User-Agent': user,
+        'User-Agent': userAgent(),
       },
     })
       .then(data => data.json())
@@ -30,6 +28,8 @@ const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) =
   }
 });
 
+const LOGIN_SUCCESS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
+
 class UserController {
   // Register a new user
   async signup({
@@ -52,7 +52,7 @@ class UserController {
 
     return response.send({
       message: 'Successfully created account',
-      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+      token: LOGIN_SUCCESS_TOKEN,
     });
   }
 
@@ -70,7 +70,7 @@ class UserController {
 
     return response.send({
       message: 'Successfully logged in',
-      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M',
+      token: LOGIN_SUCCESS_TOKEN,
     });
   }
 
@@ -85,7 +85,6 @@ class UserController {
     return response.send({
       accountType: 'individual',
       beta: false,
-      donor: {},
       email: '',
       emailValidated: true,
       features: {},
@@ -121,7 +120,6 @@ class UserController {
       data: {
         accountType: 'individual',
         beta: false,
-        donor: {},
         email: '',
         emailValidated: true,
         features: {},
@@ -170,19 +168,16 @@ class UserController {
 
     const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
 
-    const base = `${server}/v1/`;
-    const userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Ferdi/5.3.0-beta.1 Chrome/69.0.3497.128 Electron/4.2.4 Safari/537.36';
-
     // Try to get an authentication token
     let token;
     try {
       const basicToken = btoa(`${email}:${hashedPassword}`);
 
-      const rawResponse = await fetch(`${base}auth/login`, {
+      const rawResponse = await fetch(`${server}/${API_VERSION}/auth/login`, {
         method: 'POST',
         headers: {
           Authorization: `Basic ${basicToken}`,
-          'User-Agent': userAgent,
+          'User-Agent': userAgent(),
         },
       });
       const content = await rawResponse.json();