From 55f56794f86b84ca8b37ae527ca67d9cca1311ab Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sun, 21 Aug 2022 09:45:49 +0200
Subject: fix ajax requests

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/js/store/modules/share.js | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'src/js/store/modules/share.js')

diff --git a/src/js/store/modules/share.js b/src/js/store/modules/share.js
index d9c64e7f..c5d5e604 100644
--- a/src/js/store/modules/share.js
+++ b/src/js/store/modules/share.js
@@ -37,9 +37,9 @@ const defaultShares = () => ({
 	publicPollEmail: 'optional',
 })
 
-const state = defaultShares()
-
 const namespaced = true
+const state = defaultShares()
+const axiosDefaultConfig = { headers: { Accept: 'application/json' } }
 
 const mutations = {
 	set(state, payload) {
@@ -66,7 +66,7 @@ const actions = {
 
 		try {
 			const response = await axios.get(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
+				...axiosDefaultConfig,
 				params: { time: +new Date() },
 			})
 			context.commit('set', { share: response.data.share })
@@ -86,11 +86,10 @@ const actions = {
 
 		try {
 			const response = await axios.post(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
 				userName: payload.userName,
 				emailAddress: payload.emailAddress,
 				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-			})
+			}, axiosDefaultConfig)
 
 			if (payload.saveCookie && context.state.type === 'public') {
 				const cookieExpiration = (30 * 24 * 60 * 1000)
@@ -110,13 +109,10 @@ const actions = {
 			return
 		}
 
-		const endPoint = `apps/polls/s/${context.rootState.route.params.token}/email`
+		const endPoint = `apps/polls/s/${context.rootState.route.params.token}/email/${payload.emailAddress}`
 
 		try {
-			const response = await axios.put(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
-				emailAddress: payload.emailAddress,
-			})
+			const response = await axios.put(generateUrl(endPoint), null, axiosDefaultConfig)
 			context.commit('set', { share: response.data.share })
 			context.dispatch('poll/get', null, { root: true })
 		} catch (e) {
@@ -133,9 +129,7 @@ const actions = {
 		const endPoint = `apps/polls/s/${context.rootState.route.params.token}/name/${payload.displayName}`
 
 		try {
-			const response = await axios.put(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
-			})
+			const response = await axios.put(generateUrl(endPoint), null, axiosDefaultConfig)
 			context.commit('set', { share: response.data.share })
 			context.dispatch('poll/get', null, { root: true })
 			context.dispatch('comments/list', null, { root: true })
@@ -155,9 +149,7 @@ const actions = {
 		const endPoint = `apps/polls/s/${context.rootState.route.params.token}/email`
 
 		try {
-			const response = await axios.delete(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
-			})
+			const response = await axios.delete(generateUrl(endPoint), axiosDefaultConfig)
 			context.commit('set', { share: response.data.share })
 			context.dispatch('subscription/update', false, { root: true })
 			context.dispatch('poll/get', null, { root: true })
@@ -175,9 +167,7 @@ const actions = {
 		const endPoint = `apps/polls/s/${context.rootState.route.params.token}/resend`
 
 		try {
-			return await axios.put(generateUrl(endPoint), {
-				headers: { Accept: 'application/json' },
-			})
+			return await axios.put(generateUrl(endPoint), null, axiosDefaultConfig)
 		} catch (e) {
 			console.error('Error sending invitation', { error: e.response }, { payload })
 			throw e
-- 
cgit v1.2.3