Endpoints for audiences CRUD (#3861)

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -667,11 +667,11 @@ export class PostgresStorageAdapter {
         const joins = results.reduce((list, schema) => {
           return list.concat(joinTablesForSchema(schema.schema));
         }, []);
-        const classes = ['_SCHEMA','_PushStatus','_JobStatus','_JobSchedule','_Hooks','_GlobalConfig', ...results.map(result => result.className), ...joins];
-        return this._client.tx(t=>t.batch(classes.map(className=>t.none('DROP TABLE IF EXISTS $<className:name>', { className }))));
+        const classes = ['_SCHEMA', '_PushStatus', '_JobStatus', '_JobSchedule', '_Hooks', '_GlobalConfig', '_Audience', ...results.map(result => result.className), ...joins];
+        return this._client.tx(t=>t.batch(classes.map(className=>t.none('DROP TABLE IF EXISTS $<className:name>', {className}))));
       }, error => {
         if (error.code === PostgresRelationDoesNotExistError) {
-        // No _SCHEMA collection. Don't delete anything.
+          // No _SCHEMA collection. Don't delete anything.
           return;
         } else {
           throw error;

src/Controllers/DatabaseController.js

@@ -690,11 +690,12 @@ DatabaseController.prototype.reduceRelationKeys = function(className, query) {
     return this.relatedIds(
       relatedTo.object.className,
       relatedTo.key,
-      relatedTo.object.objectId).then((ids) => {
-      delete query['$relatedTo'];
-      this.addInObjectIdsIds(ids, query);
-      return this.reduceRelationKeys(className, query);
-    });
+      relatedTo.object.objectId)
+      .then((ids) => {
+        delete query['$relatedTo'];
+        this.addInObjectIdsIds(ids, query);
+        return this.reduceRelationKeys(className, query);
+      });
   }
 };
 

src/Controllers/SchemaController.js

@@ -114,6 +114,11 @@ const defaultColumns = Object.freeze({
   _GlobalConfig: {
     "objectId": {type: 'String'},
     "params": {type: 'Object'}
+  },
+  _Audience: {
+    "objectId": {type:'String'},
+    "name":   {type:'String'},
+    "query": {type:'String'} //storing query as JSON string to prevent "Nested keys should not contain the '$' or '.' characters" error
   }
 });
 
@@ -122,9 +127,9 @@ const requiredColumns = Object.freeze({
   _Role: ["name", "ACL"]
 });
 
-const systemClasses = Object.freeze(['_User', '_Installation', '_Role', '_Session', '_Product', '_PushStatus', '_JobStatus', '_JobSchedule']);
+const systemClasses = Object.freeze(['_User', '_Installation', '_Role', '_Session', '_Product', '_PushStatus', '_JobStatus', '_JobSchedule', '_Audience']);
 
-const volatileClasses = Object.freeze(['_JobStatus', '_PushStatus', '_Hooks', '_GlobalConfig', '_JobSchedule']);
+const volatileClasses = Object.freeze(['_JobStatus', '_PushStatus', '_Hooks', '_GlobalConfig', '_JobSchedule', '_Audience']);
 
 // 10 alpha numberic chars + uppercase
 const userIdRegex = /^[a-zA-Z0-9]{10}$/;
@@ -306,7 +311,11 @@ const _JobScheduleSchema = convertSchemaToAdapterSchema(injectDefaultSchema({
   fields: {},
   classLevelPermissions: {}
 }));
-const VolatileClassesSchemas = [_HooksSchema, _JobStatusSchema, _JobScheduleSchema, _PushStatusSchema, _GlobalConfigSchema];
+const _AudienceSchema = convertSchemaToAdapterSchema(injectDefaultSchema({
+  className: "_Audience",
+  fields: defaultColumns._Audience
+}));
+const VolatileClassesSchemas = [_HooksSchema, _JobStatusSchema, _JobScheduleSchema, _PushStatusSchema, _GlobalConfigSchema, _AudienceSchema];
 
 const dbTypeMatchesObjectType = (dbType, objectType) => {
   if (dbType.type !== objectType.type) return false;

src/ParseServer.js

@@ -49,6 +49,7 @@ import { SessionsRouter }       from './Routers/SessionsRouter';
 import { UserController }       from './Controllers/UserController';
 import { UsersRouter }          from './Routers/UsersRouter';
 import { PurgeRouter }          from './Routers/PurgeRouter';
+import { AudiencesRouter }          from './Routers/AudiencesRouter';
 
 import DatabaseController       from './Controllers/DatabaseController';
 import SchemaCache              from './Controllers/SchemaCache';
@@ -379,7 +380,8 @@ class ParseServer {
       new GlobalConfigRouter(),
       new PurgeRouter(),
       new HooksRouter(),
-      new CloudCodeRouter()
+      new CloudCodeRouter(),
+      new AudiencesRouter()
     ];
 
     const routes = routers.reduce((memo, router) => {

src/RestQuery.js

@@ -197,11 +197,11 @@ RestQuery.prototype.redirectClassNameForKey = function() {
   }
 
   // We need to change the class name based on the schema
-  return this.config.database.redirectClassNameForKey(
-    this.className, this.redirectKey).then((newClassName) => {
-    this.className = newClassName;
-    this.redirectClassName = newClassName;
-  });
+  return this.config.database.redirectClassNameForKey(this.className, this.redirectKey)
+    .then((newClassName) => {
+      this.className = newClassName;
+      this.redirectClassName = newClassName;
+    });
 };
 
 // Validates this operation against the allowClientClassCreation config.
@@ -491,24 +491,24 @@ RestQuery.prototype.runFind = function(options = {}) {
   if (options.op) {
     findOptions.op = options.op;
   }
-  return this.config.database.find(
-    this.className, this.restWhere, findOptions).then((results) => {
-    if (this.className === '_User') {
-      for (var result of results) {
-        cleanResultOfSensitiveUserInfo(result, this.auth, this.config);
-        cleanResultAuthData(result);
+  return this.config.database.find(this.className, this.restWhere, findOptions)
+    .then((results) => {
+      if (this.className === '_User') {
+        for (var result of results) {
+          cleanResultOfSensitiveUserInfo(result, this.auth, this.config);
+          cleanResultAuthData(result);
+        }
       }
-    }
 
-    this.config.filesController.expandFilesInObject(this.config, results);
+      this.config.filesController.expandFilesInObject(this.config, results);
 
-    if (this.redirectClassName) {
-      for (var r of results) {
-        r.className = this.redirectClassName;
+      if (this.redirectClassName) {
+        for (var r of results) {
+          r.className = this.redirectClassName;
+        }
       }
-    }
-    this.response = {results: results};
-  });
+      this.response = {results: results};
+    });
 };
 
 // Returns a promise for whether it was successful.
@@ -520,10 +520,10 @@ RestQuery.prototype.runCount = function() {
   this.findOptions.count = true;
   delete this.findOptions.skip;
   delete this.findOptions.limit;
-  return this.config.database.find(
-    this.className, this.restWhere, this.findOptions).then((c) => {
-    this.response.count = c;
-  });
+  return this.config.database.find(this.className, this.restWhere, this.findOptions)
+    .then((c) => {
+      this.response.count = c;
+    });
 };
 
 // Augments this.response with data at the paths provided in this.include.

src/Routers/AudiencesRouter.js

@@ -0,0 +1,71 @@
+import ClassesRouter from './ClassesRouter';
+import rest from '../rest';
+import * as middleware from '../middlewares';
+
+export class AudiencesRouter extends ClassesRouter {
+  handleFind(req) {
+    const body = Object.assign(req.body, ClassesRouter.JSONFromQuery(req.query));
+    var options = {};
+
+    if (body.skip) {
+      options.skip = Number(body.skip);
+    }
+    if (body.limit || body.limit === 0) {
+      options.limit = Number(body.limit);
+    }
+    if (body.order) {
+      options.order = String(body.order);
+    }
+    if (body.count) {
+      options.count = true;
+    }
+    if (body.include) {
+      options.include = String(body.include);
+    }
+
+    return rest.find(req.config, req.auth, '_Audience', body.where, options, req.info.clientSDK)
+      .then((response) => {
+
+        response.results.forEach((item) => {
+          item.query = JSON.parse(item.query);
+        });
+
+        return {response: response};
+      });
+  }
+
+  handleGet(req) {
+    req.params.className = '_Audience';
+    return super.handleGet(req)
+      .then((data) => {
+        data.response.query = JSON.parse(data.response.query);
+
+        return data;
+      });
+  }
+
+  handleCreate(req) {
+    req.params.className = '_Audience';
+    return super.handleCreate(req);
+  }
+
+  handleUpdate(req) {
+    req.params.className = '_Audience';
+    return super.handleUpdate(req);
+  }
+
+  handleDelete(req) {
+    req.params.className = '_Audience';
+    return super.handleDelete(req);
+  }
+
+  mountRoutes() {
+    this.route('GET','/push_audiences', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleFind(req); });
+    this.route('GET','/push_audiences/:objectId', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleGet(req); });
+    this.route('POST','/push_audiences', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleCreate(req); });
+    this.route('PUT','/push_audiences/:objectId', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleUpdate(req); });
+    this.route('DELETE','/push_audiences/:objectId', middleware.promiseEnforceMasterKeyAccess, req => { return this.handleDelete(req); });
+  }
+}
+
+export default AudiencesRouter;

src/Routers/FeaturesRouter.js

@@ -32,7 +32,7 @@ export class FeaturesRouter extends PromiseRouter {
           immediatePush: req.config.hasPushSupport,
           scheduledPush: req.config.hasPushScheduledSupport,
           storedPushData: req.config.hasPushSupport,
-          pushAudiences: false,
+          pushAudiences: true,
         },
         schemas: {
           addField: true,

src/Routers/FunctionsRouter.js

@@ -128,26 +128,29 @@ export class FunctionsRouter extends PromiseRouter {
         var response = FunctionsRouter.createResponseObject((result) => {
           try {
             const cleanResult = logger.truncateLogMessage(JSON.stringify(result.response.result));
-            logger.info(`Ran cloud function ${functionName} for user ${userString} `
-              + `with:\n  Input: ${cleanInput }\n  Result: ${cleanResult }`, {
-              functionName,
-              params,
-              user: userString,
-            });
+            logger.info(
+              `Ran cloud function ${functionName} for user ${userString} with:\n  Input: ${cleanInput }\n  Result: ${cleanResult }`,
+              {
+                functionName,
+                params,
+                user: userString,
+              }
+            );
             resolve(result);
           } catch (e) {
             reject(e);
           }
         }, (error) => {
           try {
-            logger.error(`Failed running cloud function ${functionName} for `
-              + `user ${userString} with:\n  Input: ${cleanInput}\n  Error: `
-              + JSON.stringify(error), {
-              functionName,
-              error,
-              params,
-              user: userString
-            });
+            logger.error(
+              `Failed running cloud function ${functionName} for user ${userString} with:\n  Input: ${cleanInput}\n  Error: ` + JSON.stringify(error),
+              {
+                functionName,
+                error,
+                params,
+                user: userString
+              }
+            );
             reject(error);
           } catch (e) {
             reject(e);