-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Refresh auth on 401, better error messaging (#874)
* Refresh auth on 401, better error messaging Signed-off-by: Carina Ursu <[email protected]> * fix tests Signed-off-by: Carina Ursu <[email protected]> --------- Signed-off-by: Carina Ursu <[email protected]>
- Loading branch information
1 parent
bb1db21
commit c636bf0
Showing
15 changed files
with
434 additions
and
52 deletions.
There are no files selected for viewing
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
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
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
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
142 changes: 142 additions & 0 deletions
142
packages/oss-console/src/components/Errors/ErrorHandler.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| import NotAuthorizedError from '@clients/common/Errors/NotAuthorizedError'; | ||
| import NotFoundError from '@clients/common/Errors/NotFoundError'; | ||
| import { AxiosError } from 'axios'; | ||
| import React from 'react'; | ||
| import Box from '@mui/material/Box'; | ||
| import Typography from '@mui/material/Typography'; | ||
| import Link from '@mui/material/Link'; | ||
| import Button from '@mui/material/Button'; | ||
| import { useFlyteApi } from '@clients/flyte-api/ApiProvider'; | ||
| import { GenericError } from './GenericError'; | ||
|
|
||
| export interface ErrorHandlerProps { | ||
| error: NotFoundError | NotAuthorizedError | AxiosError | Error; | ||
| } | ||
|
|
||
| export const ErrorHandler: React.FC<ErrorHandlerProps> = ({ error }) => { | ||
| const { getLoginUrl } = useFlyteApi(); | ||
|
|
||
| const contactSupport = ( | ||
| <> | ||
| <Typography variant="label"> | ||
| Please join the Slack community and explore its history on{' '} | ||
| <Link | ||
| color="inherit" | ||
| variant="label" | ||
| sx={{ | ||
| fontSize: 'inherit', | ||
| }} | ||
| href="https://discuss.flyte.org/" | ||
| target="_blank" | ||
| > | ||
| discuss.flyte.org | ||
| </Link> | ||
| {', '} | ||
| or file a GitHub issue on{' '} | ||
| <Link | ||
| color="inherit" | ||
| variant="label" | ||
| sx={{ | ||
| fontSize: 'inherit', | ||
| }} | ||
| href="https://github.com/flyteorg/flyte" | ||
| target="_blank" | ||
| > | ||
| flyteorg/flyte | ||
| </Link>{' '} | ||
| if the problem persists. | ||
| </Typography> | ||
| </> | ||
| ); | ||
|
|
||
| if ( | ||
| error instanceof NotFoundError || | ||
| (error instanceof AxiosError && error.response?.status === 404) | ||
| ) { | ||
| return ( | ||
| <GenericError | ||
| title="404" | ||
| description="Not Found" | ||
| content={ | ||
| <> | ||
| <Box py={1} /> | ||
| <Typography variant="body2">The requested resource was not found</Typography> | ||
|
|
||
| <Box py={1} /> | ||
|
|
||
| {contactSupport} | ||
| </> | ||
| } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| if ( | ||
| error instanceof NotAuthorizedError || | ||
| (error instanceof AxiosError && error.response?.status === 401) | ||
| ) { | ||
| return ( | ||
| <GenericError | ||
| title="401" | ||
| description="Unauthorized" | ||
| content={ | ||
| <> | ||
| <Box py={1} /> | ||
| <Typography variant="body2"> | ||
| <strong>You do not have the proper authentication to access this page</strong> | ||
| </Typography> | ||
|
|
||
| <Box py={1} /> | ||
|
|
||
| {contactSupport} | ||
| <Box py={1} /> | ||
|
|
||
| <Button | ||
| variant="contained" | ||
| href={getLoginUrl()} | ||
| autoFocus | ||
| data-cy="login-button-overlay" | ||
| > | ||
| Log in | ||
| </Button> | ||
| </> | ||
| } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| if (error instanceof AxiosError && error.response?.status === 403) { | ||
| return ( | ||
| <GenericError | ||
| title="403" | ||
| description="Forbidden" | ||
| content={ | ||
| <> | ||
| <Box py={1} /> | ||
| <Typography variant="body2"> | ||
| <strong>You don't have permission to access this page</strong> | ||
| </Typography> | ||
|
|
||
| <Box py={1} /> | ||
|
|
||
| {contactSupport} | ||
| </> | ||
| } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <GenericError | ||
| title={(error as AxiosError)?.response?.status || 'Oops!'} | ||
| description="Something went wrong." | ||
| content={ | ||
| <> | ||
| <Box py={1} /> | ||
|
|
||
| {contactSupport} | ||
| </> | ||
| } | ||
| /> | ||
| ); | ||
| }; |
102 changes: 102 additions & 0 deletions
102
packages/oss-console/src/components/Errors/GenericError.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| import React from 'react'; | ||
| import { type SvgIconProps } from '@mui/material/SvgIcon'; | ||
| import PageMeta from '@clients/primitives/PageMeta'; | ||
| import Container from '@mui/material/Container'; | ||
| import NotFoundLogo from '@clients/ui-atoms/NotFoundLogo'; | ||
| import Grid from '@mui/material/Grid'; | ||
| import Typography from '@mui/material/Typography'; | ||
|
|
||
| export interface GenericErrorProps { | ||
| title?: string | number; | ||
| description?: string; | ||
| content?: React.ReactNode; | ||
| Icon?: (props: SvgIconProps) => React.JSX.Element; | ||
| } | ||
|
|
||
| /** | ||
| * React prints the \n as "\n" in the DOM, | ||
| * so we need to split on that to make new lines | ||
| */ | ||
| const makeDescriptionSpans = (description: string = '') => { | ||
| const descriptionSpans = description.split('\\n').filter((span) => !!span); | ||
| return descriptionSpans.map((span) => ( | ||
| <span key={span}> | ||
| {span} | ||
| <br /> | ||
| </span> | ||
| )); | ||
| }; | ||
|
|
||
| export const GenericError: React.FC<GenericErrorProps> = ({ | ||
| title, | ||
| description, | ||
| content, | ||
| Icon = NotFoundLogo, | ||
| }) => { | ||
| return ( | ||
| <> | ||
| <PageMeta title={title?.toString()} /> | ||
| <Container | ||
| sx={{ | ||
| height: '100%', | ||
| flexGrow: 1, | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| }} | ||
| > | ||
| <Grid | ||
| container | ||
| gap={1} | ||
| sx={{ | ||
| flexDirection: { xs: 'column-reverse', md: 'row' }, | ||
| }} | ||
| > | ||
| <Grid item xs={12} md={2} /> | ||
| <Grid | ||
| item | ||
| xs={12} | ||
| md={4} | ||
| sx={{ | ||
| paddingRight: (t) => t.spacing(2), | ||
| paddingBottom: (t) => t.spacing(2), | ||
| }} | ||
| > | ||
| <Typography | ||
| variant="h3" | ||
| pb={1} | ||
| sx={{ | ||
| fontSize: '22px', | ||
| }} | ||
| > | ||
| {title} | ||
| </Typography> | ||
| <Typography | ||
| variant="h1" | ||
| sx={{ | ||
| fontSize: '42px', | ||
| }} | ||
| > | ||
| {makeDescriptionSpans(description)} | ||
| </Typography> | ||
|
|
||
| {content} | ||
| </Grid> | ||
| <Grid item xs={12} md={1} py={3} sx={{ display: 'flex' }} /> | ||
| {Icon && ( | ||
| <Grid item xs={4} md={4} sx={{ display: 'flex' }}> | ||
| <Icon | ||
| sx={{ | ||
| width: '100%', | ||
| height: '100%', | ||
| maxWidth: { xs: '150px', md: '250px' }, | ||
| maxHeight: { xs: '150px', md: '250px' }, | ||
| color: (theme) => theme.palette.common.grays[20], | ||
| }} | ||
| /> | ||
| </Grid> | ||
| )} | ||
| </Grid> | ||
| </Container> | ||
| </> | ||
| ); | ||
| }; |
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
Oops, something went wrong.