From 4db3ad46b412373da89baecf1f900a3022c5a1f8 Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@irit.fr>
Date: Fri, 22 Sep 2023 10:44:46 +0200
Subject: [PATCH] update urls
---
lflex_celcat_survival/auth.py | 8 ++++----
lflex_celcat_survival/fetch.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lflex_celcat_survival/auth.py b/lflex_celcat_survival/auth.py
index 45319f1..61e79ea 100644
--- a/lflex_celcat_survival/auth.py
+++ b/lflex_celcat_survival/auth.py
@@ -27,7 +27,7 @@ def create_authenticated_session(username, password):
forms1 = soup1.find_all('form')
assert len(forms1) == 1, f"1 form expected in html document but {len(forms1)} were found"
form1 = forms1[0]
- assert form1.attrs['action'] == '/idp/profile/SAML2/Redirect/SSO?execution=e1s1'
+ assert form1.attrs['action'] == '/idp/profile/SAML2/Redirect/SSO?execution=e2s1', f"action: {form1.attrs['action']}"
assert form1.attrs['method'] == 'post'
# click continue...
@@ -36,7 +36,7 @@ def create_authenticated_session(username, password):
if r1_input.attrs['type'] == 'hidden':
r2_payload[r1_input.attrs['name']] = r1_input.attrs['value'] if 'value' in r1_input.attrs else ''
r2_payload_str = urllib.parse.urlencode(r2_payload) #"&".join([f"{k}={v}" for k,v in r2_payload.items()])
- r2 = s.post('https://idp.univ-tlse3.fr/idp/profile/SAML2/Redirect/SSO?execution=e1s1',
+ r2 = s.post('https://idp.univ-tlse3.fr/idp/profile/SAML2/Redirect/SSO?execution=e2s1',
headers=r_headers, data=r2_payload_str, allow_redirects=True)
assert r2.ok
@@ -64,7 +64,7 @@ def create_authenticated_session(username, password):
forms3 = soup3.find_all('form')
assert len(forms3) == 1, f"1 form expected in html document but {len(forms3)} were found"
form3 = forms3[0]
- assert form3.attrs['action'] == '/idp/profile/SAML2/Redirect/SSO?execution=e1s3'
+ assert form3.attrs['action'] == '/idp/profile/SAML2/Redirect/SSO?execution=e2s3'
assert form3.attrs['method'] == 'post'
# do not remember data forwarding consent
@@ -76,7 +76,7 @@ def create_authenticated_session(username, password):
r4_payload.append("_eventId_proceed=Accepter")
r4_payload_str = "&".join(r4_payload)
- r4 = s.post('https://idp.univ-tlse3.fr/idp/profile/SAML2/Redirect/SSO?execution=e1s3',
+ r4 = s.post('https://idp.univ-tlse3.fr/idp/profile/SAML2/Redirect/SSO?execution=e2s3',
headers=r_headers, data=r4_payload_str, allow_redirects=True)
soup4 = BeautifulSoup(r4.text, 'html.parser')
diff --git a/lflex_celcat_survival/fetch.py b/lflex_celcat_survival/fetch.py
index 1870322..d46833c 100644
--- a/lflex_celcat_survival/fetch.py
+++ b/lflex_celcat_survival/fetch.py
@@ -11,7 +11,7 @@ def do_celcat_calendar_request(min_date, max_date, module_apogee_codes, session,
] + ['federationIds%5B%5D={}'.format(apogee_code) for apogee_code in module_apogee_codes]
fields_str = '&'.join(fields)
- logging.info(f'Fetching modules {module_apogee_codes} from {min_date} to {min_date} on url={url}')
+ logging.info(f'Fetching modules {module_apogee_codes} from {min_date} to {max_date} on url={url}')
response = session.post(url, data=fields_str, headers=headers)
if not response.ok:
logging.error(f'POST HTTP request failed (status code {response.status_code}): {response.reason}')
--
GitLab