Changed site delete endpoint to HTTP DELETE. See #1725

PiranhaCMS · Oct 20, 2021 · c504166 · c504166
1 parent 976c4fd
commit c504166
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 31 deletions.
diff --git a/core/Piranha.Manager/Controllers/SiteApiController.cs b/core/Piranha.Manager/Controllers/SiteApiController.cs
@@ -166,10 +166,10 @@ public async Task<StatusMessage> SaveContent(SiteContentEditModel model)
         /// </summary>
         /// <param name="id">The unique id</param>
         /// <returns>The result of the operation</returns>
-        [Route("delete/{id}")]
-        [HttpGet]
+        [Route("delete")]
+        [HttpDelete]
         [Authorize(Policy = Permission.SitesDelete)]
-        public async Task<StatusMessage> Delete(Guid id)
+        public async Task<StatusMessage> Delete([FromBody]Guid id)
         {
             try
             {

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.siteedit.js b/core/Piranha.Manager/assets/dist/js/piranha.siteedit.js
@@ -214,22 +214,28 @@ piranha.siteedit = new Vue({
 
             var self = this;
 
-            fetch(piranha.baseUrl + "manager/api/site/delete/" + self.id)
-                .then(function (response) { return response.json(); })
-                .then(function (result) {
-                    piranha.notifications.push(result);
+            fetch(piranha.baseUrl + "manager/api/site/delete", {
+                method: "delete",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(self.id)
+            })
+            .then(function (response) { return response.json(); })
+            .then(function (result) {
+                piranha.notifications.push(result);
 
-                    if (result.type === "success") {
-                        $("#siteedit").modal("hide");
+                if (result.type === "success") {
+                    $("#siteedit").modal("hide");
 
-                        if (self.callback)
-                        {
-                            self.callback();
-                            self.callback = null;
-                        }
+                    if (self.callback)
+                    {
+                        self.callback();
+                        self.callback = null;
                     }
-                })
-                .catch(function (error) { console.log("error:", error ); });
+                }
+            })
+            .catch(function (error) { console.log("error:", error ); });
         },
         selectRegion: function (region) {
             this.selectedRegion = region;

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.siteedit.min.js b/core/Piranha.Manager/assets/dist/js/piranha.siteedit.min.js
diff --git a/core/Piranha.Manager/assets/src/js/piranha.siteedit.js b/core/Piranha.Manager/assets/src/js/piranha.siteedit.js
@@ -214,22 +214,28 @@ piranha.siteedit = new Vue({
 
             var self = this;
 
-            fetch(piranha.baseUrl + "manager/api/site/delete/" + self.id)
-                .then(function (response) { return response.json(); })
-                .then(function (result) {
-                    piranha.notifications.push(result);
+            fetch(piranha.baseUrl + "manager/api/site/delete", {
+                method: "delete",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(self.id)
+            })
+            .then(function (response) { return response.json(); })
+            .then(function (result) {
+                piranha.notifications.push(result);
 
-                    if (result.type === "success") {
-                        $("#siteedit").modal("hide");
+                if (result.type === "success") {
+                    $("#siteedit").modal("hide");
 
-                        if (self.callback)
-                        {
-                            self.callback();
-                            self.callback = null;
-                        }
+                    if (self.callback)
+                    {
+                        self.callback();
+                        self.callback = null;
                     }
-                })
-                .catch(function (error) { console.log("error:", error ); });
+                }
+            })
+            .catch(function (error) { console.log("error:", error ); });
         },
         selectRegion: function (region) {
             this.selectedRegion = region;

diff --git a/identity/Piranha.AspNetCore.Identity/assets/piranha.useredit.js b/identity/Piranha.AspNetCore.Identity/assets/piranha.useredit.js
@@ -100,7 +100,13 @@ piranha.useredit= new Vue({
                 confirmText: piranha.resources.texts.delete,
                 onConfirm: function () {
                     var ok = false;
-                    fetch(piranha.baseUrl + "manager/user/delete/" + userId)
+                    fetch(piranha.baseUrl + "manager/user/delete", {
+                        method: "delete",
+                        headers: {
+                            "Content-Type": "application/json"
+                        },
+                        body: JSON.stringify(userId)
+                    })
                     .then(function (response) { 
                         ok = response.ok;
                         return response.json();