Get and Post examples are tested with fingerprints.

Author: MA

examples/get/get.ino

@@ -1,17 +1,20 @@
 #include "recipes/WiFi.h"
 #include "ArduinoFetch.h"
 
-#define SSID WIFISSID
-#define PASSPHRASE WIFIPASSPHRASE
+#define SSID YourWiFiSSID
+#define PASSPHRASE YourWiFiPassphrase
+#define FINGERPRINT "96 84 07 DF 0B 1C F6 58 14 DF D7 33 35 57 51 9B 15 4D 8C E7"
+
 
 void setup() {
     Serial.begin(9200);
     connectWiFi(SSID, PASSPHRASE);
 
     RequestOptions options;
     options.method = "GET";
+    options.fingerprint = FINGERPRINT;
 
-    Response response = fetch("https://api.grandeur.tech/", options);
+    Response response = fetch("https://api.github.com/", options);
 
     Serial.println(response.text());
 }

examples/post/get.ino renamed to examples/post/post.ino

@@ -1,8 +1,9 @@
 #include "recipes/WiFi.h"
 #include "ArduinoFetch.h"
 
-#define SSID WIFISSID
-#define PASSPHRASE WIFIPASSPHRASE
+#define SSID YourWiFiSSID
+#define PASSPHRASE YourWiFiPassphrase
+#define FINGERPRINT "DC 78 3C 09 3A 78 E3 A0 BA A9 C5 4F 7A A0 87 6F 89 01 71 4C"
 
 void setup() {
     Serial.begin(9200);
@@ -12,6 +13,7 @@ void setup() {
     options.method = "POST";
     options.headers.contentType = "application/json";
     options.body = "{\"email\": \"[email protected]\", \"password\": \"test:80\"}";
+    options.fingerprint = FINGERPRINT;
 
     Response response = fetch("https://api.grandeur.tech/auth/login/?apiKey=grandeurkywxmoy914080rxf9dh05n7e", options);
 

src/ArduinoFetch.cpp

@@ -1,54 +1,42 @@
 #include "ArduinoFetch.h"
 #include <WiFiClientSecure.h>
-#include <LCBUrl.h>
 
 // ArduinoFetch arduinoFetch;
 
-const char fingerprint[] PROGMEM = "DC 78 3C 09 3A 78 E3 A0 BA A9 C5 4F 7A A0 87 6F 89 01 71 4C";
-
 Response fetch(const char* url, RequestOptions options) {
     // Parsing URL.
-    LCBUrl lcbUrl;
-    lcbUrl.setUrl(url);
-    String scheme = lcbUrl.getScheme();
-    String host = lcbUrl.getHost();
-    String path = "/" + lcbUrl.getPath();
-    String afterPath = lcbUrl.getAfterPath();
-    unsigned int port = lcbUrl.getPort();
-
-    Serial.printf("scheme: %s, host: %s, path: %s, pathSegment: %s, port: %u\n", scheme.c_str(), host.c_str(), path.c_str(), afterPath.c_str(), port);
+    Url parsedUrl = parseUrl(url);
 
     WiFiClientSecure client;
     // Retry every 15 seconds.
     client.setTimeout(15000);
-    // Set fingerprint if https.
-    if(scheme == "https") client.setFingerprint(fingerprint);
 
-    delay(1000);
+    // Set fingerprint if https.
+    if(parsedUrl.scheme == "https") {
+        if(options.fingerprint == "\0") Serial.println("[Error] Provide fingerprint for HTTPS.");
+        else client.setFingerprint(options.fingerprint.c_str());
+    }
 
     // Connecting to server.
-    while(!client.connect(host, port)) {
+    while(!client.connect(parsedUrl.host, parsedUrl.port)) {
         delay(1000);
-        Serial.print(".");
+        // Serial.print(".");
     }
 
-    Serial.println("Request is: ");
-    Serial.println(
-        options.method + " " + path + afterPath + " HTTP/1.1\r\n" +
-        "Host: " + host + "\r\n" +
+    // Forming request.
+    String request =
+        options.method + " " + parsedUrl.path + parsedUrl.afterPath + " HTTP/1.1\r\n" +
+        "Host: " + parsedUrl.host + "\r\n" +
+        "User-Agent: " + options.headers.userAgent + "\r\n" +
         "Content-Type: " + options.headers.contentType + "\r\n" +
-        "Connection: close\r\n\r\n" +
-        options.body + "\r\n\r\n"
-    );
+        "Connection: " + options.headers.connection + "\r\n\r\n" +
+        options.body + "\r\n\r\n";
+
+    // Serial.println("Request is: ");
+    // Serial.println(request);
 
     // Sending request.
-    client.print(
-        options.method + " " + path + afterPath + " HTTP/1.1\r\n" +
-        "Host: " + host + "\r\n" +
-        "Content-Type: " + options.headers.contentType + "\r\n" +
-        "Connection: close\r\n\r\n" +
-        options.body + "\r\n\r\n"
-    );
+    client.print(request);
 
     // Getting response headers.
     String headers = "";
@@ -58,9 +46,9 @@ Response fetch(const char* url, RequestOptions options) {
         if(line == "\r") break;
     }
 
-    Serial.println("-----HEADERS START-----");
-    Serial.println(headers);
-    Serial.println("-----HEADERS END-----");
+    // Serial.println("-----HEADERS START-----");
+    // Serial.println(headers);
+    // Serial.println("-----HEADERS END-----");
 
     // Getting response body.
     String body = "";
@@ -73,7 +61,7 @@ Response fetch(const char* url, RequestOptions options) {
 }
 
 Headers::Headers(): contentType("application/x-www-form-urlencoded"),
-    contentLength(-1), host("\0"), userAgent("arduino-fetch"), cookie("\0"),
+    contentLength(-1), userAgent("arduino-fetch"), cookie("\0"),
     accept("*/*"), connection("close"), transferEncoding("\0") {}
 
 Body::Body(): _text("") {}
@@ -103,5 +91,5 @@ String Response::text() {
     return this->_text;
 }
 
-RequestOptions::RequestOptions(): method("GET"), headers(Headers()), body(Body()) {}
+RequestOptions::RequestOptions(): method("GET"), headers(Headers()), body(Body()), fingerprint("\0") {}
 

src/ArduinoFetch.h

@@ -1,14 +1,17 @@
-#include "utils/FormData.h"
-#include "utils/URLEncoded.h"
-#include "utils/JSON.h"
+// #include "utils/FormData.h"
+// #include "utils/URLEncoded.h"
+// #include "utils/JSON.h"
+#include "utils/Url/Url.h"
 #include <Arduino.h>
 
+#ifndef FETCH_H_
+#define FETCH_H_
+
 class Headers {
     private:
     public:
         String contentType;
         unsigned long contentLength;
-        String host;
         String userAgent;
         String cookie;
         String accept;
@@ -60,6 +63,7 @@ class RequestOptions {
         String method;
         Headers headers;
         Body body;
+        String fingerprint;
         RequestOptions();
 };
 
@@ -72,4 +76,6 @@ class RequestOptions {
 //         ArduinoFetch(const char* url, RequestOptions options);
 // };
 
-Response fetch(const char* url, RequestOptions options);
+Response fetch(const char* url, RequestOptions options);
+
+#endif

src/utils/Url/Url.cpp

@@ -0,0 +1,21 @@
+#include "Url.h"
+
+Url::Url() {}
+
+Url parseUrl(const char* url) {
+    // Parsing URL.
+    LCBUrl lcbUrl;
+    lcbUrl.setUrl(url);
+    Url parsed;
+    parsed.scheme = lcbUrl.getScheme();
+    parsed.username = lcbUrl.getUserName();
+    parsed.password = lcbUrl.getPassword();
+    parsed.host = lcbUrl.getHost();
+    parsed.path = "/" + lcbUrl.getPath();
+    parsed.afterPath = lcbUrl.getAfterPath();
+    parsed.query = lcbUrl.getQuery();
+    parsed.fragment = lcbUrl.getFragment();
+    parsed.port = lcbUrl.getPort();
+
+    return parsed;
+}

src/utils/Url/Url.h

@@ -0,0 +1,23 @@
+#include <LCBUrl.h>
+
+#ifndef URL_H_
+#define URL_H_
+
+class Url {
+    private:
+    public:
+        String scheme;
+        String username;
+        String password;
+        String host;
+        String path;
+        String afterPath;
+        String query;
+        String fragment;
+        uint port;
+        Url();
+};
+
+Url parseUrl(const char* url);
+
+#endif