Reverting PR openhab#11233 & PR openhab#11266

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
clinique · Oct 19, 2021 · 362670a · 362670a
1 parent 9f80bea
commit 362670a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
@@ -751,13 +751,11 @@
       <artifactId>org.openhab.binding.lifx</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!-- linky binding suppressed from the distribution until it is fixed
-      <dependency>
+    <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.linky</artifactId>
       <version>${project.version}</version>
-      </dependency>
-    -->
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.linuxinput</artifactId>

diff --git a/...ng.linky/src/main/feature/feature.xml.bak → ...inding.linky/src/main/feature/feature.xml b/...ng.linky/src/main/feature/feature.xml.bak → ...inding.linky/src/main/feature/feature.xml
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
@@ -66,11 +66,13 @@ public class EnedisHttpApi {
     private final HttpClient httpClient;
     private final LinkyConfiguration config;
     private boolean connected = false;
+    private CookieStore cookieStore;
 
     public EnedisHttpApi(LinkyConfiguration config, Gson gson, HttpClient httpClient) {
         this.gson = gson;
         this.httpClient = httpClient;
         this.config = config;
+        this.cookieStore = httpClient.getCookieStore();
     }
 
     public void initialize() throws LinkyException {
@@ -121,14 +123,14 @@ public void initialize() throws LinkyException {
             }
 
             AuthData authData = gson.fromJson(result.getContentAsString(), AuthData.class);
-            if (authData == null || authData.callbacks.size() < 2 || authData.callbacks.get(0).input.size() == 0
-                    || authData.callbacks.get(1).input.size() == 0 || !username
-                            .equals(Objects.requireNonNull(authData.callbacks.get(0).input.get(0)).valueAsString())) {
+            if (authData == null || authData.callbacks.size() < 2 || authData.callbacks.get(0).input.isEmpty()
+                    || authData.callbacks.get(1).input.isEmpty()) {
                 throw new LinkyException("Authentication error, the authentication_cookie is probably wrong");
             }
 
             authData.callbacks.get(1).input.get(0).value = config.password;
-            url = "https://mon-compte.enedis.fr/auth/json/authenticate?realm=/enedis&spEntityID=SP-ODW-PROD&goto=/auth/SSOPOST/metaAlias/enedis/providerIDP?ReqID%"
+            url = URL_MON_COMPTE
+                    + "/auth/json/authenticate?realm=/enedis&spEntityID=SP-ODW-PROD&goto=/auth/SSOPOST/metaAlias/enedis/providerIDP?ReqID%"
                     + reqId
                     + "%26index%3Dnull%26acsURL%3Dhttps://apps.lincs.enedis.fr/saml/SSO%26spEntityID%3DSP-ODW-PROD%26binding%3Durn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST&AMAuthCookie=";
 
@@ -178,7 +180,6 @@ private void disconnect() throws LinkyException {
                 String location = getLocation(httpClient.GET(URL_APPS_LINCS + "/logout"));
                 location = getLocation(httpClient.GET(location));
                 location = getLocation(httpClient.GET(location));
-                CookieStore cookieStore = httpClient.getCookieStore();
                 cookieStore.removeAll();
                 connected = false;
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -196,7 +197,6 @@ public void dispose() throws LinkyException {
     }
 
     private void addCookie(String key, String value) {
-        CookieStore cookieStore = httpClient.getCookieStore();
         HttpCookie cookie = new HttpCookie(key, value);
         cookie.setDomain(".enedis.fr");
         cookie.setPath("/");

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -185,9 +185,7 @@
     <module>org.openhab.binding.lgtvserial</module>
     <module>org.openhab.binding.lgwebos</module>
     <module>org.openhab.binding.lifx</module>
-    <!-- linky binding suppressed from the distribution until it is fixed
-      <module>org.openhab.binding.linky</module>
-    -->
+    <module>org.openhab.binding.linky</module>
     <module>org.openhab.binding.linuxinput</module>
     <module>org.openhab.binding.lirc</module>
     <module>org.openhab.binding.logreader</module>