Merge pull request #6 from mgagliardo91/patch-auth-url

fix(auth): Cache as authorize_url and respect relative server urls
danielgtaylor · Sep 2, 2020 · 5a6424d · 5a6424d
2 parents f254e92 + d895bf9
commit 5a6424d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/oauth/authcode.go b/oauth/authcode.go
@@ -154,7 +154,7 @@ type AuthorizationCodeHandler struct{}
 func (h *AuthorizationCodeHandler) Parameters() []cli.AuthParam {
 	return []cli.AuthParam{
 		{Name: "client_id", Required: true, Help: "OAuth 2.0 Client ID"},
-		{Name: "authorization_url", Required: true, Help: "OAuth 2.0 authorization URL, e.g. https://api.example.com/oauth/authorize"},
+		{Name: "authorize_url", Required: true, Help: "OAuth 2.0 authorization URL, e.g. https://api.example.com/oauth/authorize"},
 		{Name: "token_url", Required: true, Help: "OAuth 2.0 token URL, e.g. https://api.example.com/oauth/token"},
 		{Name: "scopes", Help: "Optional scopes to request in the token"},
 	}

diff --git a/openapi/openapi.go b/openapi/openapi.go
@@ -345,7 +345,9 @@ func loadOpenAPI3(cfg Resolver, cmd *cobra.Command, location *url.URL, resp *htt
 	basePath := ""
 	prefix := location.Scheme + "://" + location.Host
 	for _, s := range swagger.Servers {
-		if strings.HasPrefix(s.URL, prefix) {
+		if strings.HasPrefix(s.URL, "/") {
+			basePath = s.URL
+		} else if strings.HasPrefix(s.URL, prefix) {
 			base, err := url.Parse(s.URL)
 			if err != nil {
 				return cli.API{}, err