Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit51d178d

Browse files
authored
feat: add OAuth2 user settings page (#12237)
1 parent3cbe14f commit51d178d

File tree

6 files changed

+228
-9
lines changed

6 files changed

+228
-9
lines changed

‎site/src/AppRouter.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ const ExternalAuthPage = lazy(
156156
constUserExternalAuthSettingsPage=lazy(
157157
()=>import("./pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPage"),
158158
);
159+
constUserOAuth2ProviderSettingsPage=lazy(
160+
()=>
161+
import("./pages/UserSettingsPage/OAuth2ProviderPage/OAuth2ProviderPage"),
162+
);
159163
constTemplateVersionPage=lazy(
160164
()=>import("./pages/TemplateVersionPage/TemplateVersionPage"),
161165
);
@@ -362,6 +366,10 @@ export const AppRouter: FC = () => {
362366
path="external-auth"
363367
element={<UserExternalAuthSettingsPage/>}
364368
/>
369+
<Route
370+
path="oauth2-provider"
371+
element={<UserOAuth2ProviderSettingsPage/>}
372+
/>
365373
<Routepath="tokens">
366374
<Routeindexelement={<TokensPage/>}/>
367375
<Routepath="new"element={<CreateTokenPage/>}/>

‎site/src/api/api.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -974,10 +974,13 @@ export const unlinkExternalAuthProvider = async (
974974
returnresp.data;
975975
};
976976

977-
exportconstgetOAuth2ProviderApps=async():Promise<
978-
TypesGen.OAuth2ProviderApp[]
979-
>=>{
980-
constresp=awaitaxios.get(`/api/v2/oauth2-provider/apps`);
977+
exportconstgetOAuth2ProviderApps=async(
978+
filter?:TypesGen.OAuth2ProviderAppFilter,
979+
):Promise<TypesGen.OAuth2ProviderApp[]>=>{
980+
constparams=filter?.user_id
981+
?newURLSearchParams({user_id:filter.user_id})
982+
:"";
983+
constresp=awaitaxios.get(`/api/v2/oauth2-provider/apps?${params}`);
981984
returnresp.data;
982985
};
983986

@@ -1002,6 +1005,7 @@ export const putOAuth2ProviderApp = async (
10021005
constresponse=awaitaxios.put(`/api/v2/oauth2-provider/apps/${id}`,data);
10031006
returnresponse.data;
10041007
};
1008+
10051009
exportconstdeleteOAuth2ProviderApp=async(id:string):Promise<void>=>{
10061010
awaitaxios.delete(`/api/v2/oauth2-provider/apps/${id}`);
10071011
};
@@ -1029,6 +1033,10 @@ export const deleteOAuth2ProviderAppSecret = async (
10291033
);
10301034
};
10311035

1036+
exportconstrevokeOAuth2ProviderApp=async(appId:string):Promise<void>=>{
1037+
awaitaxios.delete(`/oauth2/tokens?client_id=${appId}`);
1038+
};
1039+
10321040
exportconstgetAuditLogs=async(
10331041
options:TypesGen.AuditLogsRequest,
10341042
):Promise<TypesGen.AuditLogResponse>=>{

‎site/src/api/queries/oauth2.ts

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import * as API from "api/api";
33
importtype*asTypesGenfrom"api/typesGenerated";
44

55
constappsKey=["oauth2-provider","apps"];
6-
constappKey=(id:string)=>appsKey.concat(id);
7-
constappSecretsKey=(id:string)=>appKey(id).concat("secrets");
6+
constuserAppsKey=(userId:string)=>appsKey.concat(userId);
7+
constappKey=(appId:string)=>appsKey.concat(appId);
8+
constappSecretsKey=(appId:string)=>appKey(appId).concat("secrets");
89

9-
exportconstgetApps=()=>{
10+
exportconstgetApps=(userId?:string)=>{
1011
return{
11-
queryKey:appsKey,
12-
queryFn:()=>API.getOAuth2ProviderApps(),
12+
queryKey:userId ?appsKey.concat(userId) :appsKey,
13+
queryFn:()=>API.getOAuth2ProviderApps({user_id:userId}),
1314
};
1415
};
1516

@@ -91,3 +92,14 @@ export const deleteAppSecret = (queryClient: QueryClient) => {
9192
},
9293
};
9394
};
95+
96+
exportconstrevokeApp=(queryClient:QueryClient,userId:string)=>{
97+
return{
98+
mutationFn:API.revokeOAuth2ProviderApp,
99+
onSuccess:async()=>{
100+
awaitqueryClient.invalidateQueries({
101+
queryKey:userAppsKey(userId),
102+
});
103+
},
104+
};
105+
};
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import{typeFC,useState}from"react";
2+
import{useMutation,useQuery,useQueryClient}from"react-query";
3+
import{getErrorMessage}from"api/errors";
4+
import{getApps,revokeApp}from"api/queries/oauth2";
5+
import{DeleteDialog}from"components/Dialogs/DeleteDialog/DeleteDialog";
6+
import{displayError,displaySuccess}from"components/GlobalSnackbar/utils";
7+
import{useMe}from"contexts/auth/useMe";
8+
import{Section}from"../Section";
9+
importOAuth2ProviderPageViewfrom"./OAuth2ProviderPageView";
10+
11+
constOAuth2ProviderPage:FC=()=>{
12+
constme=useMe();
13+
constqueryClient=useQueryClient();
14+
constuserOAuth2AppsQuery=useQuery(getApps(me.id));
15+
constrevokeAppMutation=useMutation(revokeApp(queryClient,me.id));
16+
const[appIdToRevoke,setAppIdToRevoke]=useState<string>();
17+
constappToRevoke=userOAuth2AppsQuery.data?.find(
18+
(app)=>app.id===appIdToRevoke,
19+
);
20+
21+
return(
22+
<Sectiontitle="OAuth2 Applications"layout="fluid">
23+
<OAuth2ProviderPageView
24+
isLoading={userOAuth2AppsQuery.isLoading}
25+
error={userOAuth2AppsQuery.error}
26+
apps={userOAuth2AppsQuery.data}
27+
revoke={(app)=>{
28+
setAppIdToRevoke(app.id);
29+
}}
30+
/>
31+
{appToRevoke!==undefined&&(
32+
<DeleteDialog
33+
title="Revoke Application"
34+
verb="Revoking"
35+
info={`This will invalidate any tokens created by the OAuth2 application "${appToRevoke.name}".`}
36+
label="Name of the application to revoke"
37+
isOpen
38+
confirmLoading={revokeAppMutation.isLoading}
39+
name={appToRevoke.name}
40+
entity="application"
41+
onCancel={()=>setAppIdToRevoke(undefined)}
42+
onConfirm={async()=>{
43+
try{
44+
awaitrevokeAppMutation.mutateAsync(appToRevoke.id);
45+
displaySuccess(
46+
`You have successfully revoked the OAuth2 application "${appToRevoke.name}"`,
47+
);
48+
setAppIdToRevoke(undefined);
49+
}catch(error){
50+
displayError(
51+
getErrorMessage(error,"Failed to revoke application."),
52+
);
53+
}
54+
}}
55+
/>
56+
)}
57+
</Section>
58+
);
59+
};
60+
61+
exportdefaultOAuth2ProviderPage;
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
importtype{Meta,StoryObj}from"@storybook/react";
2+
import{MockOAuth2ProviderApps}from"testHelpers/entities";
3+
importOAuth2ProviderPageViewfrom"./OAuth2ProviderPageView";
4+
5+
constmeta:Meta<typeofOAuth2ProviderPageView>={
6+
title:"pages/UserSettingsPage/OAuth2ProviderPageView",
7+
component:OAuth2ProviderPageView,
8+
};
9+
10+
exportdefaultmeta;
11+
typeStory=StoryObj<typeofOAuth2ProviderPageView>;
12+
13+
exportconstLoading:Story={
14+
args:{
15+
isLoading:true,
16+
error:undefined,
17+
revoke:()=>undefined,
18+
},
19+
};
20+
21+
exportconstError:Story={
22+
args:{
23+
isLoading:false,
24+
error:"some error",
25+
revoke:()=>undefined,
26+
},
27+
};
28+
29+
exportconstApps:Story={
30+
args:{
31+
isLoading:false,
32+
error:undefined,
33+
apps:MockOAuth2ProviderApps,
34+
revoke:()=>undefined,
35+
},
36+
};
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
importButtonfrom"@mui/material/Button";
2+
importTablefrom"@mui/material/Table";
3+
importTableBodyfrom"@mui/material/TableBody";
4+
importTableCellfrom"@mui/material/TableCell";
5+
importTableContainerfrom"@mui/material/TableContainer";
6+
importTableHeadfrom"@mui/material/TableHead";
7+
importTableRowfrom"@mui/material/TableRow";
8+
import{typeFC}from"react";
9+
importtype*asTypesGenfrom"api/typesGenerated";
10+
import{AvatarData}from"components/AvatarData/AvatarData";
11+
import{Avatar}from"components/Avatar/Avatar";
12+
import{ErrorAlert}from"components/Alert/ErrorAlert";
13+
import{TableLoader}from"components/TableLoader/TableLoader";
14+
15+
exporttypeOAuth2ProviderPageViewProps={
16+
isLoading:boolean;
17+
error:unknown;
18+
apps?:TypesGen.OAuth2ProviderApp[];
19+
revoke:(app:TypesGen.OAuth2ProviderApp)=>void;
20+
};
21+
22+
constOAuth2ProviderPageView:FC<OAuth2ProviderPageViewProps>=({
23+
isLoading,
24+
error,
25+
apps,
26+
revoke,
27+
})=>{
28+
return(
29+
<>
30+
{error&&<ErrorAlerterror={error}/>}
31+
32+
<TableContainer>
33+
<Table>
34+
<TableHead>
35+
<TableRow>
36+
<TableCellwidth="100%">Name</TableCell>
37+
<TableCellwidth="1%"/>
38+
</TableRow>
39+
</TableHead>
40+
<TableBody>
41+
{isLoading&&<TableLoader/>}
42+
{apps?.map((app)=>(
43+
<OAuth2AppRowkey={app.id}app={app}revoke={revoke}/>
44+
))}
45+
{apps?.length===0&&(
46+
<TableRow>
47+
<TableCellcolSpan={999}>
48+
<divcss={{textAlign:"center"}}>
49+
No OAuth2 applications have been authorized.
50+
</div>
51+
</TableCell>
52+
</TableRow>
53+
)}
54+
</TableBody>
55+
</Table>
56+
</TableContainer>
57+
</>
58+
);
59+
};
60+
61+
typeOAuth2AppRowProps={
62+
app:TypesGen.OAuth2ProviderApp;
63+
revoke:(app:TypesGen.OAuth2ProviderApp)=>void;
64+
};
65+
66+
constOAuth2AppRow:FC<OAuth2AppRowProps>=({ app, revoke})=>{
67+
return(
68+
<TableRowkey={app.id}data-testid={`app-${app.id}`}>
69+
<TableCell>
70+
<AvatarData
71+
title={app.name}
72+
avatar={
73+
Boolean(app.icon)&&(
74+
<Avatarsrc={app.icon}variant="square"fitImage/>
75+
)
76+
}
77+
/>
78+
</TableCell>
79+
80+
<TableCell>
81+
<Button
82+
variant="contained"
83+
size="small"
84+
color="error"
85+
onClick={()=>revoke(app)}
86+
>
87+
Revoke&hellip;
88+
</Button>
89+
</TableCell>
90+
</TableRow>
91+
);
92+
};
93+
94+
exportdefaultOAuth2ProviderPageView;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp