Fix code review issues

Author: sadortun

spec/DefinedSchemas.spec.js

@@ -545,13 +545,13 @@ fdescribe('DefinedSchemas', () => {
     try {
       await new Parse.Schema('Test').save();
     } catch (e) {
-      expect(e.message).toContain('cannot perform this operation when schemas options is used.');
+      expect(e.message).toContain('Cannot perform this operation when schemas options is used.');
     }
 
     try {
       await new Parse.Schema('_User').update();
     } catch (e) {
-      expect(e.message).toContain('cannot perform this operation when schemas options is used.');
+      expect(e.message).toContain('Cannot perform this operation when schemas options is used.');
     }
   });
   it('should only enable delete class endpoint since', async () => {

src/Options/Definitions.js

@@ -52,11 +52,6 @@ module.exports.ParseServerOptions = {
       'Configuration for your authentication providers, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#oauth-and-3rd-party-authentication',
     action: parsers.objectParser,
   },
-  beforeSchemasMigration: {
-    env: 'PARSE_SERVER_BEFORE_SCHEMAS_MIGRATION',
-    help:
-      'Callback when server has started and before running schemas migration operations if schemas key provided',
-  },
   cacheAdapter: {
     env: 'PARSE_SERVER_CACHE_ADAPTER',
     help: 'Adapter module for the cache',
@@ -365,12 +360,6 @@ module.exports.ParseServerOptions = {
     action: parsers.booleanParser,
     default: false,
   },
-  schemas: {
-    env: 'PARSE_SERVER_SCHEMAS',
-    help:
-      'Rest representation on Parse.Schema https://docs.parseplatform.org/rest/guide/#adding-a-schema',
-    action: parsers.arrayParser,
-  },
   security: {
     env: 'PARSE_SERVER_SECURITY',
     help: 'The security options to identify and report weak security settings.',
@@ -564,8 +553,6 @@ module.exports.PagesCustomUrlsOptions = {
     help: 'The URL to the custom page for password reset -> success.',
   },
 };
-module.exports.FieldType = {};
-module.exports.JSONSchema = {};
 module.exports.CustomPagesOptions = {
   choosePassword: {
     env: 'PARSE_SERVER_CUSTOM_PAGES_CHOOSE_PASSWORD',

src/Options/index.js

@@ -242,8 +242,6 @@ export interface ParseServerOptions {
   playgroundPath: ?string;
   /* Callback when server has started */
   serverStartComplete: ?(error: ?Error) => void;
-  /* Callback when server has started and before running schemas migration operations if schemas key provided */
-  beforeSchemasMigration: ?() => void | Promise<void>;
   /* Rest representation on Parse.Schema https://docs.parseplatform.org/rest/guide/#adding-a-schema */
   migrations: ?MigrationsOptions;
   /* Callback when server has closed */

src/ParseServer.js

@@ -69,7 +69,6 @@ class ParseServer {
       javascriptKey,
       serverURL = requiredParameter('You must provide a serverURL!'),
       serverStartComplete,
-      beforeSchemasMigration,
       migrations,
     } = options;
     // Initialize the node client SDK automatically
@@ -88,9 +87,6 @@ class ParseServer {
       .performInitialization()
       .then(() => hooksController.load())
       .then(async () => {
-        if (beforeSchemasMigration) {
-          await Promise.resolve(beforeSchemasMigration());
-        }
         if (migrations) {
           await new DefinedSchemas(migrations, this.config).execute();
         }

src/Routers/SchemasRouter.js

@@ -44,7 +44,7 @@ const checkIfDefinedSchemasIsUsed = req => {
   ) {
     throw new Parse.Error(
       Parse.Error.OPERATION_FORBIDDEN,
-      'cannot perform this operation when schemas options is used.'
+      'Cannot perform this operation when schemas options is used.'
     );
   }
 };

src/SchemaMigrations/DefinedSchemas.js

@@ -1,5 +1,4 @@
-1; // @flow
-// import Parse from 'parse/node';
+// @flow
 const Parse = require('parse/node');
 import { logger } from '../logger';
 import Config from '../Config';
@@ -68,6 +67,9 @@ export class DefinedSchemas {
     let timeout = null;
     try {
       logger.info('Running Migrations');
+      if (this.migrationsOptions && this.migrationsOptions.beforeSchemasMigration) {
+        await Promise.resolve(this.migrationsOptions.beforeSchemasMigration());
+      }
       // Set up a time out in production
       // if we fail to get schema
       // pm2 or K8s and many other process managers will try to restart the process

src/SchemaMigrations/Migrations.js

@@ -39,15 +39,11 @@ export interface MigrationsOptions {
   strict: ?boolean;
   deleteExtraFields: ?boolean;
   recreateModifiedFields: ?boolean;
+  /* Callback when server has started and before running schemas migration operations if schemas key provided */
+  beforeSchemasMigration: ?() => void | Promise<void>;
 }
 
-export type CLPOperation =
-  | 'find'
-  | 'count'
-  | 'get'
-  | 'update'
-  | 'create'
-  | 'delete' /*| 'addField'*/;
+export type CLPOperation = 'find' | 'count' | 'get' | 'update' | 'create' | 'delete';
 // @Typescript 4.1+ // type CLPPermission = 'requiresAuthentication' | '*' |  `user:${string}` | `role:${string}`
 
 type CLPValue = { [key: string]: boolean };
@@ -87,8 +83,8 @@ export class CLP {
 
 export function makeSchema(className: ClassNameType, schema: JSONSchema): JSONSchema {
   // This function solve two things:
-  // 1. It provide auto-completion to the users who are implementing schemas
-  // 2. It allow forward-compatible point in order to allow future changes to the internal structure of JSONSchema without affecting all the users
+  // 1. It provides auto-completion to the users who are implementing schemas
+  // 2. It allows forward-compatible point in order to allow future changes to the internal structure of JSONSchema without affecting all the users
 
   return {
     className,