mirror of
https://github.com/typeable/servant-swagger-ui.git
synced 2024-10-05 18:37:09 +03:00
Merge pull request #81 from haskell-servant/maksbotan/bump-versions
Bump swagger-ui, bump versions Fixes #80 Fixes #78 Fixes #79
This commit is contained in:
Maxim Koltsov
GitHub
commit
89a2415f50
59
.travis.yml
59
.travis.yml
@ -2,9 +2,13 @@
|
||||
#
|
||||
# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'
|
||||
#
|
||||
# To regenerate the script (for example after adjusting tested-with) run
|
||||
#
|
||||
# haskell-ci regenerate
|
||||
#
|
||||
# For more information, see https://github.com/haskell-CI/haskell-ci
|
||||
#
|
||||
# version: 0.9.20200121
|
||||
# version: 0.10.3
|
||||
#
|
||||
version: ~> 1.0
|
||||
language: c
|
||||
@ -32,26 +36,23 @@ before_cache:
|
||||
- rm -rfv $CABALHOME/packages/head.hackage
|
||||
jobs:
|
||||
include:
|
||||
- compiler: ghc-8.8.1
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
|
||||
- compiler: ghc-8.10.2
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.2","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
- compiler: ghc-8.8.4
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.4","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
- compiler: ghc-8.6.5
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
- compiler: ghc-8.4.4
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
- compiler: ghc-8.2.2
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
- compiler: ghc-8.0.2
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
|
||||
os: linux
|
||||
- compiler: ghc-7.10.3
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
|
||||
os: linux
|
||||
- compiler: ghc-7.8.4
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
|
||||
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
|
||||
os: linux
|
||||
before_install:
|
||||
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
|
||||
@ -105,6 +106,16 @@ install:
|
||||
echo "packages: servant-swagger-ui-example" >> cabal.project
|
||||
echo "packages: servant-swagger-ui-jensoleg" >> cabal.project
|
||||
echo "packages: servant-swagger-ui-redoc" >> cabal.project
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-core' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-example' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-jensoleg' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-redoc' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- |
|
||||
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
|
||||
- cat cabal.project || true
|
||||
@ -117,8 +128,8 @@ install:
|
||||
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
|
||||
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
|
||||
- rm cabal.project.freeze
|
||||
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
|
||||
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
|
||||
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
|
||||
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
|
||||
script:
|
||||
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
|
||||
# Packaging...
|
||||
@ -142,6 +153,16 @@ script:
|
||||
echo "packages: ${PKGDIR_servant_swagger_ui_example}" >> cabal.project
|
||||
echo "packages: ${PKGDIR_servant_swagger_ui_jensoleg}" >> cabal.project
|
||||
echo "packages: ${PKGDIR_servant_swagger_ui_redoc}" >> cabal.project
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-core' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-example' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-jensoleg' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-redoc' >> cabal.project ; fi
|
||||
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
|
||||
- |
|
||||
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
|
||||
- cat cabal.project || true
|
||||
@ -168,11 +189,11 @@ script:
|
||||
# Constraint set servant-0.14
|
||||
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all ; fi
|
||||
# Constraint set servant-0.15
|
||||
- if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi
|
||||
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi
|
||||
# Constraint set servant-0.16
|
||||
- if [ $HCNUMVER -ge 80000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
|
||||
- if [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
|
||||
# Constraint set servant-0.17
|
||||
- if [ $HCNUMVER -ge 80000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
|
||||
- if [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
|
||||
|
||||
# REGENDATA ("0.9.20200121",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
|
||||
# REGENDATA ("0.10.3",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
|
||||
# EOF
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
cabal-version: 1.12
|
||||
name: servant-swagger-ui-core
|
||||
version: 0.3.3
|
||||
x-revision: 3
|
||||
x-revision: 4
|
||||
synopsis: Servant swagger ui core components
|
||||
category: Web, Servant, Swagger
|
||||
description:
|
||||
@ -20,13 +20,12 @@ license: BSD3
|
||||
license-file: LICENSE
|
||||
build-type: Simple
|
||||
tested-with:
|
||||
GHC ==7.8.4
|
||||
|| ==7.10.3
|
||||
|| ==8.0.2
|
||||
GHC ==8.0.2
|
||||
|| ==8.2.2
|
||||
|| ==8.4.4
|
||||
|| ==8.6.5
|
||||
|| ==8.8.1
|
||||
|| ==8.8.4
|
||||
|| ==8.10.2
|
||||
|
||||
extra-source-files: Changelog.md
|
||||
|
||||
@ -38,14 +37,14 @@ library
|
||||
hs-source-dirs: src
|
||||
ghc-options: -Wall
|
||||
build-depends:
|
||||
base >=4.7 && <4.14
|
||||
base >=4.7 && <4.15
|
||||
, blaze-markup >=0.7.0.2 && <0.9
|
||||
, bytestring >=0.10.4.0 && <0.11
|
||||
, http-media >=0.7.1.3 && <0.9
|
||||
, servant >=0.14 && <0.18
|
||||
, servant >=0.14 && <0.19
|
||||
, servant-blaze >=0.8 && <0.10
|
||||
, servant-server >=0.14 && <0.18
|
||||
, swagger2 >=2.3.0.1 && <2.6
|
||||
, servant-server >=0.14 && <0.19
|
||||
, swagger2 >=2.3.0.1 && <2.7
|
||||
, text >=1.2.3.0 && <1.3
|
||||
, transformers >=0.3 && <0.6
|
||||
, transformers-compat >=0.3 && <0.7
|
||||
|
||||
@ -14,13 +14,12 @@ license: BSD3
|
||||
license-file: LICENSE
|
||||
build-type: Simple
|
||||
tested-with:
|
||||
GHC ==7.8.4
|
||||
|| ==7.10.3
|
||||
|| ==8.0.2
|
||||
GHC ==8.0.2
|
||||
|| ==8.2.2
|
||||
|| ==8.4.4
|
||||
|| ==8.6.5
|
||||
|| ==8.8.1
|
||||
|| ==8.8.4
|
||||
|| ==8.10.2
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
@ -30,10 +29,10 @@ executable servant-swagger-ui-example
|
||||
main-is: Main.hs
|
||||
ghc-options: -threaded
|
||||
build-depends:
|
||||
aeson >=0.8.0.2 && <1.5
|
||||
, base >=4.7 && <4.14
|
||||
aeson >=0.8.0.2 && <1.6
|
||||
, base >=4.7 && <4.15
|
||||
, base-compat >=0.9.3 && <0.12
|
||||
, lens >=4.7.0.1 && <4.19
|
||||
, lens >=4.7.0.1 && <4.20
|
||||
, servant
|
||||
, servant-server
|
||||
, servant-swagger
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
cabal-version: 1.12
|
||||
name: servant-swagger-ui-jensoleg
|
||||
version: 0.3.3
|
||||
x-revision: 3
|
||||
x-revision: 4
|
||||
synopsis: Servant swagger ui: Jens-Ole Graulund theme
|
||||
category: Web, Servant, Swagger
|
||||
description:
|
||||
@ -19,13 +19,12 @@ license: BSD3
|
||||
license-file: LICENSE
|
||||
build-type: Simple
|
||||
tested-with:
|
||||
GHC ==7.8.4
|
||||
|| ==7.10.3
|
||||
|| ==8.0.2
|
||||
GHC ==8.0.2
|
||||
|| ==8.2.2
|
||||
|| ==8.4.4
|
||||
|| ==8.6.5
|
||||
|| ==8.8.1
|
||||
|| ==8.8.4
|
||||
|| ==8.10.2
|
||||
|
||||
extra-source-files:
|
||||
jensoleg.index.html.tmpl
|
||||
@ -87,12 +86,12 @@ library
|
||||
ghc-options: -Wall
|
||||
build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
|
||||
build-depends:
|
||||
base >=4.7 && <4.14
|
||||
base >=4.7 && <4.15
|
||||
, bytestring >=0.10.4.0 && <0.11
|
||||
, file-embed-lzma >=0 && <0.1
|
||||
, servant >=0.14 && <0.18
|
||||
, servant-server >=0.14 && <0.18
|
||||
, swagger2 >=2.3.0.1 && <2.6
|
||||
, servant >=0.14 && <0.19
|
||||
, servant-server >=0.14 && <0.19
|
||||
, swagger2 >=2.3.0.1 && <2.7
|
||||
, text >=1.2.3.0 && <1.3
|
||||
|
||||
exposed-modules: Servant.Swagger.UI.JensOleG
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
cabal-version: 1.12
|
||||
name: servant-swagger-ui-redoc
|
||||
version: 0.3.3.1.22.3
|
||||
x-revision: 2
|
||||
x-revision: 3
|
||||
synopsis: Servant swagger ui: ReDoc theme
|
||||
category: Web, Servant, Swagger
|
||||
description:
|
||||
@ -19,7 +19,7 @@ license: BSD3
|
||||
license-file: LICENSE
|
||||
build-type: Simple
|
||||
tested-with:
|
||||
GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
|
||||
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
|
||||
|
||||
extra-source-files:
|
||||
redoc-dist-1.22.3/redoc.min.js
|
||||
@ -35,12 +35,12 @@ library
|
||||
ghc-options: -Wall
|
||||
build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
|
||||
build-depends:
|
||||
base >=4.7 && <4.14
|
||||
base >=4.7 && <4.15
|
||||
, bytestring >=0.10.4.0 && <0.11
|
||||
, file-embed-lzma >=0 && <0.1
|
||||
, servant >=0.14 && <0.18
|
||||
, servant-server >=0.14 && <0.18
|
||||
, swagger2 >=2.3.0.1 && <2.6
|
||||
, servant >=0.14 && <0.19
|
||||
, servant-server >=0.14 && <0.19
|
||||
, swagger2 >=2.3.0.1 && <2.7
|
||||
, text >=1.2.3.0 && <1.3
|
||||
|
||||
exposed-modules: Servant.Swagger.UI.ReDoc
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
- 0.3.4.3.36.1
|
||||
- Update to `swagger-ui-3.36.1`
|
||||
|
||||
- 0.3.4.3.23.11
|
||||
- Update to `swagger-ui-3.23.11`
|
||||
|
||||
|
||||
@ -43,8 +43,9 @@
|
||||
|
||||
<body>
|
||||
<div id="swagger-ui"></div>
|
||||
<script src="./swagger-ui-bundle.js"> </script>
|
||||
<script src="./swagger-ui-standalone-preset.js"> </script>
|
||||
|
||||
<script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
|
||||
<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
|
||||
<script>
|
||||
window.onload = function() {
|
||||
// servant-swagger-ui addition
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
cabal-version: 1.12
|
||||
name: servant-swagger-ui
|
||||
version: 0.3.4.3.23.11
|
||||
x-revision: 2
|
||||
version: 0.3.4.3.36.1
|
||||
synopsis: Servant swagger ui
|
||||
category: Web, Servant, Swagger
|
||||
description:
|
||||
@ -19,23 +18,23 @@ license: BSD3
|
||||
license-file: LICENSE
|
||||
build-type: Simple
|
||||
tested-with:
|
||||
GHC ==7.8.4
|
||||
|| ==7.10.3
|
||||
|| ==8.0.2
|
||||
GHC ==8.0.2
|
||||
|| ==8.2.2
|
||||
|| ==8.4.4
|
||||
|| ==8.6.5
|
||||
|| ==8.8.1
|
||||
|| ==8.8.4
|
||||
|| ==8.10.2
|
||||
|
||||
extra-source-files:
|
||||
CHANGELOG.md
|
||||
index.html.tmpl
|
||||
swagger-ui-dist-3.23.11/favicon-16x16.png
|
||||
swagger-ui-dist-3.23.11/favicon-32x32.png
|
||||
swagger-ui-dist-3.23.11/swagger-ui-bundle.js
|
||||
swagger-ui-dist-3.23.11/swagger-ui-standalone-preset.js
|
||||
swagger-ui-dist-3.23.11/swagger-ui.css
|
||||
swagger-ui-dist-3.23.11/swagger-ui.js
|
||||
swagger-ui-dist-3.36.1/favicon-16x16.png
|
||||
swagger-ui-dist-3.36.1/favicon-32x32.png
|
||||
swagger-ui-dist-3.36.1/oauth2-redirect.html
|
||||
swagger-ui-dist-3.36.1/swagger-ui-bundle.js
|
||||
swagger-ui-dist-3.36.1/swagger-ui-standalone-preset.js
|
||||
swagger-ui-dist-3.36.1/swagger-ui.css
|
||||
swagger-ui-dist-3.36.1/swagger-ui.js
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
@ -46,12 +45,12 @@ library
|
||||
ghc-options: -Wall
|
||||
build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
|
||||
build-depends:
|
||||
base >=4.7 && <4.14
|
||||
base >=4.7 && <4.15
|
||||
, bytestring >=0.10.4.0 && <0.11
|
||||
, file-embed-lzma >=0 && <0.1
|
||||
, servant >=0.14 && <0.18
|
||||
, servant-server >=0.14 && <0.18
|
||||
, swagger2 >=2.3.0.1 && <2.6
|
||||
, servant >=0.14 && <0.19
|
||||
, servant-server >=0.14 && <0.19
|
||||
, swagger2 >=2.3.0.1 && <2.7
|
||||
, text >=1.2.3.0 && <1.3
|
||||
|
||||
exposed-modules: Servant.Swagger.UI
|
||||
|
||||
@ -87,4 +87,4 @@ swaggerUiIndexTemplate :: Text
|
||||
swaggerUiIndexTemplate = $(embedText "index.html.tmpl")
|
||||
|
||||
swaggerUiFiles :: [(FilePath, ByteString)]
|
||||
swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-3.23.11")
|
||||
swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-3.36.1")
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 665 B After Width: | Height: | Size: 665 B |
|
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 628 B |
@ -0,0 +1,74 @@
|
||||
<!doctype html>
|
||||
<html lang="en-US">
|
||||
<head>
|
||||
<title>Swagger UI: OAuth2 Redirect</title>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
<script>
|
||||
'use strict';
|
||||
function run () {
|
||||
var oauth2 = window.opener.swaggerUIRedirectOauth2;
|
||||
var sentState = oauth2.state;
|
||||
var redirectUrl = oauth2.redirectUrl;
|
||||
var isValid, qp, arr;
|
||||
|
||||
if (/code|token|error/.test(window.location.hash)) {
|
||||
qp = window.location.hash.substring(1);
|
||||
} else {
|
||||
qp = location.search.substring(1);
|
||||
}
|
||||
|
||||
arr = qp.split("&")
|
||||
arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
|
||||
qp = qp ? JSON.parse('{' + arr.join() + '}',
|
||||
function (key, value) {
|
||||
return key === "" ? value : decodeURIComponent(value)
|
||||
}
|
||||
) : {}
|
||||
|
||||
isValid = qp.state === sentState
|
||||
|
||||
if ((
|
||||
oauth2.auth.schema.get("flow") === "accessCode"||
|
||||
oauth2.auth.schema.get("flow") === "authorizationCode"
|
||||
) && !oauth2.auth.code) {
|
||||
if (!isValid) {
|
||||
oauth2.errCb({
|
||||
authId: oauth2.auth.name,
|
||||
source: "auth",
|
||||
level: "warning",
|
||||
message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
|
||||
});
|
||||
}
|
||||
|
||||
if (qp.code) {
|
||||
delete oauth2.state;
|
||||
oauth2.auth.code = qp.code;
|
||||
oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
|
||||
} else {
|
||||
let oauthErrorMsg
|
||||
if (qp.error) {
|
||||
oauthErrorMsg = "["+qp.error+"]: " +
|
||||
(qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
|
||||
(qp.error_uri ? "More info: "+qp.error_uri : "");
|
||||
}
|
||||
|
||||
oauth2.errCb({
|
||||
authId: oauth2.auth.name,
|
||||
source: "auth",
|
||||
level: "error",
|
||||
message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
|
||||
});
|
||||
}
|
||||
} else {
|
||||
oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
|
||||
}
|
||||
window.close();
|
||||
}
|
||||
|
||||
window.addEventListener('DOMContentLoaded', function () {
|
||||
run();
|
||||
});
|
||||
</script>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
servant-swagger-ui/swagger-ui-dist-3.36.1/swagger-ui.css
Normal file
4
servant-swagger-ui/swagger-ui-dist-3.36.1/swagger-ui.css
Normal file
File diff suppressed because one or more lines are too long
3
servant-swagger-ui/swagger-ui-dist-3.36.1/swagger-ui.js
Normal file
3
servant-swagger-ui/swagger-ui-dist-3.36.1/swagger-ui.js
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user