Merge branch 'refactor-rest-api' of

https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api

Conflicts:
	htdocs/api/admin/explorer.php

htdocs/api/class/api.class.php

@@ -88,6 +88,17 @@ class DolibarrApi
         // Remove $db object property for object
 		unset($object->db);
 
+        // Remove the $oldcopy property because it is not supported by the JSON
+        // encoder. The following error is generated when trying to serialize
+        // it: "Error encoding/decoding JSON: Type is not supported"
+        // Note: Event if this property was correctly handled by the JSON
+        // encoder, it should be ignored because keeping it would let the API
+        // have a very strange behavior: calling PUT and then GET on the same
+        // resource would give different results:
+        // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+        // GET /objects/{id} -> returns object with oldcopy empty
+        unset($object->oldcopy);
+
         // If object has lines, remove $db property
         if(isset($object->lines) && count($object->lines) > 0)  {
             $nboflines = count($object->lines);

htdocs/api/class/api_login.class.php

@@ -18,14 +18,11 @@
 use Luracast\Restler\RestException;
 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php';
-
 
 /**
- * API generic (login, status, ...)
- *
+ * API that allows to log in with an user account.
  */
-class GenericApi extends DolibarrApi
+class Login
 {
 
 	function __construct() {
@@ -46,7 +43,7 @@ class GenericApi extends DolibarrApi
      *
 	 * @throws RestException
 	 */
-	public function login($login, $password, $entity=0, $reset=0) {
+	public function index($login, $password, $entity=0, $reset=0) {
 
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 	    
@@ -103,20 +100,4 @@ class GenericApi extends DolibarrApi
 			)
 		);
 	}
-
-	/**
-     * Get status (Dolibarr version)
-     *
-	 * @access protected
-	 * @class  DolibarrApiAccess {@requires admin}
-	 */
-	function status() {
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
-		return array(
-			'success' => array(
-				'code' => 200,
-				'dolibarr_version' => DOL_VERSION
-			)
-		);
-    }
 }

htdocs/api/class/api_status.class.php

@@ -0,0 +1,40 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+
+
+/**
+ * API that gives the status of the Dolibarr instance.
+ *
+ * @access protected 
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class Status
+{
+	/**
+     * Get status (Dolibarr version)
+	 */
+	function index() {
+		return array(
+			'success' => array(
+				'code' => 200,
+				'dolibarr_version' => DOL_VERSION
+			)
+		);
+    }
+}