Backport of Restore soft deleted users on authentication into release/0.19.x #5562
+137
−9
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.
Backport
This PR is auto-generated from #5549 to be assessed for backporting due to the inclusion of the label backport/0.19.x.
The below text is copied from the body of the original PR.
This PR contains a potential fix for the issue of deleted auth tokens preventing re-authentication (introduced with #5173). The biggest change is that previously, if a soft-deleted user authenticated, it would remain soft-deleted. Now we restore the user on authentication.
It also contains some tidying of the token error handling.
Overview of commits
fb4847a
fbc039a
3f57b09
35feed0
acda04b
c215a75