Merge pull request #1139 from nextcloud/fix-delete-comment-public

[fix] delete comments in public polls
nextcloud · Oct 15, 2020 · 7ebabac · 7ebabac
2 parents 761e813 + 18e51c6
commit 7ebabac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -66,7 +66,8 @@
 		['name' => 'subscription#set', 'url' => '/subscription', 'verb' => 'POST'],
 
 		['name' => 'comment#add', 'url' => '/comment', 'verb' => 'POST'],
-		['name' => 'comment#delete', 'url' => '/comment/{commentId}', 'verb' => 'DELETE'],
+		['name' => 'comment#delete', 'url' => '/comment/{commentId}', 'verb' => 'DELETE', 'postfix' => 'auth'],
+		['name' => 'comment#delete', 'url' => '/comment/s/{token}/{commentId}', 'verb' => 'DELETE', 'postfix' => 'public'],
 
 		['name' => 'system#get_site_users_and_groups', 'url' => '/siteusers/get', 'verb' => 'POST'],
 		['name' => 'system#validate_public_username', 'url' => '/check/username', 'verb' => 'POST'],

diff --git a/src/js/store/modules/subModules/comments.js b/src/js/store/modules/subModules/comments.js
@@ -64,6 +64,7 @@ const getters = {
 const actions = {
 	add(context, payload) {
 		const endPoint = 'apps/polls/comment'
+
 		return axios.post(generateUrl(endPoint), {
 			message: payload.message,
 			pollId: context.rootState.poll.id,
@@ -80,9 +81,13 @@ const actions = {
 	},
 
 	delete(context, payload) {
-		const endPoint = 'apps/polls/comment'
+		let endPoint = 'apps/polls/comment'
+		if (context.rootState.poll.acl.token) {
+			endPoint = endPoint.concat('/s/', context.rootState.poll.acl.token)
+		}
 		context.commit('delete', { comment: payload.comment })
-		return axios.delete(generateUrl(endPoint.concat('/', payload.comment.id)), { token: context.rootState.poll.acl.token })
+
+		return axios.delete(generateUrl(endPoint.concat('/', payload.comment.id)))
 			.then((response) => {
 				context.commit('delete', { comment: response.data.comment })
 				return response.data