kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(buildUrl): relative url is invalid URL (OAS3) or non-url (OAS2) (#6864)

Browse Source 
* OAS3: relative url when no servers defined AND specUrl is invalid Url

* OAS2: specUrl is non-url string
This commit is contained in:
Tim Lai
2021-01-22 16:55:37 -08:00
committed by GitHub
parent cdfb64f711
commit a5eb3dc0c3
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/utils/url.js
View File

@@ -3,21 +3,25 @@ export function isAbsoluteUrl(url) {
}
export function addProtocol(url) {
if(!url.match(/^\/\//i)) return url // Checks if protocol is missing e.g. //example.com
if (!url.match(/^\/\//i)) return url // Checks if protocol is missing e.g. //example.com
return `${window.location.protocol}${url}`
}
export function buildBaseUrl(selectedServer, specUrl) {
if(!selectedServer) return specUrl
if(isAbsoluteUrl(selectedServer)) return addProtocol(selectedServer)
if (!selectedServer) return specUrl
if (isAbsoluteUrl(selectedServer)) return addProtocol(selectedServer)
return new URL(selectedServer, specUrl).href
}
export function buildUrl(url, specUrl, { selectedServer="" } = {}) {
if(!url) return
if(isAbsoluteUrl(url)) return url
export function buildUrl(url, specUrl, { selectedServer="" } = {}) {
if (!url) return
if (isAbsoluteUrl(url)) return url
const baseUrl = buildBaseUrl(selectedServer, specUrl)
if (!isAbsoluteUrl(baseUrl)) {
return new URL(url, window.location.href).href
}
return new URL(url, baseUrl).href
}