refactor(h5p-server): removed qs and merge dependency

Lumieducation · Dec 29, 2024 · 6408292 · 6408292
1 parent 421cbb3
commit 6408292
Show file tree

Hide file tree

Showing 13 changed files with 163 additions and 12,028 deletions.
diff --git a/packages/h5p-examples/package-lock.json b/packages/h5p-examples/package-lock.json
diff --git a/packages/h5p-express/package-lock.json b/packages/h5p-express/package-lock.json
diff --git a/packages/h5p-html-exporter/package-lock.json b/packages/h5p-html-exporter/package-lock.json
diff --git a/packages/h5p-mongos3/package-lock.json b/packages/h5p-mongos3/package-lock.json
diff --git a/packages/h5p-react/package-lock.json b/packages/h5p-react/package-lock.json
diff --git a/packages/h5p-redis-lock/package-lock.json b/packages/h5p-redis-lock/package-lock.json
diff --git a/packages/h5p-rest-example-client/package-lock.json b/packages/h5p-rest-example-client/package-lock.json
diff --git a/packages/h5p-rest-example-server/package-lock.json b/packages/h5p-rest-example-server/package-lock.json
diff --git a/packages/h5p-server/package-lock.json b/packages/h5p-server/package-lock.json
diff --git a/packages/h5p-server/package.json b/packages/h5p-server/package.json
@@ -57,12 +57,10 @@
         "https-proxy-agent": "^5.0.1",
         "image-size": "^1.0.2",
         "jsonpath": "^1.1.1",
-        "merge": "^2.1.1",
         "mime-types": "^2.1.35",
         "nanoid": "^3.3.2",
         "node-machine-id": "^1.1.12",
         "promisepipe": "^3.0.0",
-        "qs": "^6.11.1",
         "sanitize-html": "^2.10.0",
         "stream-buffers": "^3.0.2",
         "tmp-promise": "^3.0.3",

diff --git a/packages/h5p-server/src/ContentTypeCache.ts b/packages/h5p-server/src/ContentTypeCache.ts
@@ -1,6 +1,4 @@
 import { AxiosInstance } from 'axios';
-import * as merge from 'merge';
-import * as qs from 'qs';
 import { machineIdSync } from 'node-machine-id';
 
 import H5pError from './helpers/H5pError';
@@ -91,16 +89,23 @@ export default class ContentTypeCache {
         await this.registerOrGetUuid();
         let formData = this.compileRegistrationData();
         if (this.config.sendUsageStatistics) {
-            formData = merge.recursive(
-                true,
-                formData,
-                this.compileUsageStatistics()
-            );
+            formData = {
+                ...formData,
+                ...this.compileUsageStatistics()
+            };
+        }
+
+        const params = new URLSearchParams();
+        for (const field in formData) {
+            params.set(field, formData[field].toString());
         }
+        const queryStringedFormData = params.toString();
+
         const response = await this.httpClient.post(
             this.config.hubContentTypesEndpoint,
-            qs.stringify(formData)
+            queryStringedFormData
         );
+
         if (response.status !== 200) {
             throw new H5pError(
                 'error-communicating-with-hub',