remove handling for urlencoded actions

Author: lubieowoce

Diff for: packages/next/src/server/app-render/action-handler.ts

@@ -49,15 +49,6 @@ import { synchronizeMutableCookies } from '../async-storage/request-store'
 import type { TemporaryReferenceSet } from 'react-server-dom-webpack/server.edge'
 import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 
-function formDataFromSearchQueryString(query: string) {
-  const searchParams = new URLSearchParams(query)
-  const formData = new FormData()
-  for (const [key, value] of searchParams) {
-    formData.append(key, value)
-  }
-  return formData
-}
-
 function nodeHeadersToRecord(
   headers: IncomingHttpHeaders | OutgoingHttpHeaders
 ) {
@@ -482,13 +473,8 @@ export async function handleAction({
   const contentType = req.headers['content-type']
   const { serverActionsManifest, page } = ctx.renderOpts
 
-  const {
-    actionId,
-    isURLEncodedAction,
-    isMultipartAction,
-    isFetchAction,
-    isServerAction,
-  } = getServerActionRequestMetadata(req)
+  const { actionId, isMultipartAction, isFetchAction, isServerAction } =
+    getServerActionRequestMetadata(req)
 
   // If it's not a Server Action, skip handling.
   if (!isServerAction) {
@@ -726,21 +712,11 @@ export async function handleAction({
             }
 
             const actionData = Buffer.concat(chunks).toString('utf-8')
-
-            if (isURLEncodedAction) {
-              const formData = formDataFromSearchQueryString(actionData)
-              boundActionArguments = await decodeReply(
-                formData,
-                serverModuleMap,
-                { temporaryReferences }
-              )
-            } else {
-              boundActionArguments = await decodeReply(
-                actionData,
-                serverModuleMap,
-                { temporaryReferences }
-              )
-            }
+            boundActionArguments = await decodeReply(
+              actionData,
+              serverModuleMap,
+              { temporaryReferences }
+            )
           }
         } else if (
           // The type check here ensures that `req` is correctly typed, and the
@@ -882,20 +858,11 @@ export async function handleAction({
 
             const actionData = Buffer.concat(chunks).toString('utf-8')
 
-            if (isURLEncodedAction) {
-              const formData = formDataFromSearchQueryString(actionData)
-              boundActionArguments = await decodeReply(
-                formData,
-                serverModuleMap,
-                { temporaryReferences }
-              )
-            } else {
-              boundActionArguments = await decodeReply(
-                actionData,
-                serverModuleMap,
-                { temporaryReferences }
-              )
-            }
+            boundActionArguments = await decodeReply(
+              actionData,
+              serverModuleMap,
+              { temporaryReferences }
+            )
           }
         } else {
           throw new Error('Invariant: Unknown request type.')

Diff for: packages/next/src/server/lib/server-action-request-meta.ts

@@ -7,7 +7,6 @@ export function getServerActionRequestMetadata(
   req: IncomingMessage | BaseNextRequest | NextRequest
 ): {
   actionId: string | null
-  isURLEncodedAction: boolean
   isMultipartAction: boolean
   isFetchAction: boolean
   isServerAction: boolean
@@ -23,9 +22,8 @@ export function getServerActionRequestMetadata(
     contentType = req.headers['content-type'] ?? null
   }
 
-  const isURLEncodedAction = Boolean(
-    req.method === 'POST' && contentType === 'application/x-www-form-urlencoded'
-  )
+  // might be a no-js action or a fetch action that uses FormData.
+  // we can't tell at this point, we need to run it through `decodeAction` to make sure.
   const isMultipartAction = Boolean(
     req.method === 'POST' && contentType?.startsWith('multipart/form-data')
   )
@@ -35,13 +33,10 @@ export function getServerActionRequestMetadata(
       req.method === 'POST'
   )
 
-  const isServerAction = Boolean(
-    isFetchAction || isURLEncodedAction || isMultipartAction
-  )
+  const isServerAction = Boolean(isFetchAction || isMultipartAction)
 
   return {
     actionId,
-    isURLEncodedAction,
     isMultipartAction,
     isFetchAction,
     isServerAction,

Diff for: test/e2e/app-dir/actions/app-action.test.ts

@@ -795,10 +795,10 @@ describe('app-dir action handling', () => {
       await next.fetch('/server', {
         method: 'POST',
         headers: {
-          'content-type': 'application/x-www-form-urlencoded',
+          'content-type': 'text/plain',
           'next-action': 'abc123',
         },
-        body: 'foo=bar',
+        body: '["foo","bar"]',
       })
 
       await retry(async () =>
@@ -1627,7 +1627,7 @@ describe('app-dir action handling', () => {
   })
 
   describe('redirects', () => {
-    it('redirects properly when server action handler uses `redirect`', async () => {
+    it('redirects properly when route handler uses `redirect`', async () => {
       const postRequests = []
       const responseCodes = []
 
@@ -1656,12 +1656,12 @@ describe('app-dir action handling', () => {
         expect(await browser.url()).toContain('success=true')
       })
 
-      // verify that the POST request was only made to the action handler
+      // verify that the POST request was only made to the route handler
       expect(postRequests).toEqual(['/redirects/api-redirect'])
       expect(responseCodes).toEqual([303])
     })
 
-    it('redirects properly when server action handler uses `permanentRedirect`', async () => {
+    it('redirects properly when route handler uses `permanentRedirect`', async () => {
       const postRequests = []
       const responseCodes = []
 
@@ -1689,7 +1689,7 @@ describe('app-dir action handling', () => {
       await retry(async () => {
         expect(await browser.url()).toContain('success=true')
       })
-      // verify that the POST request was only made to the action handler
+      // verify that the POST request was only made to the route handler
       expect(postRequests).toEqual(['/redirects/api-redirect-permanent'])
       expect(responseCodes).toEqual([303])
     })