swagger-client 3.27.6 → 3.27.8

package/dist/swagger-client.browser.js

@@ -220,7 +220,7 @@ function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  req.url += baseUrl({
+  const baseURL = baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -229,6 +229,7 @@ function buildRequest(options) {
     pathName,
     method
   });
+  req.url += baseURL;
 
   // Mostly for testing
   if (!operationId) {
@@ -292,7 +293,7 @@ function buildRequest(options) {
         value,
         operation,
         spec,
-        pathName
+        baseURL
       });
     }
   });
@@ -372,7 +373,7 @@ function oas3BaseUrl({
   }
   if (selectedServerUrl.includes('{')) {
     // do variable substitution
-    const varNames = getVariableTemplateNames(selectedServerUrl);
+    const varNames = extractServerVariableNames(selectedServerUrl);
     varNames.forEach(variable => {
       if (selectedServerObj.variables && selectedServerObj.variables[variable]) {
         // variable is defined in server
@@ -402,16 +403,9 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function getVariableTemplateNames(str) {
-  const results = [];
-  const re = /{([^}]{1,29})}/g;
-  let text;
-
-  // eslint-disable-next-line no-cond-assign
-  while (text = re.exec(str)) {
-    results.push(text[1]);
-  }
-  return results;
+function extractServerVariableNames(serverURL) {
+  const match = serverURL.matchAll(/\{([^{}]+)}|([^{}]+)/g);
+  return Array.from(match, ([, variable]) => variable).filter(Boolean);
 }
 
 // Compose the baseUrl ( scheme + host + basePath )
@@ -680,7 +674,7 @@ function path({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   const {
     name,
@@ -689,16 +683,17 @@ function path({
     content
   } = parameter;
   if (value === undefined) return;
+  const pathname = req.url.replace(baseURL, '');
   let resolvedPathname;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathName, {
+    resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathname, {
       [name]: value
     }, {
       encoder: val => (0,_style_serializer_js__WEBPACK_IMPORTED_MODULE_1__.encodeCharacters)((0,_content_serializer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(val, effectiveMediaType))
     });
   } else {
-    resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathName, {
+    resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathname, {
       [name]: value
     }, {
       encoder: val => (0,_style_serializer_js__WEBPACK_IMPORTED_MODULE_1__["default"])({
@@ -710,7 +705,7 @@ function path({
       })
     });
   }
-  req.url = req.url.replace(pathName, resolvedPathname);
+  req.url = baseURL + resolvedPathname;
 }
 function query({
   req,
@@ -1167,13 +1162,14 @@ function pathBuilder({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   if (value !== undefined) {
-    const resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathName, {
+    const pathname = req.url.replace(baseURL, '');
+    const resolvedPathname = (0,openapi_path_templating__WEBPACK_IMPORTED_MODULE_0__.resolve)(pathname, {
       [parameter.name]: value
     });
-    req.url = req.url.replace(pathName, resolvedPathname);
+    req.url = baseURL + resolvedPathname;
   }
 }