ipの取得方法変更

kgtkr · Feb 10, 2024 · 48f1843 · 48f1843
1 parent 9a19f82
commit 48f1843
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/packages/server/src/server/context.ts b/packages/server/src/server/context.ts
@@ -1,6 +1,6 @@
 import { prisma } from "../prisma-client";
 import { array, option } from "fp-ts";
-import { none, some } from "fp-ts/lib/Option";
+import { none, some, Option } from "fp-ts/lib/Option";
 import { TokenRepo } from "../adapters";
 import { AtAuthError } from "../at-error";
 import { ITokenRepo, Ports } from "../ports";
@@ -30,15 +30,14 @@ async function createToken(raw: unknown, tokenRepo: ITokenRepo) {
   );
 }
 
-export async function createContext(
-  headers: Record<string, unknown>
-): Promise<AppContext> {
-  const xRealIp = headers["x-real-ip"];
-  const ip = typeof xRealIp === "string" ? some(xRealIp) : none;
-  const token = await createToken(
-    headers["x-token"] || headers["X-Token"],
-    new TokenRepo(prisma)
-  );
+export async function createContext({
+  rawToken,
+  ip,
+}: {
+  rawToken: unknown;
+  ip: Option<string>;
+}): Promise<AppContext> {
+  const token = await createToken(rawToken, new TokenRepo(prisma));
 
   return {
     ports: createPorts({

diff --git a/packages/server/src/server/server.ts b/packages/server/src/server/server.ts
@@ -22,9 +22,11 @@ import { makeExecutableSchema } from "@graphql-tools/schema";
 import bodyParser from "koa-bodyparser";
 import { GraphQLError } from "graphql";
 import { startCron } from "../cron";
+import { none, some } from "fp-ts/lib/Option";
 
 export async function serverRun() {
   const app = new Koa();
+  app.proxy = true;
   app.use(cors());
   app.use(bodyParser());
 
@@ -43,7 +45,8 @@ export async function serverRun() {
       schema,
       context: ({ connectionParams }) => {
         return createContext({
-          "x-token": connectionParams?.["token"],
+          rawToken: connectionParams?.["token"],
+          ip: none,
         });
       },
     },
@@ -110,7 +113,10 @@ export async function serverRun() {
     koaMiddleware(server, {
       context: (params): Promise<AppContext> => {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        return createContext(params.ctx.request.headers);
+        return createContext({
+          rawToken: params.ctx.request.headers["x-token"],
+          ip: some(params.ctx.ip),
+        });
       },
     })
   );