Skip to content

fix: external auth device flow, check both queries for errors #12367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Emyrk merged 6 commits into from
Feb 29, 2024
Merged

fix: external auth device flow, check both queries for errors #12367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e809a26
fix: external auth device flow, check both queries for errors
Emyrk Feb 29, 2024
6ea9188
This is a terrible fix
Emyrk Feb 29, 2024
00a761d
Handle error more gracefully in the code
Emyrk Feb 29, 2024
14baf02
Show details in the error
Emyrk Feb 29, 2024
404c05c
Add 429 storybook
Emyrk Feb 29, 2024
fb6b545
Minor style update
BrunoQuaresma Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions site/src/pages/ExternalAuthPage/ExternalAuthPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ const ExternalAuthPage: FC = () => {
if (isAxiosError(exchangeExternalAuthDeviceQuery.failureReason)) {
deviceExchangeError =
exchangeExternalAuthDeviceQuery.failureReason.response?.data;
} else if (isAxiosError(externalAuthDeviceQuery.failureReason)) {
deviceExchangeError = externalAuthDeviceQuery.failureReason.response?.data;
}

if (
Expand Down
21 changes: 21 additions & 0 deletions site/src/pages/ExternalAuthPage/ExternalAuthPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,27 @@ DeviceUnauthenticated.args = {
},
};

export const Device429Error = Template.bind({});
Device429Error.args = {
externalAuth: {
display_name: "GitHub",
authenticated: false,
device: true,
installations: [],
app_install_url: "",
app_installable: false,
},
// This is intentionally undefined.
// If we get a 429 on the first /device call, then this
// is undefined with a 429 error.
externalAuthDevice: undefined,
deviceExchangeError: {
message: "Failed to authorize device.",
detail:
"rate limit hit, unable to authorize device. please try again later",
},
};

export const DeviceUnauthenticatedError = Template.bind({});
DeviceUnauthenticatedError.args = {
externalAuth: {
Expand Down
15 changes: 12 additions & 3 deletions site/src/pages/ExternalAuthPage/ExternalAuthPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { type Interpolation, type Theme } from "@emotion/react";
import OpenInNewIcon from "@mui/icons-material/OpenInNew";
import RefreshIcon from "@mui/icons-material/Refresh";
import AlertTitle from "@mui/material/AlertTitle";
import CircularProgress from "@mui/material/CircularProgress";
import Link from "@mui/material/Link";
import Tooltip from "@mui/material/Tooltip";
import type { ApiErrorResponse } from "api/errors";
import type { ExternalAuth, ExternalAuthDevice } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { Alert, AlertDetail } from "components/Alert/Alert";
import { Avatar } from "components/Avatar/Avatar";
import { CopyButton } from "components/CopyButton/CopyButton";
import { SignInLayout } from "components/SignInLayout/SignInLayout";
Expand Down Expand Up @@ -173,14 +174,22 @@ const GitDeviceAuth: FC<GitDeviceAuthProps> = ({
default:
status = (
<Alert severity="error">
An unknown error occurred. Please try again:{" "}
{deviceExchangeError.message}
<AlertTitle>{deviceExchangeError.message}</AlertTitle>
{deviceExchangeError.detail && (
<AlertDetail>{deviceExchangeError.detail}</AlertDetail>
)}
</Alert>
);
break;
}
}

// If the error comes from the `externalAuthDevice` query,
// we cannot even display the user_code.
if (deviceExchangeError && !externalAuthDevice) {
return <div>{status}</div>;
}

if (!externalAuthDevice) {
return <CircularProgress />;
}
Expand Down