Merge branch 'develop' into feature/features-api

4 files changed, 68 insertions, 39 deletions

diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.js
index 292dc80cc..c66f28f5b 100644
--- a/src/api/FeaturesApi.js
+++ b/src/api/FeaturesApi.js
@@ -3,8 +3,8 @@ export default class FeaturesApi {
     this.server = server;
   }
 
-  base() {
-    return this.server.getBaseFeatures();
+  default() {
+    return this.server.getDefaultFeatures();
   }
 
   features() {
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index 59d7d8fa2..741917104 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -4,6 +4,14 @@ export default class LocalApi {
     this.local = local;
   }
 
+  getAppSettings() {
+    return this.local.getAppSettings();
+  }
+
+  updateAppSettings(data) {
+    return this.local.updateAppSettings(data);
+  }
+
   getAppCacheSize() {
     return this.local.getAppCacheSize();
   }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index aa3a7d655..4814bba66 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,11 +1,30 @@
-import { remote } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('Franz:LocalApi');
+
 const { session } = remote;
 
 export default class LocalApi {
+  // Settings
+  getAppSettings() {
+    return new Promise((resolve) => {
+      ipcRenderer.once('appSettings', (event, data) => {
+        debug('LocalApi::getAppSettings resolves', data);
+        resolve(data);
+      });
+
+      ipcRenderer.send('getAppSettings');
+    });
+  }
+
+  async updateAppSettings(data) {
+    debug('LocalApi::updateAppSettings resolves', data);
+    ipcRenderer.send('updateAppSettings', data);
+  }
+
   // Services
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
@@ -13,7 +32,7 @@ export default class LocalApi {
       du(partitionsDir, (err, size) => {
         if (err) reject(err);
 
-        console.debug('LocalApi::getAppCacheSize resolves', size);
+        debug('LocalApi::getAppCacheSize resolves', size);
         resolve(size);
       });
     });
@@ -22,14 +41,14 @@ export default class LocalApi {
   async clearCache(serviceId) {
     const s = session.fromPartition(`persist:service-${serviceId}`);
 
-    console.debug('LocalApi::clearCache resolves', serviceId);
+    debug('LocalApi::clearCache resolves', serviceId);
     return new Promise(resolve => s.clearCache(resolve));
   }
 
   async clearAppCache() {
     const s = session.defaultSession;
 
-    console.debug('LocalApi::clearCache clearAppCache');
+    debug('LocalApi::clearCache clearAppCache');
     return new Promise(resolve => s.clearCache(resolve));
   }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index ad7988bb2..164419951 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -27,13 +27,15 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
+const debug = require('debug')('Franz:ServerApi');
+
 module.paths.unshift(
   getDevRecipeDirectory(),
   getRecipeDirectory(),
 );
 
 const { app } = remote;
-const fetch = remote.require('electron-fetch');
+const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
@@ -55,7 +57,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::login resolves', u);
+    debug('ServerApi::login resolves', u);
     return u.token;
   }
 
@@ -69,7 +71,7 @@ export default class ServerApi {
     }
     const u = await request.json();
 
-    console.debug('ServerApi::signup resolves', u);
+    debug('ServerApi::signup resolves', u);
     return u.token;
   }
 
@@ -82,7 +84,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::inviteUser');
+    debug('ServerApi::inviteUser');
     return true;
   }
 
@@ -98,7 +100,7 @@ export default class ServerApi {
     }
     const r = await request.json();
 
-    console.debug('ServerApi::retrievePassword');
+    debug('ServerApi::retrievePassword');
     return r;
   }
 
@@ -112,7 +114,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const user = new UserModel(data);
-    console.debug('ServerApi::userInfo resolves', user);
+    debug('ServerApi::userInfo resolves', user);
 
     return user;
   }
@@ -128,7 +130,7 @@ export default class ServerApi {
     const updatedData = await request.json();
 
     const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) });
-    console.debug('ServerApi::updateUserInfo resolves', user);
+    debug('ServerApi::updateUserInfo resolves', user);
     return user;
   }
 
@@ -141,7 +143,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::deleteAccount resolves', data);
+    debug('ServerApi::deleteAccount resolves', data);
     return data;
   }
 
@@ -157,7 +159,7 @@ export default class ServerApi {
 
     let services = await this._mapServiceModels(data);
     services = services.filter(service => service !== null);
-    console.debug('ServerApi::getServices resolves', services);
+    debug('ServerApi::getServices resolves', services);
     return services;
   }
 
@@ -181,7 +183,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::createService resolves', service);
+    debug('ServerApi::createService resolves', service);
     return service;
   }
 
@@ -205,7 +207,7 @@ export default class ServerApi {
 
     const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) });
 
-    console.debug('ServerApi::updateService resolves', service);
+    debug('ServerApi::updateService resolves', service);
     return service;
   }
 
@@ -240,7 +242,7 @@ export default class ServerApi {
       throw request;
     }
     const serviceData = await request.json();
-    console.debug('ServerApi::reorderService resolves', serviceData);
+    debug('ServerApi::reorderService resolves', serviceData);
     return serviceData;
   }
 
@@ -255,13 +257,13 @@ export default class ServerApi {
 
     removeServicePartitionDirectory(id, true);
 
-    console.debug('ServerApi::deleteService resolves', data);
+    debug('ServerApi::deleteService resolves', data);
     return data;
   }
 
   // Features
-  async getBaseFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/base`, this._prepareAuthRequest({
+  async getDefaultFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
       method: 'GET',
     }));
     if (!request.ok) {
@@ -270,7 +272,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const features = data;
-    console.debug('ServerApi::getBaseFeatures resolves', features);
+    console.debug('ServerApi::getDefaultFeatures resolves', features);
     return features;
   }
 
@@ -306,7 +308,7 @@ export default class ServerApi {
 
     this.recipes = this.recipes.concat(this._getDevRecipes());
 
-    console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
+    debug('StubServerApi::getInstalledRecipes resolves', this.recipes);
     return this.recipes;
   }
 
@@ -319,7 +321,7 @@ export default class ServerApi {
       throw request;
     }
     const recipes = await request.json();
-    console.debug('ServerApi::getRecipeUpdates resolves', recipes);
+    debug('ServerApi::getRecipeUpdates resolves', recipes);
     return recipes;
   }
 
@@ -334,7 +336,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getRecipes resolves', recipePreviews);
+    debug('ServerApi::getRecipes resolves', recipePreviews);
 
     return recipePreviews;
   }
@@ -351,7 +353,7 @@ export default class ServerApi {
     // data = this._addLocalRecipesToPreviews(data);
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
+    debug('ServerApi::getFeaturedRecipes resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -365,7 +367,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const recipePreviews = this._mapRecipePreviewModel(data);
-    console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
+    debug('ServerApi::searchRecipePreviews resolves', recipePreviews);
     return recipePreviews;
   }
 
@@ -379,7 +381,7 @@ export default class ServerApi {
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
-      console.debug('Recipe downloaded', recipeId);
+      debug('Recipe downloaded', recipeId);
       const buffer = await res.buffer();
       fs.writeFileSync(archivePath, buffer);
 
@@ -421,7 +423,7 @@ export default class ServerApi {
     const data = await request.json();
 
     const plan = new PlanModel(data);
-    console.debug('ServerApi::getPlans resolves', plan);
+    debug('ServerApi::getPlans resolves', plan);
     return plan;
   }
 
@@ -437,7 +439,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getHostedPage resolves', data);
+    debug('ServerApi::getHostedPage resolves', data);
     return data;
   }
 
@@ -450,7 +452,7 @@ export default class ServerApi {
     }
     const data = await request.json();
 
-    console.debug('ServerApi::getPaymentDashboardUrl resolves', data);
+    debug('ServerApi::getPaymentDashboardUrl resolves', data);
     return data;
   }
 
@@ -463,7 +465,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const orders = this._mapOrderModels(data);
-    console.debug('ServerApi::getSubscriptionOrders resolves', orders);
+    debug('ServerApi::getSubscriptionOrders resolves', orders);
     return orders;
   }
 
@@ -480,7 +482,7 @@ export default class ServerApi {
     }
     const data = await request.json();
     const news = this._mapNewsModels(data);
-    console.debug('ServerApi::getLatestNews resolves', news);
+    debug('ServerApi::getLatestNews resolves', news);
     return news;
   }
 
@@ -494,7 +496,7 @@ export default class ServerApi {
       throw request;
     }
 
-    console.debug('ServerApi::hideNews resolves', id);
+    debug('ServerApi::hideNews resolves', id);
   }
 
   // Health Check
@@ -505,7 +507,7 @@ export default class ServerApi {
     if (!request.ok) {
       throw request;
     }
-    console.debug('ServerApi::healthCheck resolves');
+    debug('ServerApi::healthCheck resolves');
   }
 
   async getLegacyServices() {
@@ -531,7 +533,7 @@ export default class ServerApi {
           return service;
         }));
 
-        console.debug('ServerApi::getLegacyServices resolves', services);
+        debug('ServerApi::getLegacyServices resolves', services);
         return services;
       }
     } catch (err) {
@@ -564,7 +566,7 @@ export default class ServerApi {
 
       return new ServiceModel(service, recipe);
     } catch (e) {
-      console.debug(e);
+      debug(e);
       return null;
     }
   }
@@ -582,7 +584,7 @@ export default class ServerApi {
 
           await this.getRecipePackage(recipeId);
 
-          console.debug('Rerun ServerAPI::getInstalledRecipes');
+          debug('Rerun ServerAPI::getInstalledRecipes');
           await this.getInstalledRecipes();
 
           recipe = this.recipes.find(r => r.id === recipeId);
@@ -682,7 +684,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Could not load dev recipes');
+      debug('Could not load dev recipes');
       return false;
     }
   }