allow override of configuration.baseUrl by passing full URL with prot…

…ocol
OpenFn · Apr 5, 2022 · f7b60a2 · f7b60a2
1 parent a1450a5
commit f7b60a2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/lib/Utils.js b/lib/Utils.js
@@ -19,10 +19,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function setUrl(configuration, path) {
   const baseUrl = configuration === null || configuration === void 0 ? void 0 : configuration.baseUrl;
+  if (isValidHttpUrl(path)) return path;
   if (baseUrl) return `${baseUrl.replace(/\/$/, '')}/${path.replace(/^\/+/g, '')}`;
   return path;
 }
 
+function isValidHttpUrl(string) {
+  let url;
+
+  try {
+    url = new URL(string);
+  } catch (_) {
+    return false;
+  }
+
+  return url.protocol === 'http:' || url.protocol === 'https:';
+}
+
 function setAuth(configuration, manualAuth) {
   if (manualAuth) return manualAuth;else if (configuration && configuration.username) return {
     username: configuration.username,

diff --git a/src/Utils.js b/src/Utils.js
@@ -5,12 +5,26 @@ import safeStringify from 'fast-safe-stringify';
 export function setUrl(configuration, path) {
   const baseUrl = configuration?.baseUrl;
 
+  if (isValidHttpUrl(path)) return path;
+
   if (baseUrl)
     return `${baseUrl.replace(/\/$/, '')}/${path.replace(/^\/+/g, '')}`;
 
   return path;
 }
 
+function isValidHttpUrl(string) {
+  let url;
+
+  try {
+    url = new URL(string);
+  } catch (_) {
+    return false;
+  }
+
+  return url.protocol === 'http:' || url.protocol === 'https:';
+}
+
 export function setAuth(configuration, manualAuth) {
   if (manualAuth) return manualAuth;
   else if (configuration && configuration.username)