add possible fix for 500 Internal Server Error

Signed-off-by: Laurent ARNAL <[email protected]>
openhab · Feb 5, 2025 · f8c7600 · f8c7600
1 parent d43ab2a
commit f8c7600
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 19 deletions.
diff --git a/...hab.binding.linky/src/main/java/org/openhab/binding/linky/internal/api/EnedisHttpApi.java b/...hab.binding.linky/src/main/java/org/openhab/binding/linky/internal/api/EnedisHttpApi.java
@@ -90,10 +90,16 @@ public EnedisHttpApi(LinkyConfiguration config, Gson gson, HttpClient httpClient
         this.config = config;
     }
 
+    public void removeAllCookie() {
+        httpClient.getCookieStore().removeAll();
+    }
+
     public void initialize() throws LinkyException {
         logger.debug("Starting login process for user: {}", config.username);
 
         try {
+            removeAllCookie();
+
             addCookie(LinkyConfiguration.INTERNAL_AUTH_ID, config.internalAuthId);
             logger.debug("Step 1: getting authentification");
             String data = getContent(URL_ENEDIS_AUTHENTICATE);

diff --git a/....binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java b/....binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java
@@ -180,19 +180,6 @@ public void initialize() {
                     api.initialize();
                     updateStatus(ThingStatus.ONLINE);
 
-                    if (thing.getProperties().isEmpty()) {
-                        UserInfo userInfo = api.getUserInfo();
-                        PrmInfo prmInfo = api.getPrmInfo(userInfo.userProperties.internId);
-                        PrmDetail details = api.getPrmDetails(userInfo.userProperties.internId, prmInfo.idPrm);
-                        updateProperties(Map.of(USER_ID, userInfo.userProperties.internId, PUISSANCE,
-                                details.situationContractuelleDtos[0].structureTarifaire().puissanceSouscrite().valeur()
-                                        + " kVA",
-                                PRM_ID, prmInfo.idPrm));
-                    }
-
-                    prmId = thing.getProperties().get(PRM_ID);
-                    userId = thing.getProperties().get(USER_ID);
-
                     updateData();
 
                     disconnect();
@@ -214,17 +201,41 @@ public void initialize() {
         }
     }
 
+    private synchronized void updateMetaData() throws LinkyException {
+        EnedisHttpApi api = this.enedisApi;
+        if (api != null) {
+            if (thing.getProperties().isEmpty()) {
+                UserInfo userInfo = api.getUserInfo();
+                PrmInfo prmInfo = api.getPrmInfo(userInfo.userProperties.internId);
+                PrmDetail details = api.getPrmDetails(userInfo.userProperties.internId, prmInfo.idPrm);
+                updateProperties(Map.of(USER_ID, userInfo.userProperties.internId, PUISSANCE,
+                        details.situationContractuelleDtos[0].structureTarifaire().puissanceSouscrite().valeur()
+                                + " kVA",
+                        PRM_ID, prmInfo.idPrm));
+            }
+
+            prmId = thing.getProperties().get(PRM_ID);
+            userId = thing.getProperties().get(USER_ID);
+        }
+    }
+
     /**
      * Request new data and updates channels
      */
     private synchronized void updateData() {
         boolean connectedBefore = isConnected();
-        updatePowerData();
-        updateDailyWeeklyData();
-        updateMonthlyData();
-        updateYearlyData();
-        if (!connectedBefore && isConnected()) {
-            disconnect();
+        try {
+            updateMetaData();
+            updatePowerData();
+            updateDailyWeeklyData();
+            updateMonthlyData();
+            updateYearlyData();
+            if (!connectedBefore && isConnected()) {
+                disconnect();
+            }
+        } catch (LinkyException e) {
+            logger.error("Exception occurs during data update", e);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
         }
     }