Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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: 4227e38be5c0810012dc472fc6931f6087fbce68
tag: 30747970da6e024b53707605d138524de6fa53b0

source-repository-package
type: git
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/bump-saml2-lib
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump saml2-web-sso
12 changes: 6 additions & 6 deletions services/galley/galley.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ library
, retry >=0.5
, safe >=0.3
, safe-exceptions >=0.1
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, schema-profunctor
, semigroups
, servant
Expand Down Expand Up @@ -325,7 +325,7 @@ executable galley
, imports
, raw-strings-qq >=1.0
, safe >=0.3
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant-client
, ssl-util
, tagged
Expand Down Expand Up @@ -456,7 +456,7 @@ executable galley-integration
, raw-strings-qq >=1.0
, retry
, safe >=0.3
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, schema-profunctor
, servant
, servant-client
Expand Down Expand Up @@ -559,7 +559,7 @@ executable galley-migrate-data
, optparse-applicative
, raw-strings-qq >=1.0
, safe >=0.3
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant-client
, ssl-util
, tagged
Expand Down Expand Up @@ -680,7 +680,7 @@ executable galley-schema
, optparse-applicative
, raw-strings-qq >=1.0
, safe >=0.3
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant-client
, ssl-util
, tagged
Expand Down Expand Up @@ -759,7 +759,7 @@ test-suite galley-tests
, lens
, raw-strings-qq >=1.0
, safe >=0.3
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant-client
, servant-swagger
, ssl-util
Expand Down
2 changes: 1 addition & 1 deletion services/galley/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- wire-api-federation
- tagged
- servant-client
- saml2-web-sso >=0.18
- saml2-web-sso >=0.19
- transformers

library:
Expand Down
2 changes: 1 addition & 1 deletion services/spar/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies:
- QuickCheck
- raw-strings-qq
- retry
- saml2-web-sso >= 0.18
- saml2-web-sso >= 0.19
- servant
- servant-multipart
- servant-server
Expand Down
12 changes: 6 additions & 6 deletions services/spar/spar.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ library
, polysemy-wire-zoo
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down Expand Up @@ -281,7 +281,7 @@ executable spar
, polysemy-wire-zoo
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down Expand Up @@ -418,7 +418,7 @@ executable spar-integration
, random
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down Expand Up @@ -546,7 +546,7 @@ executable spar-migrate-data
, polysemy-wire-zoo
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down Expand Up @@ -678,7 +678,7 @@ executable spar-schema
, polysemy-wire-zoo
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down Expand Up @@ -809,7 +809,7 @@ test-suite spec
, polysemy-wire-zoo
, raw-strings-qq
, retry
, saml2-web-sso >=0.18
, saml2-web-sso >=0.19
, servant
, servant-multipart
, servant-server
Expand Down
6 changes: 3 additions & 3 deletions services/spar/src/Spar/API.hs
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,9 @@ authresp ::
Sem r Void
authresp mbtid arbody = logErrors $ SAML2.authResp mbtid (SamlProtocolSettings.spIssuer mbtid) (SamlProtocolSettings.responseURI mbtid) go arbody
where
go :: SAML.AuthnResponse -> SAML.AccessVerdict -> Sem r Void
go resp verdict = do
result :: SAML.ResponseVerdict <- verdictHandler mbtid resp verdict
go :: SAML.AuthnResponse -> IdP -> SAML.AccessVerdict -> Sem r Void
go resp verdict idp = do
result :: SAML.ResponseVerdict <- verdictHandler resp idp verdict
throw @SparError $ SAML.CustomServant result

logErrors :: Sem r Void -> Sem r Void
Expand Down
Loading