암호화 방식 변경

src/app/api/auth/signin/route.ts

@@ -42,7 +42,7 @@ export async function POST(request: NextRequest) {
         sameSite: 'strict',
       });
 
-      res.cookies.set('role', RoleEncryption({ role }), {
+      res.cookies.set('role', await RoleEncryption({ role }), {
         httpOnly: false,
         secure: process.env.NODE_ENV === 'production',
         expires: accessTokenExpires,

src/app/api/reservation/machine/[machineId]/history/route.ts

@@ -3,9 +3,9 @@ import { NextRequest, NextResponse } from 'next/server';
 
 export async function GET(
   request: NextRequest,
-  { params }: { params: { machineId: string } }
+  context: { params: { machineId: string } }
 ) {
-  const { machineId } = params;
+  const { machineId } = context.params;
   const accessToken = request.cookies.get('accessToken')?.value;
   const headers = accessToken
     ? { Authorization: `Bearer ${accessToken}` }

src/app/my-page/page.tsx

@@ -153,7 +153,7 @@ export default function MyPage() {
 
     try {
       const response = await machineApi.getDevices();
-      console.log("Machine status response:", response);
+
       if (response.status === 200 && response.data) {
         const { washer, dryer } = response.data;
         const allMachines = [...washer, ...dryer];

src/middleware.ts

@@ -2,15 +2,15 @@ import RoleEncryption from '@/shared/lib/role-encryption';
 import { NextRequest, NextResponse } from 'next/server';
 
 export async function middleware(request: NextRequest) {
-  const accessToken = request.cookies.get('accessToken')?.value;
-  const refreshToken = request.cookies.get('refreshToken')?.value;
+  try {
+    const accessToken = request.cookies.get('accessToken')?.value;
+    const refreshToken = request.cookies.get('refreshToken')?.value;
 
-  if (!refreshToken) {
-    return NextResponse.redirect(new URL('/login', request.url));
-  }
+    if (!refreshToken) {
+      return NextResponse.redirect(new URL('/login', request.url));
+    }
 
-  if (!accessToken) {
-    try {
+    if (!accessToken) {
       const response = await fetch(
         `${process.env.NEXT_PUBLIC_BASE_URL}/auth/reissue`,
         {
@@ -36,67 +36,59 @@ export async function middleware(request: NextRequest) {
         const accessTokenExpires = new Date(`${accessTokenExpiredAt}+09:00`);
         const refreshTokenExpires = new Date(`${refreshTokenExpiredAt}+09:00`);
 
-        if (
-          isNaN(accessTokenExpires.getTime()) ||
-          isNaN(refreshTokenExpires.getTime())
-        ) {
-          console.warn(
-            'Invalid expiration dates, continuing with existing session'
-          );
-          return NextResponse.next();
-        }
-
         const nextResponse = NextResponse.next();
 
         nextResponse.cookies.set('accessToken', newAccessToken, {
           httpOnly: true,
-          secure: process.env.NODE_ENV === 'production',
+          secure: !!process.env.NODE_ENV,
           expires: accessTokenExpires,
           sameSite: 'strict',
           path: '/',
         });
 
         nextResponse.cookies.set('refreshToken', newRefreshToken, {
           httpOnly: true,
-          secure: process.env.NODE_ENV === 'production',
+          secure: !!process.env.NODE_ENV,
           expires: refreshTokenExpires,
           sameSite: 'strict',
           path: '/',
         });
 
-        nextResponse.cookies.set('role', RoleEncryption({ role }), {
+        nextResponse.cookies.set('role', await RoleEncryption({ role }), {
           httpOnly: false,
-          secure: process.env.NODE_ENV === 'production',
+          secure: !!process.env.NODE_ENV,
           expires: accessTokenExpires,
           sameSite: 'strict',
           path: '/',
         });
 
-        return nextResponse;
-      } else if (!data.success) {
-        const response = NextResponse.redirect(new URL('/login', request.url));
-        response.cookies.delete('accessToken');
-        response.cookies.delete('refreshToken');
-        response.cookies.delete('role');
+        nextResponse.cookies.set('preRole', role, {
+          httpOnly: false,
+          secure: !!process.env.NODE_ENV,
+          expires: accessTokenExpires,
+          sameSite: 'strict',
+          path: '/',
+        });
 
-        return response;
+        return nextResponse;
       }
-    } catch (err) {
-      const response = NextResponse.redirect(new URL('/login', request.url));
-      response.cookies.delete('accessToken');
-      response.cookies.delete('refreshToken');
-      response.cookies.delete('role');
-
-      return response;
-      console.log('Token refresh error, continuing with existing session');
     }
+  } catch (err) {
+    const response = NextResponse.redirect(new URL('/login', request.url));
+    response.cookies.delete('accessToken');
+    response.cookies.delete('refreshToken');
+    response.cookies.delete('role');
+    response.cookies.delete('preRole');
+
+    return response;
   }
 
   return NextResponse.next();
 }
 
 export const config = {
   matcher: [
-    '/((?!api/auth|login|register|forgot-password|_next/static|_next/image|favicon.ico|.*\\..*).*)',
+    '/((?!api|login|register|forgot-password|_next/static|_next/image|favicon.ico|.*\\..*).*)',
   ],
+
 };

src/shared/lib/get-key.ts

@@ -0,0 +1,17 @@
+export default async function GetKey() {
+  const textEncoder = new TextEncoder();
+
+  const raw = textEncoder.encode(process.env.ROLE_KEY!);
+
+  const hashed = await crypto.subtle.digest('SHA-256', raw);
+
+  return crypto.subtle.importKey(
+    'raw',
+    hashed,
+    {
+      name: 'AES-CBC',
+    },
+    false,
+    ['encrypt', 'decrypt']
+  );
+}

src/shared/lib/reservation-store.ts

@@ -15,7 +15,7 @@
 } from "./api-client";
 import { MachineOperatingState } from "./machine-status";
 import axios from "axios";
-import { getRole } from "./getRole";
+import { getRole } from "./get-role";
 
 export type FloorType = 3 | 4 | 5;
 export type MachineType = "washing" | "dryer";
@@ -95,7 +95,7 @@
     id: serverMachine.label || `unknown-${Date.now()}`,
     serverId: serverMachine.id || 0,
     type,
     floor: (serverMachine.floor as FloorType) || 3,
     location,
     status,
     isOutOfOrder: serverMachine.isOutOfOrder || false,

src/shared/lib/role-decryption.ts

@@ -1,13 +1,23 @@
 import { privateDecrypt } from "crypto";
 import { UserRole } from "./auth-utils";
+import GetKey from "./get-key";
 
 interface Props {
   role: string;
 }
 
 export default async function RoleDecryption({ role }: Props) {
-  return privateDecrypt(
-    process.env.ROLE_PRIVATE_KEY ?? "",
-    Buffer.from(role, "base64")
-  ).toString() as UserRole;
+  const [iv, cipher] = role.split(".");
+  const key = await GetKey();
+  const textDecoder = new TextDecoder();
+
+  const decrypted = await crypto.subtle.decrypt(
+    {
+      name: "AES-CBC",
+      iv: Uint8Array.from(Buffer.from(iv, "base64"))
+    },
+    key,
+    Uint8Array.from(Buffer.from(cipher, "base64"))
+  );
+  return textDecoder.decode(decrypted) as UserRole;
 }

src/shared/lib/role-encryption.ts

@@ -1,13 +1,24 @@
 import { UserRole } from "./auth-utils";
-import { publicEncrypt } from "crypto";
+import GetKey from "./get-key";
 
 interface Props {
   role: UserRole;
 }
 
-export default function RoleEncryption({ role }: Props) {
-  return publicEncrypt(
-    process.env.ROLE_PUBLIC_KEY ?? "",
-    Buffer.from(role)
-  ).toString("base64");
+export default async function RoleEncryption({ role }: Props) {
+  const key = await GetKey();
+  const textEncoder = new TextEncoder();
+  const iv = crypto.getRandomValues(new Uint8Array(16));
+
+  const encodeRole = textEncoder.encode(role);
+  const cipher = await crypto.subtle.encrypt(
+    {
+      name: "AES-CBC",
+      iv
+    },
+    key,
+    encodeRole
+  );
+
+  return Buffer.from(iv).toString("base64") + "." + Buffer.from(new Uint8Array(cipher)).toString("base64");
 }