Add minimal spec for extra_params injection, fix formData injection a…

…ppending params defined in base input
unipile · Sep 18, 2024 · 4df2454 · 4df2454
1 parent faa2f46
commit 4df2454
Show file tree

Hide file tree

Showing 12 changed files with 314 additions and 26 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -4,7 +4,7 @@
  */
 
 const config = {
-//   preset: 'ts-jest',
+  //   preset: 'ts-jest',
   testEnvironment: 'node',
   verbose: true,
   transform: {
@@ -18,11 +18,12 @@ const config = {
   //   modulePathIgnorePatterns: ['/node_modules/'],
   clearMocks: true,
   collectCoverage: false,
-//   coverageDirectory: 'coverage',
-//   coverageReporters: ['html'],
+  //   coverageDirectory: 'coverage',
+  //   coverageReporters: ['html'],
   moduleNameMapper: {
     '^(.+)\\.js$': '$1',
   },
+  setupFilesAfterEnv: ['./jest.setup.js'],
 };
 
 export default config;
diff --git a/jest.setup.js b/jest.setup.js
@@ -0,0 +1,2 @@
+// jest.setup.js
+require('jest-fetch-mock').enableMocks();
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "test-e2e-clean": "jest --clearCache && jest --showConfig && jest --verbose --config ./jest.config.js",
     "test-e2e": "jest --verbose --config ./jest.config.js",
     "test-e2e-watch": "jest --verbose --config ./jest.config.js  --watch",
+    "test-watch": "jest --verbose --config ./jest.config.js  --watch",
     "prepublishOnly": "tsc",
     "postversion": "git push origin"
   },
@@ -30,6 +31,7 @@
     "babel-jest": "^29.7.0",
     "eslint": "^8.48.0",
     "jest": "^29.7.0",
+    "jest-fetch-mock": "^3.0.3",
     "prettier": "^3.0.3",
     "ts-jest": "^29.2.4",
     "typescript": "^5.2.2"

diff --git a/src/request-sender.ts b/src/request-sender.ts
@@ -29,6 +29,13 @@ export class RequestSender {
       parameters: input.parameters ?? {},
     });
 
+    // console.log('url', url, {
+    //   protocol: this.clientState.protocol,
+    //   domain: this.clientState.domain,
+    //   apiVersion: this.clientState.apiVersion,
+    //   path: input.path,
+    //   parameters: input.parameters ?? {},
+    // });
     let parsedBody;
     if (input.body !== undefined && input.headers?.['Content-Type'] === 'application/json')
       parsedBody = JSON.stringify(input.body);
@@ -76,10 +83,10 @@ export class RequestSender {
     let formattedParameters: string;
     if (Object.keys(parameters).length === 0) formattedParameters = '';
     else {
-        /** 
-         * @todo Check if we need to something about + signs ?
-         *       cf. https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams#preserving_plus_signs
-         */
+      /**
+       * @todo Check if we need to something about + signs ?
+       *       cf. https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams#preserving_plus_signs
+       */
       formattedParameters = '?' + new URLSearchParams(parameters).toString();
     }
 

diff --git a/src/resources/account.resource.ts b/src/resources/account.resource.ts
@@ -37,6 +37,7 @@ export class AccountResource {
     const { limit, cursor } = input;
 
     const parameters: Record<string, string> = { ...options?.extra_params };
+    // console.log('getAll', options, parameters);
     if (limit) parameters.limit = String(limit);
     if (cursor) parameters.cursor = cursor;
 

diff --git a/src/resources/email.resource.ts b/src/resources/email.resource.ts
@@ -283,10 +283,6 @@ export class EmailResource {
       input;
     const formDataBody = new FormData();
 
-    if (options?.extra_params) {
-      Object.entries(options.extra_params).forEach(([k, v]) => formDataBody.append(k, v));
-    }
-
     formDataBody.append('body', body);
     formDataBody.append('account_id', account_id);
     if (draft_id) formDataBody.append('draft_id', draft_id);
@@ -321,6 +317,13 @@ export class EmailResource {
       formDataBody.append('reply_to', reply_to);
     }
 
+    if (options?.extra_params) {
+      Object.entries(options.extra_params).forEach(([k, v]) => {
+        if (!formDataBody.has(k)) {
+          formDataBody.append(k, v);
+        }
+      });
+    }
     return await this.client.request.send({
       path: ['emails'],
       method: 'POST',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// jest.setup.js
		require('jest-fetch-mock').enableMocks();