delete: session token from session

kitcc-org · Nov 14, 2024 · 46df57c · 46df57c
1 parent f21e84d
commit 46df57c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/frontend/app/routes/home._index/route.tsx b/frontend/app/routes/home._index/route.tsx
@@ -77,8 +77,8 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	}
 
 	const cookieHeader = [
-		`__Secure-user_id=${session.get('user')};`,
-		`__Secure-session_token=${session.get('sessionToken')}`,
+		`__Secure-user_id=${session.get('user')?.id};`,
+		`__Secure-session_token=${session.get('user')?.sessionToken}`,
 	].join('; ');
 
 	// prettier-ignore

diff --git a/frontend/app/routes/home.books.$bookId.edit/route.tsx b/frontend/app/routes/home.books.$bookId.edit/route.tsx
@@ -47,7 +47,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 
 	const cookieHeader = [
 		`__Secure-user_id=${session.get('user')?.id};`,
-		`__Secure-session_token=${session.get('sessionToken')}`,
+		`__Secure-session_token=${session.get('user')?.sessionToken}`,
 	].join('; ');
 	const formData = await request.formData();
 

diff --git a/frontend/app/routes/home.books.$bookId/route.tsx b/frontend/app/routes/home.books.$bookId/route.tsx
@@ -44,7 +44,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 				headers: {
 					Cookie: [
 						`__Secure-user_id=${session.get('user')?.id}`,
-						`__Secure-session_token=${session.get('sessionToken')}`,
+						`__Secure-session_token=${session.get('user')?.sessionToken}`,
 					].join('; '),
 				},
 			},
@@ -71,8 +71,8 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	}
 
 	const cookieHeader = [
-		`__Secure-user_id=${session.get('user')};`,
-		`__Secure-session_token=${session.get('sessionToken')}`,
+		`__Secure-user_id=${session.get('user')?.id};`,
+		`__Secure-session_token=${session.get('user')?.sessionToken}`,
 	].join('; ');
 	const formData = await request.formData();
 

diff --git a/frontend/app/routes/home.cart/route.tsx b/frontend/app/routes/home.cart/route.tsx
@@ -41,8 +41,8 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	}
 
 	const cookieHeader = [
-		`__Secure-user_id=${session.get('user')};`,
-		`__Secure-session_token=${session.get('sessionToken')}`,
+		`__Secure-user_id=${session.get('user')?.id};`,
+		`__Secure-session_token=${session.get('user')?.sessionToken}`,
 	].join('; ');
 
 	// prettier-ignore

diff --git a/frontend/app/routes/home.global.books.$isbn/route.tsx b/frontend/app/routes/home.global.books.$isbn/route.tsx
@@ -70,7 +70,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 
 	const cookieHeader = [
 		`__Secure-user_id=${session.get('user')?.id};`,
-		`__Secure-session_token=${session.get('sessionToken')}`,
+		`__Secure-session_token=${session.get('user')?.sessionToken}`,
 	].join('; ');
 
 	const requestBody = await request.json<CreateBookBody>();

diff --git a/frontend/app/routes/home/route.tsx b/frontend/app/routes/home/route.tsx
@@ -74,7 +74,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 
 	if (response.status === 204) {
 		session.unset('user');
-		session.unset('sessionToken');
 		session.flash('success', 'ログアウトに成功しました');
 
 		return redirect('/home', {
@@ -103,10 +102,9 @@ const Home = () => {
 	useEffect(() => {
 		if (navigation.state === 'idle') {
 			if (!!userData) {
-				// CookieにユーザIDが存在する
+				// Cookieにユーザ情報が保存されている
 				if (!user) {
-					// 状態変数にユーザ情報が保存されていない
-					// ユーザ情報を取得するAPIを呼び出す
+					// 状態変数にユーザ情報を保存する
 					setUser(userData);
 				}
 			} else {

diff --git a/frontend/app/routes/login/route.tsx b/frontend/app/routes/login/route.tsx
@@ -50,7 +50,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	// ログインに成功した場合
 	if (response.status === 200) {
 		session.set('user', response.data);
-		session.set('sessionToken', response.data.sessionToken!);
 		session.flash('success', 'ログインに成功しました');
 
 		return redirect('/home/mypage', {

diff --git a/frontend/app/services/session.server.ts b/frontend/app/services/session.server.ts
@@ -3,7 +3,6 @@ import { User } from 'client/client.schemas';
 
 interface SessionData {
 	user: User;
-	sessionToken: string;
 }
 
 interface SessionFlashData {