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

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index d97bc19..c5ef6dd 100644
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -20,6 +20,13 @@ 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["tokenstring"] = $token;
+		
+		msg_send($sr_queue, MSG_SET_USER_TOKEN, $message, true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		return $msg;		
 	}
 	
 	function setUserPass($username, $password) {
@@ -37,6 +44,66 @@ 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);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+
+		return $msg;
+	}
+	
+	function getOtkID($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_ID, $message, true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		
+		return $msg;
+		
+	}
+	
+	function getOtkPng($username, $otk) {
+		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["otk"] = $otk;
+		$message["username"] = $username;
+		error_log("sending message, $otk");
+		msg_send($sr_queue, MSG_GET_OTK_PNG, $message, true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		
+		return $msg;
 		
 	}
 	
@@ -55,7 +122,14 @@ 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);
 		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		return $msg;		
 	}
 	
 	function deleteUser($username) {
@@ -73,6 +147,14 @@ 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);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		
+		return $msg;
 		
 	}
 	
@@ -91,7 +173,37 @@ 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);
 		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $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) {
@@ -111,22 +223,19 @@ 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);
-		echo "message sent\n";
+		msg_send($sr_queue, MSG_AUTH_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 addUser($username) {
-		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
+	function deleteUserToken($username) {
 		
+		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
 		
 		if(!msg_queue_exists($MSG_QUEUE_KEY_ID_SERVER)) {
 			return false;
@@ -144,18 +253,43 @@ class GAAuthClient {
 		
 		$message["username"] = $username;
 		
-		msg_send($sr_queue, MSG_ADD_USER, $message, true, true, $msg_err);
-		echo "message sent\n";
+		msg_send($sr_queue, MSG_DELETE_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 addUser($username, $tokentype="", $hexkey="") {
+		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;
+		if($tokentype!="") $message["tokentype"] = $tokentype;
+		if($hexkey!="") $message["hexkey"] = $hexkey;
+		
+		msg_send($sr_queue, MSG_ADD_USER_TOKEN, $message, true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		
+		return $msg;
 	}
 
-	function setTokenType($username, $tokentype) {
+	function setUserTokenType($username, $tokentype) {
 		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
 		
 		
@@ -173,10 +307,17 @@ class GAAuthClient {
 		$sr_queue = msg_get_queue($MSG_QUEUE_KEY_ID_SERVER);
 		
 		
+		
 		$message["username"] = $username;
+		$message["tokentype"] = $tokentype;
+		
+		msg_send($sr_queue, MSG_SET_USER_TOKEN_TYPE, $message, true, true, $msg_err);
 		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		
+		return $msg;
 		
 	}
 }
 
-?>
\ No newline at end of file
+?>