X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=authserver%2Flib%2FauthClient.php;h=62419bd6a650db35d43076bdee89f2b6eab3e9ab;hp=e1b941f0fb2e4bb056036795c0291818efc83003;hb=1e9b1b3a5c4dd1f033ae5f3145d7bb7bcd73a4d6;hpb=e2e22b45b14cae630587bc662a8bfcda98b04510

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index e1b941f..62419bd 100644
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -55,7 +55,32 @@ class GAAuthClient {
 		return $msg;
 	}
 	
-	function getOtkPng($otk) {
+	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;
 		
 		
@@ -72,6 +97,7 @@ class GAAuthClient {
 		$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);
 		
@@ -201,7 +227,6 @@ 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);