Changeset 1453 for trunk/wifidog-auth/wifidog/ws/classes/WifidogWS/V1.php

Timestamp:

02/25/10 15:56:33 (2 years ago)

Author:

gbastien

Message:

• Added possibility to have a deployed geolocated node not show on map (quick fix) (#706)
• When producing anonymised data export, two files are produced, one for the geolocated nodes and one for the connections (#705)
• Additions and bug fixes to web service: can now logout and auth returns both error code and message
• Starting work on #707 as needed

Files:

• trunk/wifidog-auth/wifidog/ws/classes/WifidogWS/V1.php (modified) (8 diffs)

trunk/wifidog-auth/wifidog/ws/classes/WifidogWS/V1.php

@@ -103 +103 @@
                         'NumOnlineUsers' => 'NumOnlineUsers',
                         'CreationDate' => 'CreationDate',
-                        'Status' => 'Status',
+                        'Status' => 'DeploymentStatus',
                         'OpeningDate' => 'CreationDate', 
                                                                         'Connected_users' => 'OnlineUsers'),
@@ -150 +150 @@
         foreach($infields as $field) {
             if (isset(self::$_allowedFields[$objectClass][$field]))
-                $fields[] = self::$_allowedFields[$objectClass][$field];
+                $fields[$field] = self::$_allowedFields[$objectClass][$field];
             else
-                $fields[] = "$field.forbidden";
+                $fields[$field] = "$field.forbidden";
         }
         return $fields;
@@ -189 +189 @@
                 $username = (isset($this->_params['username']) ? $this->_params['username']:'');
                 $password = (isset($this->_params['password']) ? $this->_params['password']:'');
-                $this->executeAuth($username, $password, $gw_id, $gw_address, $mac, $gw_port, $from);
+                $logout = (isset($this->_params['logout']) ? $this->_params['logout']:false);
+                $this->executeAuth($username, $password, $gw_id, $gw_address, $mac, $gw_port, $from, $logout);
                 break;
             default:
@@ -204 +205 @@
      * @param $gw_id      The gateway id
      * @param $gw_ip      The gateway's ip addresss
+     * @param $mac                        The mac address of the user
+     * @param $gw_port    The port of the gateway's http server
+     * @param $from                     The ip address of the user on the node
+     * @param $logout                   Whether the user wants to logout
      * @return unknown_type
      */
-    protected function executeAuth($username = null, $password = null, $gw_id = null, $gw_ip = null, $mac = null, $gw_port = null, $from = null) {
+    protected function executeAuth($username = null, $password = null, $gw_id = null, $gw_ip = null, $mac = null, $gw_port = null, $from = null, $logout = false) {
         $this->_outputArr['auth'] = 0;
         
@@ -240 +245 @@
             if (!$token) throw new WSException("User authenticated but cannot generate connection token.", WSException::PROCESS_ERROR);
         } else {
-            // Authenticate the user on the requested network
-            $user = $network->getAuthenticator()->login($username, $password, $errMsg);
-            if (!$user) {
-                $this->_outputArr['auth'] = 0;
-                $this->_outputArr['explanation'] = $errMsg;
+            if (!$logout) {
+                // Authenticate the user on the requested network
+                $user = $network->getAuthenticator()->login($username, $password, $errMsg, $errNo);
+                if (!$user) {
+                    $this->_outputArr['auth'] = 0;
+                    $this->_outputArr['explanation'] = $errMsg;
+                    $this->_outputArr['errorcode'] = $errNo;
+                } else {
+                    $this->_outputArr['auth'] = 1;
+                    if (!is_null($node)) {
+                        $token = $user->generateConnectionTokenNoSession($node, $from, $mac);
+                       
+                        if (!$token) throw new WSException("User authenticated but cannot generate connection token.", WSException::PROCESS_ERROR);
+                    }
+                }
             } else {
+                $user = User::getUserByUsernameOrEmail($username);
+                User::setCurrentUser($user);
+                $network->getAuthenticator()->logout();
                 $this->_outputArr['auth'] = 1;
-                if (!is_null($node)) {
-                    $token = $user->generateConnectionTokenNoSession($node, $from, $mac);
-                   
-                    if (!$token) throw new WSException("User authenticated but cannot generate connection token.", WSException::PROCESS_ERROR);
-                }
             }
         }
@@ -298 +311 @@
         $fields = $this->mapFields($objectClass, $fields);
         if (empty($fields)) {
-            $fields = array_keys(self::$_allowedFields[$objectClass]);
+            $fields = self::$_allowedFields[$objectClass];
         } 
         $allowedFields = self::$_allowedFields[$objectClass];
@@ -362 +375 @@
         } 
 
+        if (!isset($objectList)) {
+            throw new WSException("Object list for '{$objectClass}' is not supported.", WSException::GENERIC_EXCEPTION);
+        }
         $this->_outputArr = self::filterRet($objectList, $fields);
     }
@@ -389 +405 @@
                     }
                     $retFields = array();
-                    foreach ($fields as $field) {
+                    foreach ($fields as $fkey => $field) {
                         $forbiddenfield = explode(".", $field);
                         if (! (count($forbiddenfield) == 2)) {
                             $methodName = 'get'.$field;
                             if (method_exists($value, $methodName)) {
-                                
-                                $retFields[$field] = self::filterRet($value->$methodName());
+                                $retFields[is_string($fkey)?$fkey:$field] = self::filterRet($value->$methodName());
                             } else {
-                                $retFields[$field] = 'unknown';
+                                $retFields[is_string($fkey)?$fkey:$field] = 'unknown';
                             }
                         } else