Merge pull request #2894 from mslourens/update_rest_url_with_slash_questionmark

add a slash before the path and a questionmark before the querystring

packages/builder/src/components/integration/index.svelte

@@ -17,9 +17,9 @@
 
   $: urlDisplay =
     schema.urlDisplay &&
-    `${datasource.config.url}${query.fields.path ?? ""}${
+    `${datasource.config.url}${
-      query.fields.queryString ?? ""
+      query.fields.path ? "/" + query.fields.path : ""
-    }`
+    }${query.fields.queryString ? "?" + query.fields.queryString : ""}`
 
   function updateQuery({ detail }) {
     query.fields[schema.type] = detail.value

packages/server/src/integrations/rest.ts

@@ -152,13 +152,17 @@ module RestModule {
       }
     }
 
+    getUrl(path: string, queryString: string): string {
+      return `${this.config.url}/${path}?${queryString}`
+    }
+
     async create({ path = "", queryString = "", headers = {}, json = {} }) {
       this.headers = {
         ...this.config.defaultHeaders,
         ...headers,
       }
 
-      const response = await fetch(this.config.url + path + queryString, {
+      const response = await fetch(this.getUrl(path, queryString), {
         method: "POST",
         headers: this.headers,
         body: JSON.stringify(json),
@@ -173,7 +177,7 @@ module RestModule {
         ...headers,
       }
 
-      const response = await fetch(this.config.url + path + queryString, {
+      const response = await fetch(this.getUrl(path, queryString), {
         headers: this.headers,
       })
 
@@ -186,7 +190,7 @@ module RestModule {
         ...headers,
       }
 
-      const response = await fetch(this.config.url + path + queryString, {
+      const response = await fetch(this.getUrl(path, queryString), {
         method: "POST",
         headers: this.headers,
         body: JSON.stringify(json),
@@ -201,7 +205,7 @@ module RestModule {
         ...headers,
       }
 
-      const response = await fetch(this.config.url + path + queryString, {
+      const response = await fetch(this.getUrl(path, queryString), {
         method: "PATCH",
         headers: this.headers,
         body: JSON.stringify(json),
@@ -216,7 +220,7 @@ module RestModule {
         ...headers,
       }
 
-      const response = await fetch(this.config.url + path + queryString, {
+      const response = await fetch(this.getUrl(path, queryString), {
         method: "DELETE",
         headers: this.headers,
       })

packages/server/src/integrations/tests/rest.spec.js

@@ -1,4 +1,6 @@
-jest.mock("node-fetch", () => jest.fn(() => ({ json: jest.fn(), text: jest.fn() })))
+jest.mock("node-fetch", () =>
+  jest.fn(() => ({ json: jest.fn(), text: jest.fn() }))
+)
 const fetch = require("node-fetch")
 const RestIntegration = require("../rest")
 
@@ -14,85 +16,85 @@ describe("REST Integration", () => {
 
   beforeEach(() => {
     config = new TestConfiguration({
-      url: BASE_URL
+      url: BASE_URL,
     })
   })
 
   it("calls the create method with the correct params", async () => {
     const query = {
-      path: "/api",
+      path: "api",
-      queryString: "?test=1",
+      queryString: "test=1",
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
       },
       json: {
-        name: "test"
+        name: "test",
-      }
+      },
     }
     const response = await config.integration.create(query)
     expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?test=1`, {
       method: "POST",
-      body: "{\"name\":\"test\"}",
+      body: '{"name":"test"}',
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
-      }
+      },
     })
   })
 
   it("calls the read method with the correct params", async () => {
     const query = {
-      path: "/api",
+      path: "api",
-      queryString: "?test=1",
+      queryString: "test=1",
       headers: {
-        Accept: "text/html"
+        Accept: "text/html",
-      }
+      },
     }
     const response = await config.integration.read(query)
     expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?test=1`, {
       headers: {
-        Accept: "text/html"
+        Accept: "text/html",
-      }
+      },
     })
   })
 
   it("calls the update method with the correct params", async () => {
     const query = {
-      path: "/api",
+      path: "api",
-      queryString: "?test=1",
+      queryString: "test=1",
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
       },
       json: {
-        name: "test"
+        name: "test",
-      }
+      },
     }
     const response = await config.integration.update(query)
     expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?test=1`, {
       method: "POST",
-      body: "{\"name\":\"test\"}",
+      body: '{"name":"test"}',
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
-      }
+      },
     })
   })
 
   it("calls the delete method with the correct params", async () => {
     const query = {
-      path: "/api",
+      path: "api",
-      queryString: "?test=1",
+      queryString: "test=1",
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
       },
       json: {
-        name: "test"
+        name: "test",
-      }
+      },
     }
     const response = await config.integration.delete(query)
     expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/api?test=1`, {
       method: "DELETE",
       headers: {
-        Accept: "application/json"
+        Accept: "application/json",
-      }
+      },
     })
   })
 })