X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=authserver%2Flib%2FauthClient.php;h=677be248f9df2012234ec78052387728a53bbed3;hb=1065be060c1b237c4fcdfdef6e3e2ee663d1ca33;hp=d97bc196237fd8960dea45d48805b5ac3c25b3d0;hpb=7cdd4cb7ea1bec4975802863a1143da1369d288c;p=ga4php.git

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index d97bc19..677be24 100644
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -20,6 +20,17 @@ class GAAuthClient {
 		$cl_queue = msg_get_queue($MSG_QUEUE_KEY_ID_CLIENT);
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
 		
+		$message["username"] = $username;
+		$message["token"] = $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);
+		
+		
 	}
 	
 	function setUserPass($username, $password) {
@@ -37,7 +48,17 @@ class GAAuthClient {
 		
 		$cl_queue = msg_get_queue($MSG_QUEUE_KEY_ID_CLIENT);
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
+
+		$message["username"] = $username;
+		$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);		
+	
 	}
 	
 	function authUserPass($username, $password) {
@@ -55,6 +76,16 @@ class GAAuthClient {
 		
 		$cl_queue = msg_get_queue($MSG_QUEUE_KEY_ID_CLIENT);
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
+
+		$message["username"] = $username;
+		$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);
 		
 	}
 	
@@ -73,6 +104,15 @@ class GAAuthClient {
 		
 		$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_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);
 		
 	}
 	
@@ -91,7 +131,43 @@ class GAAuthClient {
 		
 		$cl_queue = msg_get_queue($MSG_QUEUE_KEY_ID_CLIENT);
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
+
+		$message["username"] = $username;
+		$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);
+		
+	}
+	
+	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);
+		echo "message sent\n";
+		
+		msg_receive($cl_queue, 0, $msg_type, 524288, $msg);
+		echo "message received?\n";
+		print_r($msg);
 		
+		return $msg;
 	}
 	
 	function authUserToken($username, $passcode) {
@@ -111,20 +187,18 @@ class GAAuthClient {
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
 		
 		
-		$message["user"] = $username;
+		$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;
 		
 		
@@ -143,16 +217,14 @@ class GAAuthClient {
 		
 		
 		$message["username"] = $username;
+		if($tokentype!="") $message["tokentype"] = $tokentype;
+		if($hexkey!="") $message["hexkey"] = $hexkey;
 		
-		msg_send($sr_queue, MSG_ADD_USER, $message, true, true, $msg_err);
-		echo "message sent\n";
+		msg_send($sr_queue, MSG_ADD_USER_TOKEN, $message, true, true, $msg_err);
 		
 		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-		echo "message received?\n";
-		print_r($msg);
 		
 		return $msg;
-		
 	}
 
 	function setTokenType($username, $tokentype) {
@@ -173,10 +245,20 @@ class GAAuthClient {
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
 		
 		
+		
 		$message["username"] = $username;
+		$message["tokentype"] = $tokentype;
+		
+		msg_send($sr_queue, MSG_ADD_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;
 		
 	}
 }
 
-?>
\ No newline at end of file
+?>