Browse Source

fix(validator-badge): resolve definition URLs against browser location (#4580)

bubble
kyle 6 years ago
committed by GitHub
parent
commit
32ab8b3ce8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
  1. +15
    -4
      src/core/components/online-validator-badge.jsx

+ 15
- 4
src/core/components/online-validator-badge.jsx View File

@@ -1,6 +1,9 @@
import React from "react" import React from "react"
import URL from "url-parse"

import PropTypes from "prop-types" import PropTypes from "prop-types"
import { sanitizeUrl } from "core/utils" import { sanitizeUrl } from "core/utils"
import win from "core/window"


export default class OnlineValidatorBadge extends React.Component { export default class OnlineValidatorBadge extends React.Component {
static propTypes = { static propTypes = {
@@ -11,20 +14,28 @@ export default class OnlineValidatorBadge extends React.Component {


constructor(props, context) { constructor(props, context) {
super(props, context) super(props, context)
let { specSelectors, getConfigs } = props
let { getConfigs } = props
let { validatorUrl } = getConfigs() let { validatorUrl } = getConfigs()
this.state = { this.state = {
url: specSelectors.url(),
url: this.getDefinitionUrl(),
validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : validatorUrl validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : validatorUrl
} }
} }


getDefinitionUrl = () => {
// TODO: test this behavior by stubbing `window.location` in an Enzyme/JSDom env
let { specSelectors } = this.props

const urlObject = new URL(specSelectors.url(), win.location)
return urlObject.toString()
}

componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
let { specSelectors, getConfigs } = nextProps
let { getConfigs } = nextProps
let { validatorUrl } = getConfigs() let { validatorUrl } = getConfigs()


this.setState({ this.setState({
url: specSelectors.url(),
url: this.getDefinitionUrl(),
validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : validatorUrl validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : validatorUrl
}) })
} }


Loading…
Cancel
Save