Add account type

hacf-fr · Mar 10, 2024 · 50bbd37 · 50bbd37
1 parent 9d10b13
commit 50bbd37
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 23 deletions.
diff --git a/custom_components/ecole_directe/config_flow.py b/custom_components/ecole_directe/config_flow.py
@@ -26,6 +26,7 @@
     {
         vol.Required("username"): str,
         vol.Required("password"): str,
+        vol.Required("account_type"): vol.In({'eleve': 'Student', 'famille': 'Family'})
     }
 )
 

diff --git a/custom_components/ecole_directe/coordinator.py b/custom_components/ecole_directe/coordinator.py
@@ -39,6 +39,9 @@ async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
         """Get the latest data from Ecole Directe and updates the state."""
 
         data = self.config_entry.data
+        self.data = {
+            "account_type": data['account_type'],
+        }
 
         session = await self.hass.async_add_executor_job(get_ecoledirecte_session, data)
 
@@ -48,11 +51,12 @@ async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
 
         self.data['session'] = session
 
-        try:
-            self.data['messages'] = await self.hass.async_add_executor_job(getMessages, session, None)
-        except Exception as ex:
-            self.data['messages'] = None
-            _LOGGER.warning("Error getting messages from ecole directe: %s", ex)
+        if (data['account_type'] == 'famille'):
+            try:
+                self.data['messages'] = await self.hass.async_add_executor_job(getMessages, session, None, None)
+            except Exception as ex:
+                self.data['messages'] = None
+                _LOGGER.warning("Error getting messages for family from ecole directe: %s", ex)
 
         for eleve in session.eleves:
             if "CAHIER_DE_TEXTES" in eleve.modules:
@@ -65,5 +69,10 @@ async def _async_update_data(self) -> dict[Platform, dict[str, Any]]:
                     self.data['notes'+ eleve.eleve_id] = await self.hass.async_add_executor_job(getNotes, session, eleve)
                 except Exception as ex:
                     _LOGGER.warning("Error getting notes from ecole directe: %s", ex)
+            if "MESSAGERIE" in eleve.modules:
+                try:
+                    self.data['notes'+ eleve.eleve_id] = await self.hass.async_add_executor_job(getMessages, session, eleve, None)
+                except Exception as ex:
+                    _LOGGER.warning("Error getting notes from ecole directe: %s", ex)
 
         return self.data
diff --git a/custom_components/ecole_directe/ecoleDirecte_helper.py b/custom_components/ecole_directe/ecoleDirecte_helper.py
@@ -6,7 +6,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 APIURL="https://api.ecoledirecte.com/v3"
-APIVERSION="4.19.0"
+APIVERSION="4.53.0"
 
 def encodeString(string):
     return string.replace("%", "%25").replace("&", "%26").replace("+", "%2B").replace("+", "%2B").replace("\\", "\\\\\\").replace("\\\\", "\\\\\\\\")
@@ -81,38 +81,46 @@ def get_ecoledirecte_session(data) -> ED_Session | None:
 
     return session
 
-def getMessages(session, year):
-    return getResponse(session,
-                       f"{APIURL}/Eleves/{session.id}/messages.awp?force=false&typeRecuperation=received&idClasseur=0&orderBy=date&order=desc&query=&onlyRead=&page=0&itemsPerPage=10&getAll=0&verbe=get&v={APIVERSION}",
+def getMessages(session, eleve, year):
+    if(eleve == None):
+        return getResponse(session,
+                       f"{APIURL}/familles/{session.id}/messages.awp?force=false&typeRecuperation=received&idClasseur=0&orderBy=date&order=desc&query=&onlyRead=&page=0&itemsPerPage=100&getAll=0&verbe=get&v={APIVERSION}",
                        encodeBody({"data": {"anneeMessages": year}}))
+    return getResponse(session,
+                    f"{APIURL}/eleves/{eleve.eleve_id}/messages.awp?force=false&typeRecuperation=received&idClasseur=0&orderBy=date&order=desc&query=&onlyRead=&page=0&itemsPerPage=100&getAll=0&verbe=get&v={APIVERSION}",
+                    encodeBody({"data": {"anneeMessages": year}}))
 
 def getHomework(session, eleve, date):
     return getResponse(session,
-                       f"{APIURL}/Eleves/{eleve.eleve_id}/cahierdetexte/{date}.awp?verbe=get&v={APIVERSION}",
+                       f"{APIURL}/eleves/{eleve.eleve_id}/cahierdetexte/{date}.awp?verbe=get&v={APIVERSION}",
                        "data={}")
 
 def getHomework(session, eleve):
     return getResponse(session,
-                       f"{APIURL}/Eleves/{eleve.eleve_id}/cahierdetexte.awp?verbe=get&v={APIVERSION}",
+                       f"{APIURL}/eleves/{eleve.eleve_id}/cahierdetexte.awp?verbe=get&v={APIVERSION}",
                        "data={}")
 
 def getNotes(session, eleve):
     return getResponse(session,
-                       f"{APIURL}/Eleves/{eleve.eleve_id}/notes.awp?verbe=get&v={APIVERSION}",
+                       f"{APIURL}/eleves/{eleve.eleve_id}/notes.awp?verbe=get&v={APIVERSION}",
                        "data='data={\"anneeScolaire\": \"\"}'")
 
 def getHeaders(token):
     headers = {
-        "authority": "api.ecoledirecte.com",
-        "accept": "application/json, text/plain, */*",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:105.0) Gecko/20100101 Firefox/105.0",
-        "content-type": "application/x-www-form-urlencoded",
-        "origin": "https://www.ecoledirecte.com",
-        "sec-fetch-site": "same-site",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-dest": "empty",
-        "referer": "https://www.ecoledirecte.com/",
-        "accept-language": "fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7"
+        "Accept": "application/json, text/plain, */*",
+        "Accept-Encoding": "gzip, deflate, br",
+        "Accept-language": "fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3",
+        "Connection": "keep-alive",
+        "Content-Type": "application/x-www-form-urlencoded",
+        "DNT": "1",
+        "Host": "api.ecoledirecte.com",
+        "Origin": "https://www.ecoledirecte.com",
+        "Referer": "https://www.ecoledirecte.com/",
+        "Sec-fetch-dest": "empty",
+        "Sec-fetch-mode": "cors",
+        "Sec-fetch-site": "same-site",
+        "Sec-GPC": "1",
+        "User-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:105.0) Gecko/20100101 Firefox/105.0"
     }
     if token != None:
         headers["X-Token"] = token

diff --git a/hacs.json b/hacs.json
@@ -1,4 +1,5 @@
 {
   "name": "Ecole Directe for Home Assistant",
-  "country": "FR"
+  "country": "FR",
+  "render_readme": true
 }