SCAL-216295 : Fix for objects in arrays (#12)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thoughtspot/rise",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Rise above the REST with GraphQL",
   "main": "dist/index.js",
   "scripts": {

src/index.ts

@@ -154,11 +154,20 @@ export function rise(
             args = { ...args, ...source?.__args };
 
             Object.keys(args).forEach((arg) => {
-              if (typeof args[arg] !== 'object' || Array.isArray(args[arg])) {
-                urlToFetch = urlToFetch.replace(`$${arg}`, encodeURI(args[arg]));
-              } else {
-                urlToFetch = urlToFetch.replace(`$${arg}`, '');
+              const argToReplace = `$${arg}`;
+              if (!urlToFetch.includes(argToReplace)) return;
+
+              let argToReplaceValue = '';
+
+             try {
+                if (typeof args[arg] !== 'object' || Array.isArray(args[arg])) {
+                  argToReplaceValue = encodeURI(args[arg]);
+                }
+              } catch (e) {
+                console.debug(`[Rise] Error encoding ${arg}, Message: ${(e as any)?.message || ''}`);
               }
+
+              urlToFetch = urlToFetch.replace(argToReplace, argToReplaceValue);
             });
 
             if (method !== 'GET' && method !== 'HEAD') {

test/index.ts

@@ -348,6 +348,42 @@ describe('Should call the Target', () => {
       });
       expect(res3.errors).toBeUndefined();
     });
+
+    test('when array of object is passed', async () => {
+      const testIdentifier = 'test123';
+      nock('https://rise.com/callosum/v1')
+        .get(() => true)
+        .reply(200, function () {
+          const query = new URLSearchParams(this.req.path.split('?')[1]);
+          expect(this.req.path).toContain(`/v2/users/${testIdentifier}`);
+          expect(query.get('paramObj')).toEqual('');
+          return {
+            data: {
+              params: query.get('paramObj'),
+            },
+          };
+        });
+      const res = await graphql({
+        schema,
+        source: `
+        mutation {
+          getUserWithQueryParamArrayObject(identifier: "${testIdentifier}", paramObj: [{email: "hi"}]) {
+            params
+          }
+        }
+      `,
+        contextValue: {
+          req: {
+            headers: {
+              cookie: 'a=a',
+              foo: 'bar',
+            },
+          },
+        },
+      });
+
+      expect(res.errors).toBeUndefined();
+    });
   });
 });
 

test/schema.graphql

@@ -131,4 +131,10 @@
       path: "/v2/users/?params=$qParamsStr&paramsInt=$qParamsInt&test=yes&paramObj=$paramObj",
       method: "GET",
     ),
+
+    getUserWithQueryParamArrayObject(identifier: String!, paramObj: [ParamInput]): ParamResponse
+    @service(
+      path: "/v2/users/$identifier?paramObj=$paramObj",
+      method: "GET",
+    ),
   }