[jablotron] Migrate to v2.2 API (openhab#16743)

octa22 · jlaur · commit f89f0b396d18 · 2024-05-11T11:18:05.000+02:00
Signed-off-by: Ondrej Pecta &lt;opecta@gmail.com&gt;
diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/JablotronBindingConstants.java
@@ -54,11 +54,13 @@ public class JablotronBindingConstants {
     public static final String CHANNEL_STATUS_PGY = "statusPGY";
 
     // Constants
-    public static final String JABLOTRON_API_URL = "https://api.jablonet.net/api/1.6/";
-    public static final String AGENT = "Swagger-Codegen/1.0.0/android";
+    public static final String JABLOTRON_API_URL = "https://api.jablonet.net/api/2.2/";
+    public static final String AGENT = "net.jablonet/8.3.5.3331 (iPhone 14 Pro Max; iOS 17.4; )";
     public static final int TIMEOUT_SEC = 10;
     public static final String SYSTEM = "openHAB";
     public static final String VENDOR = "JABLOTRON:Jablotron";
+    public static final String CLIENT_VERSION = "MYJ-PUB-IOS-8.3.5.3331";
+    public static final String CLIENT_DEVICE = "Apple|iPhone 14 Pro Max|17.4";
     public static final String APPLICATION_JSON = "application/json";
     public static final String WWW_FORM_URLENCODED = "application/x-www-form-urlencoded; charset=UTF-8";
     public static final String AUTHENTICATION_CHALLENGE = "Authentication challenge without WWW-Authenticate header";
diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java
@@ -399,7 +399,8 @@ private String getCommonUrlParameters(String serviceId) {
     private Request createRequest(String url) {
         return httpClient.newRequest(url).method(HttpMethod.POST).header(HttpHeader.ACCEPT, APPLICATION_JSON)
                 .header(HttpHeader.ACCEPT_LANGUAGE, bridgeConfig.getLang()).header(HttpHeader.ACCEPT_ENCODING, "*")
-                .header("x-vendor-id", VENDOR).agent(AGENT).timeout(TIMEOUT_SEC, TimeUnit.SECONDS);
+                .header("x-vendor-id", VENDOR).header("x-client-version", CLIENT_VERSION)
+                .header("x-client-device", CLIENT_DEVICE).agent(AGENT).timeout(TIMEOUT_SEC, TimeUnit.SECONDS);
     }
 
     private void relogin() {

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,8 @@ private String getCommonUrlParameters(String serviceId) {`
`399`	`399`	`private Request createRequest(String url) {`
`400`	`400`	`return httpClient.newRequest(url).method(HttpMethod.POST).header(HttpHeader.ACCEPT, APPLICATION_JSON)`
`401`	`401`	`.header(HttpHeader.ACCEPT_LANGUAGE, bridgeConfig.getLang()).header(HttpHeader.ACCEPT_ENCODING, "*")`
`402`		`- .header("x-vendor-id", VENDOR).agent(AGENT).timeout(TIMEOUT_SEC, TimeUnit.SECONDS);`
	`402`	`+ .header("x-vendor-id", VENDOR).header("x-client-version", CLIENT_VERSION)`
	`403`	`+ .header("x-client-device", CLIENT_DEVICE).agent(AGENT).timeout(TIMEOUT_SEC, TimeUnit.SECONDS);`
`403`	`404`	`}`
`404`	`405`
`405`	`406`	`private void relogin() {`