feat: make config_section a global CLI option

Users can now specify --config-section once at the beginning of the command instead of repeating it for each subcommand. Also bumped version to v0.5.0 for this new feature.
chore: display userid after fetch
2025-08-19 09:25:50 +02:00 · 2025-08-19 09:10:04 +02:00 · 2025-08-19 09:03:42 +02:00 · 2025-08-19 08:57:37 +02:00 · 2025-08-19 08:52:39 +02:00
6 changed files with 122 additions and 819 deletions
@@ -26,22 +26,11 @@ yamllint .                      # YAML linting
 markdownlint .                  # Markdown linting
 ```

-### Running Tests
+### Testing

 ```bash
-# No formal test framework configured
+# Run tests (no specific test framework configured)
 # Project uses manual testing with example PDF files in repository
-# To test individual functions, run the CLI commands directly:
-# myice schedule --days 7
-# myice mobile-login
-# myice search --help
-```
-
-### Running the Web API
-
-```bash
-# Or with poetry
-poetry run fastapi run myice/webapi.py --host 127.0.0.1
 ```

 ## Code Style Guidelines
@@ -86,20 +75,3 @@ poetry run fastapi run myice/webapi.py --host 127.0.0.1
 - requests for HTTP requests
 - PyPDF2 for PDF processing
 - Use rich for enhanced console output
- Custom rl_ai_tools package for AI functionalities
-
-### Git Commit Messages
-
- Use conventional commits format
- Never mention Claude in commit messages
- Be descriptive but concise
- Use present tense ("add feature" not "added feature")
-
-### Additional Rules
-
- Always use ddg-mcp to perform Web Search functionality
- Follow the existing code patterns in myice/myice.py and myice/webapi.py
- Maintain backward compatibility when modifying existing APIs
- Document new features in README.md
- Always run ruff format and ruff check after editing a python file
- use conventional commit messages
@@ -76,34 +76,15 @@ Then open your browser at `http://localhost:8000`. The web interface allows you
 - View upcoming games and practices
 - See detailed information about events including player rosters

-### Authentication
-
-The web interface supports two authentication methods:
-
-1. **Infomaniak OpenID Connect (Recommended)**: Click the "Se connecter avec Infomaniak" button to authenticate using Infomaniak's OIDC provider. Only users in the allowed list will be granted access.
-
-2. **Static API Key**: For development purposes, you can still use `abc` as the token.
-
-### Environment Variables
-
-To configure OIDC authentication, set the following environment variables:
-
- `CLIENT_ID`: Your OIDC client ID (default: 8ea04fbb-4237-4b1d-a895-0b3575a3af3f)
- `CLIENT_SECRET`: Your OIDC client secret
- `REDIRECT_URI`: The redirect URI (default: http://localhost:8000/callback)
- `ALLOWED_USERS`: Comma-separated list of allowed email addresses (e.g., "user1@example.com,user2@example.com")
-
 The web API provides the following endpoints:

 - `/schedule` - Get the schedule for a specific account
 - `/game/{game_id}` - Get details for a specific game
 - `/accounts` - Get a list of available accounts
 - `/health` - Health check endpoint
- `/login` - Initiate OIDC login flow
- `/callback` - Handle OIDC callback
- `/userinfo` - Get user information

-All endpoints (except `/health`, `/login`, and `/callback`) require an Authorization header with a Bearer token.
+All endpoints (except `/health`) require an Authorization header with a Bearer token.
+For development purposes, you can use `abc` as the token.

 ## mobile functions

@@ -10,61 +10,28 @@
 </head>

 <body>
-    <div id="connectedUser" class="position-fixed top-0 end-0 m-2 p-2 bg-light border rounded"
-        style="display: none; z-index: 1000; font-size: 0.9rem;">
-        <span>Connecté: <span id="userName"></span></span>
-        <button id="disconnect" class="btn btn-danger btn-sm ms-2"
-            style="font-size: 0.8rem; padding: 0.1rem 0.3rem;">Déco</button>
-    </div>
+    <div class="container mt-4">
+        <h1 class="mb-4 text-center">MyIce - Games</h1>

-    <div class="container-fluid d-flex align-items-center justify-content-center">
-        <div class="text-center">
-            <h1 id="loginTitle" class="mb-4">MyIce - Games</h1>
-
-            <div id="loginContainer" class="mb-3">
-                <div id="oidcLoginSection">
-                    <button id="oidcLoginBtn" class="btn btn-primary btn-md px-4 py-3 shadow">Se connecter</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container mt-2" id="mainContent" style="display: none;">
+        <div id="apikeyContainer" class="mb-3"></div>

        <div id="eventFilters" style="display: none;">
-            <div class="mb-3 row">
-                <div class="col-md-3">
-                    <label for="account" class="form-label">Compte</label>
-                    <select id="account" class="form-select">
-                        <option value="default">Défaut</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="agegroup" class="form-label">Âge</label>
-                    <select id="agegroup" class="form-select">
-                        <option value="">Tous</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="subgroup" class="form-label">Sous-groupe</label>
-                    <select id="subgroup" class="form-select">
-                        <option value="">Tous</option>
-                    </select>
-                </div>
-                <div class="col-md-3 d-flex align-items-end">
-                    <button id="fetchEvents" class="btn btn-primary">Charger</button>
-                </div>
+            <div class="mb-3">
+                <label for="account" class="form-label">Sélectionner un compte</label>
+                <select id="account" class="form-select">
+                    <option value="default">Compte par défaut</option>
+                </select>
            </div>
+            <div class="mb-3">
+                <label for="agegroup" class="form-label">Filtrer par groupe d'âge</label>
+                <select id="agegroup" class="form-select">
+                    <option value="">Tous</option>
+                </select>
+            </div>
+            <button id="fetchEvents" class="btn btn-primary mb-3">Charger les événements</button>
        </div>

-        <div id="loadingIndicator" class="text-center my-3" style="display: none;">
-            <div class="spinner-border text-primary" role="status">
-                <span class="visually-hidden">Chargement...</span>
-            </div>
-            <p class="mt-2">Chargement des événements...</p>
-        </div>
-
-        <div id="eventList" class="row mt-2"></div>
+        <div id="eventList" class="row"></div>

        <!-- Modal pour afficher les détails d'un événement -->
        <div class="modal fade" id="eventDetailsModal" tabindex="-1" aria-labelledby="eventDetailsLabel"
@@ -83,13 +50,10 @@

    <script>
        document.addEventListener("DOMContentLoaded", function () {
-            const loginContainer = document.getElementById("loginContainer");
-            const oidcLoginSection = document.getElementById("oidcLoginSection");
-            const connectedUser = document.getElementById("connectedUser");
+            const apikeyContainer = document.getElementById("apikeyContainer");
            const eventFilters = document.getElementById("eventFilters");
            const accountSelect = document.getElementById("account");
            const agegroupSelect = document.getElementById("agegroup");
-            const subgroupSelect = document.getElementById("subgroup");
            const eventList = document.getElementById("eventList");
            const fetchButton = document.getElementById("fetchEvents");
            const eventDetailsContent = document.getElementById("eventDetailsContent");
@@ -98,237 +62,73 @@
            let storedApiKey = localStorage.getItem("apikey");
            let lastFetchedEvents = [];
            let storedAccount = localStorage.getItem("account") || "default";
-            let userInfo = JSON.parse(localStorage.getItem("userInfo") || "null");

-            // If we have an API key but no userInfo, fetch it from the server
-            if (storedApiKey && !userInfo) {
-                fetch(`${apiBaseUrl}/userinfo`, {
-                    headers: { "Authorization": `Bearer ${storedApiKey}` }
-                })
-                    .then(response => response.json())
-                    .then(userData => {
-                        userInfo = { email: userData.email || "Utilisateur connecté" };
-                        localStorage.setItem("userInfo", JSON.stringify(userInfo));
-                        renderLoginSection();
-                    })
-                    .catch(e => {
-                        console.error("Error fetching user info:", e);
-                        // If we can't fetch user info, proceed with rendering
-                        renderLoginSection();
+            function renderApiKeyInput() {
+                if (storedApiKey) {
+                    apikeyContainer.innerHTML = `<button id="disconnect" class="btn btn-danger">Déconnecter</button>`;
+                    document.getElementById("disconnect").addEventListener("click", () => {
+                        localStorage.removeItem("apikey");
+                        localStorage.removeItem("account");
+                        location.reload();
                    });
-            } else {
-                // Render the login section normally
-                renderLoginSection();
-            }
-
-            // Handle the static "abc" key case - removed for security
-            /*
-            if (storedApiKey === "abc" && !userInfo) {
-                userInfo = {email: "utilisateur@example.com"};
-                localStorage.setItem("userInfo", JSON.stringify(userInfo));
-            }
-            */
-
-            // Handle OIDC callback
-            const urlParams = new URLSearchParams(window.location.search);
-            const error = urlParams.get('error');
-            const hashParams = new URLSearchParams(window.location.hash.substring(1));
-            const accessToken = hashParams.get('access_token');
-
-            // Display error message if present
-            if (error) {
-                alert("Erreur d'authentification: " + decodeURIComponent(error));
-                // Remove error from URL
-                window.history.replaceState({}, document.title, "/");
-            }
-
-            // Handle access token in URL fragment
-            if (accessToken) {
-                // Store the access token
-                localStorage.setItem("apikey", accessToken);
-                storedApiKey = accessToken;
-
-                // Get user info from the userinfo endpoint
-                fetch(`${apiBaseUrl}/userinfo`, {
-                    headers: { "Authorization": `Bearer ${accessToken}` }
-                })
-                    .then(response => response.json())
-                    .then(userData => {
-                        userInfo = { email: userData.email || "Utilisateur connecté" };
-                        localStorage.setItem("userInfo", JSON.stringify(userInfo));
-
-                        // Update UI
-                        renderLoginSection();
-                    })
-                    .catch(e => {
-                        console.error("Error fetching user info:", e);
-                        // Fallback to parsing token as JWT
-                        try {
-                            // First, try to parse as JWT
-                            const tokenParts = accessToken.split('.');
-                            let userData = {};
-
-                            if (tokenParts.length === 3) {
-                                // Standard JWT format
-                                const payload = tokenParts[1];
-                                if (payload) {
-                                    // Add padding if needed
-                                    const paddedPayload = payload.padEnd(payload.length + (4 - payload.length % 4) % 4, '=');
-                                    const decodedPayload = atob(paddedPayload);
-                                    userData = JSON.parse(decodedPayload);
-                                }
-                            } else {
-                                // Non-JWT token, treat as opaque token
-                                console.log("Non-JWT token received, using default user info");
-                                userData = { email: "utilisateur@" + window.location.hostname };
-                            }
-
-                            userInfo = { email: userData.email || "Utilisateur connecté" };
-                            localStorage.setItem("userInfo", JSON.stringify(userInfo));
-                        } catch (parseError) {
-                            console.error("Error decoding token:", parseError);
-                            // Fallback to a generic user object
-                            userInfo = { email: "Utilisateur connecté" };
-                            localStorage.setItem("userInfo", JSON.stringify(userInfo));
-                        }
-
-                        // Update UI
-                        renderLoginSection();
-                    });
-
-                // Remove token from URL
-                window.history.replaceState({}, document.title, "/");
-            }
-
-            function renderLoginSection() {
-                const mainContent = document.getElementById("mainContent");
-                const loginView = document.querySelector(".container-fluid");
-                const connectedUser = document.getElementById("connectedUser");
-                const loginTitle = document.getElementById("loginTitle");
-
-                if (storedApiKey || userInfo) {
-                    // User is logged in
-                    loginView.style.display = "none";
-                    mainContent.style.display = "block";
-                    loginTitle.style.display = "none";
-
-                    connectedUser.style.display = "block";
-                    oidcLoginSection.style.display = "none";
-
-                    const userNameElement = document.getElementById("userName");
-                    if (userInfo && userInfo.email) {
-                        userNameElement.textContent = userInfo.email;
-                    } else {
-                        userNameElement.textContent = "Utilisateur";
-                    }
-
                    eventFilters.style.display = "block";
-                    updateAccountOptionsAndLoadEvents();
+                    // Load available accounts from server or use predefined ones
+                    updateAccountOptions();
+                    fetchEvents(storedApiKey, storedAccount);
                } else {
-                    // User is not logged in
-                    loginView.style.display = "flex";
-                    mainContent.style.display = "none";
-                    loginTitle.style.display = "block";
-
-                    connectedUser.style.display = "none";
-                    oidcLoginSection.style.display = "block";
+                    apikeyContainer.innerHTML = `
+                        <label for="apikey" class="form-label">API Key</label>
+                        <input type="text" id="apikey" class="form-control" placeholder="Entrez votre API Key">
+                        <button id="validateApiKey" class="btn btn-success mt-2">Valider</button>
+                    `;
                    eventFilters.style.display = "none";
-
-                    // Remove any existing event listeners to prevent duplicates
-                    const oidcLoginBtn = document.getElementById("oidcLoginBtn");
-                    const newOidcLoginBtn = oidcLoginBtn.cloneNode(true);
-                    oidcLoginBtn.parentNode.replaceChild(newOidcLoginBtn, oidcLoginBtn);
-
-                    newOidcLoginBtn.addEventListener("click", initiateOIDCLogin);
-                }
-
-                // Add disconnect handler
-                const disconnectBtn = document.getElementById("disconnect");
-                if (disconnectBtn) {
-                    // Remove any existing event listeners to prevent duplicates
-                    const newDisconnectBtn = disconnectBtn.cloneNode(true);
-                    disconnectBtn.parentNode.replaceChild(newDisconnectBtn, disconnectBtn);
-                    newDisconnectBtn.addEventListener("click", logout);
+                    document.getElementById("validateApiKey").addEventListener("click", saveApiKey);
+                    document.getElementById("apikey").addEventListener("keypress", function (event) {
+                        if (event.key === "Enter") {
+                            saveApiKey();
+                        }
+                    });
                }
            }

-            function initiateOIDCLogin() {
-                // Redirect to backend login endpoint
-                window.location.href = `${apiBaseUrl}/login`;
+            function saveApiKey() {
+                const key = document.getElementById("apikey").value;
+                if (key) {
+                    localStorage.setItem("apikey", key);
+                    location.reload();
+                } else {
+                    alert("Veuillez entrer une clé API valide.");
+                }
            }

-            function logout() {
-                localStorage.removeItem("apikey");
-                localStorage.removeItem("account");
-                localStorage.removeItem("userInfo");
-                storedApiKey = null;
-                userInfo = null;
-                location.reload();
-            }
-
-            function updateAccountOptionsAndLoadEvents() {
+            function updateAccountOptions() {
                // Fetch available accounts from the server
                fetch(`${apiBaseUrl}/accounts`, {
                    headers: { "Authorization": `Bearer ${storedApiKey}` }
                })
-                    .then(response => {
-                        if (!response.ok) {
-                            return response.json().then(errorData => {
-                                console.error("Accounts error response:", errorData);
-                                throw new Error(`HTTP error! status: ${response.status}, message: ${errorData.detail || 'Unknown error'}`);
-                            });
+                .then(response => response.json())
+                .then(accounts => {
+                    accountSelect.innerHTML = '';
+                    accounts.forEach(account => {
+                        const option = document.createElement("option");
+                        option.value = account.name;
+                        option.textContent = account.label;
+                        if (account.name === storedAccount) {
+                            option.selected = true;
                        }
-                        return response.json();
-                    })
-                    .then(accounts => {
-                        // Check if accounts is actually an array
-                        if (!Array.isArray(accounts)) {
-                            console.error("Accounts data is not an array:", accounts);
-                            throw new Error("Invalid accounts data format");
-                        }
-
-                        accountSelect.innerHTML = '';
-
-                        // If no accounts are available, add a default option
-                        if (accounts.length === 0) {
-                            const option = document.createElement("option");
-                            option.value = "default";
-                            option.textContent = "Default";
-                            accountSelect.appendChild(option);
-                            return;
-                        }
-
-                        // Add all available accounts
-                        accounts.forEach(account => {
-                            const option = document.createElement("option");
-                            option.value = account.name;
-                            option.textContent = account.label;
-                            accountSelect.appendChild(option);
-                        });
-
-                        // Select the stored account if it exists, otherwise select the first account
-                        let accountToSelect = storedAccount;
-                        if (!accounts.some(account => account.name === storedAccount)) {
-                            accountToSelect = accounts[0].name;
-                            // Update stored account
-                            storedAccount = accountToSelect;
-                            localStorage.setItem("account", accountToSelect);
-                        }
-
-                        // Set the selected account in the dropdown
-                        accountSelect.value = accountToSelect;
-
-                        // Automatically fetch events for the selected account
-                        fetchEvents(storedApiKey, accountToSelect);
-                    })
-                    .catch(error => {
-                        console.error("Erreur lors du chargement des comptes:", error);
-                        alert("Accès refusé. Vous n'êtes pas autorisé à accéder à cette application. Veuillez contacter l'administrateur.");
-                        logout();
+                        accountSelect.appendChild(option);
                    });
+                })
+                .catch(error => {
+                    console.error("Erreur lors du chargement des comptes:", error);
+                    // Fallback to default options
+                    accountSelect.innerHTML = `
+                        <option value="default" ${storedAccount === "default" ? "selected" : ""}>Compte par défaut</option>
+                    `;
+                });
            }

-            renderLoginSection();
+            renderApiKeyInput();

            accountSelect.addEventListener("change", () => {
                const selectedAccount = accountSelect.value;
@@ -340,7 +140,7 @@

            fetchButton.addEventListener("click", () => {
                if (!storedApiKey) {
-                    alert("Veuillez vous connecter");
+                    alert("Veuillez entrer une clé API");
                    return;
                }
                const selectedAccount = accountSelect.value;
@@ -348,145 +148,37 @@
            });

            agegroupSelect.addEventListener("change", () => {
-                // Update subgroup options based on selected agegroup
-                updateSubgroupOptions(agegroupSelect.value, lastFetchedEvents);
-                displayEvents(lastFetchedEvents);
-            });
-
-            subgroupSelect.addEventListener("change", () => {
                displayEvents(lastFetchedEvents);
            });

            function fetchEvents(apiKey, account) {
-                // Show loading indicator
-                const loadingIndicator = document.getElementById("loadingIndicator");
-                const eventList = document.getElementById("eventList");
-                loadingIndicator.style.display = "block";
-                eventList.innerHTML = ""; // Clear previous events
-
                fetch(`${apiBaseUrl}/schedule?account=${account}`, {
                    headers: { "Authorization": `Bearer ${apiKey}` }
                })
-                    .then(response => {
-                        if (response.status === 401) {
-                            // Token expired or invalid
-                            alert("Votre session a expiré. Veuillez vous reconnecter.");
-                            logout();
-                            return;
-                        }
-                        if (!response.ok) {
-                            // Try to parse error response as JSON, but handle plain text as well
-                            return response.text().then(errorText => {
-                                let errorMessage = 'Unknown error';
-                                try {
-                                    const errorData = JSON.parse(errorText);
-                                    errorMessage = errorData.detail || errorData.message || errorText;
-                                } catch (e) {
-                                    // If parsing fails, use the raw text
-                                    errorMessage = errorText || 'Unknown error';
-                                }
-                                console.error("Schedule error response:", errorText);
-                                throw new Error(`HTTP error! status: ${response.status}, message: ${errorMessage}`);
-                            });
-                        }
-                        return response.text().then(text => {
-                            try {
-                                return JSON.parse(text);
-                            } catch (e) {
-                                console.error("Invalid JSON response:", text);
-                                throw new Error("Le serveur a renvoyé une réponse invalide. Veuillez réessayer.");
-                            }
-                        });
-                    })
+                    .then(response => response.json())
                    .then(data => {
-                        // Hide loading indicator
-                        loadingIndicator.style.display = "none";
-
-                        if (data) {
-                            // Check if data is an array
-                            if (!Array.isArray(data)) {
-                                console.error("Schedule data is not an array:", data);
-                                throw new Error("Invalid schedule data format");
-                            }
-
-                            lastFetchedEvents = data.filter(event => event.event === "Jeu");
-                            updateAgeGroupOptions(lastFetchedEvents);
-                            displayEvents(lastFetchedEvents);
-                        }
+                        lastFetchedEvents = data.filter(event => event.event === "Jeu");
+                        updateAgeGroupOptions(lastFetchedEvents);
+                        displayEvents(lastFetchedEvents);
                    })
-                    .catch(error => {
-                        // Hide loading indicator on error
-                        loadingIndicator.style.display = "none";
-
-                        console.error("Erreur lors du chargement des événements:", error);
-                        alert("Erreur lors du chargement des événements: " + error.message);
-                    });
+                    .catch(error => console.error("Erreur lors du chargement des événements:", error));
            }

            function updateAgeGroupOptions(events) {
-                let agegroups = new Set(events.map(event => event.agegroup));
+                let agegroups = new Set(events.map(event => `${event.agegroup} ${event.name}`.trim()));
                agegroupSelect.innerHTML = '<option value="">Tous</option>';
-                Array.from(agegroups).sort().forEach(group => {
+                agegroups.forEach(group => {
                    const option = document.createElement("option");
                    option.value = group;
                    option.textContent = group;
                    agegroupSelect.appendChild(option);
                });
-
-                // Reset subgroup selector
-                subgroupSelect.innerHTML = '<option value="">Tous</option>';
-            }
-
-            function updateSubgroupOptions(selectedAgegroup, events) {
-                // Reset subgroup options
-                subgroupSelect.innerHTML = '<option value="">Tous</option>';
-
-                if (selectedAgegroup === "") {
-                    // If no agegroup is selected, disable subgroup selector
-                    subgroupSelect.disabled = true;
-                    return;
-                }
-
-                // Enable subgroup selector
-                subgroupSelect.disabled = false;
-
-                // Extract subgroups from events matching the selected agegroup
-                let subgroups = new Set();
-                events
-                    .filter(event => event.agegroup === selectedAgegroup)
-                    .forEach(event => {
-                        // Extract subgroup from event.name or event.title
-                        // This assumes the subgroup is part of the name field
-                        if (event.name && event.name !== selectedAgegroup) {
-                            subgroups.add(event.name);
-                        }
-                    });
-
-                // Add subgroups to the selector
-                Array.from(subgroups).sort().forEach(subgroup => {
-                    const option = document.createElement("option");
-                    option.value = subgroup;
-                    option.textContent = subgroup;
-                    subgroupSelect.appendChild(option);
-                });
            }

            function displayEvents(events) {
                eventList.innerHTML = "";
                let selectedAgegroup = agegroupSelect.value;
-                let selectedSubgroup = subgroupSelect.value;
-                let filteredEvents = events.filter(event => {
-                    // Filter by event type
-                    if (event.event !== "Jeu") return false;
-
-                    // Filter by agegroup
-                    if (selectedAgegroup !== "" && event.agegroup !== selectedAgegroup) return false;
-
-                    // Filter by subgroup
-                    if (selectedSubgroup !== "" && event.name !== selectedSubgroup) return false;
-
-                    return true;
-                });
+                let filteredEvents = events.filter(event => event.event === "Jeu" && (selectedAgegroup === "" || `${event.agegroup} ${event.name}` === selectedAgegroup));

                if (filteredEvents.length === 0) {
                    eventList.innerHTML = "<p class='text-muted'>Aucun événement 'Jeu' trouvé.</p>";
@@ -499,9 +191,7 @@
                    eventCard.innerHTML = `
                        <div class="card" style="border-left: 5px solid ${event.color}" data-id="${event.id_event}">
                            <div class="card-body">
-                                <h5 class="card-title">${event.agegroup} - ${event.name}</h5>
-                                <p class="card-text">${event.title}</p>
-                                <p class="card-text"><strong>Adversaire:</strong> ${event.opponent}</p>
+                                <h5 class="card-title">${event.title}</h5>
                                <p class="card-text"><strong>Lieu:</strong> ${event.place}</p>
                                <p class="card-text"><strong>Heure:</strong> ${event.start} - ${event.end}</p>
                            </div>
@@ -518,108 +208,22 @@
                    headers: { "Authorization": `Bearer ${storedApiKey}` }
                })
                    .then(response => response.json())
-                .then(data => {
-                    // Check if available players data exists
-                    const availablePlayers = data.convocation.available || [];
-                    const sortedPlayers = availablePlayers
-                        .sort((a, b) => (a.number || 0) - (b.number || 0));
+                    .then(data => {
+                        const sortedPlayers = data.convocation.available
+                            .sort((a, b) => (a.number || 0) - (b.number || 0));

-                        // Calculate player statistics
-                        const totalPlayers = sortedPlayers.length;
-                        const positionCount = {};
-                        sortedPlayers.forEach(player => {
-                            const position = player.position || "N/A";
-                            positionCount[position] = (positionCount[position] || 0) + 1;
-                        });
-
-                        // Generate position breakdown
-                        const positionBreakdown = Object.entries(positionCount)
-                            .map(([position, count]) => `${position}: ${count}`)
-                            .join(', ');
-
-                        // Sort players by position first, then by number
-                        const playersByPosition = [...sortedPlayers].sort((a, b) => {
-                            // Sort by position first
-                            const positionA = a.position || "ZZZ"; // Put undefined positions at the end
-                            const positionB = b.position || "ZZZ";
-
-                            if (positionA !== positionB) {
-                                return positionA.localeCompare(positionB);
-                            }
-
-                            // If positions are the same, sort by number
-                            const numA = parseInt(a.number) || 0;
-                            const numB = parseInt(b.number) || 0;
-                            return numA - numB;
-                        });
-
-                        // Process staff data
-                        const staffList = data.convocation.staff || [];
-                        const totalStaff = staffList.length;
-
-                        // Check if there are no players
-                        if (totalPlayers === 0 && totalStaff === 0) {
-                            eventDetailsContent.innerHTML = `
-                                <div class="card border-warning">
-                                    <div class="card-body text-center">
-                                        <h5 class="card-title">${data.title}</h5>
-                                        <p class="card-text"><strong>Type:</strong> ${data.type}</p>
-                                        <p class="card-text"><strong>Lieu:</strong> ${data.place}</p>
-                                        <p class="card-text"><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
-                                        <div class="alert alert-warning" role="alert">
-                                            <h6 class="alert-heading">Aucun joueur ni personnel convoqué</h6>
-                                            <p>Il n'y a actuellement aucun joueur ni personnel convoqué pour ce match.</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            `;
-                        } else {
-                            let staffHtml = '';
-                            if (totalStaff > 0) {
-                                staffHtml = `
-                                    <h6>Personnel (${totalStaff}):</h6>
-                                    <ul>${staffList.map(staff => {
-                                        return `<li><strong>${staff.role}:</strong> ${staff.fname} ${staff.lname}</li>`;
-                                    }).join('')}</ul>
-                                `;
-                            } else {
-                                staffHtml = `
-                                    <div class="alert alert-info" role="alert">
-                                        <h6>Aucun personnel convoqué</h6>
-                                        <p>Il n'y a actuellement aucun personnel convoqué pour ce match.</p>
-                                    </div>
-                                `;
-                            }
-
-                            if (totalPlayers === 0) {
-                                eventDetailsContent.innerHTML = `
-                                    <h5>${data.title}</h5>
-                                    <p><strong>Type:</strong> ${data.type}</p>
-                                    <p><strong>Lieu:</strong> ${data.place}</p>
-                                    <p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
-                                    <div class="alert alert-warning" role="alert">
-                                        <h6 class="alert-heading">Aucun joueur convoqué</h6>
-                                        <p>Il n'y a actuellement aucun joueur convoqué pour ce match.</p>
-                                    </div>
-                                    ${staffHtml}
-                                `;
-                            } else {
-                                eventDetailsContent.innerHTML = `
-                                    <h5>${data.title}</h5>
-                                    <p><strong>Type:</strong> ${data.type}</p>
-                                    <p><strong>Lieu:</strong> ${data.place}</p>
-                                    <p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
-                                    <p><strong>Joueurs convoqués:</strong> ${totalPlayers} joueur${totalPlayers > 1 ? 's' : ''} (${positionBreakdown})</p>
-                                    <h6>Liste des joueurs:</h6>
-                                    <ul>${playersByPosition.map(player => {
-                                        let number = player.number ? player.number : "N/A";
-                                        let position = player.position ? player.position : "N/A";
-                                        return `<li>[${position}] ${number} - ${player.fname} ${player.lname} (${player.dob})</li>`;
-                                    }).join('')}</ul>
-                                    ${staffHtml}
-                                `;
-                            }
-                        }
+                        eventDetailsContent.innerHTML = `
+                        <h5>${data.title}</h5>
+                        <p><strong>Type:</strong> ${data.type}</p>
+                        <p><strong>Lieu:</strong> ${data.place}</p>
+                        <p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
+                        <h6>Joueurs convoqués:</h6>
+                        <ul>${sortedPlayers.map(player => {
+                            let number = player.number ? player.number : "N/A";
+                            let position = player.position ? player.position : "N/A";
+                            return `<li>${number} - ${player.fname} ${player.lname} (${position}, ${player.dob})</li>`;
+                        }).join('')}</ul>
+                    `;
                        new bootstrap.Modal(document.getElementById('eventDetailsModal')).show();
                    })
                    .catch(error => console.error("Erreur lors du chargement des détails de l'événement:", error));
@@ -75,29 +75,7 @@ def sanitize_json_response(text):
        except json.JSONDecodeError:
            # If parsing still fails, try one more aggressive approach
            # Remove any remaining control characters that might be causing issues
-            # This is the key fix - we need to escape control characters rather than remove them
-            def escape_control_chars(match):
-                char = match.group(0)
-                # Handle specific control characters that might cause issues
-                if char == "\n":
-                    return "\\n"
-                elif char == "\r":
-                    return "\\r"
-                elif char == "\t":
-                    return "\\t"
-                else:
-                    # For other control characters, use Unicode escape
-                    return f"\\u{ord(char):04x}"
-
-            # More aggressive approach: escape ALL control characters
-            # This handles the case where line breaks occur within JSON string values
-            # We need to escape them before they break the JSON structure
-
-            # First, let's try to detect if there are line breaks within quoted strings
-            # and escape them properly
-
-            # Simple approach: escape all control characters
-            array_content = re.sub(r"[\x00-\x1f]", escape_control_chars, array_content)
+            array_content = re.sub(r"[\x00-\x08\x0b\x0c\x0e-\x1f]", "", array_content)

            try:
                data = json.loads(array_content)
@@ -353,7 +331,7 @@ def get_schedule(num_days: int) -> str:
    # Debug: Save raw response to file for analysis
    # with open("raw_response.txt", "w") as f:
    #     f.write(r.text)
-    return json.loads(sanitize_json_response(r.text))
+    return r.text


@wrapper_session
@@ -405,13 +383,13 @@ def schedule(
    """
    global global_config_section
    schedule = get_schedule(num_days)
+    # Sanitize the JSON response using our proven approach
+    sanitized_schedule = sanitize_json_response(schedule)
    if outfile:
        with outfile.open("w") as f:
-            f.write(json.dumps(schedule))
+            f.write(sanitized_schedule)
    else:
-        import builtins
-
-        builtins.print(json.dumps(schedule, indent=2))
+        print(sanitized_schedule)


 def os_open(file: str) -> None:
@@ -629,22 +607,7 @@ def refresh_data():
        # verify=False,
    ) as r:
        r.raise_for_status()
-        # Since the API returns valid JSON, we don't need to sanitize it
-        # Just parse it directly
-        try:
-            return r.json()
-        except json.JSONDecodeError:
-            # If direct parsing fails, try with sanitization
-            sanitized = sanitize_json_response(r.text)
-            try:
-                return json.loads(sanitized)
-            except json.JSONDecodeError:
-                # If sanitization also fails, log the raw response for debugging
-                print(
-                    f"Failed to parse response as JSON. Raw response: {r.text[:500]}..."
-                )
-                # Return an empty dict to avoid breaking the API
-                return {}
+        return r.json()


@app.command("mobile-login")
@@ -659,10 +622,7 @@ def mobile():
    global userdata, global_config_section
    userdata = mobile_login(config_section=global_config_section)
    games = [x for x in refresh_data().get("club_games")]
-    # Use built-in print to avoid rich formatting issues
-    import builtins
-
-    builtins.print(json.dumps(games, indent=2, ensure_ascii=False))
+    print(json.dumps(games, indent=2))


@app.command("mobile-game")
@@ -673,6 +633,7 @@ def mobile_game(
    global userdata, global_config_section
    userdata = mobile_login(config_section=global_config_section)

+    # data = refresh_data()
    with requests.post(
        "https://app.myice.hockey/api/mobilerest/getevent",
        headers=mobile_headers,
@@ -688,8 +649,7 @@ def mobile_game(
        ),
        # verify=False,
    ) as r:
-        data = json.loads(sanitize_json_response(r.text))["eventData"]
-
+        data = r.json()["eventData"]
        players = data["convocation"]["available"]
        if raw:
            print(data)
@@ -1,31 +1,12 @@
 import logging
 import requests
-import os
 from typing import Annotated
-from fastapi import FastAPI, Header, HTTPException, status, Request
+from fastapi import FastAPI, Header, HTTPException, status
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, RedirectResponse
+from fastapi.responses import FileResponse
 from pydantic import BaseModel
 from . import myice

-# OIDC Configuration
-CLIENT_ID = os.environ.get("CLIENT_ID", "8ea04fbb-4237-4b1d-a895-0b3575a3af3f")
-CLIENT_SECRET = os.environ.get(
-    "CLIENT_SECRET", "REDACTED_CLIENT_SECRET"
-)
-REDIRECT_URI = os.environ.get("REDIRECT_URI", "http://localhost:8000/callback")
-AUTHORIZATION_ENDPOINT = "https://login.infomaniak.com/authorize"
-TOKEN_ENDPOINT = "https://login.infomaniak.com/token"
-USERINFO_ENDPOINT = "https://login.infomaniak.com/oauth2/userinfo"
-JWKS_URI = "https://login.infomaniak.com/oauth2/jwks"
-
-# Allowed users (based on email claim)
-ALLOWED_USERS = (
-    os.environ.get("ALLOWED_USERS", "").split(",")
-    if os.environ.get("ALLOWED_USERS")
-    else []
-)
-
 origins = ["*"]

 app = FastAPI()
@@ -57,64 +38,13 @@ class AuthHeaders(BaseModel):
    Authorization: str

    def token(self) -> str:
-        parts = self.Authorization.split(" ")
-        if len(parts) == 2:
-            return parts[1]
-        return ""
+        return self.Authorization.split(" ")[1]

    def authorized(self) -> bool:
-        token = self.token()
-        if not token:
-            return False
-
-        # First check if it's a valid OIDC token
-        if self.validate_oidc_token():
-            return True
-        # Fallback to the old static key for compatibility
-        if token == "abc":
+        if self.token() == "abc":
            return True
        return False

-    def validate_oidc_token(self) -> bool:
-        try:
-            token = self.token()
-            if not token:
-                return False
-
-            # Basic validation - in production, you would validate the JWT signature
-            # and check issuer, audience, expiration, etc.
-            import base64
-            import json
-
-            # Decode JWT header and payload (without verification for simplicity in this example)
-            parts = token.split(".")
-            if len(parts) != 3:
-                # If not a standard JWT, treat as opaque token
-                # For now, we'll accept any non-empty token as valid for testing
-                return len(token) > 0
-
-            # Decode payload (part 1)
-            payload = parts[1]
-            if not payload:
-                return False
-
-            # Add padding if needed
-            payload += "=" * (4 - len(payload) % 4)
-            decoded_payload = base64.urlsafe_b64decode(payload)
-            payload_data = json.loads(decoded_payload)
-
-            # Check if user is in allowed list
-            user_email = payload_data.get("email")
-            if ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS:
-                return False
-
-            return True
-        except Exception as e:
-            print(f"Token validation error: {e}")
-            # Even if we can't validate the token, if it exists, we'll accept it for now
-            # This is for development/testing purposes only
-            return len(self.token()) > 0
-

 class HealthCheck(BaseModel):
    """Response model to validate and return when performing a health check."""
@@ -141,128 +71,6 @@ async def favico():
    return FileResponse("favicon.ico")


-@app.get("/login")
-async def login(request: Request):
-    """Redirect to Infomaniak OIDC login"""
-    import urllib.parse
-
-    state = "random_state_string"  # In production, use a proper random state
-    nonce = "random_nonce_string"  # In production, use a proper random nonce
-
-    # Store state and nonce in session (simplified for this example)
-    # In production, use proper session management
-
-    auth_url = (
-        f"{AUTHORIZATION_ENDPOINT}"
-        f"?client_id={CLIENT_ID}"
-        f"&redirect_uri={urllib.parse.quote(REDIRECT_URI)}"
-        f"&response_type=code"
-        f"&scope=openid email profile"
-        f"&state={state}"
-        f"&nonce={nonce}"
-    )
-
-    return RedirectResponse(auth_url)
-
-
-@app.get("/callback")
-async def callback(code: str, state: str):
-    """Handle OIDC callback and exchange code for token"""
-    # Exchange authorization code for access token
-    token_data = {
-        "grant_type": "authorization_code",
-        "client_id": CLIENT_ID,
-        "client_secret": CLIENT_SECRET,
-        "code": code,
-        "redirect_uri": REDIRECT_URI,
-    }
-
-    response = requests.post(TOKEN_ENDPOINT, data=token_data)
-    token_response = response.json()
-
-    if "access_token" not in token_response:
-        # Redirect back to frontend with error
-        frontend_url = os.environ.get("FRONTEND_URL", "/")
-        error_detail = token_response.get(
-            "error_description", "Failed to obtain access token"
-        )
-        return RedirectResponse(f"{frontend_url}?error={error_detail}")
-
-    access_token = token_response["access_token"]
-
-    # Get user info
-    userinfo_response = requests.get(
-        USERINFO_ENDPOINT, headers={"Authorization": f"Bearer {access_token}"}
-    )
-
-    userinfo = userinfo_response.json()
-
-    # Check if user is in allowed list
-    user_email = userinfo.get("email")
-    if ALLOWED_USERS and user_email not in ALLOWED_USERS:
-        # Redirect back to frontend with error
-        frontend_url = os.environ.get("FRONTEND_URL", "/")
-        return RedirectResponse(f"{frontend_url}?error=User not authorized")
-
-    # Redirect back to frontend with access token and user info
-    frontend_url = os.environ.get("FRONTEND_URL", "/")
-    return RedirectResponse(f"{frontend_url}#access_token={access_token}")
-
-
-@app.get("/exchange-token")
-async def exchange_token(code: str):
-    """Exchange authorization code for access token"""
-    # Exchange authorization code for access token
-    token_data = {
-        "grant_type": "authorization_code",
-        "client_id": CLIENT_ID,
-        "client_secret": CLIENT_SECRET,
-        "code": code,
-        "redirect_uri": REDIRECT_URI,
-    }
-
-    response = requests.post(TOKEN_ENDPOINT, data=token_data)
-    token_response = response.json()
-
-    if "access_token" not in token_response:
-        # Return error as JSON
-        error_detail = token_response.get(
-            "error_description", "Failed to obtain access token"
-        )
-        raise HTTPException(
-            status_code=400, detail=f"Token exchange failed: {error_detail}"
-        )
-
-    access_token = token_response["access_token"]
-
-    # Get user info
-    userinfo_response = requests.get(
-        USERINFO_ENDPOINT, headers={"Authorization": f"Bearer {access_token}"}
-    )
-
-    userinfo = userinfo_response.json()
-
-    # Check if user is in allowed list
-    user_email = userinfo.get("email")
-    if ALLOWED_USERS and user_email not in ALLOWED_USERS:
-        raise HTTPException(status_code=403, detail="User not authorized")
-
-    # Return token and user info as JSON
-    return {"access_token": access_token, "user": userinfo}
-
-
-@app.get("/userinfo")
-async def userinfo(headers: Annotated[AuthHeaders, Header()]):
-    """Get user info from access token"""
-    access_token = headers.token()
-
-    userinfo_response = requests.get(
-        USERINFO_ENDPOINT, headers={"Authorization": f"Bearer {access_token}"}
-    )
-
-    return userinfo_response.json()
-
-
@app.get("/schedule")
 async def schedule(
    headers: Annotated[AuthHeaders, Header()],
@@ -270,40 +78,18 @@ async def schedule(
 ):
    if not headers.authorized():
        raise HTTPException(401, detail="get out")
-
-    try:
-        username, password, userid, existing_token, club_id = myice.get_login(
-            config_section=account
-        )
-    except Exception as e:
-        raise HTTPException(
-            400,
-            detail=f"Configuration error: {str(e)}. Available accounts: isaac, leonard",
-        )
-
-    try:
-        if existing_token:
-            myice.userdata = {
-                "id": userid,
-                "id_club": club_id or 186,
-                "token": existing_token,
-            }
-        else:
-            myice.userdata = myice.mobile_login(config_section=account)
-
-        data = myice.refresh_data()
-        if "club_games" in data:
-            return data["club_games"]
-        else:
-            # Return empty array if no games data found
-            return []
-    except Exception as e:
-        print(f"Error fetching schedule: {e}")
-        import traceback
-
-        traceback.print_exc()
-        # Return empty array instead of throwing an error
-        return []
+    username, password, userid, existing_token, club_id = myice.get_login(
+        config_section=account
+    )
+    if existing_token:
+        myice.userdata = {
+            "id": userid,
+            "id_club": club_id or 186,
+            "token": existing_token,
+        }
+    else:
+        myice.userdata = myice.mobile_login(config_section=account)
+    return myice.refresh_data()["club_games"]


@app.get("/accounts")
@@ -1,6 +1,6 @@
 [project]
 name = "myice"
-version = "v0.5.7"
+version = "v0.5.0"
 description = "myice parsing"
 authors = [
    { name = "Rene Luria", "email" = "<rene@luria.ch>"},
Author	SHA1	Message	Date
herel	c4d9236b16	feat: make config_section a global CLI option Users can now specify --config-section once at the beginning of the command instead of repeating it for each subcommand. Also bumped version to v0.5.0 for this new feature.	2025-08-19 09:25:50 +02:00
herel	2a5883375f	chore: display userid after fetch	2025-08-19 09:10:04 +02:00
herel	c4b6e39e9e	fix: correct project scripts section name and bump version - Changed [projectscripts] to [project.scripts] in pyproject.toml to properly register the myice command line tool - Bump version to v0.4.3	2025-08-19 09:03:42 +02:00
herel	d3b5b6b6fd	fix: resolve typer/click compatibility issue with make_metavar error Fixed TypeError: Parameter.make_metavar() missing 1 required positional argument: 'ctx' by correcting typer.Option(...) usage for optional parameters with default None values. Bump version to v0.4.2	2025-08-19 08:57:37 +02:00
herel	bcde9fccf5	chore: bump version to v0.4.1 and update dependencies	2025-08-19 08:52:39 +02:00