Merge branch 'allow-to-set-file-to-null' into package

Author: Moumouls

.travis.yml

@@ -50,6 +50,9 @@ jobs:
     env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:5433/parse_server_postgres_adapter_test_database
     before_install: bash scripts/before_install_postgres.sh
     before_script: bash scripts/before_script_postgres.sh
+    script:
+      - npm run lint
+      - npm run coverage
   - stage: release
     node_js: '10'
     env:

package-lock.json

@@ -55,7 +55,7 @@
     "uuid": "3.4.0",
     "winston": "3.2.1",
     "winston-daily-rotate-file": "4.4.2",
-    "ws": "7.2.3"
+    "ws": "7.2.5"
   },
   "devDependencies": {
     "@babel/cli": "7.8.4",

package.json

@@ -1,9 +1,14 @@
 #!/bin/bash
-  
+
 set -e
+source ~/.nvm/nvm.sh
 
 echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}"
 
+nvm install $NODE_VERSION
+nvm use $NODE_VERSION
+npm install -g greenkeeper-lockfile@1
+
 if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then
   # Setup postgres 9 or 10
   sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf
@@ -20,7 +25,7 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then
 
   sudo service postgresql start
 
-else 
+else
   # Setup postgres 11 or higher
 
   #Copy defauilt hba config file and tell postgres to restart

scripts/before_install_postgres.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
-  
+
 set -e
 
 echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VERSION}"
 
+node -e 'require("./lib/index.js")'
+greenkeeper-lockfile-update
+
 psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL
     CREATE DATABASE parse_server_postgres_adapter_test_database;
     \c parse_server_postgres_adapter_test_database;
     CREATE EXTENSION postgis;
     CREATE EXTENSION postgis_topology;
 EOSQL
-

scripts/before_script_postgres.sh

@@ -9522,6 +9522,29 @@ describe('ParseGraphQLServer', () => {
 
             expect(res.status).toEqual(200);
             expect(await res.text()).toEqual('My File Content');
+
+            const mutationResult = await apolloClient.mutate({
+              mutation: gql`
+                mutation UnlinkFile($id: ID!) {
+                  updateSomeClass(
+                    input: { id: $id, fields: { someField: { file: null } } }
+                  ) {
+                    someClass {
+                      someField {
+                        name
+                        url
+                      }
+                    }
+                  }
+                }
+              `,
+              variables: {
+                id: result2.data.createSomeClass3.someClass.id,
+              },
+            });
+            expect(
+              mutationResult.data.updateSomeClass.someClass.someField
+            ).toEqual(null);
           } catch (e) {
             handleError(e);
           }

spec/ParseGraphQLServer.spec.js

@@ -1,4 +1,5 @@
 const parser = require('../lib/Adapters/Storage/Postgres/PostgresConfigParser');
+const fs = require('fs');
 
 const queryParamTests = {
   'a=1&b=2': { a: '1', b: '2' },
@@ -23,7 +24,7 @@ describe('PostgresConfigParser.parseQueryParams', () => {
 });
 
 const baseURI = 'postgres://username:password@localhost:5432/db-name';
-
+const testfile = fs.readFileSync('./Dockerfile').toString();
 const dbOptionsTest = {};
 dbOptionsTest[
   `${baseURI}?ssl=true&binary=true&application_name=app_name&fallback_application_name=f_app_name&poolSize=10`
@@ -35,9 +36,38 @@ dbOptionsTest[
   poolSize: 10,
 };
 dbOptionsTest[`${baseURI}?ssl=&binary=aa`] = {
-  ssl: false,
   binary: false,
 };
+dbOptionsTest[
+  `${baseURI}?ssl=true&ca=./Dockerfile&pfx=./Dockerfile&cert=./Dockerfile&key=./Dockerfile&binary=aa&passphrase=word&secureOptions=20`
+] = {
+  ssl: {
+    ca: testfile,
+    pfx: testfile,
+    cert: testfile,
+    key: testfile,
+    passphrase: 'word',
+    secureOptions: 20,
+  },
+  binary: false,
+};
+dbOptionsTest[
+  `${baseURI}?ssl=false&ca=./Dockerfile&pfx=./Dockerfile&cert=./Dockerfile&key=./Dockerfile&binary=aa`
+] = {
+  ssl: { ca: testfile, pfx: testfile, cert: testfile, key: testfile },
+  binary: false,
+};
+dbOptionsTest[`${baseURI}?rejectUnauthorized=true`] = {
+  ssl: { rejectUnauthorized: true },
+};
+dbOptionsTest[
+  `${baseURI}?max=5&query_timeout=100&idleTimeoutMillis=1000&keepAlive=true`
+] = {
+  max: 5,
+  query_timeout: 100,
+  idleTimeoutMillis: 1000,
+  keepAlive: true,
+};
 
 describe('PostgresConfigParser.getDatabaseOptionsFromURI', () => {
   it('creates a db options map from a query string', () => {

spec/PostgresConfigParser.spec.js

@@ -1,5 +1,5 @@
 const url = require('url');
-
+const fs = require('fs');
 function getDatabaseOptionsFromURI(uri) {
   const databaseOptions = {};
 
@@ -16,8 +16,44 @@ function getDatabaseOptionsFromURI(uri) {
   databaseOptions.user = authParts.length > 0 ? authParts[0] : '';
   databaseOptions.password = authParts.length > 1 ? authParts[1] : '';
 
-  databaseOptions.ssl =
-    queryParams.ssl && queryParams.ssl.toLowerCase() === 'true' ? true : false;
+  if (queryParams.ssl && queryParams.ssl.toLowerCase() === 'true') {
+    databaseOptions.ssl = true;
+  }
+
+  if (
+    queryParams.ca ||
+    queryParams.pfx ||
+    queryParams.cert ||
+    queryParams.key ||
+    queryParams.passphrase ||
+    queryParams.rejectUnauthorized ||
+    queryParams.secureOptions
+  ) {
+    databaseOptions.ssl = {};
+    if (queryParams.ca) {
+      databaseOptions.ssl.ca = fs.readFileSync(queryParams.ca).toString();
+    }
+    if (queryParams.pfx) {
+      databaseOptions.ssl.pfx = fs.readFileSync(queryParams.pfx).toString();
+    }
+    if (queryParams.cert) {
+      databaseOptions.ssl.cert = fs.readFileSync(queryParams.cert).toString();
+    }
+    if (queryParams.key) {
+      databaseOptions.ssl.key = fs.readFileSync(queryParams.key).toString();
+    }
+    if (queryParams.passphrase) {
+      databaseOptions.ssl.passphrase = queryParams.passphrase;
+    }
+    if (queryParams.rejectUnauthorized) {
+      databaseOptions.ssl.rejectUnauthorized =
+        queryParams.rejectUnauthorized.toLowerCase() === 'true' ? true : false;
+    }
+    if (queryParams.secureOptions) {
+      databaseOptions.ssl.secureOptions = parseInt(queryParams.secureOptions);
+    }
+  }
+
   databaseOptions.binary =
     queryParams.binary && queryParams.binary.toLowerCase() === 'true'
       ? true
@@ -31,6 +67,19 @@ function getDatabaseOptionsFromURI(uri) {
   if (queryParams.poolSize) {
     databaseOptions.poolSize = parseInt(queryParams.poolSize) || 10;
   }
+  if (queryParams.max) {
+    databaseOptions.max = parseInt(queryParams.max) || 10;
+  }
+  if (queryParams.query_timeout) {
+    databaseOptions.query_timeout = parseInt(queryParams.query_timeout);
+  }
+  if (queryParams.idleTimeoutMillis) {
+    databaseOptions.idleTimeoutMillis = parseInt(queryParams.idleTimeoutMillis);
+  }
+  if (queryParams.keepAlive) {
+    databaseOptions.keepAlive =
+      queryParams.keepAlive.toLowerCase() === 'true' ? true : false;
+  }
 
   return databaseOptions;
 }