Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: swagger-api/swagger-ui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 77f4651cbf5b3767f0d79c91fd337de82b6ddee6
Choose a base ref
...
head repository: swagger-api/swagger-ui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9064157e710d0c56d4459b5a7c16751ad0ae72c
Choose a head ref
Loading
Showing with 10,971 additions and 9,727 deletions.
  1. +0 −58 CONTRIBUTING.md
  2. +1 −1 Dockerfile
  3. +199 −9 LICENSE
  4. +3 −18 README.md
  5. +2 −1 dev-helpers/index.html
  6. +1 −0 dist/oauth2-redirect.html
  7. +19 −27 dist/swagger-ui-bundle.js
  8. +1 −1 dist/swagger-ui-bundle.js.map
  9. +5 −5 dist/swagger-ui-standalone-preset.js
  10. +1 −1 dist/swagger-ui-standalone-preset.js.map
  11. +1 −1 dist/swagger-ui.css
  12. +1 −1 dist/swagger-ui.css.map
  13. +3 −3 dist/swagger-ui.js
  14. +1 −1 dist/swagger-ui.js.map
  15. +5 −1 docker/configurator/oauth.js
  16. +1 −0 docker/nginx.conf
  17. +7 −0 docs/customization/plugin-api.md
  18. +15 −3 docs/development/setting-up.md
  19. +1 −1 docs/usage/configuration.md
  20. +6 −2 docs/usage/installation.md
  21. +3 −1 docs/usage/oauth2.md
  22. +18 −0 flavors/swagger-ui-react/README.md
  23. +15 −3 flavors/swagger-ui-react/index.js
  24. +8,064 −9,258 package-lock.json
  25. +50 −45 package.json
  26. +4 −4 release/.release-it.json
  27. +5 −0 src/core/components/auth/auths.jsx
  28. +1 −2 src/core/components/auth/basic-auth.jsx
  29. +1 −1 src/core/components/auth/oauth2.jsx
  30. +6 −0 src/core/components/execute.jsx
  31. +3 −3 src/core/components/live-response.jsx
  32. +1 −1 src/core/components/model.jsx
  33. +1 −1 src/core/components/object-model.jsx
  34. +3 −8 src/core/components/parameter-include-empty.jsx
  35. +30 −26 src/core/components/parameter-row.jsx
  36. +8 −0 src/core/components/parameters/parameters.jsx
  37. +27 −27 src/core/components/providers/markdown.jsx
  38. +2 −2 src/core/components/response-body.jsx
  39. +0 −2 src/core/containers/OperationContainer.jsx
  40. +21 −3 src/core/curlify.js
  41. +179 −81 src/core/json-schema-components.jsx
  42. +13 −1 src/core/oauth2-authorize.js
  43. +3 −2 src/core/plugins/auth/actions.js
  44. +4 −1 src/core/plugins/auth/reducers.js
  45. +2 −1 src/core/plugins/deep-linking/operation-wrapper.jsx
  46. +8 −0 src/core/plugins/oas3/actions.js
  47. +1 −2 src/core/plugins/oas3/components/http-auth.jsx
  48. +26 −12 src/core/plugins/oas3/components/request-body.jsx
  49. +5 −0 src/core/plugins/oas3/reducers.js
  50. +6 −1 src/core/plugins/oas3/selectors.js
  51. +3 −2 src/core/plugins/oas3/wrap-components/json-schema-string.jsx
  52. +1 −1 src/core/plugins/oas3/wrap-components/markdown.jsx
  53. +3 −3 src/core/plugins/oas3/wrap-components/online-validator-badge.js
  54. +3 −2 src/core/plugins/spec/actions.js
  55. +7 −3 src/core/plugins/view/root-injects.jsx
  56. +123 −23 src/core/utils.js
  57. +34 −9 src/helpers/get-parameter-schema.js
  58. +1 −1 src/style/_layout.scss
  59. +1 −0 src/style/_table.scss
  60. +47 −0 test/e2e-cypress/static/documents/bugs/4641.yaml
  61. +28 −0 test/e2e-cypress/static/documents/bugs/6016-oas2.yaml
  62. +31 −0 test/e2e-cypress/static/documents/bugs/6016-oas3.yaml
  63. +339 −0 test/e2e-cypress/static/documents/features/schema-form-core.yaml
  64. +119 −0 test/e2e-cypress/static/documents/features/schema-form-missing-values.yaml
  65. +99 −0 test/e2e-cypress/tests/bugs/4641.js
  66. +32 −0 test/e2e-cypress/tests/bugs/5070.js
  67. +42 −0 test/e2e-cypress/tests/bugs/6016.js
  68. +879 −0 test/e2e-cypress/tests/features/schema-form.js
  69. +21 −21 test/mocha/components/json-schema-form.jsx
  70. +17 −2 test/mocha/components/live-response.jsx
  71. +88 −0 test/mocha/components/parameter-row.jsx
  72. +32 −1 test/mocha/core/curlify.js
  73. +13 −7 test/mocha/core/helpers/get-parameter-schema.js
  74. +44 −9 test/mocha/core/oauth2-authorize.js
  75. +29 −1 test/mocha/core/plugins/auth/actions.js
  76. +3 −3 test/mocha/core/system/system.jsx
  77. +144 −17 test/mocha/core/utils.js
  78. +5 −0 test/mocha/docker/oauth.js
58 changes: 0 additions & 58 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# We don't declare them here — take a look at our docs.
# https://github.com/swagger-api/swagger-ui/blob/master/docs/usage/configuration.md

FROM nginx:1.17-alpine
FROM nginx:1.19-alpine

RUN apk --no-cache add nodejs

208 changes: 199 additions & 9 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,11 +1,201 @@
Copyright 2019 SmartBear Software
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2020 SmartBear Software Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
21 changes: 3 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# <img src="https://raw.githubusercontent.com/swagger-api/swagger.io/wordpress/images/assets/SWU-logo-clr.png" height="80">
# <img src="https://raw.githubusercontent.com/swagger-api/swagger.io/wordpress/images/assets/SWU-logo-clr.png" width="300">

[![NPM version](https://badge.fury.io/js/swagger-ui.svg)](http://badge.fury.io/js/swagger-ui)
[![Build Status](https://jenkins.swagger.io/view/OSS%20-%20JavaScript/job/oss-swagger-ui-master/badge/icon?subject=jenkins%20build)](https://jenkins.swagger.io/view/OSS%20-%20JavaScript/job/oss-swagger-ui-master/)
@@ -60,12 +60,12 @@ Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
##### Integration Tests

You will need JDK of version 7 or higher as instructed here
http://nightwatchjs.org/gettingstarted#selenium-server-setup
https://nightwatchjs.org/gettingstarted/#selenium-server-setup

Integration tests can be run locally with `npm run e2e` - be sure you aren't running a dev server when testing!

### Browser support
Swagger UI works in the latest versions of Chrome, Safari, Firefox, Edge and IE11.
Swagger UI works in the latest versions of Chrome, Safari, Firefox, and Edge.

### Known Issues

@@ -80,18 +80,3 @@ To help with the migration, here are the currently known issues with 3.X. This l
## Security contact

Please disclose any security-related issues or vulnerabilities by emailing [security@swagger.io](mailto:security@swagger.io), instead of using the public issue tracker.

## License

Copyright 2019 SmartBear Software

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

3 changes: 2 additions & 1 deletion dev-helpers/index.html
Original file line number Diff line number Diff line change
@@ -62,7 +62,8 @@
realm: "your-realms",
appName: "your-app-name",
scopeSeparator: " ",
additionalQueryStringParams: {}
additionalQueryStringParams: {},
usePkceWithAuthorizationCodeGrant: false
})
}
</script>
1 change: 1 addition & 0 deletions dist/oauth2-redirect.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!doctype html>
<html lang="en-US">
<title>Swagger UI: OAuth2 Redirect</title>
<body onload="run()">
</body>
</html>
Loading