Merge pull request #300 from GiganticMinecraft/fix/answer

回答が送信できないのを修正

src/app/admin/page.tsx

@@ -6,7 +6,7 @@ import { getCachedToken } from '@/features/user/api/mcToken';
 import styles from '../page.module.css';
 
 const Home = async () => {
-  const token = getCachedToken() ?? '';
+  const token = (await getCachedToken()) ?? '';
   const answers = await getAllAnswers(token);
   return (
     <main className={styles['main']}>

src/app/forms/[formId]/page.tsx

@@ -3,7 +3,7 @@ import AnswerForm from '@/features/form/components/AnswerForm';
 import { getCachedToken } from '@/features/user/api/mcToken';
 
 const Home = async ({ params }: { params: { formId: number } }) => {
-  const token = getCachedToken() ?? '';
+  const token = (await getCachedToken()) ?? '';
   const questions = await getFormQuestions(params.formId, token);
 
   return <AnswerForm questions={questions} formId={params.formId} />;

src/app/forms/page.tsx

@@ -3,7 +3,7 @@ import FormList from '@/features/form/components/FormList';
 import { getCachedToken } from '@/features/user/api/mcToken';
 
 const Home = async () => {
-  const token = getCachedToken() ?? '';
+  const token = (await getCachedToken()) ?? '';
   const forms = await getForms(token);
   return <FormList forms={forms} />;
 };

src/features/form/api/form.ts

@@ -59,11 +59,10 @@ export const postAnswers = async (
   token: string
 ): Promise<boolean> => {
   const answersJson = JSON.stringify({
-    uuid: '3fa85f64-5717-4562-b3fc-2c963f66afa6', //todo: user側の処理を実装したら書き換える
-    timestamp: new Date(),
-    form_id,
+    form_id: Number(form_id),
     answers,
   });
+
   const response = await fetch(`http://localhost:9000/forms/answers`, {
     method: 'POST',
     headers: {

src/features/form/components/AnswerForm.tsx

@@ -94,7 +94,7 @@ const AnswerForm = ({ questions: questions, formId }: Props) => {
       }
     });
 
-    const token = getCachedToken() ?? '';
+    const token = (await getCachedToken()) ?? '';
     if (await postAnswers(formId, formAnswers, token)) {
       toggleIsSubmitted(true);
       reset();

src/features/user/api/mcToken.ts

@@ -6,10 +6,14 @@ import type { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies';
 
 const KEY = 'SEICHI_PORTAL__MC_TOKEN';
 
-export const getCachedToken = (cookie?: RequestCookies) => {
-  const cache = cookie ? cookie.get(KEY) : cookies().get(KEY);
+export const getCachedToken = (
+  cookie?: RequestCookies
+): Promise<string | undefined> => {
+  return new Promise((resolve, _reject) => {
+    const cache = cookie ? cookie.get(KEY) : cookies().get(KEY);
 
-  return cache?.value;
+    resolve(cache?.value);
+  });
 };
 
 export const saveTokenToCache = ({

src/features/user/components/AuthenticatedTemplate.tsx

@@ -3,8 +3,8 @@ import type { ReactNode } from 'react';
 
 type Props = { children: ReactNode };
 
-export const AuthenticatedTemplate = ({ children }: Props) => {
-  const isAuthenticated = !!getCachedToken();
+export const AuthenticatedTemplate = async ({ children }: Props) => {
+  const isAuthenticated = !!(await getCachedToken());
 
   return isAuthenticated ? <>{children}</> : null;
 };

src/features/user/components/UnauthenticatedTemplate.tsx

@@ -3,8 +3,8 @@ import type { ReactNode } from 'react';
 
 type Props = { children: ReactNode };
 
-export const UnauthenticatedTemplate = ({ children }: Props) => {
-  const isUnauthenticated = !getCachedToken();
+export const UnauthenticatedTemplate = async ({ children }: Props) => {
+  const isUnauthenticated = !(await getCachedToken());
 
   return isUnauthenticated ? <>{children}</> : null;
 };

src/middleware.ts

@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server';
 import { getCachedToken } from '@/features/user/api/mcToken';
 import type { NextRequest } from 'next/server';
 
-export const middleware = (request: NextRequest) => {
+export const middleware = async (request: NextRequest) => {
   if (request.method !== 'GET') {
     return;
   }
@@ -11,7 +11,7 @@ export const middleware = (request: NextRequest) => {
     return;
   }
 
-  if (!!getCachedToken(request.cookies)) {
+  if (!!(await getCachedToken(request.cookies))) {
     return;
   }