Check PP response contains the expected fields. Retry if PP is still activating the device on plan

Author: PaulZC

Firmware/RTK_Everywhere/HTTP_Client.ino

@@ -522,6 +522,17 @@ void httpClientUpdate()
                         break;
                     }
 
+                    // Check if the JSON blob contains a certificate and private key
+                    // If this is the first time this device has connected to ThingStream, they
+                    // will not be present and we need to retry
+                    // httpClientConnectLimitReached will prevent excessive retries
+                    if (((const char *)((*jsonZtp)["certificate"]) == nullptr) || ((const char *)((*jsonZtp)["privateKey"]) == nullptr))
+                    {
+                        systemPrintln("ERROR - certificate or privateKey not found!\r\n");
+                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device on plan
+                        break;
+                    }
+
                     strncpy(tempHolderPtr, (const char *)((*jsonZtp)["certificate"]), MQTT_CERT_SIZE - 1);
                     recordFile("certificate", tempHolderPtr, strlen(tempHolderPtr));
 
@@ -613,6 +624,17 @@ void httpClientUpdate()
                     // We received a JSON blob containing NTRIP credentials
                     systemPrintf("PointPerfect response: %s\r\n", response.c_str());
 
+                    // Check if the JSON blob contains rtcmCredentials
+                    // If this is the first time this device has connected to ThingStream, rtcmCredentials
+                    // will not be present and we need to retry
+                    // httpClientConnectLimitReached will prevent excessive retries
+                    if ((const char *)((*jsonZtp)["rtcmCredentials"]) == nullptr)
+                    {
+                        systemPrintln("ERROR - rtcmCredentials not found!\r\n");
+                        httpClientRestart(); // Try again - allow time for ThingStream to finish activating the device on plan
+                        break;
+                    }
+
                     strncpy(settings.ntripClient_CasterHost, (const char *)((*jsonZtp)["rtcmCredentials"]["endpoint"]),
                             sizeof(settings.ntripClient_CasterHost));
                     settings.ntripClient_CasterPort = (*jsonZtp)["rtcmCredentials"]["httpPort"];