From 8e1587d60149a83afed57187b9fc6a0c2a2e16dc Mon Sep 17 00:00:00 2001 From: akop Date: Fri, 21 May 2021 15:49:39 +0200 Subject: [PATCH 1/2] remove inline-code --- dev-helpers/dev-helper-initializer.js | 30 +++++++++++++++ dev-helpers/index.html | 53 +-------------------------- dev-helpers/style.css | 19 ++++++++++ dist/index.css | 16 ++++++++ dist/index.html | 45 +---------------------- dist/swagger-initializer.js | 20 ++++++++++ docker/configurator/index.js | 21 ++++++----- docker/run.sh | 29 +++------------ 8 files changed, 107 insertions(+), 126 deletions(-) create mode 100644 dev-helpers/dev-helper-initializer.js create mode 100644 dev-helpers/style.css create mode 100644 dist/index.css create mode 100644 dist/swagger-initializer.js diff --git a/dev-helpers/dev-helper-initializer.js b/dev-helpers/dev-helper-initializer.js new file mode 100644 index 00000000000..9eb92a82b77 --- /dev/null +++ b/dev-helpers/dev-helper-initializer.js @@ -0,0 +1,30 @@ +window.onload = function() { + window["SwaggerUIBundle"] = window["swagger-ui-bundle"] + window["SwaggerUIStandalonePreset"] = window["swagger-ui-standalone-preset"] + // Build a system + const ui = SwaggerUIBundle({ + url: "https://petstore.swagger.io/v2/swagger.json", + dom_id: '#swagger-ui', + presets: [ + SwaggerUIBundle.presets.apis, + SwaggerUIStandalonePreset + ], + plugins: [ + SwaggerUIBundle.plugins.DownloadUrl + ], + layout: "StandaloneLayout" + }) + + window.ui = ui + + ui.initOAuth({ + clientId: "your-client-id", + clientSecret: "your-client-secret-if-required", + realm: "your-realms", + appName: "your-app-name", + scopeSeparator: " ", + scopes: "openid profile email phone address", + additionalQueryStringParams: {}, + usePkceWithAuthorizationCodeGrant: false + }) +} diff --git a/dev-helpers/index.html b/dev-helpers/index.html index 2b92c403b9d..52b7f35b900 100644 --- a/dev-helpers/index.html +++ b/dev-helpers/index.html @@ -5,64 +5,15 @@ Swagger UI +
- - + diff --git a/dev-helpers/style.css b/dev-helpers/style.css new file mode 100644 index 00000000000..75a5daacdb1 --- /dev/null +++ b/dev-helpers/style.css @@ -0,0 +1,19 @@ +html +{ + box-sizing: border-box; + overflow: -moz-scrollbars-vertical; + overflow-y: scroll; +} + +*, +*:before, +*:after +{ + box-sizing: inherit; +} + +body +{ + margin:0; + background: #fafafa; +} diff --git a/dist/index.css b/dist/index.css new file mode 100644 index 00000000000..f2376fdaa84 --- /dev/null +++ b/dist/index.css @@ -0,0 +1,16 @@ +html { + box-sizing: border-box; + overflow: -moz-scrollbars-vertical; + overflow-y: scroll; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +body { + margin: 0; + background: #fafafa; +} diff --git a/dist/index.html b/dist/index.html index 2a9d4e2723b..84ae62d3dad 100644 --- a/dist/index.html +++ b/dist/index.html @@ -5,56 +5,15 @@ Swagger UI + -
- - + diff --git a/dist/swagger-initializer.js b/dist/swagger-initializer.js new file mode 100644 index 00000000000..8ea0ea3afc3 --- /dev/null +++ b/dist/swagger-initializer.js @@ -0,0 +1,20 @@ +window.onload = function() { + // + + // the following lines will be replaced by docker/configurator, when it runs in a docker-container + window.ui = SwaggerUIBundle({ + url: "https://petstore.swagger.io/v2/swagger.json", + dom_id: '#swagger-ui', + deepLinking: true, + presets: [ + SwaggerUIBundle.presets.apis, + SwaggerUIStandalonePreset + ], + plugins: [ + SwaggerUIBundle.plugins.DownloadUrl + ], + layout: "StandaloneLayout" + }); + + // +}; diff --git a/docker/configurator/index.js b/docker/configurator/index.js index df44f1da18c..2ecc227377a 100755 --- a/docker/configurator/index.js +++ b/docker/configurator/index.js @@ -1,3 +1,7 @@ +/* + * Replace static code with configured data based on environment-variables. + * This code should be called BEFORE the webserver serve the api-documentation. + */ const fs = require("fs") const path = require("path") @@ -5,8 +9,8 @@ const translator = require("./translator") const oauthBlockBuilder = require("./oauth") const indent = require("./helpers").indent -const START_MARKER = "// Begin Swagger UI call region" -const END_MARKER = "// End Swagger UI call region" +const START_MARKER = "//" +const END_MARKER = "//" const targetPath = path.normalize(process.cwd() + "/" + process.argv[2]) @@ -22,12 +26,12 @@ const afterEndMarkerContent = originalHtmlContent.slice( if (startMarkerIndex < 0 || endMarkerIndex < 0) { console.error("ERROR: Swagger UI was unable to inject Docker configuration data!") - console.error("! This can happen when you provide custom HTML to Swagger UI.") + console.error("! This can happen when you provide custom HTML/JavaScript to Swagger UI.") console.error("! ") - console.error("! In order to solve this, add the `Begin Swagger UI call region`") - console.error("! and `End Swagger UI call region` markers to your HTML.") + console.error(`! In order to solve this, add the "${START_MARKER}"`) + console.error(`! and "${END_MARKER}" markers to your JavaScript.`) console.error("! See the repository for an example:") - console.error("! https://github.com/swagger-api/swagger-ui/blob/02758b8125dbf38763cfd5d4f91c7c803e9bd0ad/dist/index.html#L40-L54") + console.error("! https://github.com/swagger-api/swagger-ui/blob/8c946a02e73ef877d73b7635de27924418ba50f3/dist/swagger-initializer.js#L2-L19") console.error("! ") console.error("! If you're seeing this message and aren't using custom HTML,") console.error("! this message may be a bug. Please file an issue:") @@ -39,10 +43,9 @@ fs.writeFileSync( targetPath, `${beforeStartMarkerContent} ${START_MARKER} - const ui = SwaggerUIBundle({ - ${indent(translator(process.env, { injectBaseConfig: true }), 8, 2)} + window.ui = SwaggerUIBundle({ + ${indent(translator(process.env, {injectBaseConfig: true}), 8, 2)} }) - ${indent(oauthBlockBuilder(process.env), 6, 2)} ${END_MARKER} ${afterEndMarkerContent}` diff --git a/docker/run.sh b/docker/run.sh index c3899f2765c..115314eaf59 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -3,36 +3,19 @@ set -e BASE_URL=${BASE_URL:-/} NGINX_ROOT=/usr/share/nginx/html -INDEX_FILE=$NGINX_ROOT/index.html +INITIALIZER_SCRIPT=$NGINX_ROOT/swagger-initializer.js NGINX_CONF=/etc/nginx/nginx.conf -node /usr/share/nginx/configurator $INDEX_FILE +node /usr/share/nginx/configurator $INITIALIZER_SCRIPT -replace_in_index () { - if [ "$1" != "**None**" ]; then - sed -i "s|/\*||g" $INDEX_FILE - sed -i "s|\*/||g" $INDEX_FILE - sed -i "s|$1|$2|g" $INDEX_FILE - fi -} - -replace_or_delete_in_index () { - if [ -z "$2" ]; then - sed -i "/$1/d" $INDEX_FILE - else - replace_in_index $1 $2 - fi -} if [[ "${BASE_URL}" != "/" ]]; then sed -i "s|location / {|location $BASE_URL {|g" $NGINX_CONF fi -replace_in_index myApiKeyXXXX123456789 $API_KEY - if [ "$SWAGGER_JSON_URL" ]; then - sed -i "s|https://petstore.swagger.io/v2/swagger.json|$SWAGGER_JSON_URL|g" $INDEX_FILE - sed -i "s|http://example.com/api|$SWAGGER_JSON_URL|g" $INDEX_FILE + sed -i "s|https://petstore.swagger.io/v2/swagger.json|$SWAGGER_JSON_URL|g" $INITIALIZER_SCRIPT + sed -i "s|http://example.com/api|$SWAGGER_JSON_URL|g" $INITIALIZER_SCRIPT fi if [[ -f "$SWAGGER_JSON" ]]; then @@ -52,8 +35,8 @@ if [[ -f "$SWAGGER_JSON" ]]; then fi sed -i "s|#SWAGGER_ROOT|root $SWAGGER_ROOT/;|g" $NGINX_CONF - sed -i "s|https://petstore.swagger.io/v2/swagger.json|$REL_PATH|g" $INDEX_FILE - sed -i "s|http://example.com/api|$REL_PATH|g" $INDEX_FILE + sed -i "s|https://petstore.swagger.io/v2/swagger.json|$REL_PATH|g" $INITIALIZER_SCRIPT + sed -i "s|http://example.com/api|$REL_PATH|g" $INITIALIZER_SCRIPT fi # replace the PORT that nginx listens on if PORT is supplied From 79839948b409f88351fafe30b4503334fa702cc9 Mon Sep 17 00:00:00 2001 From: Daniil Leontiev Date: Tue, 22 Mar 2022 01:23:27 +0300 Subject: [PATCH 2/2] add missing "useBasicAuthenticationWithAccessCodeGrant: false" after merge conflict --- dev-helpers/dev-helper-initializer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-helpers/dev-helper-initializer.js b/dev-helpers/dev-helper-initializer.js index 9eb92a82b77..aaf2624aeb2 100644 --- a/dev-helpers/dev-helper-initializer.js +++ b/dev-helpers/dev-helper-initializer.js @@ -25,6 +25,7 @@ window.onload = function() { scopeSeparator: " ", scopes: "openid profile email phone address", additionalQueryStringParams: {}, + useBasicAuthenticationWithAccessCodeGrant: false, usePkceWithAuthorizationCodeGrant: false }) }