Spar re-login deleted sso users; fix handling of brig errors. #588
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fisx
force-pushed
the
spar-relogin-deleted-sso-users
branch
from
a97d72d
to
87d9e2f
Compare
|
Ping when this can be reviewed |
fisx
force-pushed
the
spar-relogin-deleted-sso-users
branch
from
87d9e2f
to
dbffd78
Compare
|
i'm actually not sure what to do with the intra calls to brig if they do not return 2xx. i'll think about it some more tomorrow. |
fisx
changed the title
fisx
force-pushed
the
spar-relogin-deleted-sso-users
branch
from
dbffd78
to
ba9a458
Compare
|
ping @neongreen all integration tests pass locally. |
neongreen
reviewed
Jan 24, 2019
services/spar/src/Spar/App.hs
Outdated
| @@ -269,9 +269,12 @@ verdictHandlerResult bindCky = catchVerdictErrors . \case | |||
| | uid == uid' -> pure uid -- redundant binding (no change to brig or spar) | |||
| | otherwise -> throwSpar SparBindUserRefTaken -- attempt to use ssoid for a second wire user | |||
|
|
|||
| cky :: SetCookie <- Intra.ssoLogin uid | |||
| SAML.logger SAML.Debug (show uid) | |||
There was a problem hiding this comment.
It would be better to have a message here as well, not just a lonely UUID
services/spar/src/Spar/Error.hs
Outdated
| @@ -93,6 +94,8 @@ sparToWaiError (SAML.CustomError SparNoBodyInBrigResponse) = Righ | |||
| sparToWaiError (SAML.CustomError (SparCouldNotParseBrigResponse msg)) = Right $ Wai.Error status502 "bad-upstream" ("Could not parse response body: " <> msg) | |||
| sparToWaiError (SAML.CustomError (SparBrigError msg)) = Right $ Wai.Error status500 "bad-upstream" msg | |||
| -- Galley-specific errors | |||
There was a problem hiding this comment.
This line should be deleted
|
|
||
| -- second login | ||
|
|
||
| liftIO $ threadDelay 1000000 |
There was a problem hiding this comment.
Also a comment about "why it's sensible to leave this threadDelay here" will be useful when we both forget in the future.
neongreen
approved these changes
Jan 24, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.