functional authd/authclient

[ga4php.git] / authserver / lib / authClient.php

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index 22a08b3..58de4ec 100644 (file)
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -21,16 +21,12 @@ class GAAuthClient {
                $sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
                
                $message["username"] = $username;
-               $message["token"] = $token;
+               $message["tokenstring"] = $token;
                
                msg_send($sr_queue, MSG_SET_USER_TOKEN, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
-               
-               
+               return $msg;            
        }
        
        function setUserPass($username, $password) {
@@ -53,12 +49,35 @@ class GAAuthClient {
                $message["password"] = $password;
                
                msg_send($sr_queue, MSG_SET_USER_PASSWORD, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);          
+
+               return $msg;
+       }
        
+       function getOtkPng($username) {
+               global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
+               
+               
+               if(!msg_queue_exists($MSG_QUEUE_KEY_ID_SERVER)) {
+                       return false;
+               }
+
+               if(!msg_queue_exists($MSG_QUEUE_KEY_ID_CLIENT)) {
+                       return false;
+               }
+               // TODO we need to setup a client queue sem lock here
+               
+               $cl_queue = msg_get_queue($MSG_QUEUE_KEY_ID_CLIENT);
+               $sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
+
+               $message["username"] = $username;
+               msg_send($sr_queue, MSG_GET_OTK_PNG, $message, true, true, $msg_err);
+               
+               msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+               
+               return $msg;
+               
        }
        
        function authUserPass($username, $password) {
@@ -81,12 +100,9 @@ class GAAuthClient {
                $message["password"] = $password;
                
                msg_send($sr_queue, MSG_AUTH_USER_PASSWORD, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
-               
+               return $msg;            
        }
        
        function deleteUser($username) {
@@ -108,11 +124,10 @@ class GAAuthClient {
                $message["username"] = $username;
                
                msg_send($sr_queue, MSG_DELETE_USER, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
+               
+               return $msg;
                
        }
        
@@ -136,12 +151,9 @@ class GAAuthClient {
                $message["realname"] = $realname;
                
                msg_send($sr_queue, MSG_SET_USER_REALNAME, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
-               
+               return $msg;            
        }
        
        function getUsers() {
@@ -161,11 +173,8 @@ class GAAuthClient {
                $sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
                
                msg_send($sr_queue, MSG_GET_USERS, "", true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 524288, $msg);
-               echo "message received?\n";
-               print_r($msg);
                
                return $msg;
        }
@@ -190,17 +199,15 @@ class GAAuthClient {
                $message["username"] = $username;
                $message["passcode"] = $passcode;
                
-               msg_send($sr_queue, MSG_AUTH_USER, $message, true, true, $msg_err);
+               msg_send($sr_queue, MSG_AUTH_USER_TOKEN, $message, true, true, $msg_err);
                echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
                
                return $msg;
        }
        
-       function addUser($username) {
+       function addUser($username, $tokentype="", $hexkey="") {
                global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
                
                
@@ -219,19 +226,17 @@ class GAAuthClient {
                
                
                $message["username"] = $username;
+               if($tokentype!="") $message["tokentype"] = $tokentype;
+               if($hexkey!="") $message["hexkey"] = $hexkey;
                
                msg_send($sr_queue, MSG_ADD_USER_TOKEN, $message, true, true, $msg_err);
-               echo "message sent\n";
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
                
                return $msg;
-               
        }
 
-       function setTokenType($username, $tokentype) {
+       function setUserTokenType($username, $tokentype) {
                global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
                
                
@@ -253,12 +258,9 @@ class GAAuthClient {
                $message["username"] = $username;
                $message["tokentype"] = $tokentype;
                
-               msg_send($sr_queue, MSG_ADD_USER, $message, true, true, $msg_err);
-               echo "message sent\n";
+               msg_send($sr_queue, MSG_SET_USER_TOKEN_TYPE, $message, true, true, $msg_err);
                
                msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-               echo "message received?\n";
-               print_r($msg);
                
                return $msg;