Style improvements (#2475)

* HooksRouter is enabled by default

* Adds middleswares on PromiseRouter, fixes #2410

* Move testing line to helper

* Modernize middlewares.js

* Moves DB uniqueness initialization to DBController, modernize

* Moves testing related code to spec folder

* remove unused _removeHook function

* Adds tests, docs for Analytics and improvements

* nit

* moves back TestUtils

Author: flovilmart

spec/Analytics.spec.js

@@ -0,0 +1,61 @@
+const analyticsAdapter = {
+  appOpened: function(parameters, req) {}, 
+  trackEvent: function(eventName, parameters, req) {}
+}
+
+describe('AnalyticsController', () => {
+  it('should track a simple event', (done) => {
+    
+    spyOn(analyticsAdapter, 'trackEvent').and.callThrough();
+    reconfigureServer({
+      analyticsAdapter
+    }).then(() => {
+      return Parse.Analytics.track('MyEvent', {
+        key: 'value',
+        count: '0'
+      })
+    }).then(() => {
+      expect(analyticsAdapter.trackEvent).toHaveBeenCalled();
+      var lastCall = analyticsAdapter.trackEvent.calls.first();
+      let args = lastCall.args;
+      expect(args[0]).toEqual('MyEvent');
+      expect(args[1]).toEqual({
+        dimensions: {
+          key: 'value',
+          count: '0'
+        }
+      });
+      done();
+    }, (err) => {
+      fail(JSON.stringify(err));
+      done();
+    })
+  });
+  
+  it('should track a app opened event', (done) => {
+    
+    spyOn(analyticsAdapter, 'appOpened').and.callThrough();
+    reconfigureServer({
+      analyticsAdapter
+    }).then(() => {
+      return Parse.Analytics.track('AppOpened', {
+        key: 'value',
+        count: '0'
+      })
+    }).then(() => {
+      expect(analyticsAdapter.appOpened).toHaveBeenCalled();
+      var lastCall = analyticsAdapter.appOpened.calls.first();
+      let args = lastCall.args;
+      expect(args[0]).toEqual({
+        dimensions: {
+          key: 'value',
+          count: '0'
+        }
+      });
+      done();
+    }, (err) => {
+      fail(JSON.stringify(err));
+      done();
+    })
+  })
+})

spec/ParseAPI.spec.js

@@ -2,14 +2,13 @@
 // It would probably be better to refactor them into different files.
 'use strict';
 
-var DatabaseAdapter = require('../src/DatabaseAdapter');
 const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
 var request = require('request');
 const rp = require('request-promise');
 const Parse = require("parse/node");
 let Config = require('../src/Config');
 const SchemaController = require('../src/Controllers/SchemaController');
-var TestUtils = require('../src/index').TestUtils;
+var TestUtils = require('../src/TestUtils');
 const deepcopy = require('deepcopy');
 
 const userSchema = SchemaController.convertSchemaToAdapterSchema({ className: '_User', fields: Object.assign({}, SchemaController.defaultColumns._Default, SchemaController.defaultColumns._User) });

spec/helper.js

@@ -4,12 +4,11 @@
 jasmine.DEFAULT_TIMEOUT_INTERVAL = process.env.PARSE_SERVER_TEST_TIMEOUT || 5000;
 
 var cache = require('../src/cache').default;
-var DatabaseAdapter = require('../src/DatabaseAdapter');
 var express = require('express');
 var facebook = require('../src/authDataManager/facebook');
 var ParseServer = require('../src/index').ParseServer;
 var path = require('path');
-var TestUtils = require('../src/index').TestUtils;
+var TestUtils = require('../src/TestUtils');
 var MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
 const GridStoreAdapter = require('../src/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
 const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter');
@@ -87,6 +86,7 @@ const reconfigureServer = changedConfiguration => {
         cache.clear();
         app = express();
         api = new ParseServer(newConfiguration);
+        api.use(require('./testing-routes').router);
         app.use('/1', api);
 
         server = app.listen(port);

src/testing-routes.js renamed to spec/testing-routes.js

@@ -1,11 +1,11 @@
 // testing-routes.js
-import AppCache         from './cache';
-import * as middlewares from './middlewares';
-import { ParseServer }  from './index';
+import AppCache         from '../src/cache';
+import * as middlewares from '../src/middlewares';
+import { ParseServer }  from '../src/index';
 import { Parse }        from 'parse/node';
 
 var express = require('express'),
-  cryptoUtils = require('./cryptoUtils');
+  cryptoUtils = require('../src/cryptoUtils');
 
 var router = express.Router();
 

src/Adapters/Analytics/AnalyticsAdapter.js

@@ -1,8 +1,18 @@
 export class AnalyticsAdapter {
+  
+  /*
+  @param parameters: the analytics request body, analytics info will be in the dimensions property
+  @param req: the original http request
+   */
   appOpened(parameters, req) {
     return Promise.resolve({});
   }
-
+  
+  /*
+  @param eventName: the name of the custom eventName
+  @param parameters: the analytics request body, analytics info will be in the dimensions property
+  @param req: the original http request
+   */
   trackEvent(eventName, parameters, req) {
     return Promise.resolve({});
   }

src/Controllers/AnalyticsController.js

@@ -3,21 +3,23 @@ import { AnalyticsAdapter } from '../Adapters/Analytics/AnalyticsAdapter';
 
 export class AnalyticsController extends AdaptableController {
   appOpened(req) {
-    return this.adapter.appOpened(req.body, req).then(
-      function(response) {
-        return { response: response };
-      }).catch((err) => {
-        return { response: {} };
-      });
+    return Promise.resolve().then(() => {
+      return this.adapter.appOpened(req.body, req);
+    }).then((response) => {
+      return { response: response || {} };
+    }).catch((err) => {
+      return { response: {} };
+    });
   }
 
   trackEvent(req) {
-    return this.adapter.trackEvent(req.params.eventName, req.body, req).then(
-      function(response) {
-        return { response: response };
-      }).catch((err) => {
-        return { response: {} };
-      });
+    return Promise.resolve().then(() => {
+      return this.adapter.trackEvent(req.params.eventName, req.body, req);
+    }).then((response) => {
+      return { response: response || {} };
+    }).catch((err) => {
+      return { response: {} };
+    });
   }
 
   expectedAdapterType() {

src/Controllers/DatabaseController.js

@@ -1,15 +1,13 @@
 // A database adapter that works with data exported from the hosted
 // Parse database.
 
-import intersect from 'intersect';
-import _         from 'lodash';
-
-var mongodb = require('mongodb');
-var Parse = require('parse/node').Parse;
-
-var SchemaController = require('./SchemaController');
-
-const deepcopy = require('deepcopy');
+import { Parse }              from 'parse/node';
+import _                      from 'lodash';
+import mongdb                 from 'mongodb';
+import intersect              from 'intersect';
+import deepcopy               from 'deepcopy';
+import logger                 from '../logger';
+import * as SchemaController  from './SchemaController';
 
 function addWriteACL(query, acl) {
   let newQuery = _.cloneDeep(query);
@@ -880,6 +878,28 @@ DatabaseController.prototype.addPointerPermissions = function(schema, className,
   }
 }
 
+DatabaseController.prototype.performInitizalization = function() {
+  const requiredUserFields = { fields: { ...SchemaController.defaultColumns._Default, ...SchemaController.defaultColumns._User } };
+
+  let userClassPromise = this.loadSchema()
+    .then(schema => schema.enforceClassExists('_User'))
+
+  let usernameUniqueness = userClassPromise
+    .then(() => this.adapter.ensureUniqueness('_User', requiredUserFields, ['username']))
+    .catch(error => {
+      logger.warn('Unable to ensure uniqueness for usernames: ', error);
+      return Promise.reject(error);
+    });
+
+  let emailUniqueness = userClassPromise
+    .then(() => this.adapter.ensureUniqueness('_User', requiredUserFields, ['email']))
+    .catch(error => {
+      logger.warn('Unable to ensure uniqueness for user email addresses: ', error);
+      return Promise.reject(error);
+    });
+  return Promise.all([usernameUniqueness, emailUniqueness]);
+}
+
 function joinTableName(className, key) {
   return `_Join:${key}:${className}`;
 }

src/Controllers/HooksController.js

@@ -1,6 +1,5 @@
 /** @flow weak */
 
-import * as DatabaseAdapter from "../DatabaseAdapter";
 import * as triggers        from "../triggers";
 import * as Parse           from "parse/node";
 import * as request         from "request";

src/Controllers/SchemaController.js

@@ -268,7 +268,7 @@ const dbTypeMatchesObjectType = (dbType, objectType) => {
 
 // Stores the entire schema of the app in a weird hybrid format somewhere between
 // the mongo format and the Parse format. Soon, this will all be Parse format.
-class SchemaController {
+export default class SchemaController {
   _dbAdapter;
   data;
   perms;

src/Controllers/UserController.js

@@ -4,7 +4,6 @@ import AdaptableController from './AdaptableController';
 import MailAdapter         from '../Adapters/Email/MailAdapter';
 import rest                from '../rest';
 
-var DatabaseAdapter = require('../DatabaseAdapter');
 var RestWrite = require('../RestWrite');
 var RestQuery = require('../RestQuery');
 var hash = require('../password').hash;