From 4979b4c9b6666c6271ffe971f7ea955421a422ef Mon Sep 17 00:00:00 2001
From: David Pedersen <david.pdrsn@gmail.com>
Date: Thu, 20 Oct 2022 20:31:24 +0200
Subject: [PATCH] Implement `Form` in terms of `RawForm`

---
 axum/src/form.rs | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/axum/src/form.rs b/axum/src/form.rs
index 43bddfc2..3ead68a4 100644
--- a/axum/src/form.rs
+++ b/axum/src/form.rs
@@ -1,10 +1,11 @@
-use crate::body::{Bytes, HttpBody};
-use crate::extract::{has_content_type, rejection::*, FromRequest};
+use crate::body::HttpBody;
+use crate::extract::{rejection::*, FromRequest, RawForm};
 use crate::BoxError;
 use async_trait::async_trait;
 use axum_core::response::{IntoResponse, Response};
+use axum_core::RequestExt;
 use http::header::CONTENT_TYPE;
-use http::{Method, Request, StatusCode};
+use http::{Request, StatusCode};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::ops::Deref;
@@ -71,22 +72,17 @@ where
 {
     type Rejection = FormRejection;
 
-    async fn from_request(req: Request<B>, state: &S) -> Result<Self, Self::Rejection> {
-        if req.method() == Method::GET {
-            let query = req.uri().query().unwrap_or_default();
-            let value = serde_urlencoded::from_str(query)
-                .map_err(FailedToDeserializeQueryString::__private_new)?;
-            Ok(Form(value))
-        } else {
-            if !has_content_type(req.headers(), &mime::APPLICATION_WWW_FORM_URLENCODED) {
-                return Err(InvalidFormContentType.into());
+    async fn from_request(req: Request<B>, _state: &S) -> Result<Self, Self::Rejection> {
+        match req.extract().await {
+            Ok(RawForm(bytes)) => {
+                let value = serde_urlencoded::from_bytes(&bytes)
+                    .map_err(FailedToDeserializeQueryString::__private_new)?;
+                Ok(Form(value))
+            }
+            Err(RawFormRejection::BytesRejection(r)) => Err(FormRejection::BytesRejection(r)),
+            Err(RawFormRejection::InvalidFormContentType(r)) => {
+                Err(FormRejection::InvalidFormContentType(r))
             }
-
-            let bytes = Bytes::from_request(req, state).await?;
-            let value = serde_urlencoded::from_bytes(&bytes)
-                .map_err(FailedToDeserializeQueryString::__private_new)?;
-
-            Ok(Form(value))
         }
     }
 }
@@ -119,7 +115,8 @@ impl<T> Deref for Form<T> {
 mod tests {
     use super::*;
     use crate::body::{Empty, Full};
-    use http::Request;
+    use bytes::Bytes;
+    use http::{Method, Request};
     use serde::{Deserialize, Serialize};
     use std::fmt::Debug;