Add slash to gateway-url if missing (#11)

SURFnet · Sep 19, 2024 · b4c8b64 · b4c8b64
1 parent b81e181
commit b4c8b64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/nl/surf/eduhub/validator/service/main.clj b/src/nl/surf/eduhub/validator/service/main.clj
@@ -33,9 +33,10 @@
             [ring.middleware.json :refer [wrap-json-response]]))
 
 (defn validate-endpoint [endpoint-id {:keys [gateway-url gateway-basic-auth ooapi-version] :as _config}]
+  {:pre [gateway-url]}
   (log/info (str "validating endpoint: " endpoint-id " - gateway-url: " gateway-url))
   (try
-    (let [response (http/get (str gateway-url "courses")
+    (let [response (http/get (str gateway-url (if (.endsWith gateway-url "/") "" "/") "courses")
                              {:headers {"x-route" (str "endpoint=" endpoint-id)
                                         "accept" (str "application/json; version=" ooapi-version)
                                         "x-envelope-response" "false"}

diff --git a/test/nl/surf/eduhub/validator/service/main_test.clj b/test/nl/surf/eduhub/validator/service/main_test.clj
@@ -21,7 +21,7 @@
             [clojure.test :refer [deftest is]]
             [nl.surf.eduhub.validator.service.main :as main]))
 
-(def app (main/wrap-validator main/app-routes {}))
+(def app (main/wrap-validator main/app-routes {:gateway-url "http://gateway.dev.surf.nl"}))
 
 (deftest test-validate-correct
   (with-redefs [http/request (fn [_] {:status 200 :body "mocked response"})]