[Github NangoHQ#662] fix proxy params (NangoHQ#664)

* [gh-NangoHQ#662] honor params * [gh-NangoHQ#662] pass along query params
stotidgaboo · Jun 7, 2023 · 519fa4b · 519fa4b
1 parent 99d3245
commit 519fa4b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/packages/node-client/lib/index.ts b/packages/node-client/lib/index.ts
@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 import { validateProxyConfiguration } from './utils.js';
 
 import type { ProxyConfiguration } from './types';
@@ -93,10 +93,18 @@ export class Nango {
             headers['Retries'] = retries;
         }
 
-        const options = {
+        const options: AxiosRequestConfig = {
             headers: this.enrichHeaders(headers)
         };
 
+        if (config.params) {
+            options.params = config.params;
+        }
+
+        if (config.paramsSerializer) {
+            options.paramsSerializer = config.paramsSerializer;
+        }
+
         if (method?.toUpperCase() === 'POST') {
             return axios.post(url, config.data, options);
         } else if (method?.toUpperCase() === 'PATCH') {

diff --git a/packages/node-client/lib/types.ts b/packages/node-client/lib/types.ts
@@ -1,3 +1,5 @@
+import type { ParamsSerializerOptions } from 'axios';
+
 export interface ProxyConfiguration {
     // allows for dynamic checking of required params
     [key: string]: any;
@@ -9,24 +11,7 @@ export interface ProxyConfiguration {
     method?: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE' | 'get' | 'post' | 'patch' | 'put' | 'delete';
     headers?: Record<string, string>;
     params?: string | Record<string, string>;
-    paramsSerializer?: {
-        encode?: (param: string) => string;
-        serialize?: (params: Record<string, any>, options?: ParamsSerializerOptions) => void;
-        indexes?: boolean;
-    };
+    paramsSerializer?: ParamsSerializerOptions;
     data?: unknown;
     retries?: number;
 }
-
-interface ParamsSerializerOptions {
-    encode?: ParamEncoder;
-    serialize?: CustomParamsSerializer;
-}
-
-interface ParamEncoder {
-    (value: any, defaultEncoder: (value: any) => any): any;
-}
-
-interface CustomParamsSerializer {
-    (params: Record<string, any>, options?: ParamsSerializerOptions): string;
-}
diff --git a/packages/server/lib/controllers/proxy.controller.ts b/packages/server/lib/controllers/proxy.controller.ts
@@ -1,6 +1,7 @@
-import type { Request, Response } from 'express';
+import type { Request, Response, NextFunction } from 'express';
 import type { OutgoingHttpHeaders } from 'http';
-import type { NextFunction } from 'express';
+import url, { UrlWithParsedQuery } from 'url';
+import querystring from 'querystring';
 import axios, { AxiosError, AxiosResponse } from 'axios';
 import { backOff } from 'exponential-backoff';
 
@@ -100,7 +101,10 @@ class ProxyController {
 
             const { method } = req;
 
-            const endpoint = req.params[0] as string;
+            const path = req.params[0] as string;
+            const { query }: UrlWithParsedQuery = url.parse(req.url, true) as unknown as UrlWithParsedQuery;
+            const queryString = querystring.stringify(query);
+            const endpoint = `${path}${queryString ? `?${queryString}` : ''}`;
 
             if (!endpoint) {
                 errorManager.errRes(res, 'missing_endpoint');