Fix token signing error blocking loop

Author: mobizt

library.json

@@ -1,6 +1,6 @@
 {
   "name": "ESP-Google-Sheet-Client",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",
   "description": "Arduino Google Sheet REST client library for Arduino devices. This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",
   "repository": {

library.properties

@@ -1,6 +1,6 @@
 name=ESP-Google-Sheet-Client
 
-version=1.4.11
+version=1.4.12
 
 author=Mobizt
 

src/ESP_Google_Sheet_Client.h

@@ -1,5 +1,5 @@
 #ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION
-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.11"
+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.4.12"
 #endif
 
 /*

src/auth/GAuthManager.cpp

@@ -434,88 +434,85 @@ void GAuthManager::tokenProcessingTask()
 
     time_t now = getTime();
 
-    while (!ret && config->signer.tokens.status != token_status_ready)
+    Utils::idle();
+    // check time if clock synching once set in the JWT token generating process (during beginning step)
+    // or valid time required for SSL handshake in ESP8266
+    if (!config->internal.clock_rdy)
     {
-        Utils::idle();
-        // check time if clock synching once set in the JWT token generating process (during beginning step)
-        // or valid time required for SSL handshake in ESP8266
-        if (!config->internal.clock_rdy)
+        if (readyToSync())
         {
-            if (readyToSync())
+            if (isSyncTimeOut())
             {
-                if (isSyncTimeOut())
-                {
-                    config->signer.tokens.error.message.clear();
-                    if (_cli_type == esp_google_sheet_client_type_internal_basic_client)
-                        setTokenError(ESP_GOOGLE_SHEET_CLIENT_ERROR_NTP_SYNC_TIMED_OUT);
-                    else
-                        setTokenError(ESP_GOOGLE_SHEET_CLIENT_ERROR_SYS_TIME_IS_NOT_READY);
-                    sendTokenStatusCB();
-                    config->signer.tokens.status = token_status_on_initialize;
-                    config->internal.last_jwt_generation_error_cb_millis = 0;
-                }
-
-                // reset flag to allow clock synching execution again in ut->syncClock if clocck synching was timed out
-                config->internal.clock_synched = false;
-                reconnect();
+                config->signer.tokens.error.message.clear();
+                if (_cli_type == esp_google_sheet_client_type_internal_basic_client)
+                    setTokenError(ESP_GOOGLE_SHEET_CLIENT_ERROR_NTP_SYNC_TIMED_OUT);
+                else
+                    setTokenError(ESP_GOOGLE_SHEET_CLIENT_ERROR_SYS_TIME_IS_NOT_READY);
+                sendTokenStatusCB();
+                config->signer.tokens.status = token_status_on_initialize;
+                config->internal.last_jwt_generation_error_cb_millis = 0;
             }
 
-            // check or set time again
-            tryGetTime();
-
-            // exit task immediately if time is not ready synched
-            // which handleToken function should run repeatedly to enter this function again.
-            if (!config->internal.clock_rdy)
-            {
-                config->signer.tokenTaskRunning = false;
-                return;
-            }
+            // reset flag to allow clock synching execution again in ut->syncClock if clocck synching was timed out
+            config->internal.clock_synched = false;
+            reconnect();
         }
 
-        // create signed JWT token and exchange with auth token
-        if (config->signer.step == gauth_jwt_generation_step_begin &&
-            (millis() - config->internal.last_jwt_begin_step_millis > config->timeout.tokenGenerationBeginStep ||
-             config->internal.last_jwt_begin_step_millis == 0))
-        {
-
-            // time must be set first
-            tryGetTime();
-            config->internal.last_jwt_begin_step_millis = millis();
+        // check or set time again
+        tryGetTime();
 
-            if (config->internal.clock_rdy)
-                config->signer.step = gauth_jwt_generation_step_encode_header_payload;
-        }
-        // encode the JWT token
-        else if (config->signer.step == gauth_jwt_generation_step_encode_header_payload)
-        {
-            if (createJWT())
-                config->signer.step = gauth_jwt_generation_step_sign;
-        }
-        // sign the JWT token
-        else if (config->signer.step == gauth_jwt_generation_step_sign)
+        // exit task immediately if time is not ready synched
+        // which handleToken function should run repeatedly to enter this function again.
+        if (!config->internal.clock_rdy)
         {
-            if (createJWT())
-                config->signer.step = gauth_jwt_generation_step_exchange;
+            config->signer.tokenTaskRunning = false;
+            return;
         }
-        // sending JWT token requst for auth token
-        else if (config->signer.step == gauth_jwt_generation_step_exchange)
-        {
+    }
 
-            if (readyToRefresh())
-            {
-                // sending a new request
-                ret = requestTokens(false);
+    // create signed JWT token and exchange with auth token
+    if (config->signer.step == gauth_jwt_generation_step_begin &&
+        (millis() - config->internal.last_jwt_begin_step_millis > config->timeout.tokenGenerationBeginStep ||
+         config->internal.last_jwt_begin_step_millis == 0))
+    {
 
-                // send error cb
-                if (!reconnect())
-                    handleTaskError(ESP_GOOGLE_SHEET_CLIENT_ERROR_TCP_ERROR_CONNECTION_LOST);
+        // time must be set first
+        tryGetTime();
+        config->internal.last_jwt_begin_step_millis = millis();
 
-                // reset state and exit loop
-                config->signer.step = ret || getTime() - now > 3599 ? gauth_jwt_generation_step_begin : gauth_jwt_generation_step_exchange;
+        if (config->internal.clock_rdy)
+            config->signer.step = gauth_jwt_generation_step_encode_header_payload;
+    }
+    // encode the JWT token
+    else if (config->signer.step == gauth_jwt_generation_step_encode_header_payload)
+    {
+        if (createJWT())
+            config->signer.step = gauth_jwt_generation_step_sign;
+    }
+    // sign the JWT token
+    else if (config->signer.step == gauth_jwt_generation_step_sign)
+    {
+        if (createJWT())
+            config->signer.step = gauth_jwt_generation_step_exchange;
+    }
+    // sending JWT token requst for auth token
+    else if (config->signer.step == gauth_jwt_generation_step_exchange)
+    {
 
-                _token_processing_task_enable = false;
-                ret = true;
-            }
+        if (readyToRefresh())
+        {
+            // sending a new request
+            ret = requestTokens(false);
+
+            // send error cb
+            if (!reconnect())
+                handleTaskError(ESP_GOOGLE_SHEET_CLIENT_ERROR_TCP_ERROR_CONNECTION_LOST);
+
+            // reset state and exit loop
+            config->signer.step = ret || getTime() - now > 3599 ? gauth_jwt_generation_step_begin : gauth_jwt_generation_step_exchange;
+
+            _token_processing_task_enable = false;
+            ret = true;
         }
     }