Merge pull request #6 from KarimullinArthur/token-fix

token fix. Remove selenium dep

bonchapi/__init__.py

@@ -1,3 +1,2 @@
 from .bonchapi import BonchAPI
 from .schemas import Lesson
-from .__meta__ import __version__

bonchapi/bonchapi.py

@@ -16,8 +16,11 @@ def __init__(self, message=None):
 class BonchAPI:
     @staticmethod
     async def get_token() -> str:
+        URL = "https://lk.sut.ru/cabinet"
+
         async with aiohttp.ClientSession() as session:
-            async with session.get("https://lk.sut.ru/cabinet/?") as resp:
+            async with session.get(URL) as resp:
+                resp.raise_for_status()
                 token = (
                     str(resp.cookies.get("miden"))
                     .split(":")[1]
@@ -26,22 +29,28 @@ async def get_token() -> str:
                 )
                 return token
 
-    async def login(self, mail: str, password: str, from_browser=False) -> bool:
-        URL = "https://lk.sut.ru/cabinet/lib/autentificationok.php"
-
-        token = await self.get_token()
+    async def login(self, mail: str, password: str) -> bool:
+        AUTH = f"https://lk.sut.ru/cabinet/lib/autentificationok.php?users={mail}&parole={password}"
+        CABINET = "https://lk.sut.ru/cabinet/"
+
+        self.token = await self.get_token()
         self.mail = mail
         self.password = password
-        self.cookies = {"miden": token}
-        payload = {"users": mail, "parole": password}
-
-        if from_browser:
-            pass
-        else:
-            async with aiohttp.ClientSession() as session:
-                async with session.post(URL, cookies=self.cookies, data=payload) as resp:
-                    if await resp.text() == "1":
-                        return True
+        self.cookies = {"miden": self.token}
+
+        async with aiohttp.ClientSession() as session:
+            async with session.get(CABINET) as resp:
+                resp.raise_for_status()
+
+                self.cookies = resp.cookies
+                self.cookies["miden"] = self.token
+
+                async with session.post(AUTH) as resp:
+                    resp.raise_for_status()
+                    text = await resp.text()
+                    if text == '1':
+                        async with session.get(CABINET) as resp:
+                            return True
                     else:
                         raise AuthError
 
@@ -52,9 +61,6 @@ async def get_raw_timetable(self, week_number: int = False) -> str:
 
         async with aiohttp.ClientSession() as session:
             async with session.post(URL, cookies=self.cookies) as resp:
-#                 print(week_number)
-#                 print(URL)
-#                 print(await resp.text())
                 bonch_acess_error_msg = "У Вас нет прав доступа. Или необходимо перезагрузить приложение.."
                 if await resp.text() == bonch_acess_error_msg:
                     await self.login(self.mail, self.password)

examples/get_timetable.py

@@ -1,16 +1,13 @@
 import asyncio
 import argparse
+import os
 
 from bonchapi import BonchAPI
 
-from bonchapi.bonchapi import AuthError
-from bonchapi.schemas import Lesson
-from get_token_from_browser import Brow
-
 import dotenv
 
 
-dotenv.load_dotenv(dotenv_path="./examples/autoclick")
+dotenv.load_dotenv(dotenv_path="./examples/autoclick/.env")
 
 
 parser = argparse.ArgumentParser(
@@ -21,37 +18,17 @@
 parser.add_argument('week_offset', nargs="?", type=int, default=0)
 args = parser.parse_args()
 
+
 async def main():
     api = BonchAPI()
 
     api.cookies = {}
 
-    def write_brow_token():
-        browser = Brow()
-        token = browser.get_token()
-        setattr(api, "cookies", {}) 
-        with open("/tmp/bonch-token", "w") as file:
-            file.write(token)
-        api.cookies["miden"] = token
-
-    def read_token_from_cache():
-        with open("/tmp/bonch-token", "r") as file:
-            token = file.readline()
-            api.cookies["miden"] = token
-
-#     write_brow_token()
-
-    try:
-        read_token_from_cache()
-    except FileNotFoundError:
-        write_brow_token()
+    mail = str(os.environ.get("mail"))
+    password = str(os.environ.get("password"))
 
-    try:
-        rsp = await api.get_timetable(week_offset=args.week_offset)
-    except AuthError:
-        write_brow_token()
+    await api.login(mail, password) 
 
-
     rsp = await api.get_timetable(week_offset=args.week_offset)
 
     week: list[str] = []

get_timetable.py

@@ -1,16 +1,13 @@
 import asyncio
 import argparse
+import os
 
 from bonchapi import BonchAPI
 
-from bonchapi.bonchapi import AuthError
-from bonchapi.schemas import Lesson
-from get_token_from_browser import Brow
-
 import dotenv
 
 
-dotenv.load_dotenv(dotenv_path="./examples/autoclick")
+dotenv.load_dotenv(dotenv_path="./examples/autoclick/.env")
 
 
 parser = argparse.ArgumentParser(
@@ -21,37 +18,17 @@
 parser.add_argument('week_offset', nargs="?", type=int, default=0)
 args = parser.parse_args()
 
+
 async def main():
     api = BonchAPI()
 
     api.cookies = {}
 
-    def write_brow_token():
-        browser = Brow()
-        token = browser.get_token()
-        setattr(api, "cookies", {}) 
-        with open("/tmp/bonch-token", "w") as file:
-            file.write(token)
-        api.cookies["miden"] = token
-
-    def read_token_from_cache():
-        with open("/tmp/bonch-token", "r") as file:
-            token = file.readline()
-            api.cookies["miden"] = token
-
-#     write_brow_token()
-
-    try:
-        read_token_from_cache()
-    except FileNotFoundError:
-        write_brow_token()
+    mail = str(os.environ.get("mail"))
+    password = str(os.environ.get("password"))
 
-    try:
-        rsp = await api.get_timetable(week_offset=args.week_offset)
-    except AuthError:
-        write_brow_token()
+    await api.login(mail, password) 
 
-
     rsp = await api.get_timetable(week_offset=args.week_offset)
 
     week: list[str] = []

pyproject.toml

@@ -35,9 +35,6 @@ Documentation = "https://github.com/KarimullinArthur/BonchAPI#readme"
 Issues = "https://github.com/KarimullinArthur/BonchAPI/issues"
 Source = "https://github.com/KarimullinArthur/BonchAPI"
 
-[tool.hatch.version]
-path = "bonchapi/__meta__.py"
-
 [tool.hatch.envs.types]
 extra-dependencies = [
   "mypy>=1.0.0",