Show error message to OAuth2 user when a matching local account already exists #116
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
f-necas
reviewed
Apr 11, 2024
Comment on lines
94
to
111
| .map(auth -> { | ||
| try { | ||
| return Pair.of(resolver.resolve(auth), ""); | ||
| } catch (DuplicatedEmailFoundException exp) { | ||
| Optional<GeorchestraUser> op = Optional.empty(); | ||
| return Pair.of(op, "/login?error=" + DUPLICATE_ACCOUNT); | ||
| } | ||
| })// | ||
| .map(user -> { | ||
| GeorchestraUser usr = user.orElse(null); | ||
| if (!user.getRight().isEmpty()) { | ||
| SecurityContextHolder.getContext(); | ||
| ServerHttpResponse response = exchange.getResponse(); | ||
| response.setStatusCode(HttpStatus.FOUND); | ||
| response.getHeaders().setLocation(URI.create(user.getRight())); | ||
| return exchange; | ||
| } | ||
|
|
||
| GeorchestraUser usr = user.getLeft().orElse(null); |
There was a problem hiding this comment.
I've tried to better understand Mono and ended up with something like (not fully working) :
.map(resolver::resolve)//
.map(user -> {
GeorchestraUser usr = user.orElse(null);
GeorchestraUsers.store(exchange, usr);
if (usr != null && usr instanceof ExtendedGeorchestraUser) {
ExtendedGeorchestraUser eu = (ExtendedGeorchestraUser) usr;
Organization org = eu.getOrg();
GeorchestraOrganizations.store(exchange, org);
}
return exchange;
})//
.doOnError(DuplicatedEmailFoundException.class, exp -> {
ServerHttpResponse response = exchange.getResponse();
response.setStatusCode(HttpStatus.FOUND);
response.getHeaders().setLocation(URI.create("/login?error=" + DUPLICATE_ACCOUNT));
exchange.getSession().flatMap(WebSession::invalidate);
})
I think we can do something way better. I couldn't succeed to handle status code in error.
There was a problem hiding this comment.
Yes I think we can do something this way, but still have to find the correct syntax. Your proposal run additional code if an exception is thrown but doesn't cancel the exception which is thrown anyway at the end of the Mono chain. In fact it's like a try-finally but we need instead something like a try-catch.
emmdurin
deleted the
show_error_message_to_user_when_duplicate_email_or_username_oauth2
branch
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.
If a user tries to log with OAuth2 and a local account with the same e-mail address already exists, it should be presented a clear error messages about this conflict, and the user should not be considered logged in.
Follow up to PR#86 after a change of source branch.