add setConfig function

Author: chavee

AuthClient.cpp

@@ -15,7 +15,8 @@ AuthClient::~AuthClient() {
 
 }
 
-void AuthClient::init(char* appid, char* scope, unsigned long bts) {
+void AuthClient::init(char *authendpoint, char* appid, char* scope, unsigned long bts) {
+    this->authendpoint = authendpoint;
     this->appid = appid;
     this->scope = scope;
     this->bootts = bts;
@@ -24,7 +25,7 @@ void AuthClient::init(char* appid, char* scope, unsigned long bts) {
 bool AuthClient::connect(bool issecuremode) {
     int port = issecuremode?GEARAUTHSECUREPORT:GEARAUTHPORT;
     this->securemode = issecuremode;
-    if (client->connect(GEARAUTHHOST,port)) {
+    if (client->connect(authendpoint,port)) {
         return true;
     }
     else {
@@ -173,7 +174,7 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
         *flag = '\0';
 
         strcpy(signbase,this->securemode?"POST&https%3A%2F%2F":"POST&http%3A%2F%2F");
-        sprintf(strtail(signbase),"%s%%3A%d",GEARAUTHHOST,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
+        sprintf(strtail(signbase),"%s%%3A%d",authendpoint,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
 
         if (mode == _REQUESTTOKEN) {
             writeln("POST /api/rtoken HTTP/1.1");
@@ -183,7 +184,7 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
             writeln("POST /api/atoken HTTP/1.1");
             strcat(signbase,"%2Fapi%2Fatoken&");
         }
-        sprintf(buff,"Host: %s:%d",GEARAUTHHOST,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
+        sprintf(buff,"Host: %s:%d",authendpoint,this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT);
         writeln(buff);
 
         write("Authorization: OAuth ");

AuthClient.h

@@ -18,6 +18,7 @@
 
 #define MGREV "E8A1b"
 #define MAXVERIFIERSIZE         32
+#define MAXGEARAUTHSIZE         32
 #define TOKENSIZE               16
 #define TOKENSECRETSIZE         32
 #define MAXHEADERLINESIZE       350
@@ -33,16 +34,16 @@ class AuthClient {
         virtual ~AuthClient();
 
         static void randomString(char* ,int);
-        void init(char*, char*,unsigned long);
+        void init(char*, char*, char*,unsigned long);
         bool connect(bool);
+        char *authendpoint;
         void stop();
         void write_P(const char[]);
         void writeln_P(const char[]);
         void write(char*);
         void writeln(char*);
         bool readln(char*, size_t);
         int getGearToken(char, char*, char*, char*, char*, char*, char*, char *, char*, char*, char*);
-    protected:
     private:
         Client* client;
         char* appid;
@@ -57,6 +58,6 @@ class AuthClient {
         char* strtail(char*);
         void strcat(char*, char*);
         void addParam(char*, char*, char*, bool);
-		unsigned long bootts;
+        unsigned long bootts;
 };
 #endif

MicroGear.cpp

@@ -114,7 +114,7 @@ void MicroGear::initEndpoint(Client *client, char* endpoint) {
         char pstr[100];
         int port = this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
-        if(client->connect(GEARAUTHHOST,port)){
+        if(client->connect(gearauth,port)){
 			sprintf(pstr,"GET /api/endpoint/%s HTTP/1.1\r\n\r\n",this->gearkey);
 			client->write((const uint8_t *)pstr,strlen(pstr));
 
@@ -137,7 +137,7 @@ void MicroGear::syncTime(Client *client, unsigned long *bts) {
     int port = (this->securemode)?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
     *bts = 0;
-    if(client->connect(GEARAUTHHOST,port)){
+    if(client->connect(gearauth,port)){
 
 		if (this->securemode) {
 			WiFiClientSecure *clientsecure = (WiFiClientSecure *)(client);
@@ -148,7 +148,7 @@ void MicroGear::syncTime(Client *client, unsigned long *bts) {
 				Serial.print("fingerprint loaded from eeprom : ");
 				Serial.println(tstr);
 			#endif
-			if (clientsecure->verify(tstr, GEARAUTHHOST)) {
+			if (clientsecure->verify(tstr, gearauth)) {
 				#ifdef DEBUG_H
 					Serial.println("fingerprint matched");
 				#endif
@@ -209,6 +209,9 @@ MicroGear::MicroGear(Client& netclient ) {
     this->backoff = 10;
     this->retry = RETRY;
 
+    strcpy(this->gearauth,GEARAUTHHOST);
+    this->gearauth[MAXGEARAUTHSIZE] = '\0';
+
     this->eepromoffset = 0;
     cb_message = NULL;
     cb_connected = NULL;
@@ -283,7 +286,7 @@ void MicroGear::resetToken() {
                 char revokecode[REVOKECODESIZE+1];
                 int port = this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
-                if(sockclient->connect(GEARAUTHHOST,port)){
+                if(sockclient->connect(gearauth,port)){
 					readEEPROM(token,EEPROM_TOKENOFFSET,TOKENSIZE);
 					readEEPROM(revokecode,EEPROM_REVOKECODEOFFSET,REVOKECODESIZE);
 					sprintf(pstr,"GET /api/revoke/%s/%s HTTP/1.1\r\n\r\n",token,revokecode);
@@ -514,7 +517,7 @@ int MicroGear::connectBroker(char* appid) {
 
     if (authclient) delete(authclient);
     authclient = new AuthClient(*sockclient);
-    authclient->init(appid,scope,bootts);
+    authclient->init(gearauth,appid,scope,bootts);
 
     tokenOK = getToken(this->gearkey,this->gearalias,token,tokensecret,endpoint);
     delete(authclient);
@@ -821,3 +824,13 @@ int MicroGear::state() {
     if (!mqttclient) return -9;
     else return this->mqttclient->state();
 }
+
+int MicroGear::setConfig(char* key, char* value) {
+    if (strcmp(key,"GEARAUTH")==0) {
+        strncpy(gearauth,value,MAXGEARAUTHSIZE);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}

MicroGear.h

@@ -86,6 +86,7 @@ class MicroGear {
 		int eepromoffset;
 		bool eepromready;
         int backoff, retry;
+        char gearauth[MAXGEARAUTHSIZE+1];
 
         void* self;
         AuthClient* authclient;
@@ -98,7 +99,6 @@ class MicroGear {
 		void syncTime(Client*, unsigned long*);
 		void initEndpoint(Client*, char*);
         bool getToken(char*, char*, char*, char*, char*);
-
 	public:
 		int constate;
         char* endpoint;
@@ -150,6 +150,7 @@ class MicroGear {
 		void setEEPROMOffset(int);
 		void readEEPROM(char*,int, int);
 		void writeEEPROM(char*,int, int);
+        int setConfig(char*, char*);
 };
 
 #endif