From 0db4269d40e74702ff05f227496f61a55aef0c25 Mon Sep 17 00:00:00 2001
From: Ivan Hrabcak <ivan@hrabcak.eu>
Date: Tue, 5 Mar 2024 17:47:46 +0100
Subject: [PATCH] Undo a fragmentation of the login code

---
 edupage_api/login.py | 78 ++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 42 deletions(-)

diff --git a/edupage_api/login.py b/edupage_api/login.py
index 829fd58..cb7fedb 100644
--- a/edupage_api/login.py
+++ b/edupage_api/login.py
@@ -132,46 +132,6 @@ def __parse_login_data(self, data):
 
         self.edupage.gsec_hash = data.split('ASC.gsechash="')[1].split('"')[0]
 
-    def __second_factor(self):
-        request_url = (
-            f"https://{self.edupage.subdomain}.edupage.org/login/twofactor?sn=1"
-        )
-        two_factor_response = self.edupage.session.get(request_url)
-
-        data = two_factor_response.content.decode()
-
-        csrf_token = data.split('csrfauth" value="')[1].split('"')[0]
-
-        authentication_token = data.split('au" value="')[1].split('"')[0]
-        authentication_endpoint = data.split('gu" value="')[1].split('"')[0]
-
-        return TwoFactorLogin(
-            authentication_endpoint, authentication_token, csrf_token, self.edupage
-        )
-
-    def __login(self, username: str, password: str, subdomain: str) -> Response:
-        request_url = f"https://{subdomain}.edupage.org/login/index.php"
-
-        response = self.edupage.session.get(request_url)
-        data = response.content.decode()
-
-        csrf_token = data.split('name="csrfauth" value="')[1].split('"')[0]
-
-        parameters = {
-            "csrfauth": csrf_token,
-            "username": username,
-            "password": password,
-        }
-
-        request_url = f"https://{subdomain}.edupage.org/login/edubarLogin.php"
-
-        response = self.edupage.session.post(request_url, parameters)
-
-        if "bad=1" in response.url:
-            raise BadCredentialsException()
-
-        return response
-
     def login(
         self, username: str, password: str, subdomain: str = "login1"
     ) -> Optional[TwoFactorLogin]:
@@ -198,7 +158,26 @@ def login(
                 or there was another problem with the second factor.
         """
 
-        response = self.__login(username, password, subdomain)
+        request_url = f"https://{subdomain}.edupage.org/login/index.php"
+
+        response = self.edupage.session.get(request_url)
+        data = response.content.decode()
+
+        csrf_token = data.split('name="csrfauth" value="')[1].split('"')[0]
+
+        parameters = {
+            "csrfauth": csrf_token,
+            "username": username,
+            "password": password,
+        }
+
+        request_url = f"https://{subdomain}.edupage.org/login/edubarLogin.php"
+
+        response = self.edupage.session.post(request_url, parameters)
+
+        if "bad=1" in response.url:
+            raise BadCredentialsException()
+        
         data = response.content.decode()
 
         if subdomain == "login1":
@@ -212,7 +191,22 @@ def login(
             self.__parse_login_data(data)
             return
 
-        return self.__second_factor()
+        request_url = (
+            f"https://{self.edupage.subdomain}.edupage.org/login/twofactor?sn=1"
+        )
+        
+        two_factor_response = self.edupage.session.get(request_url)
+
+        data = two_factor_response.content.decode()
+
+        csrf_token = data.split('csrfauth" value="')[1].split('"')[0]
+
+        authentication_token = data.split('au" value="')[1].split('"')[0]
+        authentication_endpoint = data.split('gu" value="')[1].split('"')[0]
+
+        return TwoFactorLogin(
+            authentication_endpoint, authentication_token, csrf_token, self.edupage
+        )
 
     def reload_data(self, subdomain: str, session_id: str, username: str):
         request_url = f"https://{subdomain}.edupage.org/user"