From 8709fb2f0b0e6d38d2826888a15d9391d926dd94 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@nedap.com>
Date: Tue, 5 Oct 2021 12:20:09 +0200
Subject: [PATCH] add a slash before the path and a questionmark before the
 querystring

---
 .../src/components/integration/index.svelte        |  6 +++---
 packages/server/src/integrations/rest.ts           | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/integration/index.svelte b/packages/builder/src/components/integration/index.svelte
index 5c821d3a53..a0e1b8c1c4 100644
--- a/packages/builder/src/components/integration/index.svelte
+++ b/packages/builder/src/components/integration/index.svelte
@@ -17,9 +17,9 @@
 
   $: urlDisplay =
     schema.urlDisplay &&
-    `${datasource.config.url}${query.fields.path ?? ""}${
-      query.fields.queryString ?? ""
-    }`
+    `${datasource.config.url}${
+      query.fields.path ? "/" + query.fields.path : ""
+    }${query.fields.queryString ? "?" + query.fields.queryString : ""}`
 
   function updateQuery({ detail }) {
     query.fields[schema.type] = detail.value
diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index d6cf71e324..9c6ece52d6 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/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,
       })