Merge branch 'alpha' into feat-branch

Author: mtrezza

.eslintrc.json

@@ -25,7 +25,9 @@
         "space-infix-ops": "error",
         "no-useless-escape": "off",
         "require-atomic-updates": "off",
-        "object-curly-spacing": ["error", "always"]
+        "object-curly-spacing": ["error", "always"],
+        "curly": ["error", "all"],
+        "block-spacing": ["error", "always"]
     },
     "globals": {
         "Parse": true

spec/support/MockLdapServer.js

@@ -11,7 +11,7 @@ function newServer(port, dn, provokeSearchError = false, ssl = false) {
 
   server.bind('o=example', function (req, res, next) {
     if (req.dn.toString() !== dn || req.credentials !== 'secret')
-      return next(new ldapjs.InvalidCredentialsError());
+    { return next(new ldapjs.InvalidCredentialsError()); }
     res.end();
     return next();
   });

src/Adapters/Auth/OAuth1Client.js

@@ -122,7 +122,7 @@ OAuth.nonce = function () {
   var text = '';
   var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-  for (var i = 0; i < 30; i++) text += possible.charAt(Math.floor(Math.random() * possible.length));
+  for (var i = 0; i < 30; i++) { text += possible.charAt(Math.floor(Math.random() * possible.length)); }
 
   return text;
 };

src/Adapters/Auth/index.js

@@ -215,7 +215,7 @@ module.exports = function (authOptions = {}, enableAnonymousUsers = true) {
       return { validator: undefined };
     }
     const authAdapter = loadAuthAdapter(provider, authOptions);
-    if (!authAdapter) return;
+    if (!authAdapter) { return; }
     const { adapter, appIds, providerOptions } = authAdapter;
     return { validator: authDataValidator(provider, adapter, appIds, providerOptions), adapter };
   };

src/Adapters/Auth/keycloak.js

@@ -37,13 +37,13 @@ const { Parse } = require('parse/node');
 const httpsRequest = require('./httpsRequest');
 
 const arraysEqual = (_arr1, _arr2) => {
-  if (!Array.isArray(_arr1) || !Array.isArray(_arr2) || _arr1.length !== _arr2.length) return false;
+  if (!Array.isArray(_arr1) || !Array.isArray(_arr2) || _arr1.length !== _arr2.length) { return false; }
 
   var arr1 = _arr1.concat().sort();
   var arr2 = _arr2.concat().sort();
 
   for (var i = 0; i < arr1.length; i++) {
-    if (arr1[i] !== arr2[i]) return false;
+    if (arr1[i] !== arr2[i]) { return false; }
   }
 
   return true;

src/Auth.js

@@ -434,11 +434,11 @@ const findUsersWithAuthData = (config, authData) => {
 };
 
 const hasMutatedAuthData = (authData, userAuthData) => {
-  if (!userAuthData) return { hasMutatedAuthData: true, mutatedAuthData: authData };
+  if (!userAuthData) { return { hasMutatedAuthData: true, mutatedAuthData: authData }; }
   const mutatedAuthData = {};
   Object.keys(authData).forEach(provider => {
     // Anonymous provider is not handled this way
-    if (provider === 'anonymous') return;
+    if (provider === 'anonymous') { return; }
     const providerData = authData[provider];
     const userProviderAuthData = userAuthData[provider];
     if (!isDeepStrictEqual(providerData, userProviderAuthData)) {

src/Config.js

@@ -139,7 +139,7 @@ export class Config {
   }
 
   static validateCustomPages(customPages) {
-    if (!customPages) return;
+    if (!customPages) { return; }
 
     if (Object.prototype.toString.call(customPages) !== '[object Object]') {
       throw Error('Parse Server option customPages must be an object.');
@@ -209,7 +209,7 @@ export class Config {
   }
 
   static validateSchemaOptions(schema: SchemaOptions) {
-    if (!schema) return;
+    if (!schema) { return; }
     if (Object.prototype.toString.call(schema) !== '[object Object]') {
       throw 'Parse Server option schema must be an object.';
     }

src/Controllers/DatabaseController.js

@@ -142,7 +142,7 @@ const filterSensitiveData = (
   object: any
 ) => {
   let userId = null;
-  if (auth && auth.user) userId = auth.user.id;
+  if (auth && auth.user) { userId = auth.user.id; }
 
   // replace protectedFields when using pointer-permissions
   const perms =
@@ -1592,12 +1592,12 @@ class DatabaseController {
       schema && schema.getClassLevelPermissions
         ? schema.getClassLevelPermissions(className)
         : schema;
-    if (!perms) return null;
+    if (!perms) { return null; }
 
     const protectedFields = perms.protectedFields;
-    if (!protectedFields) return null;
+    if (!protectedFields) { return null; }
 
-    if (aclGroup.indexOf(query.objectId) > -1) return null;
+    if (aclGroup.indexOf(query.objectId) > -1) { return null; }
 
     // for queries where "keys" are set and do not include all 'userField':{field},
     // we have to transparently include it, and then remove before returning to client

src/Controllers/SchemaController.js

@@ -666,10 +666,10 @@ const VolatileClassesSchemas = [
 ];
 
 const dbTypeMatchesObjectType = (dbType: SchemaField | string, objectType: SchemaField) => {
-  if (dbType.type !== objectType.type) return false;
-  if (dbType.targetClass !== objectType.targetClass) return false;
-  if (dbType === objectType.type) return true;
-  if (dbType.type === objectType.type) return true;
+  if (dbType.type !== objectType.type) { return false; }
+  if (dbType.targetClass !== objectType.targetClass) { return false; }
+  if (dbType === objectType.type) { return true; }
+  if (dbType.type === objectType.type) { return true; }
   return false;
 };
 
@@ -1020,7 +1020,7 @@ export default class SchemaController {
         }
         const fieldType = fields[fieldName];
         const error = fieldTypeIsInvalid(fieldType);
-        if (error) return { code: error.code, error: error.message };
+        if (error) { return { code: error.code, error: error.message }; }
         if (fieldType.defaultValue !== undefined) {
           let defaultValueType = getType(fieldType.defaultValue);
           if (typeof defaultValueType === 'string') {

src/Controllers/UserController.js

@@ -122,7 +122,7 @@ export class UserController extends AdaptableController {
           if (expiresDate && expiresDate.__type == 'Date') {
             expiresDate = new Date(expiresDate.iso);
           }
-          if (expiresDate < new Date()) throw 'The password reset link has expired';
+          if (expiresDate < new Date()) { throw 'The password reset link has expired'; }
         }
         return results[0];
       });