diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,11 @@ -Revision History for `openid-connect` -===================================== +# Revision History for `openid-connect` -Version 0.1.0.0 (March 25, 2020) --------------------------------- +## Version 0.1.0 (March 25, 2020) Initial release. + +### Minor Releases + + * Version 0.1.1 (May 24, 2021) + + - Update dependencies to their latest versions (thanks to @maksbotan) diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2020 Peter J. Jones +Copyright (c) 2020-2021 Peter J. Jones All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![sthenauth](https://circleci.com/gh/sthenauth/openid-connect.svg?style=shield)](https://app.circleci.com/github/sthenauth/openid-connect/pipelines) +[![tests](https://github.com/pjones/openid-connect/actions/workflows/tests.yml/badge.svg)](https://github.com/pjones/openid-connect/actions/workflows/tests.yml) OpenID Connect 1.0 in Haskell ============================= diff --git a/example/Auth.hs b/example/Auth.hs --- a/example/Auth.hs +++ b/example/Auth.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/example/Discover.hs b/example/Discover.hs --- a/example/Discover.hs +++ b/example/Discover.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/example/Main.hs b/example/Main.hs --- a/example/Main.hs +++ b/example/Main.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/example/Options.hs b/example/Options.hs --- a/example/Options.hs +++ b/example/Options.hs @@ -8,7 +8,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/example/Util.hs b/example/Util.hs --- a/example/Util.hs +++ b/example/Util.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/openid-connect.cabal b/openid-connect.cabal --- a/openid-connect.cabal +++ b/openid-connect.cabal @@ -1,19 +1,18 @@ -cabal-version: 2.2 - --------------------------------------------------------------------------------- -name: openid-connect -version: 0.1.0.0 -synopsis: An OpenID Connect library that does all the heavy lifting for you -license: BSD-2-Clause -license-file: LICENSE -author: Peter Jones -maintainer: Peter Jones -copyright: Copyright (c) 2020 Peter Jones -homepage: https://github.com/sthenauth/openid-connect -bug-reports: https://github.com/sthenauth/openid-connect/issues -category: Network +cabal-version: 2.2 +name: openid-connect +version: 0.1.1 +license: BSD-2-Clause +license-file: LICENSE +author: Peter Jones +maintainer: Peter Jones +copyright: Copyright (c) 2020-2021 Peter Jones +homepage: https://github.com/pjones/openid-connect +bug-reports: https://github.com/pjones/openid-connect/issues +category: Network +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +synopsis: + An OpenID Connect library that does all the heavy lifting for you --------------------------------------------------------------------------------- description: This package provides an OpenID Connect 1.0 compliant interface for clients and some useful types and functions for providers. @@ -30,24 +29,23 @@ example/*.sh -------------------------------------------------------------------------------- +source-repository head + type: git + location: https://github.com/pjones/openid-connect.git + +-------------------------------------------------------------------------------- flag example description: Build the example application - manual: True - default: False + manual: True + default: False -------------------------------------------------------------------------------- common options - default-language: - Haskell2010 - + default-language: Haskell2010 ghc-options: - -Wall - -Werror=incomplete-record-updates - -Werror=incomplete-uni-patterns - -Werror=missing-home-modules - -Widentities - -Wmissing-export-lists - -Wredundant-constraints + -Wall -Werror=incomplete-record-updates + -Werror=incomplete-uni-patterns -Werror=missing-home-modules + -Widentities -Wmissing-export-lists -Wredundant-constraints -------------------------------------------------------------------------------- common extensions @@ -81,27 +79,28 @@ -------------------------------------------------------------------------------- common dependencies - build-depends: base >= 4.9 && < 5.0 - , aeson >= 1.3 && < 1.5 - , bytestring >= 0.10 && < 0.11 - , case-insensitive >= 1.2 && < 1.3 - , cookie >= 0.4 && < 0.5 - , cryptonite >= 0.25 && < 1.0 - , http-client >= 0.6 && < 0.7 - , http-types >= 0.12 && < 0.13 - , jose >= 0.8 && < 0.9 - , lens >= 4.0 && < 5.0 - , memory >= 0.14 && < 1.0 - , mtl >= 2.2 && < 2.3 - , network-uri >= 2.6 && < 2.7 - , text >= 1.2 && < 1.3 - , time >= 1.8 && < 2.0 - , unordered-containers >= 0.2 && < 0.3 + build-depends: + , aeson >=1.3 && <1.6 + , base >=4.9 && <5.0 + , bytestring >=0.10 && <0.12 + , case-insensitive ^>=1.2 + , cookie ^>=0.4 + , cryptonite >=0.25 && <1.0 + , http-client >=0.6 && <0.8 + , http-types ^>=0.12 + , jose ^>=0.8 + , lens >=4.0 && <5.1 + , memory >=0.14 && <1.0 + , mtl ^>=2.2 + , network-uri >=2.6 && <2.8 + , text ^>=1.2 + , time >=1.8 && <2.0 + , unordered-containers ^>=0.2 -------------------------------------------------------------------------------- library - import: options, extensions, dependencies - hs-source-dirs: src + import: options, extensions, dependencies + hs-source-dirs: src exposed-modules: OpenID.Connect.Authentication OpenID.Connect.Client.DynamicRegistration @@ -110,6 +109,7 @@ OpenID.Connect.Provider.Key OpenID.Connect.Scope OpenID.Connect.TokenResponse + other-modules: OpenID.Connect.Client.Authentication OpenID.Connect.Client.HTTP @@ -120,33 +120,39 @@ -------------------------------------------------------------------------------- executable example - import: options, extensions, dependencies + import: options, extensions, dependencies hs-source-dirs: example - main-is: Main.hs - other-modules: Auth Discover Options Util + main-is: Main.hs + other-modules: + Auth + Discover + Options + Util if !flag(example) buildable: False - build-depends: blaze-html >= 0.9 - , http-client-tls >= 0.3 - , openid-connect >= 0.1 - , optparse-applicative >= 0.14 - , servant >= 0.16 - , servant-blaze >= 0.9 - , servant-server >= 0.16 - , warp >= 3.2 - , warp-tls >= 3.2 + build-depends: + , blaze-html >=0.9 + , http-client-tls >=0.3 + , openid-connect + , optparse-applicative >=0.14 + , servant >=0.16 + , servant-blaze >=0.9 + , servant-server >=0.16 + , warp >=3.2 + , warp-tls >=3.2 -------------------------------------------------------------------------------- test-suite test - import: options, extensions, dependencies - type: exitcode-stdio-1.0 + import: options, extensions, dependencies + type: exitcode-stdio-1.0 hs-source-dirs: test - main-is: Main.hs - build-depends: openid-connect - , tasty >= 1.1 && < 1.3 - , tasty-hunit >= 0.10 && < 0.11 + main-is: Main.hs + build-depends: + , openid-connect + , tasty >=1.1 && <1.5 + , tasty-hunit ^>=0.10 other-modules: Client diff --git a/src/OpenID/Connect/Authentication.hs b/src/OpenID/Connect/Authentication.hs --- a/src/OpenID/Connect/Authentication.hs +++ b/src/OpenID/Connect/Authentication.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/Authentication.hs b/src/OpenID/Connect/Client/Authentication.hs --- a/src/OpenID/Connect/Client/Authentication.hs +++ b/src/OpenID/Connect/Client/Authentication.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/DynamicRegistration.hs b/src/OpenID/Connect/Client/DynamicRegistration.hs --- a/src/OpenID/Connect/Client/DynamicRegistration.hs +++ b/src/OpenID/Connect/Client/DynamicRegistration.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/Flow/AuthorizationCode.hs b/src/OpenID/Connect/Client/Flow/AuthorizationCode.hs --- a/src/OpenID/Connect/Client/Flow/AuthorizationCode.hs +++ b/src/OpenID/Connect/Client/Flow/AuthorizationCode.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/HTTP.hs b/src/OpenID/Connect/Client/HTTP.hs --- a/src/OpenID/Connect/Client/HTTP.hs +++ b/src/OpenID/Connect/Client/HTTP.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/Provider.hs b/src/OpenID/Connect/Client/Provider.hs --- a/src/OpenID/Connect/Client/Provider.hs +++ b/src/OpenID/Connect/Client/Provider.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Client/TokenResponse.hs b/src/OpenID/Connect/Client/TokenResponse.hs --- a/src/OpenID/Connect/Client/TokenResponse.hs +++ b/src/OpenID/Connect/Client/TokenResponse.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Discovery.hs b/src/OpenID/Connect/Discovery.hs --- a/src/OpenID/Connect/Discovery.hs +++ b/src/OpenID/Connect/Discovery.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/JSON.hs b/src/OpenID/Connect/JSON.hs --- a/src/OpenID/Connect/JSON.hs +++ b/src/OpenID/Connect/JSON.hs @@ -8,7 +8,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Provider/Key.hs b/src/OpenID/Connect/Provider/Key.hs --- a/src/OpenID/Connect/Provider/Key.hs +++ b/src/OpenID/Connect/Provider/Key.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Registration.hs b/src/OpenID/Connect/Registration.hs --- a/src/OpenID/Connect/Registration.hs +++ b/src/OpenID/Connect/Registration.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/Scope.hs b/src/OpenID/Connect/Scope.hs --- a/src/OpenID/Connect/Scope.hs +++ b/src/OpenID/Connect/Scope.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/src/OpenID/Connect/TokenResponse.hs b/src/OpenID/Connect/TokenResponse.hs --- a/src/OpenID/Connect/TokenResponse.hs +++ b/src/OpenID/Connect/TokenResponse.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/test/Client.hs b/test/Client.hs --- a/test/Client.hs +++ b/test/Client.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/test/Client/AuthorizationCodeTest.hs b/test/Client/AuthorizationCodeTest.hs --- a/test/Client/AuthorizationCodeTest.hs +++ b/test/Client/AuthorizationCodeTest.hs @@ -8,7 +8,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/test/Client/ProviderTest.hs b/test/Client/ProviderTest.hs --- a/test/Client/ProviderTest.hs +++ b/test/Client/ProviderTest.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/test/DiscoveryTest.hs b/test/DiscoveryTest.hs --- a/test/DiscoveryTest.hs +++ b/test/DiscoveryTest.hs @@ -8,7 +8,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms diff --git a/test/HttpHelper.hs b/test/HttpHelper.hs --- a/test/HttpHelper.hs +++ b/test/HttpHelper.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-| Copyright: @@ -6,7 +7,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms @@ -19,7 +20,6 @@ ( FakeHTTPS(..) , defaultFakeHTTPS , fakeHttpsFromByteString - , httpNoOp , mkHTTPS , runHTTPS ) where @@ -66,13 +66,6 @@ ] -------------------------------------------------------------------------------- -httpNoOp - :: MonadFail m - => HTTP.Request - -> m (HTTP.Response LChar8.ByteString) -httpNoOp _ = fail "httpNoOp" - --------------------------------------------------------------------------------- mkHTTPS :: MonadIO m => FakeHTTPS @@ -80,14 +73,19 @@ -> StateT HTTP.Request m (HTTP.Response LChar8.ByteString) mkHTTPS FakeHTTPS{..} request = do put request + body <- liftIO fakeData - HTTP.Response - <$> pure fakeStatus - <*> pure fakeVersion - <*> pure fakeHeaders - <*> liftIO fakeData - <*> pure mempty - <*> pure (HTTP.ResponseClose (pure ())) + pure $ + HTTP.Response + fakeStatus + fakeVersion + fakeHeaders + body + mempty + (HTTP.ResponseClose (pure ())) +#if MIN_VERSION_http_client(0,7,8) + request +#endif -------------------------------------------------------------------------------- runHTTPS diff --git a/test/Main.hs b/test/Main.hs --- a/test/Main.hs +++ b/test/Main.hs @@ -6,7 +6,7 @@ the license terms in the LICENSE file found in the top-level directory of this distribution and at: - https://code.devalot.com/sthenauth/openid-connect + https://code.devalot.com/open/openid-connect No part of this package, including this file, may be copied, modified, propagated, or distributed except according to the terms