Patch for synap

Author: egmacke

src/Controllers/DatabaseController.js

@@ -10,16 +10,16 @@ import _ from 'lodash';
 import intersect from 'intersect';
 // @flow-disable-next
 import deepcopy from 'deepcopy';
+import SchemaCache from '../Adapters/Cache/SchemaCache';
+import MongoStorageAdapter from '../Adapters/Storage/Mongo/MongoStorageAdapter';
+import PostgresStorageAdapter from '../Adapters/Storage/Postgres/PostgresStorageAdapter';
+import type { FullQueryOptions, QueryOptions } from '../Adapters/Storage/StorageAdapter';
+import { StorageAdapter } from '../Adapters/Storage/StorageAdapter';
 import logger from '../logger';
+import type { ParseServerOptions } from '../Options';
 import Utils from '../Utils';
 import * as SchemaController from './SchemaController';
-import { StorageAdapter } from '../Adapters/Storage/StorageAdapter';
-import MongoStorageAdapter from '../Adapters/Storage/Mongo/MongoStorageAdapter';
-import PostgresStorageAdapter from '../Adapters/Storage/Postgres/PostgresStorageAdapter';
-import SchemaCache from '../Adapters/Cache/SchemaCache';
 import type { LoadSchemaOptions } from './types';
-import type { ParseServerOptions } from '../Options';
-import type { QueryOptions, FullQueryOptions } from '../Adapters/Storage/StorageAdapter';
 
 function addWriteACL(query, acl) {
   const newQuery = _.cloneDeep(query);
@@ -1319,7 +1319,7 @@ class DatabaseController {
                   return this.adapter.distinct(className, schema, query, distinct);
                 }
               } else if (pipeline) {
-                if (!classExists) {
+                if (!classExists || className === '_Join:users:_Role') {
                   return [];
                 } else {
                   return this.adapter.aggregate(

src/GraphQL/parseGraphQLUtils.js

@@ -16,7 +16,7 @@ export function toGraphQLError(error) {
     code = Parse.Error.INTERNAL_SERVER_ERROR;
     message = 'Internal server error';
   }
-  return new GraphQLError(message, { extensions: { code } });
+  return new GraphQLError(message, { extensions: { code, parseError: error } });
 }
 
 export const extractKeysAndInclude = selectedFields => {

src/ParseServerRESTController.js

@@ -111,9 +111,19 @@ function ParseServerRESTController(applicationId, router) {
     }
 
     return new Promise((resolve, reject) => {
+      let body = data;
+
+      if (options.context !== null && typeof options.context === 'object') {
+        body = {
+          ...data,
+          _context: options.context,
+        };
+        delete options.context;
+      }
+
       getAuth(options, config).then(auth => {
         const request = {
-          body: data,
+          body,
           config,
           auth,
           info: {

src/RestWrite.js

@@ -13,10 +13,10 @@ var Parse = require('parse/node');
 var triggers = require('./triggers');
 var ClientSDK = require('./ClientSDK');
 const util = require('util');
-import RestQuery from './RestQuery';
 import _ from 'lodash';
-import logger from './logger';
 import { requiredColumns } from './Controllers/SchemaController';
+import logger from './logger';
+import RestQuery from './RestQuery';
 
 // query and data are both provided in REST API format. So data
 // types are encoded by plain old objects.
@@ -42,6 +42,11 @@ function RestWrite(config, auth, className, query, data, originalData, clientSDK
   this.runOptions = {};
   this.context = context || {};
 
+  if (!!data && data._context && data._context instanceof Object) {
+    this.context = data._context;
+    delete data._context;
+  }
+
   if (action) {
     this.runOptions.action = action;
   }