used send_request helpers methods

Author: Zohair-coder

src/helpers.py

@@ -10,15 +10,16 @@ def send_request(
     method: str = "GET",
     json: dict[str, Any] = {},
     headers: dict[str, str] = {},
+    data: dict[str, Any] = {},
 ) -> Response:
     try:
-        resp = send_request_helper(session, url, method, json, headers)
+        resp = send_request_helper(session, url, method, json, headers, data)
         resp.raise_for_status()
     except Exception as ex:
         retries = 10
         for _ in range(retries):
             try:
-                resp = send_request_helper(session, url, method, json, headers)
+                resp = send_request_helper(session, url, method, json, headers, data)
                 resp.raise_for_status()
             except Exception as inner_ex:
                 if (
@@ -51,12 +52,13 @@ def send_request_helper(
     method: str,
     json: dict[str, Any],
     headers: dict[str, str],
+    data: dict[str, Any],
 ) -> Response:
     timeout = 2
     if method == "GET":
         resp = session.get(url, headers=headers, timeout=timeout)
     elif method == "POST":
-        resp = session.post(url, json=json, headers=headers, timeout=timeout)
+        resp = session.post(url, json=json, data=data, headers=headers, timeout=timeout)
     else:
         raise Exception("Invalid method: {}".format(method))
     return resp

src/login.py

@@ -1,13 +1,15 @@
 from requests import Session
 from bs4 import BeautifulSoup, Tag
 import re
+from typing import Any
 
 import config
 import totp
+from helpers import send_request
 
 
 def login_with_drexel_connect(session: Session) -> Session:
-    response = session.get(config.drexel_connect_base_url)
+    response = send_request(session, config.drexel_connect_base_url, method="GET")
     soup = BeautifulSoup(response.text, "html.parser")
 
     csrf_token = extract_csrf_token(soup)
@@ -21,26 +23,20 @@ def login_with_drexel_connect(session: Session) -> Session:
     }
 
     # this should send the credentials and send the MFA request
-    response = session.post(
-        config.drexel_connect_base_url + form_action_path, data=login_payload
-    )
+    response = send_request(session, config.drexel_connect_base_url + form_action_path, data=login_payload, method="POST")
 
     soup = BeautifulSoup(response.text, "html.parser")
     data = parse_initial_mfa_page(soup)
 
-    response = session.post(
-        config.drexel_connect_base_url + data["url"], data=data["form-data"]
-    )
+    response = send_request(session, config.drexel_connect_base_url + data["url"], data=data["form-data"], method="POST")
     json_response = response.json()
 
     data = {
         json_response["csrfN"]: json_response["csrfV"],
         "_eventId": json_response["actValue"],
     }
 
-    response = session.post(
-        config.drexel_connect_base_url + json_response["flowExURL"], data=data
-    )
+    response = send_request(session, config.drexel_connect_base_url + json_response["flowExURL"], data=data, method="POST")
     soup = BeautifulSoup(response.text, "html.parser")
 
     parsed_data = parse_final_mfa_page(soup)
@@ -53,10 +49,10 @@ def login_with_drexel_connect(session: Session) -> Session:
         "j_mfaToken": totp_code,
     }
 
-    response = session.post(
-        config.drexel_connect_base_url + parsed_data["url"], data=data
-    )
-
+    # session.post(
+    #     config.drexel_connect_base_url + parsed_data["url"], data=data
+    # )
+    send_request(session, config.drexel_connect_base_url + parsed_data["url"], data=data, method="POST")
     return session
 
 
@@ -98,7 +94,7 @@ def extract_form_action_path(soup: BeautifulSoup) -> str:
     return form_action_path
 
 
-def parse_initial_mfa_page(soup: BeautifulSoup) -> dict[str, str]:
+def parse_initial_mfa_page(soup: BeautifulSoup) -> dict[str, Any]:
     data = {}
 
     # get the first script tag that isn't empty