div fixes for customer registration journey with myelectricaldata bridge

Signed-off-by: Laurent ARNAL <[email protected]>
openhab · Dec 17, 2024 · 18265b0 · 18265b0
1 parent 61e6831
commit 18265b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...nhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java b/...nhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/LinkyAuthServlet.java
@@ -146,7 +146,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         } else if (servletBaseUrl.contains("myelectricaldata")) {
             template = myelectricaldataStep1;
         } else {
-            template = enedisStep1;
+            template = index;
         }
 
         // for some unknown reason, getRequestURL return a malformed URL mixing http:// and port 443

diff --git a/...g.linky/src/main/java/org/openhab/binding/linky/internal/handler/EnedisBridgeHandler.java b/...g.linky/src/main/java/org/openhab/binding/linky/internal/handler/EnedisBridgeHandler.java
@@ -43,7 +43,7 @@ public class EnedisBridgeHandler extends ApiBridgeHandler {
     private static final String ENEDIS_ACCOUNT_URL_PREPROD = "gw.ext.prod-sandbox.api.enedis.fr";
 
     private static final String BASE_URL_PROD = "https://gw.ext.prod.api.enedis.fr/";
-    private static final String ENEDIS_ACCOUNT_URL_PROD = "https://mon-compte-particulier.enedis.fr/";
+    public static final String ENEDIS_ACCOUNT_URL_PROD = "https://mon-compte-particulier.enedis.fr/";
 
     private static final String CONTRACT_URL = "customers_upc/v5/usage_points/contracts?usage_point_id=%s";
     private static final String IDENTITY_URL = "customers_i/v5/identity?usage_point_id=%s";

diff --git a/...c/main/java/org/openhab/binding/linky/internal/handler/MyElectricalDataBridgeHandler.java b/...c/main/java/org/openhab/binding/linky/internal/handler/MyElectricalDataBridgeHandler.java
@@ -57,7 +57,8 @@ public class MyElectricalDataBridgeHandler extends ApiBridgeHandler {
 
     // List of Linky services related urls, information
     public static final String LINKY_MYELECTRICALDATA_ACCOUNT_URL = "https://www.myelectricaldata.fr/";
-    public static final String LINKY_MYELECTRICALDATA_AUTHORIZE_URL = EnedisBridgeHandler.ENEDIS_AUTHORIZE_URL;
+    public static final String LINKY_MYELECTRICALDATA_AUTHORIZE_URL = EnedisBridgeHandler.ENEDIS_ACCOUNT_URL_PROD
+            + EnedisBridgeHandler.ENEDIS_AUTHORIZE_URL;
     public static final String LINKY_MYELECTRICALDATA_API_TOKEN_URL = LINKY_MYELECTRICALDATA_ACCOUNT_URL
             + "v1/oauth2/authorize?client_id=%s&response_type=code&redirect_uri=na&user_type=na&state=na&person_id=-1&usage_points_id=%s";
 
@@ -98,7 +99,7 @@ public String getClientId() {
     public String getClientSecret() {
         return "";
     }
-    
+
     @Override
     public boolean getIsSandbox() {
         return false;