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
add stories
  • Loading branch information
@Emyrk
Emyrk committed Dec 5, 2023
commit ea2f65ba53c3de0b97d46a4b2bd6586f1fe2b88c
82 changes: 49 additions & 33 deletions site/src/pages/UserExternalAuthSettingsPage/UserExternalAuthSettingsPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,52 @@
// import { ExternalAuthSettingsPageView } from "./ExternalAuthSettingsPageView";
// import type { Meta, StoryObj } from "@storybook/react";
import {
MockGithubAuthLink,
MockGithubExternalProvider,
} from "testHelpers/entities";
import { UserExternalAuthSettingsPageView } from "./UserExternalAuthSettingsPageView";
import type { Meta, StoryObj } from "@storybook/react";

// const meta: Meta<typeof ExternalAuthSettingsPageView> = {
// title: "pages/DeploySettingsPage/ExternalAuthSettingsPageView",
// component: ExternalAuthSettingsPageView,
// args: {
// config: {
// external_auth: [
// {
// id: "0000-1111",
// type: "GitHub",
// client_id: "client_id",
// regex: "regex",
// auth_url: "",
// token_url: "",
// validate_url: "",
// app_install_url: "https://github.com/apps/coder/installations/new",
// app_installations_url: "",
// no_refresh: false,
// scopes: [],
// extra_token_keys: [],
// device_flow: true,
// device_code_url: "",
// display_icon: "",
// display_name: "GitHub",
// },
// ],
// },
// },
// };
const meta: Meta<typeof UserExternalAuthSettingsPageView> = {
title: "pages/UserExternalAuthSettingsPage/UserExternalAuthSettingsPageView",
component: UserExternalAuthSettingsPageView,
args: {
isLoading: false,
getAuthsError: undefined,
unlinked: 0,
auths: {
providers: [],
links: [],
},
onUnlinkExternalAuth: () => {},
onValidateExternalAuth: () => {},
},
};

// export default meta;
// type Story = StoryObj<typeof ExternalAuthSettingsPageView>;
export default meta;
type Story = StoryObj<typeof UserExternalAuthSettingsPageView>;

// export const Page: Story = {};
export const NoProviders: Story = {};

export const Authenticated: Story = {
args: {
...meta.args,
auths: {
providers: [MockGithubExternalProvider],
links: [MockGithubAuthLink],
},
},
};

export const UnAuthenticated: Story = {
args: {
...meta.args,
auths: {
providers: [MockGithubExternalProvider],
links: [
{
...MockGithubAuthLink,
authenticated: false,
},
],
},
},
};
2 changes: 1 addition & 1 deletion site/src/pages/UserExternalAuthSettingsPage/UserExternalAuthSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const useExternalAuth = (providerID: string, unlinked: number) => {
if (unlinked > 0) {
void refetch();
}
}, [unlinked]);
}, [refetch, unlinked]);

useEffect(() => {
if (signedIn) {
Expand Down
20 changes: 20 additions & 0 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2931,3 +2931,23 @@ export const DeploymentHealthUnhealthy: TypesGen.HealthcheckReport = {
},
},
};

export const MockGithubExternalProvider: TypesGen.ExternalAuthLinkProvider = {
id: "github",
type: "github",
device: false,
display_icon: "/icon/github.svg",
display_name: "GitHub",
allow_refresh: true,
allow_validate: true,
};

export const MockGithubAuthLink: TypesGen.ExternalAuthLink = {
provider_id: "github",
created_at: "",
updated_at: "",
has_refresh_token: true,
expires: "",
authenticated: true,
validate_error: "",
};