Skip to content

Bump saml2-web-sso. (again) #2546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fisx merged 3 commits into from
Jul 7, 2022
Merged

Bump saml2-web-sso. (again) #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4610d9
Bump saml2-web-sso.
fisx Jul 7, 2022
881a0ac
Fixup
fisx Jul 7, 2022
4429a78
changelog
fisx Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion changelog.d/5-internal/bump-saml2-lib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Bump saml2-web-sso
Bump saml2-web-sso (#2545, #2546)
4 changes: 2 additions & 2 deletions libs/wire-api/src/Wire/API/Routes/Public/Spar.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) =
Expand Down
4 changes: 0 additions & 4 deletions services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions stack.yaml.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down