diff --git a/cabal.project b/cabal.project index 54f49143c9..8c2563decc 100644 --- a/cabal.project +++ b/cabal.project @@ -142,7 +142,7 @@ source-repository-package source-repository-package type: git location: https://github.com/wireapp/saml2-web-sso - tag: 30747970da6e024b53707605d138524de6fa53b0 + tag: 74371cd775cb98d6cf85f6e182244a3c4fd48702 source-repository-package type: git diff --git a/changelog.d/5-internal/bump-saml2-lib b/changelog.d/5-internal/bump-saml2-lib index f849116b80..8f95d5dee4 100644 --- a/changelog.d/5-internal/bump-saml2-lib +++ b/changelog.d/5-internal/bump-saml2-lib @@ -1 +1 @@ -Bump saml2-web-sso +Bump saml2-web-sso (#2545, #2546) diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Spar.hs b/libs/wire-api/src/Wire/API/Routes/Public/Spar.hs index d5b53bbac1..6d22692463 100644 --- a/libs/wire-api/src/Wire/API/Routes/Public/Spar.hs +++ b/libs/wire-api/src/Wire/API/Routes/Public/Spar.hs @@ -125,13 +125,13 @@ type APIINTERNAL = :<|> "teams" :> Capture "team" TeamId :> DeleteNoContent :<|> "sso" :> "settings" :> ReqBody '[JSON] SsoSettings :> Put '[JSON] NoContent -sparSPIssuer :: SAML.HasConfig m => Maybe TeamId -> m SAML.Issuer +sparSPIssuer :: (Functor m, SAML.HasConfig m) => Maybe TeamId -> m SAML.Issuer sparSPIssuer Nothing = SAML.Issuer <$> SAML.getSsoURI (Proxy @APISSO) (Proxy @APIAuthRespLegacy) sparSPIssuer (Just tid) = SAML.Issuer <$> SAML.getSsoURI' (Proxy @APISSO) (Proxy @APIAuthResp) tid -sparResponseURI :: SAML.HasConfig m => Maybe TeamId -> m URI.URI +sparResponseURI :: (Functor m, SAML.HasConfig m) => Maybe TeamId -> m URI.URI sparResponseURI Nothing = SAML.getSsoURI (Proxy @APISSO) (Proxy @APIAuthRespLegacy) sparResponseURI (Just tid) = diff --git a/services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs b/services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs index c33baf07f2..00eac038b5 100644 --- a/services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs +++ b/services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs @@ -29,10 +29,6 @@ import qualified SAML2.WebSSO as SAML import Spar.Sem.SamlProtocolSettings import Wire.API.Routes.Public.Spar --- TODO(sandy): Why is this instance not provided by SAML? Very rude! -instance SAML.HasConfig ((->) SAML.Config) where - getConfig = id - sparRouteToServant :: SAML.Config -> Sem (SamlProtocolSettings ': r) a -> Sem r a sparRouteToServant cfg = interpret $ \case SpIssuer mitlt -> pure $ sparSPIssuer mitlt cfg diff --git a/stack.yaml b/stack.yaml index 430c751eb2..70c8584804 100644 --- a/stack.yaml +++ b/stack.yaml @@ -87,7 +87,7 @@ extra-deps: # a version > 1.0.0 of wai-middleware-prometheus is available # (required: https://github.com/fimad/prometheus-haskell/pull/45) - git: https://github.com/wireapp/saml2-web-sso - commit: 30747970da6e024b53707605d138524de6fa53b0 # master (Jul 07, 2022) + commit: 74371cd775cb98d6cf85f6e182244a3c4fd48702 # master (Jul 07, 2022) - git: https://github.com/kim/hs-collectd commit: 885da222be2375f78c7be36127620ed772b677c9 diff --git a/stack.yaml.lock b/stack.yaml.lock index 837a4d9aa3..c464f67166 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -30,11 +30,11 @@ packages: git: https://github.com/wireapp/saml2-web-sso pantry-tree: size: 4887 - sha256: 6682027579687623346c9dd7e946b676c3ae1cc2bdc435c0ea4c7982ac098577 - commit: 30747970da6e024b53707605d138524de6fa53b0 + sha256: bb082762abbd48527788941f8555706eb5af6c03761834f255dada3e962d5f5e + commit: 74371cd775cb98d6cf85f6e182244a3c4fd48702 original: git: https://github.com/wireapp/saml2-web-sso - commit: 30747970da6e024b53707605d138524de6fa53b0 + commit: 74371cd775cb98d6cf85f6e182244a3c4fd48702 - completed: name: collectd version: 0.0.0.2