fix formdata parsing

wanderer-moe · Oct 16, 2023 · 88aea96 · 88aea96
1 parent 62de25e
commit 88aea96
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 15 deletions.
diff --git a/src/v2/routes/auth/asset-categories/deleteAssetCategory.ts b/src/v2/routes/auth/asset-categories/deleteAssetCategory.ts
@@ -13,7 +13,12 @@ const DeleteAssetCategorySchema = z.object({
 })
 
 export async function deleteAssetCategory(c: APIContext): Promise<Response> {
-    const formData = DeleteAssetCategorySchema.safeParse(await c.req.formData())
+    const formData = DeleteAssetCategorySchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/assets/collections/addAssetToCollection.ts b/src/v2/routes/auth/assets/collections/addAssetToCollection.ts
@@ -16,7 +16,10 @@ const AddAssetToCollectionSchema = z.object({
 
 export async function addAssetToCollection(c: APIContext): Promise<Response> {
     const formData = AddAssetToCollectionSchema.safeParse(
-        await c.req.formData()
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
     )
 
     if (!formData.success) {

diff --git a/src/v2/routes/auth/assets/collections/deleteAssetFromCollection.ts b/src/v2/routes/auth/assets/collections/deleteAssetFromCollection.ts
@@ -19,7 +19,10 @@ export async function deleteAssetFromCollection(
     c: APIContext
 ): Promise<Response> {
     const formData = DeleteAssetFromCollectionSchema.safeParse(
-        await c.req.formData()
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
     )
 
     if (!formData.success) {

diff --git a/src/v2/routes/auth/assets/favorite/removeFavoriteAsset.ts b/src/v2/routes/auth/assets/favorite/removeFavoriteAsset.ts
@@ -12,7 +12,12 @@ const RemoveFavoriteAssetSchema = z.object({
 })
 
 export async function removeFavoriteAsset(c: APIContext): Promise<Response> {
-    const formData = RemoveFavoriteAssetSchema.safeParse(await c.req.formData())
+    const formData = RemoveFavoriteAssetSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/login.ts b/src/v2/routes/auth/login.ts
@@ -29,7 +29,6 @@ export async function login(c: APIContext): Promise<Response> {
     )
 
     if (!formData.success) {
-        console.log(formData)
         return c.json({ success: false, state: "invalid data" }, 400)
     }
 

diff --git a/src/v2/routes/auth/oc-generators/deleteOCGeneratorResponse.ts b/src/v2/routes/auth/oc-generators/deleteOCGeneratorResponse.ts
@@ -15,7 +15,10 @@ export async function deleteOCGeneratorResponse(
     c: APIContext
 ): Promise<Response> {
     const formData = DeleteOCGeneratorResponseSchema.safeParse(
-        await c.req.formData()
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
     )
 
     if (!formData.success) {

diff --git a/src/v2/routes/auth/oc-generators/saveOCGeneratorResponse.ts b/src/v2/routes/auth/oc-generators/saveOCGeneratorResponse.ts
@@ -59,7 +59,10 @@ export async function saveOCGeneratorResponse(
     c: APIContext
 ): Promise<Response> {
     const formData = SaveOCGeneratorResponseSchema.safeParse(
-        await c.req.formData()
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
     )
 
     if (!formData.success) {

diff --git a/src/v2/routes/auth/tags/createTag.ts b/src/v2/routes/auth/tags/createTag.ts
@@ -16,7 +16,12 @@ const CreateTagSchema = z.object({
 })
 
 export async function createTag(c: APIContext): Promise<Response> {
-    const formData = CreateTagSchema.safeParse(await c.req.formData())
+    const formData = CreateTagSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/tags/deleteTag.ts b/src/v2/routes/auth/tags/deleteTag.ts
@@ -13,7 +13,12 @@ const DeleteTagSchema = z.object({
 })
 
 export async function deleteTag(c: APIContext): Promise<Response> {
-    const formData = DeleteTagSchema.safeParse(await c.req.formData())
+    const formData = DeleteTagSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/user-attributes/self-upload/uploadAvatar.ts b/src/v2/routes/auth/user-attributes/self-upload/uploadAvatar.ts
@@ -20,7 +20,12 @@ const UploadProfileImageSchema = z.object({
 
 // TODO: add support for animated avatars
 export async function uploadProfileImage(c: APIContext): Promise<Response> {
-    const formData = UploadProfileImageSchema.safeParse(await c.req.formData())
+    const formData = UploadProfileImageSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/user-attributes/self-upload/uploadBanner.ts b/src/v2/routes/auth/user-attributes/self-upload/uploadBanner.ts
@@ -23,7 +23,12 @@ const UploadBannerSchema = z.object({
 
 // TODO: add support for animated banners
 export async function uploadBannerImage(c: APIContext): Promise<Response> {
-    const formData = UploadBannerSchema.safeParse(await c.req.formData())
+    const formData = UploadBannerSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/user-attributes/updateUserAttributes.ts b/src/v2/routes/auth/user-attributes/updateUserAttributes.ts
@@ -43,7 +43,10 @@ const UpdateUserAttributesSchema = z
 
 export async function updateUserAttributes(c: APIContext): Promise<Response> {
     const formData = UpdateUserAttributesSchema.safeParse(
-        await c.req.formData()
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
     )
 
     if (!formData.success) {

diff --git a/src/v2/routes/auth/user-attributes/user-relations/followUser.ts b/src/v2/routes/auth/user-attributes/user-relations/followUser.ts
@@ -11,7 +11,12 @@ const FollowUserSchema = z.object({
 })
 
 export async function followUser(c: APIContext): Promise<Response> {
-    const formData = FollowUserSchema.safeParse(await c.req.formData())
+    const formData = FollowUserSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
 
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)

diff --git a/src/v2/routes/auth/user-attributes/user-relations/unfollowUser.ts b/src/v2/routes/auth/user-attributes/user-relations/unfollowUser.ts
@@ -12,8 +12,12 @@ const UnfollowUserSchema = z.object({
 })
 
 export async function unfollowUser(c: APIContext): Promise<Response> {
-    const formData = UnfollowUserSchema.safeParse(await c.req.formData())
-
+    const formData = UnfollowUserSchema.safeParse(
+        await c.req.formData().then((formData) => {
+            const data = Object.fromEntries(formData.entries())
+            return data
+        })
+    )
     if (!formData.success) {
         return c.json({ success: false, state: "invalid data" }, 400)
     }