Skip to content

Commit 3cf7b2d

Browse files
leon-liangleon-liang
committed
run formatter
1 parent 08ba8fc commit 3cf7b2d

File tree

21 files changed

+257
-176
lines changed

21 files changed

+257
-176
lines changed

‎client/package-lock.json‎

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"prettier": "^3.5.3",
4949
"prettier-eslint": "^16.4.2",
5050
"prettier-eslint-cli": "^8.0.1",
51+
"prettier-plugin-tailwindcss": "^0.6.13",
5152
"tailwindcss": "^4",
5253
"tw-animate-css": "^1.3.4",
5354
"typescript": "^5"

‎client/src/api/index.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import {AccountApiFactory, Configuration, RootApiFactory} from "@/api/generated";
1+
import {
2+
AccountApiFactory,
3+
Configuration,
4+
RootApiFactory,
5+
} from "@/api/generated";
26
import globalAxios from "axios";
37
import { getSession } from "next-auth/react";
48

‎client/src/app/api/auth/[...nextauth]/route.ts‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -4,88 +4,88 @@ import { JWT } from "next-auth/jwt";
44
import jwt from "jsonwebtoken";
55

66
function requestRefreshAccessToken(token: JWT) {
7-
return fetch(`${process.env.KEYCLOAK_ISSUER}/protocol/openid-connect/token`, {
8-
headers: { "Content-Type": "application/x-www-form-urlencoded" },
9-
// @ts-ignore
10-
body: new URLSearchParams({
11-
client_id: process.env.KEYCLOAK_CLIENT_ID,
12-
client_secret: process.env.KEYCLOAK_CLIENT_SECRET,
13-
grant_type: "refresh_token",
14-
refresh_token: token.refreshToken,
15-
}),
16-
method: "POST",
17-
cache: "no-store",
18-
});
7+
return fetch(`${process.env.KEYCLOAK_ISSUER}/protocol/openid-connect/token`, {
8+
headers: { "Content-Type": "application/x-www-form-urlencoded" },
9+
// @ts-ignore
10+
body: new URLSearchParams({
11+
client_id: process.env.KEYCLOAK_CLIENT_ID,
12+
client_secret: process.env.KEYCLOAK_CLIENT_SECRET,
13+
grant_type: "refresh_token",
14+
refresh_token: token.refreshToken,
15+
}),
16+
method: "POST",
17+
cache: "no-store",
18+
});
1919
}
2020

2121
const authOptions: NextAuthOptions = {
22-
secret: process.env.NEXTAUTH_SECRET,
23-
providers: [
24-
KeycloakProvider({
25-
clientId: process.env.KEYCLOAK_CLIENT_ID ?? "",
26-
clientSecret: process.env.KEYCLOAK_CLIENT_SECRET ?? "",
27-
issuer: process.env.KEYCLOAK_ISSUER,
28-
httpOptions: {
29-
timeout: 10000,
30-
},
31-
}),
32-
],
33-
session: {
34-
maxAge: 60 * 30,
35-
},
36-
callbacks: {
37-
async jwt({ token, account }) {
38-
if (account) {
39-
token.idToken = account.id_token;
40-
token.accessToken = account.access_token;
41-
token.refreshToken = account.refresh_token;
42-
token.expiresAt = account.expires_at;
22+
secret: process.env.NEXTAUTH_SECRET,
23+
providers: [
24+
KeycloakProvider({
25+
clientId: process.env.KEYCLOAK_CLIENT_ID ?? "",
26+
clientSecret: process.env.KEYCLOAK_CLIENT_SECRET ?? "",
27+
issuer: process.env.KEYCLOAK_ISSUER,
28+
httpOptions: {
29+
timeout: 10000,
30+
},
31+
}),
32+
],
33+
session: {
34+
maxAge: 60 * 30,
35+
},
36+
callbacks: {
37+
async jwt({ token, account }) {
38+
if (account) {
39+
token.idToken = account.id_token;
40+
token.accessToken = account.access_token;
41+
token.refreshToken = account.refresh_token;
42+
token.expiresAt = account.expires_at;
4343

44-
if (account.access_token) {
45-
const decodedToken = jwt.decode(account.access_token);
46-
// @ts-ignore
47-
token.roles = decodedToken.resource_access.account.roles;
48-
}
49-
return token;
50-
}
51-
// @ts-ignore
52-
if (Date.now() < token.expiresAt * 1000 - 60 * 1000) {
53-
return token;
54-
} else {
55-
try {
56-
const response = await requestRefreshAccessToken(token);
44+
if (account.access_token) {
45+
const decodedToken = jwt.decode(account.access_token);
46+
// @ts-ignore
47+
token.roles = decodedToken.resource_access.account.roles;
48+
}
49+
return token;
50+
}
51+
// @ts-ignore
52+
if (Date.now() < token.expiresAt * 1000 - 60 * 1000) {
53+
return token;
54+
} else {
55+
try {
56+
const response = await requestRefreshAccessToken(token);
5757

58-
const tokens: TokenSet = await response.json();
58+
const tokens: TokenSet = await response.json();
5959

60-
if (!response.ok) throw tokens;
60+
if (!response.ok) throw tokens;
6161

62-
const updatedToken: JWT = {
63-
...token,
64-
idToken: tokens.id_token,
65-
accessToken: tokens.access_token,
66-
expiresAt: Math.floor(
67-
Date.now() / 1000 + (tokens.expires_in as number),
68-
),
69-
refreshToken: tokens.refresh_token ?? token.refreshToken,
70-
};
71-
return updatedToken;
72-
} catch (error) {
73-
console.error("Error refreshing access token", error);
74-
return { ...token, error: "RefreshAccessTokenError" };
75-
}
76-
}
77-
},
78-
async session({ session, token }) {
79-
// @ts-ignore
80-
session.accessToken = token.accessToken;
81-
// @ts-ignore
82-
session.refreshToken = token.refreshToken;
83-
// @ts-ignore
84-
session.roles = token.roles;
85-
return session;
86-
},
62+
const updatedToken: JWT = {
63+
...token,
64+
idToken: tokens.id_token,
65+
accessToken: tokens.access_token,
66+
expiresAt: Math.floor(
67+
Date.now() / 1000 + (tokens.expires_in as number),
68+
),
69+
refreshToken: tokens.refresh_token ?? token.refreshToken,
70+
};
71+
return updatedToken;
72+
} catch (error) {
73+
console.error("Error refreshing access token", error);
74+
return { ...token, error: "RefreshAccessTokenError" };
75+
}
76+
}
77+
},
78+
async session({ session, token }) {
79+
// @ts-ignore
80+
session.accessToken = token.accessToken;
81+
// @ts-ignore
82+
session.refreshToken = token.refreshToken;
83+
// @ts-ignore
84+
session.roles = token.roles;
85+
return session;
8786
},
87+
},
8888
};
8989
const handler = NextAuth(authOptions);
9090

91-
export { handler as GET, handler as POST };
91+
export { handler as GET, handler as POST };

‎client/src/app/api/auth/sso-sign-out/route.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
import { NextRequest, NextResponse } from "next/server";
22

33
export async function GET(req: NextRequest) {
4-
try {
5-
const refreshToken = req.headers.get("refresh_token");
4+
try {
5+
const refreshToken = req.headers.get("refresh_token");
66

7-
if (
8-
!refreshToken ||
9-
!process.env.KEYCLOAK_END_SESSION_ENDPOINT ||
10-
!process.env.KEYCLOAK_CLIENT_ID
11-
) {
12-
throw Error;
13-
}
14-
15-
const body = `client_id=${process.env.KEYCLOAK_CLIENT_ID}&client_secret=${process.env.KEYCLOAK_CLIENT_SECRET}&refresh_token=${refreshToken}`;
7+
if (
8+
!refreshToken ||
9+
!process.env.KEYCLOAK_END_SESSION_ENDPOINT ||
10+
!process.env.KEYCLOAK_CLIENT_ID
11+
) {
12+
throw Error;
13+
}
1614

17-
const endSession = await fetch(process.env.KEYCLOAK_END_SESSION_ENDPOINT, {
18-
method: "POST",
19-
headers: {
20-
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
21-
Authorization: `Bearer ${refreshToken}`,
22-
},
23-
body,
24-
});
15+
const body = `client_id=${process.env.KEYCLOAK_CLIENT_ID}&client_secret=${process.env.KEYCLOAK_CLIENT_SECRET}&refresh_token=${refreshToken}`;
2516

26-
if (endSession && endSession.status && endSession.status >= 300) {
27-
console.error("END_SESSION ERROR", endSession.status);
28-
throw Error;
29-
}
17+
const endSession = await fetch(process.env.KEYCLOAK_END_SESSION_ENDPOINT, {
18+
method: "POST",
19+
headers: {
20+
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
21+
Authorization: `Bearer ${refreshToken}`,
22+
},
23+
body,
24+
});
3025

31-
return NextResponse.json({ success: true });
32-
} catch (error) {
33-
return NextResponse.json({
34-
success: false,
35-
message: `Error signing out: ${error}`,
36-
});
26+
if (endSession && endSession.status && endSession.status >= 300) {
27+
console.error("END_SESSION ERROR", endSession.status);
28+
throw Error;
3729
}
38-
}
30+
31+
return NextResponse.json({ success: true });
32+
} catch (error) {
33+
return NextResponse.json({
34+
success: false,
35+
message: `Error signing out: ${error}`,
36+
});
37+
}
38+
}

‎client/src/app/layout.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ export default function RootLayout({
3030
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
3131
>
3232
<Providers>
33-
<SessionGuard>
34-
{children}
35-
</SessionGuard>
33+
<SessionGuard>{children}</SessionGuard>
3634
</Providers>
3735
</body>
3836
</html>

‎client/src/app/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"use client";
22

33
import WhiteBoard from "@/components/WhiteBoard";
4-
import {useGetMe} from "@/hooks/api/account.api";
4+
import { useGetMe } from "@/hooks/api/account.api";
55

66
export default function Home() {
7-
const {data} = useGetMe()
8-
console.log(data)
7+
const { data } = useGetMe();
8+
console.log(data);
99

1010
return <WhiteBoard />;
1111
}

‎client/src/app/providers.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ export default function Providers({ children }: PropsWithChildren) {
88
const [queryClient] = React.useState(() => new QueryClient());
99

1010
return (
11-
<SessionProvider refetchInterval={4 * 60}>
12-
<QueryClientProvider client={queryClient}>
13-
{children}
14-
</QueryClientProvider>
15-
</SessionProvider>
11+
<SessionProvider refetchInterval={4 * 60}>
12+
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
13+
</SessionProvider>
1614
);
1715
}

‎client/src/components/WhiteBoard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function WhiteBoard() {
3939

4040
return (
4141
<div style={{ width: "100vw", height: "100vh" }}>
42-
<div className="fixed left-4 top-1/2 -translate-y-1/2 z-10 ">
42+
<div className="fixed top-1/2 left-4 z-10 -translate-y-1/2">
4343
<Sidebar onAddNode={handleAddNode} />
4444
</div>
4545
<ReactFlow

0 commit comments

Comments
 (0)