..

ardatan · Aug 3, 2022 · bd0ee2f · bd0ee2f
1 parent f812c8a
commit bd0ee2f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/.changeset/tender-walls-grin.md b/.changeset/tender-walls-grin.md
@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/openapi': patch
+---
+
+Use `qs` to stringify query parameters because URLSearchParameters doesn't respect nested values
diff --git a/packages/handlers/openapi/src/openapi-to-graphql/resolver_builder.ts b/packages/handlers/openapi/src/openapi-to-graphql/resolver_builder.ts
@@ -469,7 +469,9 @@ export function getResolver<TSource, TContext, TArgs>(
       };
     }
 
-    urlObject.search = qs.stringify(query);
+    const allQueryParams = {};
+
+    Object.assign(allQueryParams, query);
 
     /**
      * Determine possible payload
@@ -512,22 +514,12 @@ export function getResolver<TSource, TContext, TArgs>(
       }
       // Query string:
       if (typeof data.options.qs === 'object') {
-        for (const query in data.options.qs) {
-          const val = data.options.qs[query];
-          if (val) {
-            urlObject.searchParams.set(query, val);
-          }
-        }
+        Object.assign(allQueryParams, data.options.qs);
       }
     }
 
     if (typeof customQs === 'object') {
-      for (const query in customQs) {
-        const val = customQs[query];
-        if (val) {
-          urlObject.searchParams.set(query, val);
-        }
-      }
+      Object.assign(allQueryParams, customQs);
     }
 
     // Get authentication headers and query parameters
@@ -541,12 +533,8 @@ export function getResolver<TSource, TContext, TArgs>(
           options.headers[headerName] = headerValue;
         }
       }
-      for (const query in authQs) {
-        const val = authQs[query];
-        if (val) {
-          urlObject.searchParams.set(query, val);
-        }
-      }
+
+      Object.assign(allQueryParams, authQs);
 
       // Add authentication cookie if created
       if (authCookie !== null) {
@@ -558,12 +546,7 @@ export function getResolver<TSource, TContext, TArgs>(
     // Extract OAuth token from context (if available)
     if (data.options.sendOAuthTokenInQuery) {
       const oauthQueryObj = createOAuthQS(data, ctx, logger);
-      for (const query in oauthQueryObj) {
-        const val = oauthQueryObj[query];
-        if (val) {
-          urlObject.searchParams.set(query, val);
-        }
-      }
+      Object.assign(allQueryParams, oauthQueryObj);
     } else {
       const oauthHeader = createOAuthHeader(data, ctx, logger);
       for (const headerName in oauthHeader) {
@@ -574,6 +557,8 @@ export function getResolver<TSource, TContext, TArgs>(
       }
     }
 
+    urlObject.search = qs.stringify(allQueryParams);
+
     const urlWithoutQuery = urlObject.href.replace(urlObject.search, '');
     resolveData.url = urlWithoutQuery;
     resolveData.usedRequestOptions = Object.assign({}, options);