fix: Replace existing HTTP request module

Author: dblythy

DEPRECATIONS.md

@@ -7,7 +7,6 @@ The following is a list of deprecations, according to the [Deprecation Policy](h
 | DEPPS1 | Native MongoDB syntax in aggregation pipeline   | [#7338](https://github.com/parse-community/parse-server/issues/7338) | 5.0.0 (2022)                    | 6.0.0 (2023)                    | deprecated            | -     |
 | DEPPS2 | Config option `directAccess` defaults to `true` | [#6636](https://github.com/parse-community/parse-server/pull/6636)   | 5.0.0 (2022)                    | 6.0.0 (2023)                    | deprecated            | -     |
 | DEPPS3 | Config option `enforcePrivateUsers` defaults to `true` | [#7319](https://github.com/parse-community/parse-server/pull/7319)   | 5.0.0 (2022)                    | 6.0.0 (2023)                    | deprecated            | -     |
-| DEPPS4 | Remove convenience method for http request `Parse.Cloud.httpRequest` | [#7589](https://github.com/parse-community/parse-server/pull/7589)   | 5.0.0 (2022)                    | 6.0.0 (2023)                    | deprecated            | -     |
 | DEPPS5 | Config option `allowClientClassCreation` defaults to `false` | [#7925](https://github.com/parse-community/parse-server/pull/7925)   | 5.3.0 (2022)                    | 7.0.0 (2024)                    | deprecated            | -     |
 | DEPPS6 | Auth providers disabled by default | [#7953](https://github.com/parse-community/parse-server/pull/7953)   | 5.3.0 (2022)                    | 7.0.0 (2024)                    | deprecated            | -     |
 | DEPPS7 | Remove file trigger syntax `Parse.Cloud.beforeSaveFile((request) => {})` | [#7966](https://github.com/parse-community/parse-server/pull/7966)   | 5.3.0 (2022)                    | 7.0.0 (2024)                    | deprecated            | -     |

package-lock.json

@@ -19,12 +19,13 @@
   ],
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@graphql-yoga/node": "2.6.0",
-    "@graphql-tools/utils": "8.12.0",
     "@graphql-tools/merge": "8.3.6",
     "@graphql-tools/schema": "9.0.4",
+    "@graphql-tools/utils": "8.12.0",
+    "@graphql-yoga/node": "2.6.0",
     "@parse/fs-files-adapter": "1.2.2",
     "@parse/push-adapter": "4.1.2",
+    "axios": "1.1.3",
     "bcryptjs": "2.4.3",
     "body-parser": "1.20.1",
     "commander": "5.1.0",
@@ -34,8 +35,8 @@
     "follow-redirects": "1.15.2",
     "graphql": "16.6.0",
     "graphql-list-fields": "2.0.2",
-    "graphql-tag": "2.12.6",
     "graphql-relay": "0.10.0",
+    "graphql-tag": "2.12.6",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.1.5",

package.json

@@ -1686,25 +1686,6 @@ describe('Cloud Code', () => {
     obj.save().then(done, done.fail);
   });
 
-  it('can deprecate Parse.Cloud.httpRequest', async () => {
-    const logger = require('../lib/logger').logger;
-    spyOn(logger, 'warn').and.callFake(() => {});
-    Parse.Cloud.define('hello', () => {
-      return 'Hello world!';
-    });
-    await Parse.Cloud.httpRequest({
-      method: 'POST',
-      url: 'http://localhost:8378/1/functions/hello',
-      headers: {
-        'X-Parse-Application-Id': Parse.applicationId,
-        'X-Parse-REST-API-Key': 'rest',
-      },
-    });
-    expect(logger.warn).toHaveBeenCalledWith(
-      'DeprecationWarning: Parse.Cloud.httpRequest is deprecated and will be removed in a future version. Use a http request library instead.'
-    );
-  });
-
   describe('cloud jobs', () => {
     it('should define a job', done => {
       expect(() => {

spec/CloudCode.spec.js

@@ -83,18 +83,17 @@ describe('httpRequest', () => {
   });
 
   it('should fail on 404', async () => {
-    await expectAsync(
-      httpRequest({
+    try {
+      await httpRequest({
         url: `${httpRequestServer}/404`,
-      })
-    ).toBeRejectedWith(
-      jasmine.objectContaining({
-        status: 404,
-        buffer: Buffer.from('NO'),
-        text: 'NO',
-        data: undefined,
-      })
-    );
+      });
+      fail('should have failed');
+    } catch (e) {
+      expect(e.status).toBe(404);
+      expect(e.buffer).toEqual(Buffer.from('NO'));
+      expect(e.text).toBe('NO');
+      expect(e.data).toBeUndefined();
+    }
   });
 
   it('should post on echo', async () => {
@@ -178,7 +177,6 @@ describe('httpRequest', () => {
       url: `${httpRequestServer}/qs`,
       params: 'foo=bar&foo2=bar2',
     });
-
     expect(httpResponse.status).toBe(200);
     expect(httpResponse.data).toEqual({ foo: 'bar', foo2: 'bar2' });
   });

spec/HTTPRequest.spec.js

@@ -116,7 +116,7 @@ describe('Pages Router', () => {
         followRedirects: false,
       }).catch(e => e);
       expect(res.status).toBe(200);
-      expect(res.text).toEqual('"Password successfully reset"');
+      expect(res.text).toEqual('Password successfully reset');
     });
 
     it('request_password_reset: responds with AJAX error on missing password', async () => {
@@ -970,10 +970,12 @@ describe('Pages Router', () => {
         // Do not compose this URL with `new URL(...)` because that would normalize
         // the URL and remove path patterns; the path patterns must reach the router
         const url = `${config.publicServerURL}/apps/../.gitignore`;
-        const response = await request({
-          url: url,
-          followRedirects: false,
-        }).catch(e => e);
+        const response = await request
+          .legacy({
+            url: url,
+            followRedirects: false,
+          })
+          .catch(e => e);
         expect(response.status).toBe(404);
         expect(response.text).toBe('Not found.');
       });

spec/PagesRouter.spec.js

@@ -59,6 +59,7 @@ describe('test validate_receipt endpoint', () => {
       const otherResponse = await request({
         url: url,
       });
+      console.log(otherResponse.data);
       expect(otherResponse.text).toBe('download_file');
     }
   });

spec/PurchaseValidation.spec.js

@@ -713,14 +713,8 @@ ParseCloud.useMasterKey = () => {
   );
 };
 
-const request = require('./httpRequest');
-ParseCloud.httpRequest = opts => {
-  Deprecator.logRuntimeDeprecation({
-    usage: 'Parse.Cloud.httpRequest',
-    solution: 'Use a http request library instead.',
-  });
-  return request(opts);
-};
+import axios from 'axios';
+ParseCloud.httpRequest = axios;
 
 module.exports = ParseCloud;
 

src/cloud-code/Parse.Cloud.js

@@ -85,7 +85,57 @@ const encodeBody = function ({ body, headers = {} }) {
  * @param {Parse.Cloud.HTTPOptions} options The Parse.Cloud.HTTPOptions object that makes the request.
  * @return {Promise<Parse.Cloud.HTTPResponse>} A promise that will be resolved with a {@link Parse.Cloud.HTTPResponse} object when the request completes.
  */
-module.exports = function httpRequest(options) {
+import axios from 'axios';
+import { parse as qs } from 'querystring';
+module.exports = async options => {
+  if (options.method) {
+    options.method = options.method.toLowerCase();
+  }
+  if (options.body) {
+    options.data = options.body;
+    delete options.body;
+  }
+  if (typeof options.params === 'object') {
+    options.qs = options.params;
+  } else if (typeof options.params === 'string') {
+    options.qs = qs(options.params);
+  }
+  if (options.qs) {
+    options.params = options.qs;
+    delete options.qs;
+  }
+  if (!options.followRedirects) {
+    options.maxRedirects = 0;
+    delete options.followRedirects;
+  }
+  try {
+    const response = await axios(options);
+    const data = response.data;
+    if (Object.prototype.toString.call(data) === '[object Object]') {
+      response.text = JSON.stringify(data);
+      response.data = data;
+    } else {
+      response.text = data;
+    }
+    response.buffer = Buffer.from(response.text);
+    return response;
+  } catch (e) {
+    e.status = e.response && e.response.status;
+    const data = e.response && e.response.data;
+    if (Object.prototype.toString.call(data) === '[object Object]') {
+      e.text = JSON.stringify(data);
+      e.data = data;
+    } else {
+      e.text = data;
+    }
+    e.buffer = Buffer.from(e.text);
+    if (e.status === 301 || e.status === 302 || e.status === 303) {
+      return e;
+    }
+    throw e;
+  }
+};
+module.exports.legacy = function httpRequest(options) {
   let url;
   try {
     url = parse(options.url);