Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(sdk-java): put query values before a path fragment

Yudhi Armyndharis43cf03cf4282
diff --git a/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java b/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
index 98f8f719b..f10a3a3be 100644
--- a/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
+++ b/sdk/java/src/main/java/com/rmyndharis/openwa/http/Http.java
@@ -63,7 +63,13 @@ public final class Http {
qs.add(encodeQuery(e.getKey()) + "=" + encodeQuery(value));
}
String q = qs.toString();
- return q.isEmpty() ? url : url + (url.contains("?") ? "&" : "?") + q;
+ if (q.isEmpty()) {
+ return url;
+ }
+ int fragmentAt = url.indexOf('#');
+ String fragment = fragmentAt < 0 ? "" : url.substring(fragmentAt);
+ String target = fragmentAt < 0 ? url : url.substring(0, fragmentAt);
+ return target + (target.contains("?") ? "&" : "?") + q + fragment;
}
private static String encodeQuery(String s) {
diff --git a/sdk/java/src/test/java/com/rmyndharis/openwa/ClientTest.java b/sdk/java/src/test/java/com/rmyndharis/openwa/ClientTest.java
index 92a7da00d..f96e091ce 100644
--- a/sdk/java/src/test/java/com/rmyndharis/openwa/ClientTest.java
+++ b/sdk/java/src/test/java/com/rmyndharis/openwa/ClientTest.java
@@ -16,6 +16,7 @@ import com.rmyndharis.openwa.http.HttpMethod;
import com.rmyndharis.openwa.model.AuthValidateResponse;
import com.rmyndharis.openwa.model.SuccessResult;
import com.rmyndharis.openwa.support.MockTransport;
+import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
@@ -119,6 +120,41 @@ class ClientTest {
assertEquals("application/json", tx.lastRequest().headers().get("Content-Type"));
}
+ @Test
+ void rawRequestsKeepQueryBeforeFragment() {
+ OpenWAClient prefixed = new OpenWAClient(ClientConfig.builder()
+ .baseUrl("https://h:2785/gateway").apiKey("owa_k1_x").transport(tx).build());
+ String[][] cases = {
+ {"/api/sessions#part", "limit=50", "part"},
+ {"/api/sessions?offset=2#part", "offset=2&limit=50", "part"},
+ {"/api/sessions#part?x=2", "limit=50", "part?x=2"},
+ {"/api/sessions?offset=2", "offset=2&limit=50", null}
+ };
+ for (String[] row : cases) {
+ tx.respond(200, "{\"success\":true}");
+ SuccessResult result = prefixed.request(HttpMethod.GET, row[0], Map.of("limit", 50), null, SuccessResult.class);
+ assertTrue(result.success());
+ URI uri = URI.create(tx.lastRequest().url());
+ assertEquals("https", uri.getScheme(), row[0]);
+ assertEquals("h:2785", uri.getRawAuthority(), row[0]);
+ assertEquals("/gateway/api/sessions", uri.getRawPath(), row[0]);
+ assertEquals(row[1], uri.getRawQuery(), row[0]);
+ assertEquals(row[2], uri.getRawFragment(), row[0]);
+ assertEquals(HttpMethod.GET, tx.lastRequest().method());
+ assertEquals("owa_k1_x", tx.lastRequest().headers().get("X-API-Key"));
+ }
+ }
+
+ @Test
+ void fragmentCharactersInTypedIdsStayInThePath() {
+ tx.respond(200, "{\"id\":\"s#part\",\"name\":\"n\",\"status\":\"ready\"}");
+ assertEquals("s#part", client.sessions.get("s#part").id());
+ URI uri = URI.create(tx.lastRequest().url());
+ assertEquals("/api/sessions/s%23part", uri.getRawPath());
+ assertNull(uri.getRawQuery());
+ assertNull(uri.getRawFragment());
+ }
+
@Test
void nonOkResponseThrowsClassifiedError() {
tx.respond(404, "{\"statusCode\":404,\"message\":\"nope\",\"error\":\"Not Found\"}");
diff --git a/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java b/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
index 5b53d7cbf..fef1032f0 100644
--- a/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
+++ b/sdk/java/src/test/java/com/rmyndharis/openwa/http/HttpTest.java
@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.gson.Gson;
+import java.net.URI;
import java.time.Duration;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -74,6 +75,30 @@ class HttpTest {
Http.buildUrl("http://h", "/m?a=1", new Query(null, 50, null), gson));
}
+ @Test
+ void buildUrlAppendsQueryBeforeFragment() {
+ String[][] cases = {
+ {"/m#part", "limit=50", "part"},
+ {"/m?a=1#part", "a=1&limit=50", "part"},
+ {"/m#part?x=2", "limit=50", "part?x=2"}
+ };
+ for (String[] row : cases) {
+ URI uri = URI.create(Http.buildUrl("https://h/v1", row[0], new Query(null, 50, null), gson));
+ assertEquals("h", uri.getRawAuthority(), row[0]);
+ assertEquals("/v1/m", uri.getRawPath(), row[0]);
+ assertEquals(row[1], uri.getRawQuery(), row[0]);
+ assertEquals(row[2], uri.getRawFragment(), row[0]);
+ }
+ }
+
+ @Test
+ void buildUrlLeavesFragmentAloneWhenNoQueryValuesAreAdded() {
+ String original = "https://h/v1/m?a=1#part?x=2";
+ assertEquals(original, Http.buildUrl("https://h/v1", "/m?a=1#part?x=2", null, gson));
+ assertEquals(original, Http.buildUrl("https://h/v1", "/m?a=1#part?x=2", Map.of(), gson));
+ assertEquals(original, Http.buildUrl("https://h/v1", "/m?a=1#part?x=2", new Query(null, null, null), gson));
+ }
+
@Test
void mergeHeadersAuthAndJsonWin() {
Map<String, String> defaults = new LinkedHashMap<>();