Merge pull request #482 from pryv/release/1.8.1-open

Release/1.8.1 open

Author: sgoumaz

components/api-server/bin/migrate

@@ -3,7 +3,6 @@
 // Binary for launching the db migration process.
 
 const { getApplication } = require('api-server/src/application');
-const bluebird = require('bluebird');
 const { getLogger, getConfig } = require('@pryv/boiler');
 let logger;
 
@@ -40,9 +39,9 @@ let logger;
       logger.error(e, e);
       process.exit(1);
     });
-})()
+})();
 
-async function connectAndMigrate(app) {
+async function connectAndMigrate (app) {
   logger.info('Connecting to storage...');
   await app.storageLayer.waitForConnection();
 

components/api-server/bin/nightly

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-// Binary for nightly tasks setup. 
+// Binary for nightly tasks setup.
 
 const { getApplication } = require('api-server/src/application');
 const { getLogger } = require('@pryv/boiler');
@@ -10,7 +10,7 @@ const { getUsersRepository } = require('business/src/users/repository');
 (async () => {
   // Load settings asynchronously because we have to fetch
   // some values from register via an http-get request.
-  
+
   // Construct application
   const app = getApplication();
   await app.initiate();
@@ -20,15 +20,13 @@ const { getUsersRepository } = require('business/src/users/repository');
   const storage = require('../../storage');
   const storageLayer = app.storageLayer;
   const storageSize = new storage.Size(
-    [ storageLayer.accesses,
-      storageLayer.followedSlices,
-      storageLayer.profile ],
-    [ storageLayer.eventFiles ]
+    [storageLayer.accesses, storageLayer.followedSlices, storageLayer.profile],
+    [storageLayer.eventFiles]
   );
 
-  // This bit is useful to trace down promise rejections that aren't caught. 
+  // This bit is useful to trace down promise rejections that aren't caught.
   process.on('unhandledRejection', (reason, promise) => {
-    logger.warn('Unhandled promise rejection:', promise, 'reason:', reason.stack || reason); 
+    logger.warn('Unhandled promise rejection:', promise, 'reason:', reason.stack || reason);
   });
   process.on('exit', function () {
     logger.info('Service stopped.');
@@ -52,11 +50,11 @@ const { getUsersRepository } = require('business/src/users/repository');
 /**
  * Standalone script to perform nightly tasks (such as updating storage sizes for all users).
  */
-async function runNightlyTasks(storageLayer, storageSize) {
+async function runNightlyTasks (storageLayer, storageSize) {
   logger.info('Starting update of storage size');
 
   // Retrieve all existing users
-  const usersRepository = await getUsersRepository(); 
+  const usersRepository = await getUsersRepository();
   const users = await usersRepository.getAll();
 
   // Compute storage size used by each user
@@ -68,6 +66,6 @@ async function runNightlyTasks(storageLayer, storageSize) {
         user.username + '" ' + '(' + user.id + '): ' + err);
     }
   }
-  
+
   logger.info(users.length + ' users updated.');
 }

components/api-server/bin/server

@@ -1,19 +1,18 @@
 #!/usr/bin/env node
 
-// Binary for launching the api-server process. 
+// Binary for launching the api-server process.
 
 const Server = require('../src/server');
 const { getApplication } = require('api-server/src/application');
 
 const loadCommonMeta = require('../src/methods/helpers/setCommonMeta').loadSettings;
 
-const { getConfig, getLogger } = require('@pryv/boiler');
+const { getLogger } = require('@pryv/boiler');
 const logger = getLogger('serverRoot');
 
 (async () => {
-  const config = await getConfig();
   loadCommonMeta({}); // load settings to common meta
-  
+
   // Construct application
   const app = getApplication();
   await app.initiate();
@@ -27,7 +26,7 @@ const logger = getLogger('serverRoot');
   });
 
   // Start the server
-  const server = new Server(); 
+  const server = new Server();
   await server.start();
 })()
   .then(() => logger.info('Startup sequence complete, Server is running. mode: [' + process.env.NODE_ENV + ']'))

components/api-server/config/default-config.yml

@@ -13,13 +13,13 @@ reporting:
 http:
   ip: '127.0.0.1'
   port: 3000
-  
+
 
 database:
   engine: 'mongodb' # set to sqlite for poc sqlite storage for events
   authUser: ''
   authPassword: ''
-  host: 'localhost'
+  host: '127.0.0.1'
   port: 27017
   name: 'pryv-node'
   connectTimeoutMS: 60000
@@ -46,7 +46,7 @@ customExtensions:
 
 axonMessaging:
   enabled: false
-  host: 'localhost'
+  host: '127.0.0.1'
   port: 4000
   pubConnectInsteadOfBind: false
 

components/api-server/config/development-config.yml

@@ -16,7 +16,7 @@ auth:
 serviceInfoUrl: file://test/service-info.json
 services:
   email:
-    enabled: 
+    enabled:
       welcome: false
       resetPassword: false
   register:
@@ -31,11 +31,11 @@ openSource:
   isActive: false
 dnsLess:
   isActive: true
-  publicUrl: http://localhost:3000/
+  publicUrl: http://127.0.0.1:3000/
 custom:
   systemStreams:
     account:
-      - 
+      -
         isIndexed: true
         isUnique: true
         isShown: true
@@ -45,7 +45,7 @@ custom:
         id: email
         isRequiredInValidation: true
     other:
-      - 
+      -
         isShown: true
         isEditable: true
         type: my-custom-stream/string
@@ -60,4 +60,4 @@ backwardCompatibility:
     prefix:
       isActive: false
 trace:
-  enable: true
+  enable: true

components/api-server/config/production-config.yml

@@ -6,7 +6,7 @@ http:
 database:
   authUser: api-server
   authPassword: OVERRIDE ME
-  host: localhost
+  host: 127.0.0.1
   port: 27017
   name: pryv-node
 eventFiles:

components/api-server/config/test-config.yml

@@ -21,7 +21,7 @@ services:
     welcomeTemplate: welcome-email
     resetPasswordTemplate: reset-password"
   register:
-    url: http://localhost:5123
+    url: http://127.0.0.1:5123
     key: test-system-key
 axonMessaging:
   enabled: true
@@ -40,7 +40,7 @@ openSource:
   isActive: false
 dnsLess:
   isActive: false
-  publicUrl: http://localhost:3000/
+  publicUrl: http://127.0.0.1:3000/
 influxdb:
   host: 127.0.0.1
   port: 8086

components/api-server/src/application.js

@@ -213,7 +213,7 @@ class Application {
     require('./routes/auth/register')(this.expressApp, this);
     if (this.isOpenSource) {
       require('www')(this.expressApp, this);
-      require('register')(this.expressApp, this);
+      await require('register')(this.expressApp, this);
     }
 
     require('./routes/system')(this.expressApp, this);

components/api-server/src/server.js

@@ -191,7 +191,7 @@ class Server {
     }
     const reportingSettings = this.config.get('reporting');
     const templateVersion = reportingSettings.templateVersion;
-    const reportingUrl = process.env.NODE_ENV === 'test' ? 'http://localhost:4001' : null;
+    const reportingUrl = process.env.NODE_ENV === 'test' ? 'http://127.0.0.1:4001' : null;
     const licenseName = reportingSettings.licenseName;
     const role = 'api-server';
     const mylog = function (str) {

components/api-server/test/methods/helpers/mailing.test.js

@@ -25,7 +25,7 @@ describe('Mailing helper methods', () => {
   it('[HGVD] should throw an error if mailing method is invalid', () => {
     const emailSettings = {
       method: 'invalid',
-      url: 'https://localhost:9000/sendmail',
+      url: 'https://127.0.0.1:9000/sendmail',
       key: 'v3ryStrongK3y'
     };
 
@@ -36,7 +36,7 @@ describe('Mailing helper methods', () => {
 
   it('[OKQ2] should throw an error if mailing method is missing', () => {
     const emailSettings = {
-      url: 'https://localhost:9000/sendmail',
+      url: 'https://127.0.0.1:9000/sendmail',
       key: 'v3ryStrongK3y'
     };
 
@@ -91,7 +91,7 @@ describe('Mailing helper methods', () => {
   });
 
   describe('using Microservice', () => {
-    const baseURL = 'https://localhost:9000/sendmail/';
+    const baseURL = 'https://127.0.0.1:9000/sendmail/';
     const path = '/' + template + '/' + lang;
     const emailSettings = {
       method: 'microservice',