From 83a0bee2356afd1a7e21a46beb010b44212f5e79 Mon Sep 17 00:00:00 2001
From: Andres Morey <andresmarcel@gmail.com>
Date: Thu, 21 Nov 2024 14:27:13 +0300
Subject: [PATCH] moved request clone() to nextjs package

---
 packages/nextjs/src/index.ts | 2 +-
 shared/src/util.ts           | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/nextjs/src/index.ts b/packages/nextjs/src/index.ts
index 3b8f7c9..00cc33c 100644
--- a/packages/nextjs/src/index.ts
+++ b/packages/nextjs/src/index.ts
@@ -63,7 +63,7 @@ export function createCsrfProtect(opts?: Partial<NextConfigOptions>): NextCsrfPr
   return async (request, response) => {
     // execute protect function
     const token = await _csrfProtect({
-      request,
+      request: request.clone(),
       url: request.nextUrl,
       getCookie: (name) => request.cookies.get(name)?.value,
       setCookie: (cookie) => response.cookies.set(cookie),
diff --git a/shared/src/util.ts b/shared/src/util.ts
index 9a701f1..ee3d267 100644
--- a/shared/src/util.ts
+++ b/shared/src/util.ts
@@ -73,12 +73,9 @@ export async function getTokenString(request: Request, tokenOpts: TokenOptions =
   // check request body
   const contentType = request.headers.get('content-type') || 'text/plain';
 
-  // clone request so reading doesn't alter original
-  const requestCopy = request.clone();
-
   // url-encoded or multipart/form-data
   if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
-    const formData = await requestCopy.formData();
+    const formData = await request.formData();
     const formDataVal = getTokenValueFromFormData(formData, tokenOpts);
     if (typeof formDataVal === 'string') return formDataVal;
     return '';
@@ -86,13 +83,13 @@ export async function getTokenString(request: Request, tokenOpts: TokenOptions =
 
   // json-encoded
   if (contentType === 'application/json' || contentType === 'application/ld+json') {
-    const json = await requestCopy.json() as any;
+    const json = await request.json() as any;
     const jsonVal = json[fieldName];
     if (typeof jsonVal === 'string') return jsonVal;
     return '';
   }
 
-  const rawVal = await requestCopy.text();
+  const rawVal = await request.text();
 
   // non-form server actions
   if (contentType.startsWith('text/plain')) {