remove Parse.File and Parse.Server

Author: dplewis

src/ClientSDK.js

@@ -1,5 +1,4 @@
 import Parse from 'parse/node';
-import ParseServer from './cloud-code/Parse.Server';
 
 var semver = require('semver');
 
@@ -40,12 +39,10 @@ module.exports = {
   applicationId: Parse.applicationId,
   _decode: Parse._decode,
   CoreManager: Parse.CoreManager,
-  File: Parse.File,
   Object: Parse.Object,
   Query: Parse.Query,
   Schema: Parse.Schema,
   User: Parse.User,
-  Server: ParseServer,
   compatible,
   supportsForwardDelete,
   fromString,

src/Routers/FilesRouter.js

@@ -1,9 +1,9 @@
 import express from 'express';
 import * as Middlewares from '../middlewares';
-import * as Parse from '../ClientSDK';
 import ParseError from '../ParseError';
 import Config from '../Config';
 import logger from '../logger';
+import { loadModule } from '../Adapters/AdapterLoader';
 const triggers = require('../triggers');
 const http = require('http');
 const Utils = require('../Utils');
@@ -80,16 +80,20 @@ export class FilesRouter {
       const filesController = config.filesController;
       const mime = (await import('mime')).default;
       let contentType = mime.getType(filename);
-      let file = new Parse.File(filename, { base64: '' }, contentType);
-      const triggerResult = await triggers.maybeRunFileTrigger(
-        triggers.Types.beforeFind,
-        { file },
-        config,
-        req.auth
-      );
-      if (triggerResult?.file?._name) {
-        filename = triggerResult?.file?._name;
-        contentType = mime.getType(filename);
+      const hasBeforeFindTrigger = triggers.triggerExists('@File', triggers.Types.beforeFind, config.applicationId);
+      if (hasBeforeFindTrigger) {
+        const Parse = await loadModule('parse/node.js');
+        const file = new Parse.File(filename, { base64: '' }, contentType);
+        const triggerResult = await triggers.maybeRunFileTrigger(
+          triggers.Types.beforeFind,
+          { file },
+          config,
+          req.auth
+        );
+        if (triggerResult?.file?._name) {
+          filename = triggerResult?.file?._name;
+          contentType = mime.getType(filename);
+        }
       }
 
       if (isFileStreamable(req, filesController)) {
@@ -109,19 +113,22 @@ export class FilesRouter {
       if (!data) {
         return;
       }
-      file = new Parse.File(filename, { base64: data.toString('base64') }, contentType);
-      const afterFind = await triggers.maybeRunFileTrigger(
-        triggers.Types.afterFind,
-        { file, forceDownload: false },
-        config,
-        req.auth
-      );
-
+      const hasAfterFindHook = triggers.triggerExists('@File', triggers.Types.afterFind, config.applicationId);
+      let afterFind;
+      if (hasAfterFindHook) {
+        const Parse = await loadModule('parse/node.js');
+        const file = new Parse.File(filename, { base64: data.toString('base64') }, contentType);
+        afterFind = await triggers.maybeRunFileTrigger(
+          triggers.Types.afterFind,
+          { file, forceDownload: false },
+          config,
+          req.auth
+        );
+      }
       if (afterFind?.file) {
         contentType = mime.getType(afterFind.file._name);
         data = Buffer.from(afterFind.file._data, 'base64');
       }
-
       res.status(200);
       res.set('Content-Type', contentType);
       res.set('Content-Length', data.length);
@@ -211,6 +218,8 @@ export class FilesRouter {
     }
 
     const base64 = req.body.toString('base64');
+    // TODO: Move to beforeSave trigger check
+    const Parse = await loadModule('parse/node.js');
     const file = new Parse.File(filename, { base64 }, contentType);
     const { metadata = {}, tags = {} } = req.fileData || {};
     try {
@@ -299,19 +308,23 @@ export class FilesRouter {
     try {
       const { filesController } = req.config;
       const { filename } = req.params;
-      // run beforeDeleteFile trigger
-      const file = new Parse.File(filename);
-      file._url = await filesController.adapter.getFileLocation(req.config, filename);
-      const fileObject = { file, fileSize: null };
-      await triggers.maybeRunFileTrigger(
-        triggers.Types.beforeDelete,
-        fileObject,
-        req.config,
-        req.auth
-      );
-      // delete file
+      const fileObject = { file: null, fileSize: null };
+
+      const hasBeforeDeleteHook = triggers.triggerExists('@File', triggers.Types.beforeDelete, req.config.applicationId);
+      if (hasBeforeDeleteHook) {
+        const Parse = await loadModule('parse/node.js');
+        const file = new Parse.File(filename);
+        file._url = await filesController.adapter.getFileLocation(req.config, filename);
+        fileObject.file = file;
+        await triggers.maybeRunFileTrigger(
+          triggers.Types.beforeDelete,
+          fileObject,
+          req.config,
+          req.auth
+        );
+      }
       await filesController.deleteFile(req.config, filename);
-      // run afterDeleteFile trigger
+
       await triggers.maybeRunFileTrigger(
         triggers.Types.afterDelete,
         fileObject,

src/Routers/UsersRouter.js

@@ -270,7 +270,7 @@ export class UsersRouter extends ClassesRouter {
     await req.config.filesController.expandFilesInObject(req.config, user);
 
     // Before login trigger; throws if failure
-    const hasBeforeLoginTrigger = await triggerExists('_User', TriggerTypes.beforeLogin, req.config.applicationId);
+    const hasBeforeLoginTrigger = triggerExists('_User', TriggerTypes.beforeLogin, req.config.applicationId);
     if (hasBeforeLoginTrigger) {
       const Parse = await loadModule('parse/node.js');
       await maybeRunTrigger(
@@ -306,7 +306,7 @@ export class UsersRouter extends ClassesRouter {
 
     await createSession();
 
-    const hasAfterLoginTrigger = await triggerExists('_User', TriggerTypes.afterLogin, req.config.applicationId);
+    const hasAfterLoginTrigger = triggerExists('_User', TriggerTypes.afterLogin, req.config.applicationId);
     if (hasAfterLoginTrigger) {
       const Parse = await loadModule('parse/node.js');
       const afterLoginUser = Parse.User.fromJSON(Object.assign({ className: '_User' }, user));
@@ -412,7 +412,7 @@ export class UsersRouter extends ClassesRouter {
           records.results[0].objectId,
           req.info.context
         );
-        const hasAfterLogoutTrigger = await triggerExists('_Session', TriggerTypes.afterLogout, req.config.applicationId);
+        const hasAfterLogoutTrigger = triggerExists('_Session', TriggerTypes.afterLogout, req.config.applicationId);
         if (hasAfterLogoutTrigger) {
           const Parse = await loadModule('parse/node.js');
           await maybeRunTrigger(

src/middlewares.js

@@ -1,5 +1,4 @@
 import AppCache from './cache';
-import Parse from 'parse/node';
 import ParseError from './ParseError';
 import auth from './Auth';
 import Config from './Config';
@@ -9,6 +8,7 @@ import rest from './rest';
 import MongoStorageAdapter from './Adapters/Storage/Mongo/MongoStorageAdapter';
 import PostgresStorageAdapter from './Adapters/Storage/Postgres/PostgresStorageAdapter';
 import rateLimit from 'express-rate-limit';
+import { RateLimitZone } from './cloud-code/Parse.Server';
 import { RateLimitOptions } from './Options/Definitions';
 import { pathToRegexp } from 'path-to-regexp';
 import RedisStore from 'rate-limit-redis';
@@ -600,14 +600,14 @@ export const addRateLimit = (route, config, cloud) => {
         return request.auth?.isMaster;
       },
       keyGenerator: async request => {
-        if (route.zone === Parse.Server.RateLimitZone.global) {
+        if (route.zone === RateLimitZone.global) {
           return request.config.appId;
         }
         const token = request.info.sessionToken;
-        if (route.zone === Parse.Server.RateLimitZone.session && token) {
+        if (route.zone === RateLimitZone.session && token) {
           return token;
         }
-        if (route.zone === Parse.Server.RateLimitZone.user && token) {
+        if (route.zone === RateLimitZone.user && token) {
           if (!request.auth) {
             await new Promise(resolve => handleParseSession(request, null, resolve));
           }