From 9ce9a3f951d26f6d3f6315f068a4b477ed386d86 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 5 Jul 2022 21:04:42 -0500 Subject: [PATCH] patchMe(): use multipart/form-data only optionally --- app/soapbox/actions/me.ts | 14 +++++++------- app/soapbox/features/edit_profile/index.tsx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/soapbox/actions/me.ts b/app/soapbox/actions/me.ts index f6a79ab85..074f5d4cc 100644 --- a/app/soapbox/actions/me.ts +++ b/app/soapbox/actions/me.ts @@ -6,7 +6,7 @@ import api from '../api'; import { loadCredentials } from './auth'; import { importFetchedAccount } from './importer'; -import type { AxiosError } from 'axios'; +import type { AxiosError, AxiosRequestHeaders } from 'axios'; import type { AppDispatch, RootState } from 'soapbox/store'; import type { APIEntity } from 'soapbox/types/entities'; @@ -62,16 +62,16 @@ const persistAuthAccount = (account: APIEntity, params: Record) => } }; -const patchMe = (params: Record) => +const patchMe = (params: Record, isFormData = false) => (dispatch: AppDispatch, getState: () => RootState) => { dispatch(patchMeRequest()); + const headers: AxiosRequestHeaders = isFormData ? { + 'Content-Type': 'multipart/form-data', + } : {}; + return api(getState) - .patch('/api/v1/accounts/update_credentials', params, { - headers: { - 'Content-Type': 'multipart/form-data', - }, - }) + .patch('/api/v1/accounts/update_credentials', params, { headers }) .then(response => { persistAuthAccount(response.data, params); dispatch(patchMeSuccess(response.data)); diff --git a/app/soapbox/features/edit_profile/index.tsx b/app/soapbox/features/edit_profile/index.tsx index 9d5c3b622..a2fc13b92 100644 --- a/app/soapbox/features/edit_profile/index.tsx +++ b/app/soapbox/features/edit_profile/index.tsx @@ -197,7 +197,7 @@ const EditProfile: React.FC = () => { const handleSubmit: React.FormEventHandler = (event) => { const promises = []; - promises.push(dispatch(patchMe(data))); + promises.push(dispatch(patchMe(data, true))); if (features.muteStrangers) { promises.push(