Merge pull request #78 from solaoi/feature_add-cookie-settings

cookie設定を追加
solaoi · Apr 11, 2023 · d7fbd55 · d7fbd55
2 parents 936d57f + 02e212d
commit d7fbd55
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 4 deletions.
diff --git a/app/api/[[...slug]].ts b/app/api/[[...slug]].ts
@@ -34,6 +34,7 @@ const Handler: BlitzApiHandler = async (req: BlitzApiRequest, res: BlitzApiRespo
     statusCode,
     sleep,
     response,
+    cookies,
     logs,
     ntimesError,
     ntimesErrorStatusCode,
@@ -86,7 +87,21 @@ const Handler: BlitzApiHandler = async (req: BlitzApiRequest, res: BlitzApiRespo
     res.status(Number(ntimesErrorStatusCode)).end()
     return
   }
-  res.status(Number(statusCode)).setHeader("Content-Type", contentType).end(response)
+  if (cookies !== "") {
+    res
+      .status(Number(statusCode))
+      .setHeader("Content-Type", contentType)
+      .setHeader(
+        "Set-Cookie",
+        cookies
+          .replaceAll("\r", "")
+          .split("\n")
+          .filter((v) => v !== "")
+      )
+      .end(response)
+  } else {
+    res.status(Number(statusCode)).setHeader("Content-Type", contentType).end(response)
+  }
 }
 
 export default Handler
diff --git a/app/lib/sqlite3Client.ts b/app/lib/sqlite3Client.ts
@@ -30,6 +30,7 @@ type StubTableType = {
   contentType: string
   statusCode: string
   response: string
+  cookies: string
   sleep: number
   logs: string
   ntimesError: number

diff --git a/app/pages/projects/[projectId].tsx b/app/pages/projects/[projectId].tsx
@@ -165,13 +165,20 @@ export const Project = () => {
                 onClick={async () => {
                   const { stubs } = await invoke(getStubs, { where: { projectId: projectId } })
                   const stubsForExport = stubs.map(
-                    ({ path, method, contentType, statusCode, response, sleep }) => {
+                    ({ path, method, contentType, statusCode, response, cookies, sleep }) => {
                       return {
                         path: `/api${project.basePath}${path}`,
                         method,
                         contentType,
                         statusCode,
                         response,
+                        cookies:
+                          cookies === ""
+                            ? null
+                            : cookies
+                                .replaceAll("\r", "")
+                                .split("\n")
+                                .filter((v) => v !== ""),
                         sleep: sleep * 1000,
                       }
                     }

diff --git a/app/pages/stubs/[stubId].tsx b/app/pages/stubs/[stubId].tsx
@@ -99,7 +99,7 @@ export const Stub = () => {
               _hover={{ bg: "teal.400", borderColor: "teal.400" }}
               leftIcon={<DownloadIcon />}
               onClick={async () => {
-                const { path, method, contentType, statusCode, response, sleep } = stub
+                const { path, method, contentType, statusCode, response, cookies, sleep } = stub
                 const blob = new Blob(
                   [
                     JSON.stringify(
@@ -109,6 +109,13 @@ export const Stub = () => {
                         contentType,
                         statusCode,
                         response,
+                        cookies:
+                          cookies === ""
+                            ? null
+                            : cookies
+                                .replaceAll("\r", "")
+                                .split("\n")
+                                .filter((v) => v !== ""),
                         sleep: sleep * 1000,
                       },
                       null,
@@ -166,6 +173,21 @@ export const Stub = () => {
                 <Text mb="1" h="1.5rem">
                   statusCode
                 </Text>
+                {stub.cookies !== "" &&
+                  stub.cookies
+                    .replaceAll("\r", "")
+                    .split("\n")
+                    .filter((v) => v !== "")
+                    .map((_, i) => {
+                      if (i === 0) {
+                        return (
+                          <Text key={"cookie_title_" + i} mb="1" h="1.5rem">
+                            cookies
+                          </Text>
+                        )
+                      }
+                      return <Text key={"cookie_title_" + i} mb="1" h="1.5rem"></Text>
+                    })}
                 {stub.sleep !== 0 && (
                   <>
                     <Text mb="1" h="1.5rem">
@@ -217,6 +239,16 @@ export const Stub = () => {
                 <Text mb="1" h="1.5rem">
                   {stub.statusCode}
                 </Text>
+                {stub.cookies !== "" &&
+                  stub.cookies
+                    .replaceAll("\r", "")
+                    .split("\n")
+                    .filter((v) => v !== "")
+                    .map((v, i) => (
+                      <Text key={"cookie_" + i} mb="1" h="1.5rem">
+                        {v}
+                      </Text>
+                    ))}
                 {stub.sleep !== 0 && (
                   <>
                     <Text mb="1" h="1.5rem">

diff --git a/app/stubs/components/StubForm.tsx b/app/stubs/components/StubForm.tsx
@@ -44,6 +44,12 @@ export function StubForm<S extends z.ZodType<any, any>>(props: FormProps<S>) {
         ]}
       />
       <LabeledTextField name="statusCode" label="StatusCode" placeholder="200" />
+      <LabeledTextAreaField
+        name="cookies"
+        label="Cookies"
+        placeholder="KEY1=VAL1; path=/; expires=Sat, 24 Nov 2012 08:34:29 GMT&#13;KEY2=VAL2; path=/; expires=Sat, 24 Nov 2012 08:34:29 GMT"
+        rows="4"
+      />
       <LabeledTextAreaField name="response" label="Response" placeholder="Response" rows="5" />
       <LabeledTextAreaField name="memo" label="Memo" placeholder="Any additional comments" />
       <Card heading="Optional" bgColor="#E2E8F0">

diff --git a/app/stubs/mutations/createStub.ts b/app/stubs/mutations/createStub.ts
@@ -23,6 +23,7 @@ const CreateStub = z.object({
   statusCode: z
     .string()
     .regex(/^\d{3}$/, { message: "The status code must be a three-digit number." }),
+  cookies: z.string().default(""),
   response: z.string().default(""),
   sleep: z.number().min(0).default(0),
   ntimesError: z.number().min(0).default(0),

diff --git a/app/stubs/mutations/updateStub.ts b/app/stubs/mutations/updateStub.ts
@@ -23,6 +23,7 @@ const UpdateStub = z.object({
   statusCode: z
     .string()
     .regex(/^\d{3}$/, { message: "The status code must be a three-digit number." }),
+  cookies: z.string().default(""),
   response: z.string(),
   sleep: z.number().min(0),
   ntimesError: z.number().min(0).default(0),

diff --git a/db/migrations/20230411015209_/migration.sql b/db/migrations/20230411015209_/migration.sql
@@ -0,0 +1,28 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Stub" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "createdBy" TEXT NOT NULL,
+    "updatedBy" TEXT NOT NULL,
+    "path" TEXT NOT NULL,
+    "method" TEXT NOT NULL,
+    "contentType" TEXT NOT NULL,
+    "statusCode" TEXT NOT NULL,
+    "cookies" TEXT NOT NULL DEFAULT '',
+    "response" TEXT NOT NULL,
+    "sleep" INTEGER NOT NULL DEFAULT 0,
+    "logs" TEXT NOT NULL,
+    "ntimesError" INTEGER NOT NULL DEFAULT 0,
+    "ntimesErrorStatusCode" TEXT NOT NULL DEFAULT '500',
+    "ntimesErrorCounter" INTEGER NOT NULL DEFAULT 0,
+    "memo" TEXT NOT NULL DEFAULT '',
+    "projectId" INTEGER NOT NULL,
+    CONSTRAINT "Stub_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_Stub" ("contentType", "createdAt", "createdBy", "id", "logs", "memo", "method", "ntimesError", "ntimesErrorCounter", "ntimesErrorStatusCode", "path", "projectId", "response", "sleep", "statusCode", "updatedAt", "updatedBy") SELECT "contentType", "createdAt", "createdBy", "id", "logs", "memo", "method", "ntimesError", "ntimesErrorCounter", "ntimesErrorStatusCode", "path", "projectId", "response", "sleep", "statusCode", "updatedAt", "updatedBy" FROM "Stub";
+DROP TABLE "Stub";
+ALTER TABLE "new_Stub" RENAME TO "Stub";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;
diff --git a/db/schema.prisma b/db/schema.prisma
@@ -86,6 +86,7 @@ model Stub {
   method                String
   contentType           String
   statusCode            String
+  cookies               String   @default("")
   response              String
   sleep                 Int      @default(0)
   logs                  String

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "co-metub",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "license": "MIT",
   "engines": {
     "node": "18",