Merge remote-tracking branch 'origin/develop' into release

4 files changed, 12 insertions, 27 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index ad37ca02c..2fad7eb21 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -12,6 +12,7 @@ import {
   SERVER_NOT_LOADED,
 } from '../config';
 
+// Note: This cannot be used from the internal-server since we are not running within the context of a browser window
 const apiBase = (withVersion = true) => {
   let url;
 
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.ts
index 644f15b93..71721bb0f 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.ts
@@ -8,9 +8,9 @@ const debug = require('debug')('Ferdi:LocalApi');
 
 export default class LocalApi {
   // Settings
-  getAppSettings(type) {
+  getAppSettings(type: any) {
     return new Promise(resolve => {
-      ipcRenderer.once('appSettings', (event, resp) => {
+      ipcRenderer.once('appSettings', (_event, resp) => {
         debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
         resolve(resp);
       });
@@ -19,7 +19,7 @@ export default class LocalApi {
     });
   }
 
-  async updateAppSettings(type, data) {
+  async updateAppSettings(type: any, data: any) {
     debug('LocalApi::updateAppSettings resolves', type, data);
     ipcRenderer.send('updateAppSettings', {
       type,
@@ -31,7 +31,7 @@ export default class LocalApi {
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
     return new Promise((resolve, reject) => {
-      du(partitionsDir, (err, size) => {
+      du(partitionsDir, (err: Error | null, size?: number | undefined) => {
         if (err) reject(err);
 
         debug('LocalApi::getAppCacheSize resolves', size);
@@ -40,7 +40,7 @@ export default class LocalApi {
     });
   }
 
-  async clearCache(serviceId = null) {
+  async clearCache(serviceId: string | null = null) {
     const s = serviceId
       ? session.fromPartition(`persist:service-${serviceId}`)
       : session.defaultSession;
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index bc0b0dff9..b5042525a 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,19 +1,18 @@
 import { join } from 'path';
 import tar from 'tar';
 import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
-import { app, require as remoteRequire } from '@electron/remote';
+import { require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
 import RecipeModel from '../../models/Recipe';
 import NewsModel from '../../models/News';
 import UserModel from '../../models/User';
-import OrderModel from '../../models/Order';
 
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment';
+import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -435,9 +434,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase(
-      true,
-    )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
+    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -591,19 +588,6 @@ export default class ServerApi {
       .filter(newsItem => newsItem !== null);
   }
 
-  _mapOrderModels(orders) {
-    return orders
-      .map(orderItem => {
-        try {
-          return new OrderModel(orderItem);
-        } catch (e) {
-          console.error(e);
-          return null;
-        }
-      })
-      .filter(orderItem => orderItem !== null);
-  }
-
   _getDevRecipes() {
     const recipesDirectory = getDevRecipeDirectory();
     try {
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 9f718f171..e493b2962 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,5 +1,5 @@
-import { app } from '@electron/remote';
 import localStorage from 'mobx-localstorage';
+import { ferdiLocale, ferdiVersion } from '../../environment';
 
 export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
   const request = Object.assign(options, {
@@ -7,10 +7,10 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) =>
     headers: {
       'Content-Type': 'application/json',
       'X-Franz-Source': 'desktop',
-      'X-Franz-Version': app.getVersion(),
+      'X-Franz-Version': ferdiVersion,
       'X-Franz-platform': process.platform,
       'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-      'X-Franz-System-Locale': app.getLocale(),
+      'X-Franz-System-Locale': ferdiLocale,
       ...options.headers,
     },
   });