WPB-6258 Connection request from deleted user #3861
Merged
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
zebot
added
the
ok-to-test
stefanwire
approved these changes
Feb 6, 2024
fisx
approved these changes
Feb 9, 2024
integration/test/Test/Connection.hs
Outdated
| @@ -401,3 +402,14 @@ testFederationAllowMixedConnectWithRemote = | |||
| connectTwoUsers alice bob | |||
| where | |||
| defSearchPolicy = "full_search" | |||
|
|
|||
| testPendingConnectionUserDeleted :: HasCallStack => Domain -> App () | |||
| testPendingConnectionUserDeleted domain = do | |||
There was a problem hiding this comment.
Suggested change
| testPendingConnectionUserDeleted domain = do | |
| testPendingConnectionUserDeleted bobsDomain = do |
? I sometimes feel we're trying really hard to make identifiers mean as little as possible in /integration. could be just me, though :)
| now | ||
| (ucConvId uc) | ||
| let e = ConnectionUpdated ucCancelled Nothing Nothing | ||
| onConnectionEvent deleted conn e |
There was a problem hiding this comment.
is there a reason the local and the remote part look so different? (just curious)
services/brig/src/Brig/IO/Intra.hs
Outdated
| sendCancelledEvent :: Local UserId -> Remote UserConnection -> m () | ||
| sendCancelledEvent luidDeleted ruc = do | ||
| runExceptT (sendConnectionAction luidDeleted Nothing (qUnqualified . ucTo <$> ruc) RemoteRescind) >>= \case | ||
| -- I don't think we want to abort the operation since this is running asynchronously and cannot be retried anyway |
There was a problem hiding this comment.
why can't it be retried? i'd expect this to go back to the rabbit queue and then get picked up again in a bit?
…tion-request-from-deleted-user-cannot-be-rejected
fisx
approved these changes
Feb 14, 2024
battermann
deleted the
WPB-6258-be-connection-request-from-deleted-user-cannot-be-rejected
branch
elland
pushed a commit
that referenced
this pull request
Feb 22, 2024
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.
https://wearezeta.atlassian.net/browse/WPB-6258
Checklist
changelog.d