Merge pull request #375 from eatski/main

Release to Production

__test__/story.e2e.ts

@@ -3,7 +3,6 @@ import { test, expect } from '@playwright/test';
 import { PrismaClient } from '@prisma/client';
 import { resolveFixturePath } from '../fixtures';
 import { generateId } from '@/common/util/id';
-import { RECAPTCHA_COOKIE_KEY } from '@/common/util/grecaptcha';
 
 const BASE_URL = 'http://localhost:3000';
 
@@ -58,12 +57,6 @@ test('質問の送信', async ({ page }) => {
     })
 
     await page.goto(BASE_URL + "/stories/" + storyId);
-    process.env.MACHINE_TOKEN && await page.context().addCookies([{
-        name: RECAPTCHA_COOKIE_KEY,
-        value: process.env.MACHINE_TOKEN,
-        url: BASE_URL,
-        httpOnly: true
-    }]);
     await page.waitForLoadState("networkidle")
     const input = await page.getByRole('textbox', { name: "AIへの質問" });
     await input.fill("あなたはAIですか？");

package.json

@@ -18,7 +18,7 @@
 		"build-storybook": "storybook build"
 	},
 	"dependencies": {
-		"@anthropic-ai/sdk": "0.25.1",
+		"@anthropic-ai/sdk": "0.25.2",
 		"@hookform/resolvers": "3.1.0",
 		"@prisma/client": "5.18.0",
 		"@szhsin/react-menu": "4.2.2",
@@ -32,7 +32,7 @@
 		"mustache": "4.2.0",
 		"next": "14.2.5",
 		"next-auth": "4.24.7",
-		"openai": "4.55.4",
+		"openai": "4.55.5",
 		"randomstring": "1.3.0",
 		"react": "18.3.1",
 		"react-copy-to-clipboard": "5.1.0",
@@ -54,7 +54,7 @@
 	"devDependencies": {
 		"@axe-core/playwright": "4.9.1",
 		"@biomejs/biome": "1.8.3",
-		"@eslint/config-array": "0.17.1",
+		"@eslint/config-array": "0.18.0",
 		"@eslint/object-schema": "2.1.4",
 		"@next/bundle-analyzer": "14.2.5",
 		"@playwright/test": "1.46.0",

src/app/stories/[storyId]/page.tsx

@@ -8,7 +8,6 @@ import { getUserSession } from "@/server/serverComponent/getUserSession";
 import { setupABTestValue } from "@/server/serverComponent/setupABTestingVariant";
 import { checkAnswer } from "@/server/services/answer";
 import { askQuestion } from "@/server/services/question";
-import { verifyRecaptcha } from "@/server/services/recaptcha";
 import { getStories, getStory } from "@/server/services/story";
 import { deleteStory } from "@/server/services/story/deleteStory";
 import {
@@ -187,12 +186,10 @@ export default async function StoryPage({ params: { storyId } }: StoryProps) {
 				}}
 				sendQuestion={async (input) => {
 					"use server";
-					await verifyRecaptcha(input.recaptchaToken);
 					return askQuestion(input.text, story, setupABTestValue());
 				}}
 				checkAnswer={async (input) => {
 					"use server";
-					await verifyRecaptcha(input.recaptchaToken);
 					return checkAnswer(input.text, story);
 				}}
 				postStoryEvalution={async () => {

src/app/verification/page.tsx

@@ -0,0 +1 @@
+export default async function Verification() {}

src/components/play/index.tsx

@@ -1,5 +1,4 @@
 "use client";
-import { CLIENT_KEY, getRecaptchaToken } from "@/common/util/grecaptcha";
 import { gtagEvent } from "@/common/util/gtag";
 import { Button } from "@/designSystem/components/button";
 import type {
@@ -8,7 +7,6 @@ import type {
 	answer as answerSchema,
 } from "@/server/model/story";
 import { useMutation, useQuery } from "@tanstack/react-query";
-import Script from "next/script";
 import { useCallback, useState } from "react";
 import { z } from "zod";
 import { useConfirmModal } from "../confirmModal";
@@ -35,14 +33,12 @@ type Props = {
 	>;
 	sendQuestion: (args: {
 		text: string;
-		recaptchaToken: string;
 	}) => Promise<{
 		answer: z.infer<typeof answerSchema>;
 		hitQuestionExample: QuestionExampleWithCustomMessage | null;
 	}>;
 	checkAnswer: (args: {
 		text: string;
-		recaptchaToken: string;
 	}) => Promise<{
 		isCorrect: boolean;
 		distance: number;
@@ -55,7 +51,6 @@ const AnswerFormContainer: React.FC<{
 	changeMode: (mode: Mode) => void;
 	checkAnswer: (args: {
 		text: string;
-		recaptchaToken: string;
 	}) => Promise<{
 		isCorrect: boolean;
 		distance: number;
@@ -66,7 +61,6 @@ const AnswerFormContainer: React.FC<{
 		async (text: string) => {
 			const response = await checkAnswer({
 				text: text,
-				recaptchaToken: await getRecaptchaToken(),
 			});
 			return {
 				...response,
@@ -159,12 +153,9 @@ export function Play({
 				return <MobileLimitation />;
 		}
 	}
+
 	return (
 		<>
-			<Script
-				strategy="lazyOnload"
-				src={`https://www.google.com/recaptcha/api.js?render=${CLIENT_KEY}`}
-			/>
 			{mode === "question" && (
 				<div className={styles.sectionWrapper}>
 					<QuestionForm

src/components/play/useQuestion.test.tsx

@@ -16,8 +16,6 @@ import {
 	vitest,
 } from "vitest";
 
-import * as recapcha from "../../common/util/grecaptcha";
-
 const Provider: React.FC<PropsWithChildren> = ({ children }) => {
 	const queryClient = useMemo(() => new QueryClient(), []);
 	return (
@@ -30,9 +28,6 @@ describe("useQuestion", () => {
 
 	beforeEach(() => {
 		server.listen();
-		vi.spyOn(recapcha, "getRecaptchaToken").mockReturnValue(
-			Promise.resolve("test"),
-		);
 	});
 
 	afterEach(() => {
@@ -115,13 +110,11 @@ describe("useQuestion", () => {
 			[
 			  [
 			    {
-			      "recaptchaToken": "test",
 			      "text": "太郎は犬ですか？",
 			    },
 			  ],
 			  [
 			    {
-			      "recaptchaToken": "test",
 			      "text": "太郎は猫ですか？",
 			    },
 			  ],

src/components/play/useQuestion.ts

@@ -1,7 +1,6 @@
 import { useMutation } from "@tanstack/react-query";
 import { useRef, useState } from "react";
 import { z } from "zod";
-import { getRecaptchaToken } from "../../common/util/grecaptcha";
 import type {
 	Answer,
 	QuestionExampleWithCustomMessage,
@@ -48,7 +47,6 @@ const useMutableHistory = () => {
 export const useQuestion = (
 	sendQuestion: (args: {
 		text: string;
-		recaptchaToken: string;
 	}) => Promise<{
 		answer: z.infer<typeof answer>;
 		hitQuestionExample: QuestionExampleWithCustomMessage | null;
@@ -69,7 +67,6 @@ export const useQuestion = (
 			const id = pushHistory({ input: text, result: null });
 			const result = await mutateAsync({
 				text,
-				recaptchaToken: await getRecaptchaToken(),
 			});
 			const simpleMessage = (
 				{