Merge branch 'alpha' into afterLiveQueryEventLogging

mtrezza · web-flow · commit e153535e1cf1 · 2022-03-22T23:50:05.000+01:00
diff --git a/changelogs/CHANGELOG_beta.md b/changelogs/CHANGELOG_beta.md
diff --git a/changelogs/CHANGELOG_release.md b/changelogs/CHANGELOG_release.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "5.0.0-alpha.29",
+  "version": "5.1.1",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
diff --git a/spec/AuthenticationAdapters.spec.js b/spec/AuthenticationAdapters.spec.js
@@ -1722,7 +1722,9 @@ describe('Apple Game Center Auth adapter', () => {
       await gcenter.validateAuthData(authData);
       fail();
     } catch (e) {
-      expect(e.message).toBe('Apple Game Center - invalid publicKeyUrl: http://static.gc.apple.com/public-key/gc-prod-4.cer');
+      expect(e.message).toBe(
+        'Apple Game Center - invalid publicKeyUrl: http://static.gc.apple.com/public-key/gc-prod-4.cer'
+      );
     }
   });
 });
diff --git a/spec/Idempotency.spec.js b/spec/Idempotency.spec.js
@@ -93,28 +93,31 @@ describe('Idempotency', () => {
     expect(counter).toBe(2);
   });
 
-  it_only_db('postgres')('should delete request entry when postgress ttl function is called', async () => {
-    const client = Config.get(Parse.applicationId).database.adapter._client;
-    let counter = 0;
-    Parse.Cloud.define('myFunction', () => {
-      counter++;
-    });
-    const params = {
-      method: 'POST',
-      url: 'http://localhost:8378/1/functions/myFunction',
-      headers: {
-        'X-Parse-Application-Id': Parse.applicationId,
-        'X-Parse-Master-Key': Parse.masterKey,
-        'X-Parse-Request-Id': 'abc-123',
-      },
-    };
-    await expectAsync(request(params)).toBeResolved();
-    await expectAsync(request(params)).toBeRejected();
-    await new Promise(resolve => setTimeout(resolve, maxTimeOut));
-    await client.one('SELECT idempotency_delete_expired_records()');
-    await expectAsync(request(params)).toBeResolved();
-    expect(counter).toBe(2);
-  });
+  it_only_db('postgres')(
+    'should delete request entry when postgress ttl function is called',
+    async () => {
+      const client = Config.get(Parse.applicationId).database.adapter._client;
+      let counter = 0;
+      Parse.Cloud.define('myFunction', () => {
+        counter++;
+      });
+      const params = {
+        method: 'POST',
+        url: 'http://localhost:8378/1/functions/myFunction',
+        headers: {
+          'X-Parse-Application-Id': Parse.applicationId,
+          'X-Parse-Master-Key': Parse.masterKey,
+          'X-Parse-Request-Id': 'abc-123',
+        },
+      };
+      await expectAsync(request(params)).toBeResolved();
+      await expectAsync(request(params)).toBeRejected();
+      await new Promise(resolve => setTimeout(resolve, maxTimeOut));
+      await client.one('SELECT idempotency_delete_expired_records()');
+      await expectAsync(request(params)).toBeResolved();
+      expect(counter).toBe(2);
+    }
+  );
 
   it('should enforce idempotency for cloud code jobs', async () => {
     let counter = 0;
diff --git a/spec/ParseQuery.spec.js b/spec/ParseQuery.spec.js
@@ -4777,7 +4777,7 @@ describe('Parse.Query testing', () => {
       ttl: new Date(now - 2 * 24 * 60 * 60 * 1000), // 2 days ago
     });
 
-    await Parse.Object.saveAll([obj1, obj2])
+    await Parse.Object.saveAll([obj1, obj2]);
     const q1 = new Parse.Query('MyCustomObject');
     q1.greaterThan('ttl', { $relativeTime: 'in 1 day' });
     const results1 = await q1.find({ useMasterKey: true });
@@ -4825,8 +4825,8 @@ describe('Parse.Query testing', () => {
     q.greaterThan('ttl', { $relativeTime: '-12 bananas ago' });
     try {
       await q.find({ useMasterKey: true });
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
   });
@@ -4842,8 +4842,8 @@ describe('Parse.Query testing', () => {
     q.greaterThan('nonDateField', { $relativeTime: '1 day ago' });
     try {
       await q.find({ useMasterKey: true });
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
   });
diff --git a/spec/ParseServerRESTController.spec.js b/spec/ParseServerRESTController.spec.js
@@ -186,10 +186,7 @@ describe('ParseServerRESTController', () => {
             databaseAdapter.createObject.calls.argsFor(i + 1)[3]
           );
         }
-        expect(results.map(result => result.get('key')).sort()).toEqual([
-          'value1',
-          'value2',
-        ]);
+        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
       });
 
       it('should not save anything when one operation fails in a transaction', async () => {
diff --git a/spec/PostgresInitOptions.spec.js b/spec/PostgresInitOptions.spec.js
@@ -24,7 +24,6 @@ const GameScore = Parse.Object.extend({
 });
 
 describe_only_db('postgres')('Postgres database init options', () => {
-
   it('should create server with public schema databaseOptions', async () => {
     const adapter = new PostgresStorageAdapter({
       uri: postgresURI,
@@ -71,8 +70,8 @@ describe_only_db('postgres')('Postgres database init options', () => {
       await reconfigureServer({
         databaseAdapter: adapter,
       });
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error).toBeDefined();
     }
   });
diff --git a/spec/PostgresStorageAdapter.spec.js b/spec/PostgresStorageAdapter.spec.js
@@ -179,14 +179,14 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
         {
           createdAt: {
             $eq: {
-              $relativeTime: '12 days ago'
-            }
-          }
+              $relativeTime: '12 days ago',
+            },
+          },
         },
-        { }
+        {}
       );
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
     await dropTable(client, tableName);
@@ -222,14 +222,14 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
         {
           createdAt: {
             $ne: {
-              $relativeTime: '12 days ago'
-            }
-          }
+              $relativeTime: '12 days ago',
+            },
+          },
         },
-        { }
+        {}
       );
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
     await dropTable(client, tableName);
@@ -265,14 +265,14 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
         {
           createdAt: {
             $exists: {
-              $relativeTime: '12 days ago'
-            }
-          }
+              $relativeTime: '12 days ago',
+            },
+          },
         },
-        { }
+        {}
       );
-      fail("Should have thrown error");
-    } catch(error) {
+      fail('Should have thrown error');
+    } catch (error) {
       expect(error.code).toBe(Parse.Error.INVALID_JSON);
     }
     await dropTable(client, tableName);
@@ -563,9 +563,10 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
     await reconfigureServer();
     const adapter = Config.get('test').database.adapter;
     const client = adapter._client;
-    const qs = "SELECT format('%I.%I(%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes)) FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE p.proname = 'idempotency_delete_expired_records'";
+    const qs =
+      "SELECT format('%I.%I(%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes)) FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE p.proname = 'idempotency_delete_expired_records'";
     const foundFunction = await client.one(qs);
-    expect(foundFunction.format).toBe("public.idempotency_delete_expired_records()");
+    expect(foundFunction.format).toBe('public.idempotency_delete_expired_records()');
     await adapter.deleteIdempotencyFunction();
     await client.none(qs);
   });
diff --git a/spec/batch.spec.js b/spec/batch.spec.js
@@ -267,10 +267,7 @@ describe('batch', () => {
             databaseAdapter.createObject.calls.argsFor(i + 1)[3]
           );
         }
-        expect(results.map(result => result.get('key')).sort()).toEqual([
-          'value1',
-          'value2',
-        ]);
+        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
       });
 
       it('should not save anything when one operation fails in a transaction', async () => {
diff --git a/src/Adapters/Auth/gcenter.js b/src/Adapters/Auth/gcenter.js
@@ -28,7 +28,7 @@ function verifyPublicKeyUrl(publicKeyUrl) {
     const domainParts = hostnameParts.slice(length - 2, length);
     const domain = domainParts.join('.');
     return domain === 'apple.com';
-  } catch(error) {
+  } catch (error) {
     return false;
   }
 }
diff --git a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
@@ -2440,55 +2440,48 @@ export class PostgresStorageAdapter implements StorageAdapter {
       ? fieldNames.map((fieldName, index) => `lower($${index + 3}:name) varchar_pattern_ops`)
       : fieldNames.map((fieldName, index) => `$${index + 3}:name`);
     const qs = `CREATE INDEX IF NOT EXISTS $1:name ON $2:name (${constraintPatterns.join()})`;
-    const setIdempotencyFunction = options.setIdempotencyFunction !== undefined ? options.setIdempotencyFunction : false;
+    const setIdempotencyFunction =
+      options.setIdempotencyFunction !== undefined ? options.setIdempotencyFunction : false;
     if (setIdempotencyFunction) {
       await this.ensureIdempotencyFunctionExists(options);
     }
-    await conn.none(qs, [indexNameOptions.name, className, ...fieldNames])
-      .catch(error => {
-        if (
-          error.code === PostgresDuplicateRelationError &&
-          error.message.includes(indexNameOptions.name)
-        ) {
-          // Index already exists. Ignore error.
-        } else if (
-          error.code === PostgresUniqueIndexViolationError &&
-          error.message.includes(indexNameOptions.name)
-        ) {
-          // Cast the error into the proper parse error
-          throw new Parse.Error(
-            Parse.Error.DUPLICATE_VALUE,
-            'A duplicate value for a field with unique values was provided'
-          );
-        } else {
-          throw error;
-        }
-      });
+    await conn.none(qs, [indexNameOptions.name, className, ...fieldNames]).catch(error => {
+      if (
+        error.code === PostgresDuplicateRelationError &&
+        error.message.includes(indexNameOptions.name)
+      ) {
+        // Index already exists. Ignore error.
+      } else if (
+        error.code === PostgresUniqueIndexViolationError &&
+        error.message.includes(indexNameOptions.name)
+      ) {
+        // Cast the error into the proper parse error
+        throw new Parse.Error(
+          Parse.Error.DUPLICATE_VALUE,
+          'A duplicate value for a field with unique values was provided'
+        );
+      } else {
+        throw error;
+      }
+    });
   }
 
-  async deleteIdempotencyFunction(
-    options?: Object = {}
-  ): Promise<any> {
+  async deleteIdempotencyFunction(options?: Object = {}): Promise<any> {
     const conn = options.conn !== undefined ? options.conn : this._client;
     const qs = 'DROP FUNCTION IF EXISTS idempotency_delete_expired_records()';
-    return conn
-      .none(qs)
-      .catch(error => {
-        throw error;
-      });
+    return conn.none(qs).catch(error => {
+      throw error;
+    });
   }
 
-  async ensureIdempotencyFunctionExists(
-    options?: Object = {}
-  ): Promise<any> {
+  async ensureIdempotencyFunctionExists(options?: Object = {}): Promise<any> {
     const conn = options.conn !== undefined ? options.conn : this._client;
     const ttlOptions = options.ttl !== undefined ? `${options.ttl} seconds` : '60 seconds';
-    const qs = 'CREATE OR REPLACE FUNCTION idempotency_delete_expired_records() RETURNS void LANGUAGE plpgsql AS $$ BEGIN DELETE FROM "_Idempotency" WHERE expire < NOW() - INTERVAL $1; END; $$;';
-    return conn
-      .none(qs, [ttlOptions])
-      .catch(error => {
-        throw error;
-      });
+    const qs =
+      'CREATE OR REPLACE FUNCTION idempotency_delete_expired_records() RETURNS void LANGUAGE plpgsql AS $$ BEGIN DELETE FROM "_Idempotency" WHERE expire < NOW() - INTERVAL $1; END; $$;';
+    return conn.none(qs, [ttlOptions]).catch(error => {
+      throw error;
+    });
   }
 }
 
diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js
@@ -375,6 +375,7 @@ class DatabaseController {
     // multiple schemas, so instead use loadSchema to get a schema.
     this.schemaPromise = null;
     this._transactionalSession = null;
+    this.options = options;
   }
 
   collectionExists(className: string): Promise<boolean> {
diff --git a/src/batch.js b/src/batch.js
@@ -13,7 +13,7 @@ function mountOnto(router) {
 function parseURL(urlString) {
   try {
     return new URL(urlString);
-  } catch(error) {
+  } catch (error) {
     return undefined;
   }
 }
diff --git a/src/middlewares.js b/src/middlewares.js
@@ -432,7 +432,12 @@ export function promiseEnforceMasterKeyAccess(request) {
  */
 export function promiseEnsureIdempotency(req) {
   // Enable feature only for MongoDB
-  if (!((req.config.database.adapter instanceof MongoStorageAdapter) || (req.config.database.adapter instanceof PostgresStorageAdapter))) {
+  if (
+    !(
+      req.config.database.adapter instanceof MongoStorageAdapter ||
+      req.config.database.adapter instanceof PostgresStorageAdapter
+    )
+  ) {
     return Promise.resolve();
   }
   // Get parameters

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "parse-server",`
`3`		`- "version": "5.0.0-alpha.29",`
	`3`	`+ "version": "5.1.1",`
`4`	`4`	`"description": "An express module providing a Parse-compatible API server",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"repository": {`