Skip to content

feat: add user/settings page for managing external auth #10945

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
merged 9 commits into from
Dec 6, 2023
Merged

feat: add user/settings page for managing external auth #10945

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ecd30f5
feat: add endpoints to list all authed external apps
Emyrk Nov 29, 2023
919e490
Update swagger
Emyrk Nov 30, 2023
aa92509
feat: add user/settings page for managing external auth
Emyrk Nov 29, 2023
a84ed83
fix rename fixes on ui
Emyrk Dec 1, 2023
add4d6f
update FE to add external settings page
Emyrk Dec 4, 2023
ea2f65b
add stories
Emyrk Dec 4, 2023
cc7cd52
fmt
Emyrk Dec 4, 2023
ad5587a
PR suggestions
Emyrk Dec 5, 2023
08a9752
Merge remote-tracking branch 'origin/main' into external_auth_fe_updates
Emyrk Dec 5, 2023
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
Prev Previous commit
Next Next commit
PR suggestions
  • Loading branch information
@Emyrk
Emyrk committed Dec 5, 2023
commit ad5587ab4b810407015db4597b6160b534dd4b2c
3 changes: 0 additions & 3 deletions site/src/api/queries/externalauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ export const userExternalAuth = (providerID: string) => {
export const validateExternalAuth = (_: QueryClient) => {
return {
mutationFn: API.getExternalAuthProvider,
onSuccess: async () => {
// No invalidation needed.
},
};
};

Expand Down
28 changes: 15 additions & 13 deletions site/src/pages/UserExternalAuthSettingsPage/UserExternalAuthSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ const UserExternalAuthSettingsPage: FC = () => {
...mutateParams,
onSuccess: async () => {
await mutateParams.onSuccess();
await refetch();
setUnlinked(unlinked + 1);
},
});

Expand All @@ -49,17 +47,14 @@ const UserExternalAuthSettingsPage: FC = () => {
}}
onValidateExternalAuth={async (providerID: string) => {
try {
await validateAppMutation.mutateAsync(providerID, {
onSuccess: (data) => {
if (data.authenticated) {
displaySuccess("Application link is valid.");
} else {
displayError(
"Application link is not valid. Please unlink the application and reauthenticate.",
);
}
},
});
const data = await validateAppMutation.mutateAsync(providerID);
if (data.authenticated) {
displaySuccess("Application link is valid.");
} else {
displayError(
"Application link is not valid. Please unlink the application and reauthenticate.",
);
}
} catch (e) {
displayError(
getErrorMessage(e, "Error validating application link."),
Expand All @@ -83,7 +78,14 @@ const UserExternalAuthSettingsPage: FC = () => {
onConfirm={async () => {
try {
await unlinkAppMutation.mutateAsync(appToUnlink!);
// setAppToUnlink closes the modal
setAppToUnlink(undefined);
// refetch repopulates the external auth data
await refetch();
// this tells our child components to refetch their data
// as at least 1 provider was unlinked.
setUnlinked(unlinked + 1);

displaySuccess("Successfully unlinked the oauth2 application.");
} catch (e) {
displayError(getErrorMessage(e, "Error unlinking application."));
Expand Down