chore(docker): use docker cache mount for pip install step

Migrate from Python 3.11 to 3.13 with updated dependencies. Switch from PyPDF2 to pypdf library for better PDF processing. Add new U14 age groups and extract-pdf utility script.

.gitignore

@@ -3,11 +3,7 @@ myice.ini
 schedule.json
 .envrc
 cookies.txt
-# Tailwind CSS generated artifacts
+# Byte-compiled / optimized / DLL files
-style.css
-tailwindcss
-
-# Python bytecode
 __pycache__/
 *.py[cod]
 *$py.class
@@ -169,4 +165,3 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-strix_runs/*

.pre-commit-config.yaml

@@ -13,13 +13,9 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
       - id: detect-private-key
-  - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.30.1
-    hooks:
-      - id: gitleaks
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.16.7
+    rev: v0.12.9
     hooks:
       # Run the linter.
       - id: ruff
@@ -28,26 +24,26 @@ repos:
       - id: ruff-format
         args: [--diff, --target-version, py312]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v2.3.1
+    rev: v1.17.1
     hooks:
       - id: mypy
         exclude: ^(docs/|example-plugin/)
         args: [--ignore-missing-imports]
         additional_dependencies: [types-requests, pypdf]
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.38.0
+    rev: v1.37.1
     hooks:
       - id: yamllint
         args: [--strict]
 
   - repo: https://github.com/markdownlint/markdownlint
-    rev: v0.18.1
+    rev: v0.13.0
     hooks:
       - id: markdownlint
         exclude: "^.github|(^docs/_sidebar\\.md$)"
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.11.0.1-1
+    rev: v0.11.0.1
     hooks:
       - id: shellcheck
         args: ["--severity=error"]
@@ -55,12 +51,12 @@ repos:
         files: "\\.sh$"
 
   - repo: https://github.com/golangci/misspell
-    rev: v0.8.0
+    rev: v0.7.0
     hooks:
       - id: misspell
         args: ["-i", "charactor"]
   - repo: https://github.com/python-poetry/poetry
-    rev: "2.4.1"
+    rev: "2.1.4"
     hooks:
       - id: poetry-check
       - id: poetry-lock

AGENTS.md

@@ -29,48 +29,19 @@ markdownlint .                  # Markdown linting
 ### Running Tests
 
 ```bash
-# Manual testing approach - run individual commands to test functionality
+# No formal test framework configured
-# Test schedule fetching
+# Project uses manual testing with example PDF files in repository
-myice schedule --days 7
+# To test individual functions, run the CLI commands directly:
-
+# myice schedule --days 7
-# Test mobile login
+# myice mobile-login
-myice mobile-login
+# myice search --help
-
-# Test specific command help
-myice search --help
-
-# Test web API (run in background)
-poetry run fastapi run myice/webapi.py &
-
-# Run a single pre-commit hook on specific file
-pre-commit run ruff --files myice/myice.py
-pre-commit run ruff-format --files myice/webapi.py
-pre-commit run mypy --files myice/myice.py
-```
-
-### CSS/Frontend Build
-
-When modifying `index.html` or the Tailwind CSS setup:
-
-```bash
-# One-off build of style.css
-./build-css.sh
-
-# Watch mode for development
-./build-css.sh --watch
-
-# Or manually with the standalone CLI (if already downloaded)
-./tailwindcss -i ./style-input.css -o ./style.css --minify
 ```
 
 ### Running the Web API
 
 ```bash
-# Run with poetry
+# Or with poetry
 poetry run fastapi run myice/webapi.py --host 127.0.0.1
-
-# Run with uv (alternative)
-uv run fastapi run myice/webapi.py --host 127.0.0.1
 ```
 
 ## Code Style Guidelines
@@ -131,6 +102,4 @@ uv run fastapi run myice/webapi.py --host 127.0.0.1
 - 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
+- use conventional commit messages
-- When fixing JSON parsing issues, follow the pattern established in
-  sanitize_json_response function

Dockerfile

@@ -4,56 +4,34 @@ FROM python:3.13-slim AS builder
 # Create working directory
 WORKDIR /app
 
-# Install tools needed for Tailwind CSS build
+# poetry export -f requirements.txt --output requirements.txt --without-hashes
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    && rm -rf /var/lib/apt/lists/*
-
 # Copy dependency files
 COPY requirements.txt ./
 
 # Install dependencies to a target directory
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install --no-deps --disable-pip-version-check -r requirements.txt
+    pip install --no-cache-dir --no-deps --disable-pip-version-check --target=/app/site-packages -r requirements.txt
 
-# Build Tailwind CSS
+# Use Alpine as the base image for a much smaller footprint
-COPY index.html style-input.css tailwind.config.js ./
+FROM python:3.13-slim
-RUN curl -sL https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/tailwindcss-linux-x64 -o tailwindcss \
-    && chmod +x tailwindcss \
-    && ./tailwindcss -i ./style-input.css -o ./style.css --minify
 
-# Runtime stage
+# Copy installed packages from builder stage
-FROM python:3.13-slim AS runtime
+COPY --from=builder /app/site-packages /app/site-packages
 
-# Create working directory
+# Copy application code
+COPY index.html favicon.ico /app/
+COPY myice /app/myice
+
+# Set PYTHONPATH so Python can find our installed packages
+ENV PYTHONPATH=/app/site-packages
+
+# Set working directory
 WORKDIR /app
 
-# Install only runtime dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
 # Create a non-root user for security
 RUN useradd --home-dir /app --no-create-home --uid 1000 myice
-
-# Copy installed packages from builder stage
-COPY --from=builder /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
-
-# Copy application code and compiled assets
-COPY index.html favicon.ico ./
-COPY --from=builder /app/style.css ./style.css
-COPY myice ./myice
-
-# Change ownership of copied files
-RUN chown -R myice:myice /app
-
-# Switch to non-root user
 USER myice
 
-# Bytecompile Python files for faster first load
-RUN python -m compileall -q ./myice
-
 # Expose port
 EXPOSE 8000
 

README.md

@@ -64,20 +64,17 @@ To fetch the `token` and `club_id` using mobile-login:
 myice mobile-login
 ```
 
-This will output the necessary information that you can add to your
+This will output the necessary information that you can add to your `myice.ini` file.
-`myice.ini` file.
 
 ## web interface
 
-The tool includes a web interface that can be accessed by running the web
+The tool includes a web interface that can be accessed by running the web API server:
-API server:
 
 ```shell
 uv run fastapi run myice/webapi.py
 ```
 
-Then open your browser at `http://localhost:8000`. The web interface allows
+Then open your browser at `http://localhost:8000`. The web interface allows you to:
-you to:
 
 - Select between different configured accounts
 - View upcoming games and practices
@@ -91,24 +88,16 @@ The web interface supports two authentication methods:
    Infomaniak" button to authenticate using Infomaniak's OIDC provider. Only
    users in the allowed list will be granted access.
 
-1. **Static API Key**: For development purposes, you can still use `abc` as
+1. **Static API Key**: For development purposes, you can still use `abc` as the token.
-   the token.
 
 ### Environment Variables
 
 To configure OIDC authentication, set the following environment variables:
 
-- `CLIENT_ID`: Your OIDC client ID
+- `CLIENT_ID`: Your OIDC client ID (default: 8ea04fbb-4237-4b1d-a895-0b3575a3af3f)
-  (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
+- `ALLOWED_USERS`: Comma-separated list of allowed email addresses (e.g., `"user1@example.com,user2@example.com"`)
-  (e.g. `"user1@example.com,user2@example.com"`)
-- `ALLOWED_REDIRECT_URIS`: Comma-separated list of redirect targets external
-  apps may request via `/login?redirect_uri=...` (default: `myice://callback`
-  for the mobile app). Only allowlisted targets are honored; the callback
-  redirects back to the requesting app with the access token in the URL
-  fragment instead of the web frontend.
 
 The web API provides the following endpoints:
 

build-css.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Build CSS using Tailwind CSS standalone CLI
-# For local development, run:
-#   ./build-css.sh        # one-off build
-#   ./build-css.sh --watch  # watch mode
-
-version="v3.4.17"
-os="$(uname -s)"
-arch="$(uname -m)"
-
-case "$os" in
-    Linux*)     platform="linux";;
-    Darwin*)    platform="macos";;
-    *)          echo "Unsupported OS: $os"; exit 1;;
-esac
-
-case "$arch" in
-    x86_64)     arch="x64";;
-    arm64)      arch="arm64";;
-    aarch64)    arch="arm64";;
-    *)          echo "Unsupported architecture: $arch"; exit 1;;
-esac
-
-binary="tailwindcss-${platform}-${arch}"
-url="https://github.com/tailwindlabs/tailwindcss/releases/download/${version}/${binary}"
-
-if [ ! -f "tailwindcss" ]; then
-    echo "Downloading Tailwind CSS standalone CLI (${version} ${platform}/${arch})..."
-    curl -sL "$url" -o tailwindcss
-    chmod +x tailwindcss
-fi
-
-if [ "${1:-}" == "--watch" ]; then
-    echo "Building CSS in watch mode..."
-    ./tailwindcss -i ./style-input.css -o ./style.css --watch
-else
-    echo "Building CSS..."
-    ./tailwindcss -i ./style-input.css -o ./style.css --minify
-fi

build-docker.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-REGISTRY="harbor.cl1.parano.ch/library"
-IMAGE="myice"
-
-current_commit=$(git rev-parse HEAD)
-
-git_tag=$(git tag --points-at "$current_commit")
-
-if [[ -z $git_tag ]]; then
-    echo "Build only works on a git tag" >&2
-    exit 1
-fi
-
-docker build --platform linux/amd64 -t "$REGISTRY/$IMAGE:$git_tag" .
-docker push "$REGISTRY/$IMAGE:$git_tag"

index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>MyIce - Games</title>
-    <link rel="stylesheet" href="/style.css">
+    <script src="https://cdn.tailwindcss.com"></script>
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 </head>
 
@@ -131,13 +131,6 @@
                 }
             });
 
-            // Close modal when pressing ESC key
-            document.addEventListener("keydown", (e) => {
-                if (e.key === "Escape" && !eventDetailsModal.classList.contains("hidden")) {
-                    eventDetailsModal.classList.add("hidden");
-                }
-            });
-
             // If we have an API key but no userInfo, fetch it from the server
             if (storedApiKey && !userInfo) {
                 fetch(`${apiBaseUrl}/userinfo`, {
@@ -475,17 +468,6 @@
                 subgroupSelect.innerHTML = '<option value="">Tous</option>';
             }
 
-            function extractSubgroup(name) {
-                // Extract subgroup from name by removing opponent part after " - "
-                if (!name) return "";
-                const parts = name.split(" - ");
-                if (parts.length > 1) {
-                    parts.pop(); // Remove opponent
-                    return parts.join(" - ");
-                }
-                return name;
-            }
-
             function updateSubgroupOptions(selectedAgegroup, events) {
                 // Reset subgroup options
                 subgroupSelect.innerHTML = '<option value="">Tous</option>';
@@ -504,9 +486,10 @@
                 events
                     .filter(event => event.agegroup === selectedAgegroup)
                     .forEach(event => {
-                        // Extract subgroup from event.name by removing opponent
+                        // 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(extractSubgroup(event.name));
+                            subgroups.add(event.name);
                         }
                     });
 
@@ -531,8 +514,7 @@
                     if (selectedAgegroup !== "" && event.agegroup !== selectedAgegroup) return false;
 
                     // Filter by subgroup
-                    let eventSubgroup = extractSubgroup(event.name);
+                    if (selectedSubgroup !== "" && event.name !== selectedSubgroup) return false;
-                    if (selectedSubgroup !== "" && eventSubgroup !== selectedSubgroup) return false;
 
                     return true;
                 });
@@ -545,49 +527,40 @@
                 filteredEvents.forEach(event => {
                     const eventCard = document.createElement("div");
                     eventCard.className = "bg-white rounded-2xl shadow-lg overflow-hidden transform hover:scale-105 transition-all duration-300 cursor-pointer";
+                    eventCard.innerHTML = `
+                        <div class="p-6 border-l-4" style="border-color: ${event.color || '#818cf8'}">
+                            <div class="flex justify-between items-start">
+                                <div>
+                                    <h3 class="text-xl font-bold text-gray-800">${event.agegroup} - ${event.name}</h3>
+                                    <p class="text-gray-600 mt-1">${event.title}</p>
+                                </div>
+                            </div>
 
-                    const card = document.createElement("div");
+                            <div class="mt-4 space-y-2">
-                    card.className = "p-6 border-l-4";
+                                <p class="flex items-center text-gray-700">
-                    card.style.borderColor = event.color || "#818cf8";
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" />
+                                    </svg>
+                                    <strong>Adversaire:</strong> ${event.opponent}
+                                </p>
 
-                    const inner = document.createElement("div");
+                                <p class="flex items-center text-gray-700">
-                    inner.className = "flex justify-between items-start";
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" />
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" />
+                                    </svg>
+                                    <strong>Lieu:</strong> ${event.place}
+                                </p>
 
-                    const innerDiv = document.createElement("div");
+                                <p class="flex items-center text-gray-700">
-                    const h3 = document.createElement("h3");
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    h3.className = "text-xl font-bold text-gray-800";
+                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
-                    h3.textContent = event.agegroup + " - " + event.name;
+                                    </svg>
-                    const subtitle = document.createElement("p");
+                                    <strong>Heure:</strong> ${event.start} - ${event.end}
-                    subtitle.className = "text-gray-600 mt-1";
+                                </p>
-                    subtitle.textContent = event.title;
+                            </div>
-                    innerDiv.appendChild(h3);
+                        </div>
-                    innerDiv.appendChild(subtitle);
+                    `;
-                    inner.appendChild(innerDiv);
-                    card.appendChild(inner);
-
-                    const detailsDiv = document.createElement("div");
-                    detailsDiv.className = "mt-4 space-y-2";
-
-                    const p1 = document.createElement("p");
-                    p1.className = "flex items-center text-gray-700";
-                    p1.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" /></svg><strong>Adversaire:</strong> ';
-                    p1.appendChild(document.createTextNode(event.opponent));
-                    detailsDiv.appendChild(p1);
-
-                    const p2 = document.createElement("p");
-                    p2.className = "flex items-center text-gray-700";
-                    p2.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z" /></svg><strong>Lieu:</strong> ';
-                    p2.appendChild(document.createTextNode(event.place));
-                    detailsDiv.appendChild(p2);
-
-                    const p3 = document.createElement("p");
-                    p3.className = "flex items-center text-gray-700";
-                    p3.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" /></svg><strong>Heure:</strong> ';
-                    p3.appendChild(document.createTextNode(event.start + " - " + event.end));
-                    detailsDiv.appendChild(p3);
-
-                    card.appendChild(detailsDiv);
-                    eventCard.appendChild(card);
                     eventCard.addEventListener("click", () => fetchEventDetails(event.id_event));
                     eventList.appendChild(eventCard);
                 });
@@ -600,10 +573,12 @@
                 })
                     .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));
 
+                        // Calculate player statistics
                         const totalPlayers = sortedPlayers.length;
                         const positionCount = {};
                         sortedPlayers.forEach(player => {
@@ -611,158 +586,113 @@
                             positionCount[position] = (positionCount[position] || 0) + 1;
                         });
 
+                        // Generate position breakdown
                         const positionBreakdown = Object.entries(positionCount)
-                        .map(([position, count]) => position + ": " + count)
+                            .map(([position, count]) => `${position}: ${count}`)
-                        .join(", ");
+                            .join(', ');
 
+                        // Sort players by position first, then by number
                         const playersByPosition = [...sortedPlayers].sort((a, b) => {
-                        const positionA = a.position || "ZZZ";
+                            // 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;
 
-                    eventDetailsContent.innerHTML = "";
+                        // Check if there are no players
-
                         if (totalPlayers === 0 && totalStaff === 0) {
-                        const wrapper = document.createElement("div");
+                            eventDetailsContent.innerHTML = `
-                        wrapper.className = "rounded-xl border border-amber-300 bg-amber-50 p-6";
+                                <div class="rounded-xl border border-amber-300 bg-amber-50 p-6">
-                        const centerDiv = document.createElement("div");
+                                    <div class="text-center">
-                        centerDiv.className = "text-center";
+                                        <h5 class="text-2xl font-bold text-gray-800 mb-4">${data.title}</h5>
-                        const h5 = document.createElement("h5");
+                                        <div class="space-y-2 text-gray-700 mb-6">
-                        h5.className = "text-2xl font-bold text-gray-800 mb-4";
+                                            <p><strong>Type:</strong> ${data.type}</p>
-                        h5.textContent = data.title;
+                                            <p><strong>Lieu:</strong> ${data.place}</p>
-                        centerDiv.appendChild(h5);
+                                            <p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
-
+                                        </div>
-                        const infoDiv = document.createElement("div");
+                                        <div class="bg-amber-100 border border-amber-300 text-amber-800 px-4 py-3 rounded-lg">
-                        infoDiv.className = "space-y-2 text-gray-700 mb-6";
+                                            <h6 class="font-bold text-lg mb-1">Aucun joueur ni personnel convoqué</h6>
-                        const pType = document.createElement("p");
+                                            <p>Il n'y a actuellement aucun joueur ni personnel convoqué pour ce match.</p>
-                        pType.innerHTML = "<strong>Type:</strong> ";
+                                        </div>
-                        pType.appendChild(document.createTextNode(data.type));
+                                    </div>
-                        infoDiv.appendChild(pType);
+                                </div>
-                        const pLieu = document.createElement("p");
+                            `;
-                        pLieu.innerHTML = "<strong>Lieu:</strong> ";
-                        pLieu.appendChild(document.createTextNode(data.place));
-                        infoDiv.appendChild(pLieu);
-                        const pHeure = document.createElement("p");
-                        pHeure.innerHTML = "<strong>Heure:</strong> ";
-                        pHeure.appendChild(document.createTextNode(data.time_start + " - " + data.time_end));
-                        infoDiv.appendChild(pHeure);
-                        centerDiv.appendChild(infoDiv);
-
-                        const msgDiv = document.createElement("div");
-                        msgDiv.className = "bg-amber-100 border border-amber-300 text-amber-800 px-4 py-3 rounded-lg";
-                        const msgH6 = document.createElement("h6");
-                        msgH6.className = "font-bold text-lg mb-1";
-                        msgH6.textContent = "Aucun joueur ni personnel convoqué";
-                        msgDiv.appendChild(msgH6);
-                        const msgP = document.createElement("p");
-                        msgP.textContent = "Il n'y a actuellement aucun joueur ni personnel convoqué pour ce match.";
-                        msgDiv.appendChild(msgP);
-                        centerDiv.appendChild(msgDiv);
-                        wrapper.appendChild(centerDiv);
-                        eventDetailsContent.appendChild(wrapper);
                         } else {
-                        const container = document.createElement("div");
+                            let staffHtml = '';
-                        const h5 = document.createElement("h5");
+                            if (totalStaff > 0) {
-                        h5.className = "text-2xl font-bold text-gray-800 mb-4";
+                                staffHtml = `
-                        h5.textContent = data.title;
+                                    <div class="mt-6">
-                        container.appendChild(h5);
+                                        <h6 class="text-xl font-semibold text-gray-800 mb-3">Personnel (${totalStaff}):</h6>
-
+                                        <ul class="space-y-2">
-                        const infoDiv = document.createElement("div");
+                                            ${staffList.map(staff => {
-                        infoDiv.className = "space-y-2 text-gray-700 mb-6";
+                                                return `<li class="flex items-center"><span class="font-medium w-32">${staff.role}:</span> <span>${staff.fname} ${staff.lname}</span></li>`;
-                        const pType = document.createElement("p");
+                                            }).join('')}
-                        pType.innerHTML = "<strong>Type:</strong> ";
+                                        </ul>
-                        pType.appendChild(document.createTextNode(data.type));
+                                    </div>
-                        infoDiv.appendChild(pType);
+                                `;
-                        const pLieu = document.createElement("p");
+                            } else {
-                        pLieu.innerHTML = "<strong>Lieu:</strong> ";
+                                staffHtml = `
-                        pLieu.appendChild(document.createTextNode(data.place));
+                                    <div class="mt-6 bg-blue-50 border border-blue-200 text-blue-800 px-4 py-3 rounded-lg">
-                        infoDiv.appendChild(pLieu);
+                                        <h6 class="font-bold mb-1">Aucun personnel convoqué</h6>
-                        const pHeure = document.createElement("p");
+                                        <p>Il n'y a actuellement aucun personnel convoqué pour ce match.</p>
-                        pHeure.innerHTML = "<strong>Heure:</strong> ";
+                                    </div>
-                        pHeure.appendChild(document.createTextNode(data.time_start + " - " + data.time_end));
+                                `;
-                        infoDiv.appendChild(pHeure);
+                            }
-                        container.appendChild(infoDiv);
 
                             if (totalPlayers === 0) {
-                            const noPlayersDiv = document.createElement("div");
+                                eventDetailsContent.innerHTML = `
-                            noPlayersDiv.className = "bg-amber-100 border border-amber-300 text-amber-800 px-4 py-3 rounded-lg";
+                                    <div>
-                            const noPlayersH6 = document.createElement("h6");
+                                        <h5 class="text-2xl font-bold text-gray-800 mb-4">${data.title}</h5>
-                            noPlayersH6.className = "font-bold mb-1";
+                                        <div class="space-y-2 text-gray-700 mb-6">
-                            noPlayersH6.textContent = "Aucun joueur convoqué";
+                                            <p><strong>Type:</strong> ${data.type}</p>
-                            noPlayersDiv.appendChild(noPlayersH6);
+                                            <p><strong>Lieu:</strong> ${data.place}</p>
-                            const noPlayersP = document.createElement("p");
+                                            <p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
-                            noPlayersP.textContent = "Il n'y a actuellement aucun joueur convoqué pour ce match.";
+                                        </div>
-                            noPlayersDiv.appendChild(noPlayersP);
+                                        <div class="bg-amber-100 border border-amber-300 text-amber-800 px-4 py-3 rounded-lg">
-                            container.appendChild(noPlayersDiv);
+                                            <h6 class="font-bold mb-1">Aucun joueur convoqué</h6>
+                                            <p>Il n'y a actuellement aucun joueur convoqué pour ce match.</p>
+                                        </div>
+                                        ${staffHtml}
+                                    </div>
+                                `;
                             } else {
-                            const playersP = document.createElement("p");
+                                eventDetailsContent.innerHTML = `
-                            playersP.innerHTML = "<strong>Joueurs convoqués:</strong> ";
+                                    <div>
-                            playersP.appendChild(document.createTextNode(totalPlayers + " joueur" + (totalPlayers > 1 ? "s" : "") + " (" + positionBreakdown + ")"));
+                                        <h5 class="text-2xl font-bold text-gray-800 mb-4">${data.title}</h5>
-                            infoDiv.appendChild(playersP);
+                                        <div class="space-y-2 text-gray-700 mb-6">
+                                            <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>
+                                        </div>
 
-                            const playersDiv = document.createElement("div");
+                                        <div>
-                            const playersH6 = document.createElement("h6");
+                                            <h6 class="text-xl font-semibold text-gray-800 mb-3">Liste des joueurs:</h6>
-                            playersH6.className = "text-xl font-semibold text-gray-800 mb-3";
+                                            <ul class="grid grid-cols-1 md:grid-cols-2 gap-3">
-                            playersH6.textContent = "Liste des joueurs:";
+                                                ${playersByPosition.map(player => {
-                            playersDiv.appendChild(playersH6);
+                                                    let number = player.number ? player.number : "N/A";
-                            const playersUl = document.createElement("ul");
+                                                    let position = player.position ? player.position : "N/A";
-                            playersUl.className = "grid grid-cols-1 md:grid-cols-2 gap-3";
+                                                    return `<li class="bg-indigo-50 rounded-lg p-3"><span class="font-medium">[${position}] ${number}</span> - ${player.fname} ${player.lname} <span class="text-gray-500 text-sm">(${player.dob})</span></li>`;
-                            playersByPosition.forEach(player => {
+                                                }).join('')}
-                                const li = document.createElement("li");
+                                            </ul>
-                                li.className = "bg-indigo-50 rounded-lg p-3";
+                                        </div>
-                                const number = player.number ? player.number : "N/A";
+
-                                const position = player.position ? player.position : "N/A";
+                                        ${staffHtml}
-                                li.textContent = "[" + position + "] " + number + " - " + player.fname + " " + player.lname + " (" + player.dob + ")";
+                                    </div>
-                                playersUl.appendChild(li);
+                                `;
-                            });
-                            playersDiv.appendChild(playersUl);
-                            container.appendChild(playersDiv);
                             }
-
-                        if (totalStaff > 0) {
-                            const staffDiv = document.createElement("div");
-                            staffDiv.className = "mt-6";
-                            const staffH6 = document.createElement("h6");
-                            staffH6.className = "text-xl font-semibold text-gray-800 mb-3";
-                            staffH6.textContent = "Personnel (" + totalStaff + "):";
-                            staffDiv.appendChild(staffH6);
-                            const staffUl = document.createElement("ul");
-                            staffUl.className = "space-y-2";
-                            staffList.forEach(staff => {
-                                const li = document.createElement("li");
-                                li.className = "flex items-center";
-                                const roleSpan = document.createElement("span");
-                                roleSpan.className = "font-medium w-32";
-                                roleSpan.textContent = staff.role + ":";
-                                li.appendChild(roleSpan);
-                                li.appendChild(document.createTextNode(" " + staff.fname + " " + staff.lname));
-                                staffUl.appendChild(li);
-                            });
-                            staffDiv.appendChild(staffUl);
-                            container.appendChild(staffDiv);
-                        } else {
-                            const noStaffDiv = document.createElement("div");
-                            noStaffDiv.className = "mt-6 bg-blue-50 border border-blue-200 text-blue-800 px-4 py-3 rounded-lg";
-                            const noStaffH6 = document.createElement("h6");
-                            noStaffH6.className = "font-bold mb-1";
-                            noStaffH6.textContent = "Aucun personnel convoqué";
-                            noStaffDiv.appendChild(noStaffH6);
-                            const noStaffP = document.createElement("p");
-                            noStaffP.textContent = "Il n'y a actuellement aucun personnel convoqué pour ce match.";
-                            noStaffDiv.appendChild(noStaffP);
-                            container.appendChild(noStaffDiv);
-                        }
-
-                        eventDetailsContent.appendChild(container);
                         }
                         eventDetailsModal.classList.remove("hidden");
                     })

myice/myice.py

@@ -13,7 +13,7 @@ import tempfile
 from enum import Enum
 from pathlib import Path
 from typing import Annotated
-
+from typing import List, Tuple
 import pypdf
 import requests
 import typer
@@ -112,8 +112,8 @@ def sanitize_json_response(text):
 
 
 app = typer.Typer(no_args_is_help=True)
-session = requests.Session()
+session: requests.Session
-userid: int = 0
+userid: int
 global_config_section: str = "default"
 
 
@@ -140,14 +140,14 @@ class AgeGroup(str, Enum):
     u13a = "U13 (A)"
     u13p = "U13 (Prép)"
     u14ev = "U14 (Elite Vernets)"
-    u14sae = "U14 (Groupe SAE)"
     u14esmv = "U14 (Elite Sous-Moulin/Vergers)"
     u15t = "U15 (Top)"
     u15a = "U15 (A)"
-    u16e = "U16 (Elit)"
+    u16e = "U16 (Elite)"
     u16t = "U16 (Top GS Ass)"
-    u18e = "U18 (Elit)"
+    u18e = "U18 (Elite)"
-    u21e = "U21 (Elit)"
+    u18el = "U18 (Elit)"
+    u21e = "U21 (ELIT)"
     u14t = "U14 (Top)"
     u14t1 = "U14 (Top1)"
     u14t2 = "U14 (Top2)"
@@ -245,6 +245,7 @@ def get_login(
 
 def select_club(club_id: int = 172):
     """Select a club by ID after login."""
+    global session
     r = session.get(
         f"https://app.myice.hockey/?cl={club_id}", headers={"User-Agent": user_agent}
     )
@@ -252,12 +253,14 @@ def select_club(club_id: int = 172):
 
 
 def do_login(config_section: str | None = None):
+    global session
     global userid
+    global global_config_section
 
     # Use provided config_section, or fall back to global one
     section = config_section if config_section is not None else global_config_section
 
-    username, password, userid_tmp, _token, club_id = get_login(config_section=section)
+    username, password, userid_tmp, token, club_id = get_login(config_section=section)
     if userid_tmp is not None:
         userid = userid_tmp
     r = session.get("https://app.myice.hockey/", headers={"User-Agent": user_agent})
@@ -284,6 +287,7 @@ def do_login(config_section: str | None = None):
 
 
 def get_userid():
+    global session
     r = session.get(
         "https://app.myice.hockey/players/clubschedule/",
         headers={
@@ -302,7 +306,7 @@ def get_userid():
 
 def wrapper_session(func):
     def wrapper(*args, **kwargs):
-        global session, userid
+        global session, userid, global_config_section
         # Use the global config_section
         config_section = global_config_section
 
@@ -326,9 +330,11 @@ def wrapper_session(func):
 
 @wrapper_session
 def get_schedule(num_days: int) -> str:
+    global session
+    global userid
     assert session and userid
     now = datetime.datetime.now()
-    date_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
+    date_start = now
     date_end = date_start + datetime.timedelta(days=num_days)
     r = session.post(
         "https://app.myice.hockey/inc/processclubplanning.php",
@@ -355,6 +361,7 @@ def get_schedule(num_days: int) -> str:
 
 @wrapper_session
 def game_pdf(gameid: int, outfile: Path):
+    global session, userid
     assert session and userid
     r = session.get(
         f"https://app.myice.hockey/pdfexports/playerplatgamepdfgenerator.php?id={gameid}",
@@ -371,6 +378,7 @@ def game_pdf(gameid: int, outfile: Path):
 
 @wrapper_session
 def practice_pdf(gameid: int, outfile: Path):
+    global session, userid
     assert session and userid
     r = session.get(
         f"https://app.myice.hockey/pdfexports/playerplatpracticepdf.php?practice={gameid}",
@@ -398,6 +406,7 @@ def schedule(
     """
     Fetch schedule as json
     """
+    global global_config_section
     schedule = get_schedule(num_days)
     if outfile:
         with outfile.open("w") as f:
@@ -409,16 +418,14 @@ def schedule(
 
 
 def os_open(file: str) -> None:
-    import subprocess
-
     if os.uname().sysname == "Linux":
-        subprocess.run(["xdg-open", file])
+        os.system(f"xdg-open {file}")
     else:
         print(f"Opening file {file}", file=sys.stderr)
-        subprocess.run(["open", file])
+        os.system(f"open {file}")
 
 
-def extract_players(pdf_file: Path) -> list[str]:
+def extract_players(pdf_file: Path) -> List[str]:
     reader = pypdf.PdfReader(pdf_file)
     page = reader.pages[0]
 
@@ -445,6 +452,7 @@ def get_game_pdf(
     """
     Genate the pdf for the game invitation
     """
+    global global_config_section
     if open_file:
         output_filename = f"game_{game_id}.pdf"
     else:
@@ -465,6 +473,7 @@ def get_practice_pdf(
     """
     Genate the pdf for the practice invitation
     """
+    global global_config_section
     output_filename = f"practice_{game_id}.pdf"
     practice_pdf(game_id, Path(output_filename))
     os_open(output_filename)
@@ -484,6 +493,7 @@ def parse_schedule(
     """
     Parse schedule.json to look for specific games or practices
     """
+    global global_config_section
     try:
         with schedule_file.open("r") as f:
             data = json.load(f)
@@ -533,6 +543,7 @@ def check_with_ai(
     """
     Search through the schedule with natural language using Infomaniak LLM API
     """
+    global global_config_section
     if not utils.init():
         sys.exit(1)
     with schedule_file.open("r") as f:
@@ -547,7 +558,7 @@ def check_with_ai(
     system = "\n".join(
         [
             "Tu es une IA connaissant bien les données suivantes, qui décrivent les match et entraînements d'équipes de hockey sur glace.",
-            f"aujourd'hui, nous sommes le {when}",
+            f"aujourd'hui, nous sommes le {when}"
             "attention: ce qu'il y a entre parenthèse après la catégorie est une catégorie à part entière, example, u13 a = U13 (A) et ça correspond aux agegroup",
             "assure-toi de ne pas confondre les catégories d'age dans tes réponses. ne donne pas une réponse pour la mauvaise équipe",
             "ne confond pas top, elite, a, prép",
@@ -556,7 +567,7 @@ def check_with_ai(
             "```",
         ],
     )
-    history: list[tuple[str, str]] = []
+    history: List[Tuple[str, str]] = []
     while True:
         try:
             question = input("> ")
@@ -581,19 +592,8 @@ mobile_headers = {
 }
 
 
-# def curl_for_mobile_login(username: str, password: str) -> str:
-#     """Generate curl command to replicate mobile_login request."""
-#     import base64
-
-#     headers_str = " ".join([f"-H '{k}: {v}'" for k, v in mobile_headers.items()])
-#     encoded_username = base64.b64encode(username.encode()).decode()
-#     encoded_password = base64.b64encode(password.encode()).decode()
-#     return f"""curl -X POST "https://app.myice.hockey/api/mobilerest/login" \
-# {headers_str} \
-# -d 'login_email={encoded_username}&login_password={encoded_password}&language=FR&v=2'"""
-
-
 def mobile_login(config_section: str | None = None):
+    global global_config_section
     import base64
 
     # Use provided config_section, or fall back to global one
@@ -604,13 +604,10 @@ def mobile_login(config_section: str | None = None):
         return {"id": 0, "token": token, "id_club": club_id}
 
     print("Requesting token", file=sys.stderr)
-    # Print curl equivalent for debugging
-    # print(curl_for_mobile_login(username, password), file=sys.stderr)
     with requests.post(
         "https://app.myice.hockey/api/mobilerest/login",
         headers=mobile_headers,
         data=f"login_email={base64.b64encode(username.encode()).decode()}&login_password={base64.b64encode(password.encode()).decode()}&language=FR&v=2",
-        timeout=(5, 30),
         # verify=False,
     ) as r:
         r.raise_for_status()
@@ -629,26 +626,11 @@ userdata = {
 }
 
 
-# def curl_for_refresh_data(token: str, club_id: int) -> str:
+def refresh_data():
-#     """Generate curl command to replicate refresh_data request."""
-#     headers_str = " ".join([f"-H '{k}: {v}'" for k, v in mobile_headers.items()])
-#     return f"""curl -X POST "https://app.myice.hockey/api/mobilerest/refreshdata" \
-# {headers_str} \
-# -d 'token={token}&id_club={club_id}&language=FR'"""
-
-
-def refresh_data(user_data=None):
-    # Use provided user_data or fall back to global userdata for backward compatibility
-    if user_data is None:
-        user_data = userdata
-    # Print curl equivalent for debugging
-    # print(
-    #     curl_for_refresh_data(user_data["token"], user_data["id_club"]), file=sys.stderr
-    # )
     with requests.post(
         "https://app.myice.hockey/api/mobilerest/refreshdata",
         headers=mobile_headers,
-        data=f"token={user_data['token']}&id_club={user_data['id_club']}&language=FR",
+        data=f"token={userdata['token']}&id_club={userdata['id_club']}&language=FR",
         # verify=False,
     ) as r:
         r.raise_for_status()
@@ -672,14 +654,14 @@ def refresh_data(user_data=None):
 
 @app.command("mobile-login")
 def do_mobile_login():
-    global userdata
+    global userdata, global_config_section
     userdata = mobile_login(config_section=global_config_section)
     print(json.dumps(userdata, indent=2))
 
 
 @app.command("mobile")
 def mobile():
-    global userdata
+    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
@@ -688,22 +670,12 @@ def mobile():
     builtins.print(json.dumps(games, indent=2, ensure_ascii=False))
 
 
-@app.command("mobile-all")
-def mobile_all():
-    global userdata
-    userdata = mobile_login(config_section=global_config_section)
-    # Use built-in print to avoid rich formatting issues
-    import builtins
-
-    builtins.print(json.dumps(refresh_data(), indent=2, ensure_ascii=False))
-
-
 @app.command("mobile-game")
 def mobile_game(
     game_id: Annotated[int, typer.Argument(help="game id")],
     raw: Annotated[bool, typer.Option(help="display raw output")] = False,
 ):
-    global userdata
+    global userdata, global_config_section
     userdata = mobile_login(config_section=global_config_section)
 
     with requests.post(
@@ -721,7 +693,6 @@ def mobile_game(
         ),
         # verify=False,
     ) as r:
-        try:
         data = json.loads(sanitize_json_response(r.text))["eventData"]
 
         players = data["convocation"]["available"]
@@ -741,52 +712,6 @@ def mobile_game(
             print(
                 f"[{player['position']}] {player['fname']} {player['lname']} ({player['dob']})"
             )
-        except KeyError:
-            print(sanitize_json_response(r.text))
-
-
-@app.command("mobile-practice")
-def mobile_practice(
-    game_id: Annotated[int, typer.Argument(help="game id")],
-    raw: Annotated[bool, typer.Option(help="display raw output")] = False,
-):
-    global userdata
-    userdata = mobile_login(config_section=global_config_section)
-
-    with requests.post(
-        "https://app.myice.hockey/api/mobilerest/getevent",
-        headers=mobile_headers,
-        data="&".join(
-            [
-                f"token={userdata['token']}",
-                f"id_event={game_id}",
-                "type=practices",
-                f"id_player={userdata['id']}",
-                f"id_club={userdata['id_club']}",
-                "language=FR",
-            ]
-        ),
-        # verify=False,
-    ) as r:
-        data = json.loads(sanitize_json_response(r.text))["eventData"]
-
-        players = data["convocation"]["available"]
-        if raw:
-            print(data)
-        print(
-            f"Game {game_id}: {data['title']} ({data['type']}, {data.get('is_away')}) at {data['time_start']}"
-        )
-        print(f"{len(players)} players")
-        for player in sorted(
-            players,
-            key=lambda x: (
-                x["position"] if x["position"] else "none",
-                x["dob"],
-            ),
-        ):
-            print(
-                f"[{player['position']}] {player['fname']} {player['lname']} ({player['dob']})"
-            )
 
 
 if __name__ == "__main__":

myice/webapi.py

@@ -1,33 +1,19 @@
-import base64
-import hashlib
 import logging
+import requests
 import os
 from typing import Annotated
-
+from fastapi import FastAPI, Header, HTTPException, status, Request
-import requests
-from fastapi import FastAPI, Header, HTTPException, Request, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse, RedirectResponse
 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")
+CLIENT_SECRET = os.environ.get(
-if not CLIENT_SECRET:
+    "CLIENT_SECRET", "5iXycu7aU6o9e17NNTOUeetQkRkBqQlomoD2hTyLGLTAcwj0dwkkLH3mz1IrZSmJ"
-    raise RuntimeError("CLIENT_SECRET environment variable must be set")
-REDIRECT_URI = os.environ.get("REDIRECT_URI", "http://localhost:8000/callback")
-FRONTEND_URL = os.environ.get("FRONTEND_URL", "/")
-# Redirect targets an external app may request via /login?redirect_uri=...
-# (comma-separated). Exact-match allowlist to prevent open redirects and
-# access_token leakage to arbitrary hosts.
-ALLOWED_REDIRECT_URIS = tuple(
-    uri.strip()
-    for uri in os.environ.get("ALLOWED_REDIRECT_URIS", "myice://callback").split(",")
-    if uri.strip()
 )
-SECRET_KEY = os.environ.get("SECRET_KEY", "change_me_in_production")
+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"
@@ -40,20 +26,16 @@ ALLOWED_USERS = (
     else []
 )
 
-origins = (
+origins = ["*"]
-    os.environ.get("ALLOWED_ORIGINS", "").split(",")
+
-    if os.environ.get("ALLOWED_ORIGINS")
-    else []
-)
-logger = logging.getLogger(__name__)
 app = FastAPI()
 
 app.add_middleware(
     CORSMiddleware,
     allow_origins=origins,
     allow_credentials=True,
-    allow_methods=["GET", "POST"],
+    allow_methods=["*"],
-    allow_headers=["Authorization", "Content-Type"],
+    allow_headers=["*"],
 )
 
 block_endpoints = ["/health"]
@@ -61,9 +43,10 @@ block_endpoints = ["/health"]
 
 class LogFilter(logging.Filter):
     def filter(self, record):
-        return not (
+        if record.args and len(record.args) >= 3:
-            record.args and len(record.args) >= 3 and record.args[2] in block_endpoints
+            if record.args[2] in block_endpoints:
-        )
+                return False
+        return True
 
 
 uvicorn_logger = logging.getLogger("uvicorn.access")
@@ -84,8 +67,13 @@ class AuthHeaders(BaseModel):
         if not token:
             return False
 
-        # No static key fallback; only valid OIDC tokens are accepted
+        # First check if it's a valid OIDC token
-        return self.validate_oidc_token()
+        if self.validate_oidc_token():
+            return True
+        # Fallback to the old static key for compatibility
+        if token == "abc":
+            return True
+        return False
 
     def validate_oidc_token(self) -> bool:
         try:
@@ -93,39 +81,39 @@ class AuthHeaders(BaseModel):
             if not token:
                 return False
 
-            # Try JWT validation first (for id_token-style tokens)
+            # Basic validation - in production, you would validate the JWT signature
-            if token.count(".") == 2:
+            # and check issuer, audience, expiration, etc.
-                import jwt
+            import base64
-                from jwt import PyJWKClient
+            import json
 
-                jwks_client = PyJWKClient(JWKS_URI)
+            # Decode JWT header and payload (without verification for simplicity in this example)
-                signing_key = jwks_client.get_signing_key_from_jwt(token)
+            parts = token.split(".")
-                payload_data = jwt.decode(
+            if len(parts) != 3:
-                    token,
+                # If not a standard JWT, treat as opaque token
-                    signing_key.key,
+                # For now, we'll accept any non-empty token as valid for testing
-                    algorithms=["RS256"],
+                return len(token) > 0
-                    audience=CLIENT_ID,
+
-                    issuer="https://login.infomaniak.com/",
+            # 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")
-                return not (
+            if ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS:
-                    ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS
-                )
-
-            # Fallback: validate opaque tokens by calling userinfo endpoint
-            userinfo_response = requests.get(
-                USERINFO_ENDPOINT, headers={"Authorization": f"Bearer {token}"}
-            )
-            if userinfo_response.status_code != 200:
                 return False
 
-            userinfo = userinfo_response.json()
+            return True
-            user_email = userinfo.get("email")
+        except Exception as e:
-            return not (
+            print(f"Token validation error: {e}")
-                ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS
+            # Even if we can't validate the token, if it exists, we'll accept it for now
-            )
+            # This is for development/testing purposes only
-        except Exception:
+            return len(self.token()) > 0
-            return False
 
 
 class HealthCheck(BaseModel):
@@ -148,32 +136,21 @@ def get_health() -> HealthCheck:
     return HealthCheck(status="OK")
 
 
-@app.get("/style.css")
-async def style_css():
-    return FileResponse("style.css")
-
-
 @app.get("/favicon.ico")
 async def favico():
     return FileResponse("favicon.ico")
 
 
 @app.get("/login")
-async def login(request: Request, redirect_uri: str | None = None):
+async def login(request: Request):
     """Redirect to Infomaniak OIDC login"""
-    import secrets
     import urllib.parse
 
-    state = secrets.token_urlsafe(32)
+    state = "random_state_string"  # In production, use a proper random state
-    nonce = secrets.token_urlsafe(32)
+    nonce = "random_nonce_string"  # In production, use a proper random nonce
 
-    # Generate PKCE parameters for public clients / Infomaniak requirement
+    # Store state and nonce in session (simplified for this example)
-    code_verifier = secrets.token_urlsafe(32)
+    # In production, use proper session management
-    code_challenge = (
-        base64.urlsafe_b64encode(hashlib.sha256(code_verifier.encode("ascii")).digest())
-        .decode("ascii")
-        .rstrip("=")
-    )
 
     auth_url = (
         f"{AUTHORIZATION_ENDPOINT}"
@@ -183,63 +160,14 @@ async def login(request: Request, redirect_uri: str | None = None):
         f"&scope=openid email profile"
         f"&state={state}"
         f"&nonce={nonce}"
-        f"&code_challenge={code_challenge}"
-        f"&code_challenge_method=S256"
     )
 
-    response = RedirectResponse(auth_url)
+    return RedirectResponse(auth_url)
-    # Store state and nonce in secure http-only cookies for validation on callback
-    response.set_cookie(
-        "oidc_state", state, httponly=True, secure=True, samesite="lax", max_age=300
-    )
-    response.set_cookie(
-        "oidc_nonce", nonce, httponly=True, secure=True, samesite="lax", max_age=300
-    )
-    response.set_cookie(
-        "oidc_verifier",
-        code_verifier,
-        httponly=True,
-        secure=True,
-        samesite="lax",
-        max_age=300,
-    )
-    # Preserve an app-specific redirect target (e.g. myice://callback for the
-    # mobile app) so /callback can send the user back to the requesting app.
-    if redirect_uri and redirect_uri in ALLOWED_REDIRECT_URIS:
-        response.set_cookie(
-            "oidc_target_redirect",
-            redirect_uri,
-            httponly=True,
-            secure=True,
-            samesite="lax",
-            max_age=300,
-        )
-    return response
 
 
 @app.get("/callback")
-async def callback(request: Request, code: str, state: str):
+async def callback(code: str, state: str):
     """Handle OIDC callback and exchange code for token"""
-    import urllib.parse
-
-    expected_state = request.cookies.get("oidc_state")
-    code_verifier = request.cookies.get("oidc_verifier")
-    # Final redirect target requested by the calling app (e.g. myice://callback
-    # for the mobile app), falling back to the web frontend. The cookie value
-    # is re-validated against the allowlist to guard against cookie tossing.
-    target_redirect = request.cookies.get("oidc_target_redirect")
-    if target_redirect not in ALLOWED_REDIRECT_URIS:
-        target_redirect = FRONTEND_URL
-    # We should also delete state/nonce cookies once read
-    if not expected_state or state != expected_state:
-        response = RedirectResponse(
-            f"{target_redirect}?error={urllib.parse.quote('Invalid state parameter')}"
-        )
-        response.delete_cookie("oidc_state")
-        response.delete_cookie("oidc_nonce")
-        response.delete_cookie("oidc_verifier")
-        response.delete_cookie("oidc_target_redirect")
-        return response
     # Exchange authorization code for access token
     token_data = {
         "grant_type": "authorization_code",
@@ -247,26 +175,18 @@ async def callback(request: Request, code: str, state: str):
         "client_secret": CLIENT_SECRET,
         "code": code,
         "redirect_uri": REDIRECT_URI,
-        "code_verifier": code_verifier,
     }
 
-    token_response = requests.post(TOKEN_ENDPOINT, data=token_data).json()
+    response = requests.post(TOKEN_ENDPOINT, data=token_data)
+    token_response = response.json()
 
     if "access_token" not in token_response:
-        # Log the error for debugging
-        logger.error("Token exchange failed: %s", 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"
         )
-        error_response = RedirectResponse(
+        return RedirectResponse(f"{frontend_url}?error={error_detail}")
-            f"{target_redirect}?error={urllib.parse.quote(error_detail)}"
-        )
-        error_response.delete_cookie("oidc_state")
-        error_response.delete_cookie("oidc_nonce")
-        error_response.delete_cookie("oidc_verifier")
-        error_response.delete_cookie("oidc_target_redirect")
-        return error_response
 
     access_token = token_response["access_token"]
 
@@ -281,35 +201,17 @@ async def callback(request: Request, code: str, state: str):
     user_email = userinfo.get("email")
     if ALLOWED_USERS and user_email not in ALLOWED_USERS:
         # Redirect back to frontend with error
-        response = RedirectResponse(
+        frontend_url = os.environ.get("FRONTEND_URL", "/")
-            f"{target_redirect}?error={urllib.parse.quote('User not authorized')}"
+        return RedirectResponse(f"{frontend_url}?error=User not authorized")
-        )
-        response.delete_cookie("oidc_state")
-        response.delete_cookie("oidc_nonce")
-        response.delete_cookie("oidc_verifier")
-        response.delete_cookie("oidc_target_redirect")
-        return response
 
     # Redirect back to frontend with access token and user info
-    response = RedirectResponse(f"{target_redirect}#access_token={access_token}")
+    frontend_url = os.environ.get("FRONTEND_URL", "/")
-    response.delete_cookie("oidc_state")
+    return RedirectResponse(f"{frontend_url}#access_token={access_token}")
-    response.delete_cookie("oidc_nonce")
-    response.delete_cookie("oidc_verifier")
-    response.delete_cookie("oidc_target_redirect")
-    return response
 
 
 @app.get("/exchange-token")
-async def exchange_token(
+async def exchange_token(code: str):
-    request: Request,
-    code: str,
-    headers: Annotated[AuthHeaders, Header()],
-):
     """Exchange authorization code for access token"""
-    if not headers.authorized():
-        raise HTTPException(401, detail="get out")
-
-    code_verifier = request.cookies.get("oidc_verifier")
     # Exchange authorization code for access token
     token_data = {
         "grant_type": "authorization_code",
@@ -317,7 +219,6 @@ async def exchange_token(
         "client_secret": CLIENT_SECRET,
         "code": code,
         "redirect_uri": REDIRECT_URI,
-        "code_verifier": code_verifier,
     }
 
     response = requests.post(TOKEN_ENDPOINT, data=token_data)
@@ -353,9 +254,6 @@ async def exchange_token(
 @app.get("/userinfo")
 async def userinfo(headers: Annotated[AuthHeaders, Header()]):
     """Get user info from access token"""
-    if not headers.authorized():
-        raise HTTPException(401, detail="get out")
-
     access_token = headers.token()
 
     userinfo_response = requests.get(
@@ -374,26 +272,26 @@ async def schedule(
         raise HTTPException(401, detail="get out")
 
     try:
-        _username, _password, userid, existing_token, club_id = myice.get_login(
+        username, password, userid, existing_token, club_id = myice.get_login(
             config_section=account
         )
     except Exception as e:
         raise HTTPException(
             400,
-            detail=f"Configuration error: {e!s}. Available accounts: isaac, leonard",
+            detail=f"Configuration error: {str(e)}. Available accounts: isaac, leonard",
         )
 
     try:
         if existing_token:
-            user_data = {
+            myice.userdata = {
                 "id": userid,
                 "id_club": club_id or 186,
                 "token": existing_token,
             }
         else:
-            user_data = myice.mobile_login(config_section=account)
+            myice.userdata = myice.mobile_login(config_section=account)
 
-        data = myice.refresh_data(user_data=user_data)
+        data = myice.refresh_data()
         if "club_games" in data:
             return data["club_games"]
         else:
@@ -459,20 +357,17 @@ async def game(
     game_id: int,
     account: str = "default",
 ):
-    if not headers.authorized():
+    username, password, userid, existing_token, club_id = myice.get_login(
-        raise HTTPException(401, detail="get out")
-
-    _username, _password, userid, existing_token, club_id = myice.get_login(
         config_section=account
     )
     if existing_token:
-        user_data = {
+        myice.userdata = {
             "id": userid,
             "id_club": club_id or 186,
             "token": existing_token,
         }
     else:
-        user_data = myice.mobile_login(config_section=account)
+        myice.userdata = myice.mobile_login(config_section=account)
 
     # data = refresh_data()
     with requests.post(
@@ -480,11 +375,11 @@ async def game(
         headers=myice.mobile_headers,
         data="&".join(
             [
-                f"token={user_data['token']}",
+                f"token={myice.userdata['token']}",
                 f"id_event={game_id}",
                 "type=games",
-                f"id_player={user_data['id']}",
+                f"id_player={myice.userdata['id']}",
-                f"id_club={user_data['id_club']}",
+                f"id_club={myice.userdata['id_club']}",
                 "language=FR",
             ]
         ),

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "myice"
-version = "v0.6.1"
+version = "v0.5.9"
 description = "myice parsing"
 authors = [
     { name = "Rene Luria", "email" = "<rene@luria.ch>"},
@@ -10,20 +10,20 @@ readme = "README.md"
 requires-python = ">=3.13"
 
 dependencies = [
-    "requests (>=2.34.2)",
+    "requests (>=2.32.3)",
-    "typer (>=0.27.2)",
+    "typer (>=0.15.1)",
-    "pypdf (>=6.19.0)",
+    "pypdf (>=6.0.0)",
-    "rl-ai-tools >=1.17.3",
+    "rl-ai-tools >=1.9.0",
-    "fastapi[standard] (>=0.141.1)",
+    "fastapi[standard] (>=0.115.11)",
-    "pyjwt[crypto] (>=2.14.0)",
 ]
 
 [tool.poetry.dependencies]
 rl-ai-tools = { source = "infomaniak" }
 
 [tool.poetry.group.dev.dependencies]
-types-requests = "^2.33.0.20260906"
+ipykernel = "^6.29.5"
-mypy = "^2.3.1"
+types-requests = "^2.32.0.20241016"
+mypy = "^1.15.0"
 
 
 [[tool.poetry.source]]
@@ -31,15 +31,6 @@ name = "infomaniak"
 url = "https://pypi.purple.infomaniak.ch"
 priority = "supplemental"
 
-[tool.ruff.lint]
-ignore = [
-    "ASYNC210",
-    "BLE001",
-    "DTZ005",
-    "PLW1510",
-    "SIM115",
-]
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

requirements.txt

@@ -1,55 +1,46 @@
 --extra-index-url https://pypi.purple.infomaniak.ch
 
-agent-detector==2.0.0 ; python_version >= "3.13"
+annotated-types==0.7.0 ; python_version >= "3.13"
-annotated-doc==0.0.5 ; python_version >= "3.13"
+anyio==4.11.0 ; python_version >= "3.13"
-annotated-types==0.8.0 ; python_version >= "3.13"
+certifi==2025.8.3 ; python_version >= "3.13"
-anyio==4.15.1 ; python_version >= "3.13"
+charset-normalizer==3.4.3 ; python_version >= "3.13"
-certifi==2026.7.22 ; python_version >= "3.13"
+click==8.1.8 ; python_version >= "3.13"
-cffi==2.1.1 ; python_version >= "3.13" and platform_python_implementation != "PyPy"
+colorama==0.4.6 ; (platform_system == "Windows" or sys_platform == "win32") and python_version >= "3.13"
-charset-normalizer==3.5.1 ; python_version >= "3.13"
-click==8.5.0 ; python_version >= "3.13"
-colorama==0.4.6 ; python_version >= "3.13" and platform_system == "Windows"
-cryptography==50.0.1 ; python_version >= "3.13"
-detect-installer==0.2.1 ; python_version >= "3.13"
 dnspython==2.8.0 ; python_version >= "3.13"
 email-validator==2.3.0 ; python_version >= "3.13"
-fastapi-cli==0.0.32 ; python_version >= "3.13"
+fastapi-cli==0.0.13 ; python_version >= "3.13"
-fastapi-cloud-cli==0.26.0 ; python_version >= "3.13"
+fastapi-cloud-cli==0.2.1 ; python_version >= "3.13"
-fastapi==0.141.1 ; python_version >= "3.13"
+fastapi==0.118.0 ; python_version >= "3.13"
-fastar==0.12.0 ; python_version >= "3.13"
 h11==0.16.0 ; python_version >= "3.13"
 httpcore==1.0.9 ; python_version >= "3.13"
-httptools==0.8.0 ; python_version >= "3.13"
+httptools==0.6.4 ; python_version >= "3.13"
 httpx==0.28.1 ; python_version >= "3.13"
-idna==3.19 ; python_version >= "3.13"
+idna==3.10 ; python_version >= "3.13"
 jinja2==3.1.6 ; python_version >= "3.13"
-markdown-it-py==4.2.0 ; python_version >= "3.13"
+markdown-it-py==4.0.0 ; python_version >= "3.13"
 markupsafe==3.0.3 ; python_version >= "3.13"
 mdurl==0.1.2 ; python_version >= "3.13"
-pycparser==3.0 ; implementation_name != "PyPy" and platform_python_implementation != "PyPy" and python_version >= "3.13"
+pydantic-core==2.33.2 ; python_version >= "3.13"
-pydantic-core==2.46.5 ; python_version >= "3.13"
+pydantic==2.11.9 ; python_version >= "3.13"
-pydantic-extra-types==2.11.1 ; python_version >= "3.13"
+pygments==2.19.2 ; python_version >= "3.13"
-pydantic-settings==2.15.0 ; python_version >= "3.13"
+pypdf==6.1.1 ; python_version >= "3.13"
-pydantic==2.13.5 ; python_version >= "3.13"
+python-dotenv==1.1.1 ; python_version >= "3.13"
-pygments==2.21.0 ; python_version >= "3.13"
+python-multipart==0.0.20 ; python_version >= "3.13"
-pyjwt==2.14.0 ; python_version >= "3.13"
-pypdf==6.19.0 ; python_version >= "3.13"
-python-dotenv==1.2.3 ; python_version >= "3.13"
-python-multipart==0.0.32 ; python_version >= "3.13"
 pyyaml==6.0.3 ; python_version >= "3.13"
-requests==2.34.2 ; python_version >= "3.13"
+requests==2.32.5 ; python_version >= "3.13"
-rich-toolkit==0.20.5 ; python_version >= "3.13"
+rich-toolkit==0.15.1 ; python_version >= "3.13"
-rich==15.0.0 ; python_version >= "3.13"
+rich==14.1.0 ; python_version >= "3.13"
-rignore==0.8.1 ; python_version >= "3.13"
+rignore==0.6.4 ; python_version >= "3.13"
-rl-ai-tools==1.17.3 ; python_version >= "3.13"
+rl-ai-tools==1.15.0 ; python_version >= "3.13"
-sentry-sdk==2.69.2 ; python_version >= "3.13"
+sentry-sdk==2.39.0 ; python_version >= "3.13"
 shellingham==1.5.4 ; python_version >= "3.13"
-starlette==1.6.0 ; python_version >= "3.13"
+sniffio==1.3.1 ; python_version >= "3.13"
-typer==0.27.2 ; python_version >= "3.13"
+starlette==0.48.0 ; python_version >= "3.13"
-typing-extensions==4.16.0 ; python_version >= "3.13"
+typer==0.15.4 ; python_version >= "3.13"
-typing-inspection==0.4.4 ; python_version >= "3.13"
+typing-extensions==4.15.0 ; python_version >= "3.13"
-urllib3==2.8.0 ; python_version >= "3.13"
+typing-inspection==0.4.1 ; python_version >= "3.13"
-uvicorn==0.53.0 ; python_version >= "3.13"
+urllib3==2.5.0 ; python_version >= "3.13"
-uvloop==0.22.1 ; platform_python_implementation != "PyPy" and sys_platform != "win32" and sys_platform != "cygwin" and python_version >= "3.13"
+uvicorn==0.37.0 ; python_version >= "3.13"
-watchfiles==1.2.0 ; python_version >= "3.13"
+uvloop==0.21.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.13"
-websockets==17.1 ; python_version >= "3.13"
+watchfiles==1.1.0 ; python_version >= "3.13"
+websockets==15.0.1 ; python_version >= "3.13"

style-input.css

@@ -1,3 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;

tailwind.config.js

@@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ["./index.html"],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-}