feat: 유저 세션 체크 로직 추가

src/app/[locale]/community/archive/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Archive from '@/components/community/Archive'
+import { initCheck } from '@/util/session-util'
+
+export default async function CommunityArchivePage() {
+  await initCheck()
 
-export default function CommunityArchivePage() {
   return (
     <>
       <Hero title="자료 다운로드" />

src/app/[locale]/community/faq/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Faq from '@/components/community/Faq'
+import { initCheck } from '@/util/session-util'
+
+export default async function CommunityFaqPage() {
+  await initCheck()
 
-export default function CommunityFaqPage() {
   return (
     <>
       <Hero title="FAQ" />

src/app/[locale]/community/notice/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Notice from '@/components/community/Notice'
+import { initCheck } from '@/util/session-util'
+
+export default async function CommunityNoticePage() {
+  await initCheck()
 
-export default function CommunityNoticePage() {
   return (
     <>
       <Hero title="공지사항" />

src/app/[locale]/intro/page.jsx

@@ -1,6 +1,9 @@
 import Intro from '@/components/Intro'
+import { initCheck } from '@/util/session-util'
+
+export default async function IntroPage() {
+  await initCheck()
 
-export default function IntroPage() {
   return (
     <>
       <div className="container mx-auto p-4 m-4 border">

src/app/[locale]/layout.js

@@ -5,6 +5,7 @@ import { LocaleProvider } from './LocaleProvider'
 
 export default function LocaleLayout({ children }) {
   const locale = useCurrentLocale()
+
   return (
     <>
       <LocaleProvider locale={locale} fallback={''}>

src/app/[locale]/management/plan/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Plan from '@/components/management/Plan'
+import { initCheck } from '@/util/session-util'
+
+export default async function ManagementPlanPage() {
+  await initCheck()
 
-export default function ManagementPlanPage() {
   return (
     <>
       <Hero title="도면관리" />

src/app/[locale]/management/stuff/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Stuff from '@/components/management/Stuff'
+import { initCheck } from '@/util/session-util'
+
+export default async function ManagementStuffPage() {
+  await initCheck()
 
-export default function ManagementStuffPage() {
   return (
     <>
       <Hero title="물건관리" />

src/app/[locale]/master/company/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Company from '@/components/master/Company'
+import { initCheck } from '@/util/session-util'
+
+export default async function MasterCompanyPage() {
+  await initCheck()
 
-export default function MasterCompanyPage() {
   return (
     <>
       <Hero title="회사정보 조회" />

src/app/[locale]/master/price/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Price from '@/components/master/Price'
+import { initCheck } from '@/util/session-util'
+
+export default async function MasterPricePage() {
+  await initCheck()
 
-export default function MasterPricePage() {
   return (
     <>
       <Hero title="가격 마스터 조회" />

src/app/[locale]/page.js

@@ -1,6 +1,6 @@
-import MainPage from '@/components/Main'
 import { getSession } from '@/lib/authActions'
 import { getCurrentLocale } from '@/locales/server'
+import MainPage from '@/components/Main'
 
 export default async function page() {
   const session = await getSession()

src/app/[locale]/playground/page.jsx

@@ -1,6 +1,14 @@
 import Playground from '@/components/Playground'
+import { initCheck } from '@/util/session-util'
+
+export default async function PlaygroundPage() {
+  // const { session } = await checkSession()
+
+  // if (!session.isLoggedIn) {
+  //   redirect('/login')
+  // }
+  await initCheck()
 
-export default function PlaygroundPage() {
   return (
     <>
       <Playground />

src/app/[locale]/roof/page.jsx

@@ -1,7 +1,10 @@
 import Hero from '@/components/Hero'
 import Roof from '@/components/Roof'
+import { initCheck } from '@/util/session-util'
+
+export default async function RoofPage() {
+  await initCheck()
 
-export default function RoofPage() {
   return (
     <>
       <Hero title="Drawing on canvas 2D Roof" />

src/app/[locale]/roof2/page.jsx

@@ -1,17 +1,9 @@
-'use client'
-
 import Roof2 from '@/components/Roof2'
-import { textState } from '@/store/canvasAtom'
-import { useEffect } from 'react'
-import { useRecoilState } from 'recoil'
 import RoofSelect from '@/app/[locale]/roof2/RoofSelect'
+import { initCheck } from '@/util/session-util'
 
-export default function Roof2Page() {
-  const [text, setText] = useRecoilState(textState)
-
-  useEffect(() => {
-    console.log(text)
-  }, [])
+export default async function Roof2Page() {
+  await initCheck()
 
   return (
     <>

src/components/Roof2.jsx

@@ -1,3 +1,5 @@
+'use client'
+
 import { useCanvas } from '@/hooks/useCanvas'
 import { useEffect, useState, useRef } from 'react'
 import { Mode, useMode } from '@/hooks/useMode'

src/components/common/grid/QGrid.jsx

@@ -7,7 +7,6 @@ import 'ag-grid-community/styles/ag-grid.css'
 import 'ag-grid-community/styles/ag-theme-quartz.css'
 
 export default function QGrid(props) {
-  console.log('QGrid props:', props)
   const { gridData, gridColumns, isPageable = true } = props
   const [count, setCount] = useState(0)
   const [clickedCount, setClickedCount] = useState(0)

src/lib/authActions.js

@@ -20,7 +20,8 @@ export async function getSession() {
 
   console.log('session:', session)
   if (!session.isLoggedIn) {
-    session.isLoggedIn = defaultSession.isLoggedIn
+    // session.isLoggedIn = defaultSession.isLoggedIn
+    session.isLoggedIn = false
   }
 
   return session
@@ -35,24 +36,20 @@ export async function login(formData) {
   console.log('id:', userId)
   console.log('password:', password)
 
-  // const user = {
-  //   id: 1,
-  //   name: 'jinsoo Kim',
-  //   email: 'jinsoo.kim@example.com',
-  // }
-  const loginUser = await getUserByIdAndPassword({ userId, password })
-  console.log('loginUser:', loginUser)
+  // const loginUser = await getUserByIdAndPassword({ userId, password })
+  const loginUser = {
+    id: 1,
+    userId: 'test123',
+    name: 'jinsoo Kim',
+    email: 'jinsoo.kim@example.com',
+  }
 
   if (!loginUser) {
     throw Error('Wrong Credentials!')
   }
 
-  // session.id = user.id
-  // session.email = user.email
-  session.userId = loginUser.USER_ID
-  session.saleStoreId = loginUser.SALE_STORE_ID
-  session.name = loginUser.NAME
-  session.mail = loginUser.MAIL
+  session.name = loginUser.USER_ID
+  session.email = loginUser.SALE_STORE_ID
   session.isLoggedIn = true
   console.log('session:', session)
 

src/lib/session.js

@@ -1,10 +1,4 @@
-export const defaultSession = {
-  userId: null,
-  saleStoreId: null,
-  name: null,
-  mail: null,
-  isLoggedIn: false,
-}
+export const defaultSession = {}
 
 export const sessionOptions = {
   password: process.env.SESSION_SECRET,

src/lib/user.js

@@ -1,5 +1,7 @@
 'use server'
 
+import { getSession } from './authActions'
+
 const { PrismaClient } = require('@prisma/client')
 
 const prisma = new PrismaClient()
@@ -29,3 +31,11 @@ export async function getUsers() {
     },
   })
 }
+
+export async function checkSession() {
+  const session = await getSession()
+
+  return {
+    session,
+  }
+}

src/util/context-util.js

@@ -30,7 +30,7 @@ const CanvasWithContextMenu = forwardRef(({ canvasProps }, ref) => {
     document.addEventListener('click', handleOutsideClick)
 
     return () => {
-      canvasProps.upperCanvasEl.removeEventListener('contextmenu', handleContextMenu)
+      // canvasProps.upperCanvasEl.removeEventListener('contextmenu', handleContextMenu)
       document.removeEventListener('click', handleClick)
       document.removeEventListener('click', handleOutsideClick)
     }

src/util/session-util.js

@@ -0,0 +1,10 @@
+import { checkSession } from '@/lib/user'
+import { redirect } from 'next/navigation'
+
+export const initCheck = async () => {
+  const { session } = await checkSession()
+
+  if (!session.isLoggedIn) {
+    redirect('/login')
+  }
+}