Skip to content

Commit 760fcae

Browse files
stevendannastevendanna
authored
automate-gateway: update swagger-ui to 3.35.2 (#4406)
Signed-off-by: Steven Danna <[email protected]>
1 parent 7e4ea1b commit 760fcae

17 files changed

+103
-204
lines changed

‎components/automate-gateway/Makefile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
include ../../Makefile.common_go
2-
.PHONY: docs run proto unit
2+
.PHONY: docs run proto unit vendor_swagger
33

44
BIN=automate-gateway
55
LINTERARGS:=--skip-files .*\.pb\.swagger\.go
6+
SWAGGER_UI_VERSION := 3.35.2
7+
SWAGGER_UI_URL := https://github.com/swagger-api/swagger-ui/archive/v$(SWAGGER_UI_VERSION).tar.gz
68

79
run:
810
@go run cmd/automate-gateway/automate-gateway.go serve --config config/config.toml
@@ -22,3 +24,9 @@ proto:
2224

2325
unit:
2426
@go test -v -cover ./...
27+
28+
vendor_swagger:
29+
rm -rf third_party/swagger-ui
30+
curl -L "$(SWAGGER_UI_URL)" | tar xzv -C third_party/ swagger-ui-$(SWAGGER_UI_VERSION)/dist
31+
mv third_party/swagger-ui-$(SWAGGER_UI_VERSION)/dist third_party/swagger-ui
32+
rm -rf third_party/swagger-ui-$(SWAGGER_UI_VERSION)/

‎components/automate-gateway/third_party/swagger-ui/favicon-16x16.png

220 Bytes
Loading

‎components/automate-gateway/third_party/swagger-ui/favicon-32x32.png

-513 Bytes
Loading

‎components/automate-gateway/third_party/swagger-ui/index.html

+55-91
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,60 @@
11
<!-- HTML for static distribution bundle build -->
22
<!DOCTYPE html>
33
<html lang="en">
4-
<head>
5-
<meta charset="UTF-8">
6-
<title>Swagger UI</title>
7-
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
8-
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
9-
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
10-
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
11-
<style>
12-
html
13-
{
14-
box-sizing: border-box;
15-
overflow: -moz-scrollbars-vertical;
16-
overflow-y: scroll;
4+
<head>
5+
<meta charset="UTF-8">
6+
<title>Swagger UI</title>
7+
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
8+
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
9+
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
10+
<style>
11+
html
12+
{
13+
box-sizing: border-box;
14+
overflow: -moz-scrollbars-vertical;
15+
overflow-y: scroll;
16+
}
17+
18+
*,
19+
*:before,
20+
*:after
21+
{
22+
box-sizing: inherit;
23+
}
24+
25+
body
26+
{
27+
margin:0;
28+
background: #fafafa;
29+
}
30+
</style>
31+
</head>
32+
33+
<body>
34+
<div id="swagger-ui"></div>
35+
36+
<script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
37+
<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
38+
<script>
39+
window.onload = function() {
40+
// Begin Swagger UI call region
41+
const ui = SwaggerUIBundle({
42+
url: "https://petstore.swagger.io/v2/swagger.json",
43+
dom_id: '#swagger-ui',
44+
deepLinking: true,
45+
presets: [
46+
SwaggerUIBundle.presets.apis,
47+
SwaggerUIStandalonePreset
48+
],
49+
plugins: [
50+
SwaggerUIBundle.plugins.DownloadUrl
51+
],
52+
layout: "StandaloneLayout"
53+
})
54+
// End Swagger UI call region
55+
56+
window.ui = ui
1757
}
18-
*,
19-
*:before,
20-
*:after
21-
{
22-
box-sizing: inherit;
23-
}
24-
25-
body {
26-
margin:0;
27-
background: #fafafa;
28-
}
29-
</style>
30-
</head>
31-
32-
<body>
33-
34-
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
35-
<defs>
36-
<symbol viewBox="0 0 20 20" id="unlocked">
37-
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
38-
</symbol>
39-
40-
<symbol viewBox="0 0 20 20" id="locked">
41-
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
42-
</symbol>
43-
44-
<symbol viewBox="0 0 20 20" id="close">
45-
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
46-
</symbol>
47-
48-
<symbol viewBox="0 0 20 20" id="large-arrow">
49-
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
50-
</symbol>
51-
52-
<symbol viewBox="0 0 20 20" id="large-arrow-down">
53-
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
54-
</symbol>
55-
56-
57-
<symbol viewBox="0 0 24 24" id="jump-to">
58-
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
59-
</symbol>
60-
61-
<symbol viewBox="0 0 24 24" id="expand">
62-
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
63-
</symbol>
64-
65-
</defs>
66-
</svg>
67-
68-
<div id="swagger-ui"></div>
69-
70-
<script src="./swagger-ui-bundle.js"> </script>
71-
<script src="./swagger-ui-standalone-preset.js"> </script>
72-
<script>
73-
window.onload = function() {
74-
75-
// Build a system
76-
const ui = SwaggerUIBundle({
77-
configUrl: "./config.json",
78-
dom_id: '#swagger-ui',
79-
deepLinking: true,
80-
presets: [
81-
SwaggerUIBundle.presets.apis,
82-
SwaggerUIStandalonePreset
83-
],
84-
plugins: [
85-
SwaggerUIBundle.plugins.DownloadUrl
86-
],
87-
layout: "StandaloneLayout",
88-
validatorUrl: null,
89-
})
90-
91-
window.ui = ui
92-
}
93-
</script>
94-
</body>
95-
58+
</script>
59+
</body>
9660
</html>

‎components/automate-gateway/third_party/swagger-ui/oauth2-redirect.html

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!doctype html>
22
<html lang="en-US">
3-
<body onload="run()">
3+
<title>Swagger UI: OAuth2 Redirect</title>
4+
<body>
45
</body>
56
</html>
67
<script>
@@ -27,7 +28,10 @@
2728

2829
isValid = qp.state === sentState
2930

30-
if (oauth2.auth.schema.get("flow") === "accessCode" && !oauth2.auth.code) {
31+
if ((
32+
oauth2.auth.schema.get("flow") === "accessCode"||
33+
oauth2.auth.schema.get("flow") === "authorizationCode"
34+
) && !oauth2.auth.code) {
3135
if (!isValid) {
3236
oauth2.errCb({
3337
authId: oauth2.auth.name,
@@ -42,16 +46,27 @@
4246
oauth2.auth.code = qp.code;
4347
oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
4448
} else {
49+
let oauthErrorMsg
50+
if (qp.error) {
51+
oauthErrorMsg = "["+qp.error+"]: " +
52+
(qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
53+
(qp.error_uri ? "More info: "+qp.error_uri : "");
54+
}
55+
4556
oauth2.errCb({
4657
authId: oauth2.auth.name,
4758
source: "auth",
4859
level: "error",
49-
message: "Authorization failed: no accessCode received from the server"
60+
message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
5061
});
5162
}
5263
} else {
5364
oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
5465
}
5566
window.close();
5667
}
68+
69+
window.addEventListener('DOMContentLoaded', function () {
70+
run();
71+
});
5772
</script>

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-bundle.js

+2-85
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-bundle.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-es-bundle-core.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-es-bundle-core.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-es-bundle.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-es-bundle.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-standalone-preset.js

+2-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui-standalone-preset.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui.css

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui.js

+2-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/automate-gateway/third_party/swagger-ui/swagger-ui.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)