Merge pull request #4 from pubnub/auth

Auth param added

Author: vveljko

PubNub.cpp

@@ -39,17 +39,24 @@ bool PubNub::begin(const char *publish_key_, const char *subscribe_key_, const c
 	subscribe_key = subscribe_key_;
 	origin = origin_;
 	uuid = NULL;
+	auth = NULL;
 }
 
 void PubNub::set_uuid(const char *uuid_)
 {
 	uuid = uuid_;
 }
 
+void PubNub::set_auth(const char *auth_)
+{
+	auth = auth_;
+}
+
 PubNub_BASE_CLIENT *PubNub::publish(const char *channel, const char *message, int timeout)
 {
 	PubNub_BASE_CLIENT &client = publish_client;
 	unsigned long t_start;
+	int have_param = 0;
 
 retry:
 	t_start = millis();
@@ -92,7 +99,14 @@ PubNub_BASE_CLIENT *PubNub::publish(const char *channel, const char *message, in
 		}
 	}
 
-	enum PubNub_BH ret = this->_request_bh(client, t_start, timeout, '?');
+	if (auth) {
+		client.print(have_param ? '&' : '?');
+		client.print("auth=");
+		client.print(auth);
+		have_param = 1;
+	}
+	
+	enum PubNub_BH ret = this->_request_bh(client, t_start, timeout, have_param ? '&' : '?');
 	switch (ret) {
 	case PubNub_BH_OK:
 		/* Success and reached body, return handle to the client
@@ -115,6 +129,7 @@ PubSubClient *PubNub::subscribe(const char *channel, int timeout)
 {
 	PubSubClient &client = subscribe_client;
 	unsigned long t_start;
+	int have_param = 0;
 
 retry:
 	t_start = millis();
@@ -136,9 +151,16 @@ PubSubClient *PubNub::subscribe(const char *channel, int timeout)
 	if (uuid) {
 		client.print("?uuid=");
 		client.print(uuid);
+		have_param = 1;
+	}
+	if (auth) {
+		client.print(have_param ? '&' : '?');
+		client.print("auth=");
+		client.print(auth);
+		have_param = 1;
 	}
 
-	enum PubNub_BH ret = this->_request_bh(client, t_start, timeout, uuid ? '&' : '?');
+	enum PubNub_BH ret = this->_request_bh(client, t_start, timeout, have_param ? '&' : '?');
 	switch (ret) {
 	case PubNub_BH_OK:
 		/* Success and reached body. We need to eat '[' first,

PubNub.h

@@ -152,6 +152,13 @@ class PubNub {
 	 * that generates a random UUID (although not 100% reliable). */
 	void set_uuid(const char *uuid);
 
+	/* Set the authorization key/token of PubNub client. This is useful
+	 * e.g. for access rights validation (PAM).
+	 *
+	 * Pass NULL to unset. The string is not copied over (just like
+	 * in begin()). */
+	void set_auth(const char *auth);
+
 	/* Publish
 	 *
 	 * Send a message (assumed to be well-formed JSON) to a given channel.
@@ -215,6 +222,7 @@ class PubNub {
 	const char *publish_key, *subscribe_key;
 	const char *origin;
 	const char *uuid;
+	const char *auth;
 
 	PubNub_BASE_CLIENT publish_client, history_client;
 	PubSubClient subscribe_client;