fix: handle getUser error
#3285
Merged
Conversation
This file contains hidden or 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
johnstcn
approved these changes
Jul 29, 2022
mafredri
approved these changes
Jul 29, 2022
Kira-Pilot
reviewed
Jul 29, 2022
Kira-Pilot
reviewed
Jul 29, 2022
| export const LoginPage: React.FC = () => { | ||
| const styles = useStyles() | ||
| const location = useLocation() | ||
| const xServices = useContext(XServiceContext) | ||
| const [authState, authSend] = useActor(xServices.authXService) | ||
| const isLoading = authState.hasTag("loading") | ||
| const redirectTo = retrieveRedirect(location.search) | ||
| const locationState = location.state ? (location.state as LocationState) : null |
There was a problem hiding this comment.
Do we need to use a ternary because of types? Or can we:
Suggested change
| const locationState = location.state ? (location.state as LocationState) : null | |
| const locationState = location.state ?? null |
There was a problem hiding this comment.
location.state can be null, but since we are typecasting it, the compiler thinks it is never null, so we are typecasting it only if it is not null.
presleyp
reviewed
Jul 29, 2022
| if (authState.matches("signedOut")) { | ||
| return <Navigate to={navigateTo} /> | ||
| return <Navigate to={navigateTo} state={{ isRedirect: !isHomePage }} /> |
There was a problem hiding this comment.
does isRedirect replicate the functionality of embedRedirect?
There was a problem hiding this comment.
I think we could use one both to know whether to show the error and where to go next, but it might be better to keep them separate like this
There was a problem hiding this comment.
Yeah, we’d probably have to retrieve the redirect in the component but that didn’t seem like a very solid approach.
presleyp
approved these changes
Jul 29, 2022
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.
Building on #3241, this PR handles the
getUsererror fromauthXService.Special criteria: The error is only shown when redirecting to the
/loginpage from a page other than/. It is also not shown when loading the/loginpage directly.Subtasks
getUsererror above the Sign-in form/)You are signed out.orAn internal error occurredmessage and move the details in the error details section.Fixes #3088
Screenshot