diff --git a/lflex_celcat_survival/auth.py b/lflex_celcat_survival/auth.py index 61e79eaac2ac9a75b4f1db431a256f6876c9995e..0bd608fecd7fb70676bb04fa8438c8966b9c5590 100644 --- a/lflex_celcat_survival/auth.py +++ b/lflex_celcat_survival/auth.py @@ -15,11 +15,11 @@ def create_authenticated_session(username, password): r_headers = {"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"} # first simple connection. can become useful if it sets cookies - r0 = s.get('https://edt.univ-tlse3.fr/calendar2') + r0 = s.get('https://edt.univ-tlse3.fr/calendar') assert r0.ok # start login procedure - r1 = s.get('https://edt.univ-tlse3.fr/calendar2/Login', allow_redirects=True) + r1 = s.get('https://edt.univ-tlse3.fr/calendar/Login', allow_redirects=True) assert r1.ok soup1 = BeautifulSoup(r1.text, 'html.parser') @@ -83,7 +83,7 @@ def create_authenticated_session(username, password): forms4 = soup4.find_all('form') assert len(forms4) == 1, f"1 form expected in html document but {len(forms4)} were found" form4 = forms4[0] - assert form4.attrs['action'] == 'https://edt.univ-tlse3.fr/calendar2/Saml/AssertionConsumerService' + assert form4.attrs['action'] == 'https://edt.univ-tlse3.fr/calendar/Saml/AssertionConsumerService' assert form4.attrs['method'] == 'post' # click continue... @@ -92,7 +92,7 @@ def create_authenticated_session(username, password): if r4_input.attrs['type'] == 'hidden': r5_payload[r4_input.attrs['name']] = r4_input.attrs['value'] r5_payload_str = urllib.parse.urlencode(r5_payload) - r5 = s.post('https://edt.univ-tlse3.fr/calendar2/Saml/AssertionConsumerService', + r5 = s.post('https://edt.univ-tlse3.fr/calendar/Saml/AssertionConsumerService', headers=r_headers, data=r5_payload_str, allow_redirects=True) assert r5.ok diff --git a/lflex_celcat_survival/course_request.py b/lflex_celcat_survival/course_request.py index 1a819b0144d74472d6a19d28b6ed5194135da412..68acc4689a8f8de0a5f67baa7d03d30d1087a575 100644 --- a/lflex_celcat_survival/course_request.py +++ b/lflex_celcat_survival/course_request.py @@ -13,6 +13,6 @@ class CourseRequest: return (date_range_min, date_range_max, apogee_codes) - def do_request(self, session, url='https://edt.univ-tlse3.fr/calendar2/Home/GetCalendarData'): + def do_request(self, session, url='https://edt.univ-tlse3.fr/calendar/Home/GetCalendarData'): (date_min, date_max, apogee_codes) = self.generate_request_input() return fetch.do_celcat_calendar_request(date_min, date_max, apogee_codes, session, url) diff --git a/lflex_celcat_survival/fetch.py b/lflex_celcat_survival/fetch.py index d46833c8a0073d5445716dc0d3b8c9b5ab64be6c..a6bbac0ce761e3e7714f87e908baf2235df14b56 100644 --- a/lflex_celcat_survival/fetch.py +++ b/lflex_celcat_survival/fetch.py @@ -1,7 +1,7 @@ import logging import requests -def do_celcat_calendar_request(min_date, max_date, module_apogee_codes, session, url='https://edt.univ-tlse3.fr/calendar2/Home/GetCalendarData'): +def do_celcat_calendar_request(min_date, max_date, module_apogee_codes, session, url='https://edt.univ-tlse3.fr/calendar/Home/GetCalendarData'): headers = {"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"} fields = [ f'start={min_date}',