X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=authserver%2Flib%2FauthClient.php;h=a29af89bddead7d2d01ceb12a0964a93a95ad70a;hb=07e42724b584df5d317a72b0e0ed1bafbc744b8f;hp=a3a2172990192060e551e8e3a12a5d32ab3807ef;hpb=3354ed0d5c9f3877ac2222ac25326acd05d3d236;p=ga4php.git

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index a3a2172..a29af89 100644
--- 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,10 @@ 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 authUserPass($username, $password) {
@@ -81,12 +75,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 +99,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 +126,32 @@ 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() {
+		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);
+		
+		msg_send($sr_queue, MSG_GET_USERS, "", true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 524288, $msg);
+		
+		return $msg;
 	}
 	
 	function authUserToken($username, $passcode) {
@@ -164,17 +174,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;
 		
 		
@@ -193,19 +201,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;
 		
 		
@@ -227,16 +233,13 @@ 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;
 		
 	}
 }
 
-?>
\ No newline at end of file
+?>