pysportbot 0.0.18__tar.gz → 0.0.20__tar.gz

{pysportbot-0.0.18 → pysportbot-0.0.20}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pysportbot
-Version: 0.0.18
+Version: 0.0.20
 Summary: A python-based bot for automatic resasports slot booking
+License-File: LICENSE
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
 Requires-Python: >=3.10,<3.14
@@ -10,10 +11,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: beautifulsoup4 (>=4.13.3,<5.0.0)
-Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: pandas (>=2.3.2,<3.0.0)
 Requires-Dist: pytz (>=2025.2,<2026.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: requests (>=2.32.5,<3.0.0)
 Description-Content-Type: text/markdown
 
 # No queues. Just gains.
@@ -24,10 +24,11 @@ Description-Content-Type: text/markdown
 [![Release](https://img.shields.io/github/v/release/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/releases)
 [![Build status](https://img.shields.io/github/actions/workflow/status/jbeirer/resasports-bot/main.yml?branch=main)](https://github.com/jbeirer/resasports-bot/actions/workflows/main.yml?query=branch%3Amain)
 [![codecov](https://codecov.io/gh/jbeirer/resasports-bot/graph/badge.svg?token=ZCJV384TXF)](https://codecov.io/gh/jbeirer/resasports-bot)
-[![Commit activity](https://img.shields.io/github/commit-activity/m/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/commits/main/)
+[![Activity](https://img.shields.io/github/commit-activity/m/jbeirer/resasports-bot?label=activity)](https://github.com/jbeirer/resasports-bot/commits/main/)
 [![License](https://img.shields.io/github/license/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/blob/main/LICENSE)
 [![Documentation](https://img.shields.io/badge/api-docs-blue)](https://jbeirer.github.io/resasports-bot/)
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/jbeirer/resasports-bot/blob/main/CODE_OF_CONDUCT.md)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg?label=Contributing)](https://github.com/jbeirer/resasports-bot/blob/main/CODE_OF_CONDUCT.md)
+[![Downloads](https://static.pepy.tech/badge/pysportbot)](https://pepy.tech/projects/pysportbot)
 
 PySportBot empowers you to programmatically book fitness classes at any sports center that uses the [Resasports](https://social.resasports.com/en/) booking management software.
 
@@ -154,10 +155,10 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Set up Python 3.12
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 

{pysportbot-0.0.18 → pysportbot-0.0.20}/README.md

@@ -6,10 +6,11 @@
 [![Release](https://img.shields.io/github/v/release/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/releases)
 [![Build status](https://img.shields.io/github/actions/workflow/status/jbeirer/resasports-bot/main.yml?branch=main)](https://github.com/jbeirer/resasports-bot/actions/workflows/main.yml?query=branch%3Amain)
 [![codecov](https://codecov.io/gh/jbeirer/resasports-bot/graph/badge.svg?token=ZCJV384TXF)](https://codecov.io/gh/jbeirer/resasports-bot)
-[![Commit activity](https://img.shields.io/github/commit-activity/m/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/commits/main/)
+[![Activity](https://img.shields.io/github/commit-activity/m/jbeirer/resasports-bot?label=activity)](https://github.com/jbeirer/resasports-bot/commits/main/)
 [![License](https://img.shields.io/github/license/jbeirer/resasports-bot)](https://github.com/jbeirer/resasports-bot/blob/main/LICENSE)
 [![Documentation](https://img.shields.io/badge/api-docs-blue)](https://jbeirer.github.io/resasports-bot/)
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/jbeirer/resasports-bot/blob/main/CODE_OF_CONDUCT.md)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg?label=Contributing)](https://github.com/jbeirer/resasports-bot/blob/main/CODE_OF_CONDUCT.md)
+[![Downloads](https://static.pepy.tech/badge/pysportbot)](https://pepy.tech/projects/pysportbot)
 
 PySportBot empowers you to programmatically book fitness classes at any sports center that uses the [Resasports](https://social.resasports.com/en/) booking management software.
 
@@ -136,10 +137,10 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Set up Python 3.12
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 

{pysportbot-0.0.18 → pysportbot-0.0.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pysportbot"
-version = "v0.0.18"
+version = "v0.0.20"
 description = "A python-based bot for automatic resasports slot booking"
 authors = [
   { name = "Joshua Falco Beirer", email = "jbeirer@cern.ch" }
@@ -15,29 +15,28 @@ dynamic = ["requires-python", "dependencies"]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.14"
-requests = "^2.32.3"
-beautifulsoup4 = "^4.13.3"
-pandas = "^2.2.3"
+requests = "^2.32.5"
+pandas = "^2.3.2"
 pytz = "^2025.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.5"
-pytest-cov = "^6.0.0"
-deptry = "^0.23.0"
-mypy = "^1.15.0"
-pre-commit = "^4.2.0"
-tox = "^4.24.2"
-ipykernel = "^6.29.5"
-types-pytz = "^2025.1.0.20250318"
-types-requests = "^2.32.0.20250306"
+pytest = "^8.4.2"
+pytest-cov = "^7.0.0"
+deptry = "^0.23.1"
+mypy = "^1.18.1"
+pre-commit = "^4.3.0"
+tox = "^4.30.2"
+ipykernel = "^6.30.1"
+types-pytz = "^2025.2.0.20250809"
+types-requests = "^2.32.4.20250913"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "^1.6.1"
-mkdocs-material = "^9.6.9"
-mkdocstrings = {extras = ["python"], version = "^0.29.0"}
+mkdocs-material = "^9.6.20"
+mkdocstrings = {extras = ["python"], version = "^0.30.0"}
 
 [build-system]
-requires = ["poetry-core>=2.1.3"]
+requires = ["poetry-core>=2.2.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
@@ -47,14 +46,14 @@ preview = true
 
 [tool.mypy]
 files = ["pysportbot"]
-disallow_untyped_defs = "True"
-no_implicit_optional = "True"
-check_untyped_defs = "True"
-warn_return_any = "True"
-warn_unused_ignores = "True"
-show_error_codes = "True"
-ignore_missing_imports= "True"
-disallow_any_unimported = "False"
+disallow_untyped_defs = true
+no_implicit_optional = true
+check_untyped_defs = true
+warn_return_any = true
+warn_unused_ignores = true
+show_error_codes = true
+ignore_missing_imports= true
+disallow_any_unimported = false
 
 
 [tool.pytest.ini_options]

pysportbot-0.0.20/pysportbot/authenticator.py

@@ -0,0 +1,304 @@
+import json
+
+from .endpoints import Endpoints
+from .session import Session
+from .utils.errors import ErrorMessages
+from .utils.logger import get_logger
+
+logger = get_logger(__name__)
+
+
+class Authenticator:
+    """
+    Handles user authentication and Nubapp login functionality.
+
+    Flow overview:
+
+      1. Login to Resasocial (api.resasocial.com) via /user/login
+         -> get Resasocial JWT + (id_user, id_application).
+
+      2. Store (id_user, id_application) in self.creds for use by Activities.
+
+      3. Call /secure/user/getSportUserToken with the Resasocial JWT
+         -> get Nubapp (sport.nubapp.com) JWT.
+
+      4. Store Nubapp JWT in self.headers["Authorization"].
+
+      5. Use Nubapp JWT to call /api/v4/users/getUser.php and verify the user.
+    """
+
+    def __init__(self, session: Session, centre: str) -> None:
+        self.session = session.session
+        # Base headers; will be enriched with Nubapp JWT after login
+        self.headers = session.headers
+        # Centre is still passed in from the bot, but not used in the new flow
+        self.centre = centre
+        self.timeout = (5, 10)
+
+        # Authentication state
+        self.authenticated: bool = False
+        self.user_id: str | None = None
+
+        # Minimal "credentials" object used by Activities
+        # (id_application, id_user) are filled after /user/login.
+        self.creds: dict[str, str] = {}
+
+        # Resasocial (resasports) JWT state
+        self.resasocial_jwt: str | None = None
+        self.resasocial_refresh: str | None = None
+        self.id_user: str | None = None
+        self.id_application: str | None = None
+
+        # Nubapp JWT tokens used for authenticated sport.nubapp.com requests
+        self.sport_jwt: str | None = None
+        self.sport_refresh: str | None = None
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+
+    def login(self, email: str, password: str) -> None:
+        """
+        Full login flow:
+
+          1. Resasocial JSON login (/user/login)
+          2. Fill self.creds with (id_application, id_user) for Activities
+          3. /secure/user/getSportUserToken -> Nubapp JWT
+          4. Store Nubapp JWT in headers and fetch user info to confirm identity
+        """
+        logger.info("Starting login process...")
+
+        try:
+            self._resasocial_jwt_login(email, password)
+
+            # Expose IDs in the same structure Activities expects
+            self.creds = {
+                "id_application": str(self.id_application),
+                "id_user": str(self.id_user),
+            }
+
+            self._get_sport_user_token()
+            self._authenticate_with_bearer_token(self.sport_jwt)
+            self._fetch_user_information()
+
+            self.authenticated = True
+            logger.info("Login process completed successfully!")
+
+        except Exception as exc:
+            self.authenticated = False
+            self.user_id = None
+            logger.error(f"Login process failed: {exc}")
+            # Normalize to a consistent login error for callers/tests
+            raise ValueError(ErrorMessages.failed_login()) from exc
+
+    def is_session_valid(self) -> bool:
+        """
+        Check whether the current Nubapp JWT is still valid by probing USER.
+        """
+        if not self.sport_jwt:
+            return False
+
+        try:
+            # At this point self.headers already contains Nubapp Authorization
+            response = self.session.post(
+                Endpoints.USER,
+                headers=self.headers,
+                timeout=self.timeout,
+            )
+
+            if response.status_code != 200:
+                return False
+
+            data = response.json()
+            return bool(data.get("data", {}).get("user"))
+
+        except Exception as exc:
+            logger.debug(f"Session validation failed: {exc}")
+            return False
+
+    # ------------------------------------------------------------------
+    # Step 1: Resasocial JWT login
+    # ------------------------------------------------------------------
+
+    def _resasocial_jwt_login(self, email: str, password: str) -> None:
+        """Perform login via the /user/login JSON endpoint on api.resasocial.com."""
+        logger.debug("Logging in via Resasocial /user/login (JWT flow)")
+
+        payload = {"username": email, "password": password}
+        # Use a copy of the base headers: no Authorization here.
+        headers = self.headers.copy()
+
+        response = self.session.post(
+            Endpoints.USER_LOGIN,
+            json=payload,
+            headers=headers,
+            timeout=self.timeout,
+        )
+
+        if response.status_code != 200:
+            logger.error(
+                "JWT login failed with status %s. Body (truncated): %r",
+                response.status_code,
+                response.text[:200],
+            )
+            raise ValueError(ErrorMessages.failed_login())
+
+        try:
+            data = response.json()
+        except Exception as exc:
+            logger.error(
+                "JWT login returned non-JSON response. Body (truncated): %r",
+                response.text[:200],
+            )
+            raise ValueError(ErrorMessages.failed_login()) from exc
+
+        logger.debug(
+            "/user/login response keys: %s; applications count=%d",
+            list(data.keys()),
+            len(data.get("applications") or []),
+        )
+
+        self.resasocial_jwt = data.get("jwt_token")
+        self.resasocial_refresh = data.get("refresh_token")
+
+        apps = data.get("applications") or []
+        if not apps:
+            logger.error("No applications returned in /user/login response")
+            raise ValueError(ErrorMessages.failed_login())
+
+        first_app = apps[0]
+        self.id_application = first_app.get("id_application")
+        self.id_user = first_app.get("id_user")
+
+        if not self.resasocial_jwt or not self.id_user or not self.id_application:
+            logger.error(
+                "Missing required fields in /user/login response: "
+                f"jwt_token={self.resasocial_jwt}, id_user={self.id_user}, "
+                f"id_application={self.id_application}"
+            )
+            raise ValueError(ErrorMessages.failed_login())
+
+        logger.info(
+            "JWT login successful. id_user=%s, id_application=%s",
+            self.id_user,
+            self.id_application,
+        )
+
+    # ------------------------------------------------------------------
+    # Step 3: getSportUserToken -> Nubapp JWT
+    # ------------------------------------------------------------------
+
+    def _get_sport_user_token(self) -> None:
+        """
+        Request the Nubapp JWT token using the Resasocial JWT.
+        This replaces the old login_from_social.php redirect method.
+        """
+        logger.debug("Fetching Nubapp JWT via getSportUserToken")
+
+        if not self.resasocial_jwt or not self.id_user or not self.id_application:
+            logger.error("Cannot fetch sport user token without resasocial_jwt, id_user, id_application")
+            raise ValueError(ErrorMessages.failed_login())
+
+        # Local headers specific to this Resasocial-authenticated call
+        social_auth_headers = self.headers.copy()
+        social_auth_headers["Authorization"] = f"Bearer {self.resasocial_jwt}"
+
+        params = {
+            "id_user": self.id_user,
+            "id_application": self.id_application,
+        }
+
+        response = self.session.get(
+            Endpoints.SPORT_USER_TOKEN,
+            params=params,
+            headers=social_auth_headers,
+            timeout=self.timeout,
+        )
+
+        if response.status_code != 200:
+            logger.error(
+                "getSportUserToken failed with status %s. Body (truncated): %r",
+                response.status_code,
+                response.text[:200],
+            )
+            raise ValueError(ErrorMessages.failed_login())
+
+        try:
+            data = response.json()
+        except Exception as exc:
+            logger.error(
+                "getSportUserToken returned non-JSON response. Body (truncated): %r",
+                response.text[:200],
+            )
+            raise ValueError(ErrorMessages.failed_login()) from exc
+
+        logger.debug("response keys: %s", list(data.keys()))
+
+        self.sport_jwt = data.get("jwt_token")
+        self.sport_refresh = data.get("refresh_token")
+
+        if not self.sport_jwt:
+            logger.error("No jwt_token found in getSportUserToken response")
+            raise ValueError(ErrorMessages.failed_login())
+
+        logger.info("Nubapp JWT obtained successfully.")
+
+    # ------------------------------------------------------------------
+    # Step 4: Set Authorization header for Nubapp
+    # ------------------------------------------------------------------
+
+    def _authenticate_with_bearer_token(self, token: str | None) -> None:
+        """
+        Store the Nubapp JWT in self.headers so that all subsequent
+        Nubapp API calls (including Activities) share the same auth.
+        """
+        if not token:
+            raise ValueError(ErrorMessages.failed_login())
+
+        logger.debug("Setting Nubapp Authorization header")
+        self.headers["Authorization"] = f"Bearer {token}"
+
+    # ------------------------------------------------------------------
+    # Step 5: Nubapp User info
+    # ------------------------------------------------------------------
+
+    def _fetch_user_information(self) -> None:
+        """
+        Fetch and validate user information from Nubapp.
+
+        No extra payload — we just rely on the Nubapp JWT already set in self.headers.
+        """
+        logger.debug("Fetching user info from Nubapp")
+
+        if not self.sport_jwt:
+            raise ValueError(ErrorMessages.failed_login())
+
+        response = self.session.post(
+            Endpoints.USER,
+            headers=self.headers,
+            timeout=self.timeout,
+        )
+
+        if response.status_code != 200:
+            logger.error(
+                "Fetching user info failed with status %s. Body (truncated): %r",
+                response.status_code,
+                response.text[:200],
+            )
+            raise ValueError(ErrorMessages.failed_login())
+
+        try:
+            data = response.json()
+        except (json.JSONDecodeError, ValueError) as exc:
+            raise ValueError(f"Failed to parse user information: {exc}") from exc
+
+        user_data = data.get("data", {}).get("user")
+        if not user_data:
+            raise ValueError("No user data found in response")
+
+        user_id = user_data.get("id_user")
+        if not user_id:
+            raise ValueError("No user ID found in response")
+
+        self.user_id = str(user_id)
+        logger.info("Authentication successful. User ID: %s", self.user_id)

pysportbot-0.0.20/pysportbot/endpoints.py

@@ -0,0 +1,69 @@
+from enum import Enum
+
+
+class Endpoints(str, Enum):
+    """
+    Centralized collection of API endpoints used by the bot.
+
+    This enum provides type-safe access to all URLs with clear structure.
+    """
+
+    # ============================================================
+    # Base URLs
+    # ============================================================
+
+    # Resasocial / Resasports API (used for login, centre data, etc.)
+    BASE_SOCIAL = "https://api.resasocial.com"
+
+    # Nubapp API (used for bookings, user data, etc.)
+    BASE_NUBAPP = "https://sport.nubapp.com"
+
+    # Path used for all Nubapp JSON API endpoints
+    NUBAPP_API = "api/v4"
+
+    # ============================================================
+    # Centre Management
+    # ============================================================
+
+    # Returns the list of centres with their bounds / metadata.
+    # Used by Centres.fetch_centres() to populate the centre list (slug, name, etc).
+    CENTRE = f"{BASE_SOCIAL}/ajax/applications/bounds/"
+
+    # ============================================================
+    # Authentication
+    # ============================================================
+
+    # Resasports login endpoint
+    USER_LOGIN = f"{BASE_SOCIAL}/user/login"
+
+    # Nubapp authentification via JWT token
+    SPORT_USER_TOKEN = f"{BASE_SOCIAL}/secure/user/getSportUserToken"
+
+    # ============================================================
+    # Nubapp User & Application
+    # ============================================================
+
+    # User information endpoint (requires Nubapp JWT)
+    USER = f"{BASE_NUBAPP}/{NUBAPP_API}/users/getUser.php"
+
+    # ============================================================
+    # Activities & Scheduling
+    # ============================================================
+
+    ACTIVITIES = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/getActivities.php"
+    SLOTS = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/getActivitiesCalendar.php"
+
+    # ============================================================
+    # Booking
+    # ============================================================
+
+    BOOKING = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/bookActivityCalendar.php"
+    CANCELLATION = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/leaveActivityCalendar.php"
+
+    # ============================================================
+    # Utility
+    # ============================================================
+
+    def __str__(self) -> str:
+        """Return URL string for direct HTTP usage."""
+        return str(self.value)

pysportbot-0.0.18/pysportbot/authenticator.py

@@ -1,217 +0,0 @@
-import json
-from urllib.parse import parse_qs, urlparse
-
-from bs4 import BeautifulSoup
-
-from .endpoints import Endpoints
-from .session import Session
-from .utils.errors import ErrorMessages
-from .utils.logger import get_logger
-
-logger = get_logger(__name__)
-
-
-class Authenticator:
-    """Handles user authentication and Nubapp login functionality."""
-
-    def __init__(self, session: Session, centre: str) -> None:
-        """
-        Initialize the Authenticator.
-
-        Args:
-            session (Session): An instance of the Session class.
-            centre (str): The centre selected by the user.
-        """
-        self.session = session.session
-        self.headers = session.headers
-        self.creds: dict[str, str] = {}
-        self.centre = centre
-        self.timeout = (5, 10)
-
-        # Authentication state
-        self.authenticated = False
-        self.user_id: str | None = None
-
-    def is_session_valid(self) -> bool:
-        """
-        Check if the current session is still valid.
-
-        Returns:
-            bool: True if session is valid, False otherwise.
-        """
-        try:
-            response = self.session.post(Endpoints.USER, headers=self.headers, timeout=self.timeout)
-            if response.status_code == 200:
-                response_dict = json.loads(response.content.decode("utf-8"))
-                return bool(response_dict.get("user"))
-
-        except Exception as e:
-            logger.debug(f"Session validation failed with exception: {e}")
-            return False
-
-        logger.debug(f"Session validation failed with status code: {response.status_code}")
-        return False
-
-    def login(self, email: str, password: str) -> None:
-        """
-        Authenticate the user with email and password and log in to Nubapp.
-
-        Args:
-            email (str): The user's email address.
-            password (str): The user's password.
-
-        Raises:
-            ValueError: If login credentials are invalid or authentication fails.
-            RuntimeError: If the login process fails due to system errors.
-        """
-        logger.info("Starting login process...")
-
-        try:
-            # Fetch the CSRF token and perform login
-            csrf_token = self._fetch_csrf_token()
-            # Resasport login with CSRF token
-            self._resasports_login(email, password, csrf_token)
-            # Retrieve Nubapp credentials
-            self._retrieve_nubapp_credentials()
-            bearer_token = self._login_to_nubapp()
-            # Authenticate with the bearer token
-            self._authenticate_with_bearer_token(bearer_token)
-            # Fetch user information to complete the login process
-            self._fetch_user_information()
-
-            logger.info("Login process completed successfully!")
-
-        except Exception as e:
-            self.authenticated = False
-            self.user_id = None
-            logger.error(f"Login process failed: {e}")
-            raise
-
-    def _fetch_csrf_token(self) -> str:
-        """Fetch CSRF token from the login page."""
-        logger.debug(f"Fetching CSRF token from {Endpoints.USER_LOGIN}")
-
-        response = self.session.get(Endpoints.USER_LOGIN, headers=self.headers, timeout=self.timeout)
-        if response.status_code != 200:
-            raise RuntimeError(ErrorMessages.failed_fetch("login popup"))
-
-        soup = BeautifulSoup(response.text, "html.parser")
-        csrf_tag = soup.find("input", {"name": "_csrf_token"})
-        if csrf_tag is None:
-            raise ValueError("CSRF token input not found on the page")
-
-        csrf_token = str(csrf_tag["value"])  # type: ignore[index]
-        logger.debug("CSRF token fetched successfully")
-        return csrf_token
-
-    def _resasports_login(self, email: str, password: str, csrf_token: str) -> None:
-        """Perform login to the main site."""
-        logger.debug("Performing site login")
-
-        payload = {
-            "_username": email,
-            "_password": password,
-            "_csrf_token": csrf_token,
-            "_submit": "",
-            "_force": "true",
-        }
-
-        headers = self.headers.copy()
-        headers.update({"Content-Type": "application/x-www-form-urlencoded"})
-
-        response = self.session.post(Endpoints.LOGIN_CHECK, data=payload, headers=headers, timeout=self.timeout)
-
-        if response.status_code != 200:
-            logger.error(f"Site login failed: {response.status_code}")
-            raise ValueError(ErrorMessages.failed_login())
-
-        logger.info("Site login successful!")
-
-    def _retrieve_nubapp_credentials(self) -> None:
-        """Retrieve Nubapp credentials from the centre endpoint."""
-        logger.debug("Retrieving Nubapp credentials")
-
-        cred_endpoint = Endpoints.get_cred_endpoint(self.centre)
-        response = self.session.get(cred_endpoint, headers=self.headers, timeout=self.timeout)
-
-        if response.status_code != 200:
-            raise RuntimeError(ErrorMessages.failed_fetch("credentials"))
-
-        try:
-            response_data = json.loads(response.content.decode("utf-8"))
-            creds_payload = response_data.get("payload", "")
-            creds = {k: v[0] for k, v in parse_qs(creds_payload).items()}
-            creds.update({"platform": "resasocial", "network": "resasports"})
-
-            self.creds = creds
-            logger.debug("Nubapp credentials retrieved successfully")
-
-        except (ValueError, KeyError, SyntaxError) as e:
-            raise RuntimeError(f"Failed to parse credentials: {e}") from e
-
-    def _login_to_nubapp(self) -> str:
-        """Login to Nubapp and extract bearer token."""
-        logger.debug("Logging in to Nubapp")
-
-        response = self.session.get(
-            Endpoints.NUBAPP_LOGIN,
-            headers=self.headers,
-            params=self.creds,
-            timeout=self.timeout,
-            allow_redirects=False,
-        )
-
-        if response.status_code != 302:
-            logger.error(f"Nubapp login failed: {response.status_code}")
-            raise ValueError(ErrorMessages.failed_login())
-
-        # Extract bearer token from redirect URL
-        redirect_url = response.headers.get("Location", "")
-        if not redirect_url:
-            raise ValueError(ErrorMessages.failed_login())
-
-        parsed_url = urlparse(redirect_url)
-        token = parse_qs(parsed_url.query).get("token", [None])[0]
-
-        if not token:
-            raise ValueError(ErrorMessages.failed_login())
-
-        logger.info("Nubapp login successful!")
-        return token
-
-    def _authenticate_with_bearer_token(self, token: str) -> None:
-        """Add bearer token to headers for authentication."""
-        logger.debug("Setting up bearer token authentication")
-        self.headers["Authorization"] = f"Bearer {token}"
-
-    def _fetch_user_information(self) -> None:
-        """Fetch and validate user information."""
-        logger.debug("Fetching user information")
-
-        payload = {
-            "id_application": self.creds["id_application"],
-            "id_user": self.creds["id_user"],
-        }
-
-        response = self.session.post(Endpoints.USER, headers=self.headers, data=payload, timeout=self.timeout)
-
-        if response.status_code != 200:
-            raise ValueError(ErrorMessages.failed_login())
-
-        try:
-            response_dict = json.loads(response.content.decode("utf-8"))
-            user_data = response_dict.get("data", {}).get("user")
-
-            if not user_data:
-                raise ValueError("No user data found in response")
-
-            user_id = user_data.get("id_user")
-            if not user_id:
-                raise ValueError("No user ID found in response")
-
-            self.user_id = str(user_id)
-            self.authenticated = True
-            logger.info(f"Authentication successful. User ID: {self.user_id}")
-
-        except (json.JSONDecodeError, KeyError) as e:
-            raise ValueError(f"Failed to parse user information: {e}") from e

pysportbot-0.0.18/pysportbot/endpoints.py

@@ -1,58 +0,0 @@
-from enum import Enum
-
-
-class Endpoints(str, Enum):
-    """
-    API endpoints used throughout the application.
-
-    This enum provides type-safe access to all API endpoints with clear organization
-    and automatic string conversion for use in HTTP requests.
-    """
-
-    # === Base URLs ===
-    BASE_SOCIAL = "https://social.resasports.com"
-    BASE_NUBAPP = "https://sport.nubapp.com"
-
-    # === URL Components ===
-    NUBAPP_RESOURCES = "web/resources"
-    NUBAPP_API = "api/v4"
-
-    # === Centre Management ===
-    CENTRE = f"{BASE_SOCIAL}/ajax/applications/bounds/"
-
-    # === Authentication ===
-    USER_LOGIN = f"{BASE_SOCIAL}/popup/login"
-    LOGIN_CHECK = f"{BASE_SOCIAL}/popup/login_check"
-    NUBAPP_LOGIN = f"{BASE_NUBAPP}/{NUBAPP_RESOURCES}/login_from_social.php"
-
-    # === User Management ===
-    USER = f"{BASE_NUBAPP}/{NUBAPP_API}/users/getUser.php"
-
-    # === Activities & Scheduling ===
-    ACTIVITIES = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/getActivities.php"
-    SLOTS = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/getActivitiesCalendar.php"
-
-    # === Booking Management ===
-    BOOKING = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/bookActivityCalendar.php"
-    CANCELLATION = f"{BASE_NUBAPP}/{NUBAPP_API}/activities/leaveActivityCalendar.php"
-
-    @classmethod
-    def get_cred_endpoint(cls, centre_slug: str) -> str:
-        """
-        Generate the credentials endpoint for a specific centre.
-
-        Args:
-            centre_slug (str): The unique identifier for the sports centre
-
-        Returns:
-            str: Complete URL for fetching centre credentials
-
-        Example:
-            >>> Endpoints.get_cred_endpoint("kirolklub")
-            "https://social.resasports.com/ajax/application/kirolklub/book/request"
-        """
-        return f"{cls.BASE_SOCIAL}/ajax/application/{centre_slug}/book/request"
-
-    def __str__(self) -> str:
-        """Return the URL string for direct use in HTTP requests."""
-        return str(self.value)