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

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index 677be24..735c8a1 100644
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -3,6 +3,32 @@
 require_once("lib.php");
 
 class GAAuthClient {
+	function syncUserToken($username, $tokenone, $tokentwo) {
+		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;
+		$message["tokenone"] = $tokenone;
+		$message["tokentwo"] = $tokentwo;
+
+		msg_send($sr_queue, MSG_SYNC_TOKEN, $message, true, true, $msg_err);
+		
+		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
+		return $msg;		
+		
+	}
 	
 	function setUserToken($username, $token) {
 		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
@@ -21,16 +47,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 +75,62 @@ 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 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;
+		
 	}
 	
 	function authUserPass($username, $password) {
@@ -81,12 +153,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 +177,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 +204,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 +226,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;
 	}
@@ -191,7 +253,33 @@ class GAAuthClient {
 		$message["passcode"] = $passcode;
 		
 		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);
+		
+		return $msg;
+	}
+	
+	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;
+		}
+
+		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_DELETE_USER_TOKEN, $message, true, true, $msg_err);
 		
 		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
 		
@@ -227,7 +315,7 @@ class GAAuthClient {
 		return $msg;
 	}
 
-	function setTokenType($username, $tokentype) {
+	function setUserTokenType($username, $tokentype) {
 		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
 		
 		
@@ -249,12 +337,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;