handle token flag, remove unused code

Author: chavee

AuthClient.cpp

@@ -134,7 +134,7 @@ void AuthClient::addParam(char* buff, char* key, char* value, bool first) {
     encode(strtail(buff),value);
 }
 
-int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* endpoint, char* gearkey, char* gearsecret, char* gearalias, char* scope, char* rtoken, char* rtokensecret) {
+int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* endpoint, char *flag, char* gearkey, char* gearsecret, char* gearalias, char* scope, char* rtoken, char* rtokensecret) {
         #ifdef DEBUG_H
             Serial.println("Enter getGearToken()..");
         #endif
@@ -159,6 +159,7 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
         *token = '\0';
         *tokensecret = '\0';
         *endpoint = '\0';
+        *flag = '\0';
 
         strcpy(signbase,"POST&http%3A%2F%2F");
         sprintf(strtail(signbase),"%s%%3A%d",GEARAUTHHOST,GEARAUTHPORT);
@@ -362,7 +363,8 @@ int AuthClient::getGearToken(char mode, char* token, char* tokensecret, char* en
                                     if (strcmp(p,"oauth_token")==0) strcpy(token,s+1);
                                     else if (strcmp(p,"oauth_token_secret")==0) strcpy(tokensecret,s+1);
                                     else if (strcmp(p,"endpoint")==0) strcpy(endpoint,s+1);
-                                    delay(200);
+                                    else if (strcmp(p,"flag")==0) strcpy(flag,s+1);
+                                    delay(50);
                                     if (!last) p = t+1; else break;
                                 }
                                 return httpstatus;

AuthClient.h

@@ -32,7 +32,7 @@ class AuthClient {
         void write(char*);
         void writeln(char*);
         bool readln(char*, size_t);
-        int getGearToken(char, char*, char*, char*, char*, char*, char*, char*, char*, char*);
+        int getGearToken(char, char*, char*, char*, char*, char*, char*, char *, char*, char*, char*);
     protected:
     private:
         Client* client;

MicroGear.cpp

@@ -176,12 +176,13 @@ void MicroGear::resetToken() {
 
 
 void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecret, char *endpoint) {
-    char state[2];
+    char state[2], tstate[2];
     int authstatus = 0;
 
     char ekey[KEYSIZE+1];
     char rtoken[TOKENSIZE+1];
     char rtokensecret[TOKENSECRETSIZE+1];
+    char flag[FLAGSIZE+1];
     char buff[2*TOKENSECRETSIZE+2];
     char revokecode[REVOKECODESIZE+1];
 
@@ -214,7 +215,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     Serial.println("authclient is connected");
                 #endif
 
-                authstatus = authclient->getGearToken(_REQUESTTOKEN,rtoken,rtokensecret,endpoint,gearkey,gearsecret,galias,scope,NULL,NULL);
+                authstatus = authclient->getGearToken(_REQUESTTOKEN,rtoken,rtokensecret,endpoint,flag,gearkey,gearsecret,galias,scope,NULL,NULL);
                 delay(1000);
                 #ifdef DEBUG_H
                     Serial.println(authstatus); Serial.println(rtoken); Serial.println(rtokensecret); Serial.println(endpoint);
@@ -227,7 +228,6 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     writeEEPROM(gearkey,EEPROM_KEYOFFSET,KEYSIZE);
                     writeEEPROM(rtoken,EEPROM_TOKENOFFSET,TOKENSIZE);
                     writeEEPROM(rtokensecret,EEPROM_TOKENSECRETOFFSET,TOKENSECRETSIZE);
-
                     #ifdef DEBUG_H
                         Serial.println("@ Write Request Token");
                         Serial.println(state);
@@ -259,7 +259,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     #ifdef DEBUG_H
                         Serial.println("authclient is connected, get access token");
                     #endif
-                    authstatus = authclient->getGearToken(_ACCESSTOKEN,token,tokensecret,endpoint,gearkey,gearsecret,galias,"",rtoken,rtokensecret);
+                    authstatus = authclient->getGearToken(_ACCESSTOKEN,token,tokensecret,endpoint,flag,gearkey,gearsecret,galias,"",rtoken,rtokensecret);
                     delay(1000);
                     authclient->stop();
                     delay(1000);
@@ -271,13 +271,21 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     delay(1000);
                 }
             }
-
             #ifdef DEBUG_H
                 Serial.println(authstatus);
+                Serial.print("flag = ");
+                Serial.println(flag[0]);
             #endif
+
+            // still write an EEPROM ic case of flag S 
             if (authstatus == 200) {
                 *state = EEPROM_STATE_ACC;
-                writeEEPROM(state,EEPROM_STATEOFFSET,1);
+
+                // if return with session flag mark eeprom token as null
+                if (flag[0] != 'S') *tstate = EEPROM_STATE_ACC;
+                else *tstate = EEPROM_STATE_NUL;
+
+                writeEEPROM(tstate,EEPROM_STATEOFFSET,1);
                 writeEEPROM(gearkey,EEPROM_KEYOFFSET,KEYSIZE);
                 writeEEPROM(token,EEPROM_TOKENOFFSET,TOKENSIZE);
                 writeEEPROM(tokensecret,EEPROM_TOKENSECRETOFFSET,TOKENSECRETSIZE);
@@ -421,18 +429,6 @@ boolean MicroGear::connect(char* appid) {
                     if (backoff < MAXBACKOFFTIME) backoff = 2*backoff;
                     delay(backoff);
                     break;
-            case CLIENT_REJECTED :
-                    #ifdef DEBUG_H
-                        Serial.println("mqtt connection rejected");
-                        Serial.println(retry);
-                    #endif
-                    if (--retry <= 0) {
-                        resetToken();
-                        #ifdef DEBUG_H
-                            Serial.println("Reset token");
-                        #endif
-                    }
-                    break;
         }
         return constate;
     }

MicroGear.h

@@ -21,8 +21,6 @@
 #define GEARTIMEADDRESS "ga.netpie.io"
 #define GEARTIMEPORT 8080
 
-#define CLIENTTYPE "esp1"
-
 #define MINBACKOFFTIME             10
 #define MAXBACKOFFTIME             10000
 #define MAXENDPOINTLENGTH          200
@@ -35,6 +33,7 @@
 #define USERNAMESIZE               65
 #define PASSWORDSIZE               28
 #define REVOKECODESIZE             28
+#define FLAGSIZE                   4
 
 #define EEPROM_STATE_NUL           65
 #define EEPROM_STATE_REQ           66
@@ -54,9 +53,8 @@
 
 #define CLIENT_NOTCONNECT          0
 #define CLIENT_CONNECTED           1
-#define CLIENT_REJECTED            2
 
-/* event type */
+/* Event Type */
 #define MESSAGE                    1
 #define PRESENT                    2
 #define ABSENT                     3