From ec86678decc325339e7bfc3d43af4354d619e1cb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 25 Apr 2013 04:50:45 +0200
Subject: [PATCH] Contacts: Small steps towards RESTfulness

---
 appinfo/routes.php |  8 ++++----
 js/storage.js      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index b42f47b1..f667c1d3 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -56,8 +56,8 @@ $this->create('contacts_address_book_add', 'addressbook/{backend}/add')
 	)
 	->requirements(array('backend', 'addressbookid'));
 
-$this->create('contacts_address_book_delete', 'addressbook/{backend}/{addressbookid}/delete')
-	->post()
+$this->create('contacts_address_book_delete', 'addressbook/{backend}/{addressbookid}')
+	->delete()
 	->action(
 		function($params) {
 			session_write_close();
@@ -76,8 +76,8 @@ $this->create('contacts_address_book_add_contact', 'addressbook/{backend}/{addre
 	)
 	->requirements(array('backend', 'addressbookid'));
 
-$this->create('contacts_address_book_delete_contact', 'addressbook/{backend}/{addressbookid}/contact/{contactid}/delete')
-	->post()
+$this->create('contacts_address_book_delete_contact', 'addressbook/{backend}/{addressbookid}/contact/{contactid}')
+	->delete()
 	->action(
 		function($params) {
 			session_write_close();
diff --git a/js/storage.js b/js/storage.js
index b653fde8..7aa3768b 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -92,7 +92,7 @@ OC.Contacts = OC.Contacts || {};
 		console.log('Storage.deleteAddressBook', backend, addressbookid);
 		return this.requestRoute(
 			'contacts_address_book_delete',
-			'POST',
+			'DELETE',
 			{backend: 'local', addressbookid: addressbookid}
 		);
 	}
@@ -146,7 +146,7 @@ OC.Contacts = OC.Contacts || {};
 		return this.requestRoute(
 			'contacts_address_book_add_contact',
 			'POST',
-			{user: this.user, backend: backend, addressbookid: addressbookid}
+			{backend: backend, addressbookid: addressbookid}
 		);
 	}
 
@@ -161,8 +161,8 @@ OC.Contacts = OC.Contacts || {};
 		console.log('Storage.deleteContact', backend, addressbookid, contactid);
 		return this.requestRoute(
 			'contacts_address_book_delete_contact',
-			'POST',
-			{user: this.user, backend: backend, addressbookid: addressbookid, contactid: contactid}
+			'DELETE',
+			{backend: backend, addressbookid: addressbookid, contactid: contactid}
 		);
 	}
 
@@ -178,7 +178,7 @@ OC.Contacts = OC.Contacts || {};
 		var photo = new Image();
 		var url = OC.Router.generate(
 			'contacts_contact_photo',
-			{user: this.user, backend: backend, addressbookid: addressbookid, contactid: contactid}
+			{backend: backend, addressbookid: addressbookid, contactid: contactid}
 		);
 		var defer = $.Deferred();
 		$.when(