Merge branch 'alpha' into snyk-upgrade-88be3eb02ce6725e515b875a3de97add

Author: mtrezza

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,24 @@
+# [5.0.0-alpha.11](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.10...5.0.0-alpha.11) (2021-11-29)
+
+
+### Bug Fixes
+
+* upgrade mime from 2.5.2 to 3.0.0 ([#7725](https://github.com/parse-community/parse-server/issues/7725)) ([f5ef98b](https://github.com/parse-community/parse-server/commit/f5ef98bde32083403c0e30a12162fcc1e52cac37))
+
+# [5.0.0-alpha.10](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.9...5.0.0-alpha.10) (2021-11-29)
+
+
+### Bug Fixes
+
+* upgrade parse from 3.3.1 to 3.4.0 ([#7723](https://github.com/parse-community/parse-server/issues/7723)) ([d4c1f47](https://github.com/parse-community/parse-server/commit/d4c1f473073764cb0570c633fc4a30669c2ce889))
+
+# [5.0.0-alpha.9](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.8...5.0.0-alpha.9) (2021-11-27)
+
+
+### Bug Fixes
+
+* unable to use objectId size higher than 19 on GraphQL API ([#7627](https://github.com/parse-community/parse-server/issues/7627)) ([ed86c80](https://github.com/parse-community/parse-server/commit/ed86c807721cc52a1a5a9dea0b768717eec269ed))
+
 # [5.0.0-alpha.8](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.7...5.0.0-alpha.8) (2021-11-18)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "5.0.0-alpha.8",
+  "version": "5.0.0-alpha.11",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -32,28 +32,28 @@
     "cors": "2.8.5",
     "deepcopy": "2.1.0",
     "express": "4.17.1",
-    "follow-redirects": "1.14.4",
+    "follow-redirects": "1.14.5",
     "graphql": "15.7.1",
     "graphql-list-fields": "2.0.2",
-    "graphql-relay": "0.9.0",
-    "graphql-tag": "2.12.5",
+    "graphql-relay": "0.7.0",
+    "graphql-tag": "2.12.6",
     "graphql-upload": "11.0.0",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "1.12.3",
     "ldapjs": "2.3.1",
     "lodash": "4.17.21",
     "lru-cache": "5.1.1",
-    "mime": "2.5.2",
+    "mime": "3.0.0",
     "mongodb": "3.6.11",
     "mustache": "4.2.0",
-    "parse": "3.3.1",
+    "parse": "3.4.0",
     "pg-monitor": "1.4.1",
     "pg-promise": "10.11.1",
     "pluralize": "8.0.0",
     "redis": "3.1.2",
     "semver": "7.3.5",
-    "subscriptions-transport-ws": "0.10.0",
+    "subscriptions-transport-ws": "0.11.0",
     "tv4": "1.3.0",
     "uuid": "8.3.2",
     "winston": "3.3.3",

package.json

@@ -1999,6 +1999,25 @@ describe('beforeFind hooks', () => {
     });
   });
 
+  it('should have object found with nested relational data query', async () => {
+    const obj1 = Parse.Object.extend('TestObject');
+    const obj2 = Parse.Object.extend('TestObject2');
+    let item2 = new obj2();
+    item2 = await item2.save();
+    let item1 = new obj1();
+    const relation = item1.relation('rel');
+    relation.add(item2);
+    item1 = await item1.save();
+    Parse.Cloud.beforeFind('TestObject', req => {
+      const additionalQ = new Parse.Query('TestObject');
+      additionalQ.equalTo('rel', item2);
+      return Parse.Query.and(req.query, additionalQ);
+    });
+    const q = new Parse.Query('TestObject');
+    const res = await q.first();
+    expect(res.id).toEqual(item1.id);
+  });
+
   it('should use the modified exclude query', async () => {
     Parse.Cloud.beforeFind('MyObject', req => {
       const q = req.query;
@@ -3516,23 +3535,4 @@ describe('sendEmail', () => {
       'Failed to send email because no mail adapter is configured for Parse Server.'
     );
   });
-
-  it('should have object found with nested relational data query', async () => {
-    const obj1 = Parse.Object.extend('TestObject');
-    const obj2 = Parse.Object.extend('TestObject2');
-    let item2 = new obj2();
-    item2 = await item2.save();
-    let item1 = new obj1();
-    const relation = item1.relation('rel');
-    relation.add(item2);
-    item1 = await item1.save();
-    Parse.Cloud.beforeFind('TestObject', req => {
-      const additionalQ = new Parse.Query('TestObject');
-      additionalQ.equalTo('rel', item2);
-      return Parse.Query.and(req.query, additionalQ);
-    });
-    const q = new Parse.Query('TestObject');
-    const res = await q.first();
-    expect(res.id).toEqual(item1.id);
-  });
 });

spec/CloudCode.spec.js

@@ -2287,8 +2287,7 @@ describe('ParseGraphQLServer', () => {
             expect(nodeResult.data.node2.objectId).toBe(obj2.id);
             expect(nodeResult.data.node2.someField).toBe('some value 2');
           });
-          // TODO: (moumouls, davimacedo) Fix flaky test
-          xit('Id inputs should work either with global id or object id', async () => {
+          it('Id inputs should work either with global id or object id', async () => {
             try {
               await apolloClient.mutate({
                 mutation: gql`
@@ -2595,9 +2594,12 @@ describe('ParseGraphQLServer', () => {
                   .map(value => value.node.someField)
                   .sort()
               ).toEqual(['some value 22', 'some value 44']);
-              expect(
-                findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.id
-              ).toBeLessThan(findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.id);
+              // NOTE: Here @davimacedo tried to test RelayID order, but the test is wrong since
+              // "objectId1" < "objectId2" do not always keep the order when objectId is transformed
+              // to base64 by Relay
+              // "SecondaryObject:bBRgmzIRRM" < "SecondaryObject:nTMcuVbATY" true
+              // base64("SecondaryObject:bBRgmzIRRM"") < base64(""SecondaryObject:nTMcuVbATY"") false
+              // "U2Vjb25kYXJ5T2JqZWN0OmJCUmdteklSUk0=" < "U2Vjb25kYXJ5T2JqZWN0Om5UTWN1VmJBVFk=" false
               expect(
                 findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId
               ).toBeLessThan(
@@ -2763,6 +2765,23 @@ describe('ParseGraphQLServer', () => {
               handleError(e);
             }
           });
+          it('Id inputs should work either with global id or object id with objectId higher than 19', async () => {
+            await reconfigureServer({ objectIdSize: 20 });
+            const obj = new Parse.Object('SomeClass');
+            await obj.save({ name: 'aname', type: 'robot' });
+            const result = await apolloClient.query({
+              query: gql`
+                query getSomeClass($id: ID!) {
+                  someClass(id: $id) {
+                    objectId
+                    id
+                  }
+                }
+              `,
+              variables: { id: obj.id },
+            });
+            expect(result.data.someClass.objectId).toEqual(obj.id);
+          });
         });
       });
 

spec/ParseGraphQLServer.spec.js

@@ -1807,7 +1807,13 @@ export class PostgresStorageAdapter implements StorageAdapter {
         if (key === 'ACL') {
           memo.push('_rperm');
           memo.push('_wperm');
-        } else if (key.length > 0) {
+        } else if (
+          key.length > 0 &&
+          // Remove selected field not referenced in the schema
+          // Relation is not a column in postgres
+          // $score is a Parse special field and is also not a column
+          ((schema.fields[key] && schema.fields[key].type !== 'Relation') || key === '$score')
+        ) {
           memo.push(key);
         }
         return memo;

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -972,9 +972,9 @@ class DatabaseController {
       });
     }
     if (query['$and']) {
-      const ors = query['$and'];
+      const ands = query['$and'];
       return Promise.all(
-        ors.map((aQuery, index) => {
+        ands.map((aQuery, index) => {
           return this.reduceInRelation(className, aQuery, schema).then(aQuery => {
             query['$and'][index] = aQuery;
           });