Compare commits
17
Commits
main
..
a3d4114044
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a3d4114044
|
||
|
|
cec54a45d7
|
||
|
|
3efa7101e1
|
||
|
|
861ff0650f
|
||
|
|
73f72d1bbe
|
||
|
|
a407a108ed
|
||
|
|
d6277d7766
|
||
|
|
5b1d741a16
|
||
|
|
5957868e0f
|
||
|
|
525d3bf326
|
||
|
|
0e1eb0da3f
|
||
|
|
4b81cc7f9f
|
||
|
|
c4d9236b16
|
||
|
|
2a5883375f
|
||
|
|
c4b6e39e9e
|
||
|
|
d3b5b6b6fd
|
||
|
|
bcde9fccf5
|
No files matched your search
+1
-6
@@ -3,11 +3,7 @@ myice.ini
|
|||||||
schedule.json
|
schedule.json
|
||||||
.envrc
|
.envrc
|
||||||
cookies.txt
|
cookies.txt
|
||||||
# Tailwind CSS generated artifacts
|
# Byte-compiled / optimized / DLL files
|
||||||
style.css
|
|
||||||
tailwindcss
|
|
||||||
|
|
||||||
# Python bytecode
|
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
*$py.class
|
*$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
|
# 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.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
strix_runs/*
|
|
||||||
+8
-12
@@ -13,13 +13,9 @@ repos:
|
|||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
- id: check-added-large-files
|
- id: check-added-large-files
|
||||||
- id: detect-private-key
|
- 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
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
# Ruff version.
|
# Ruff version.
|
||||||
rev: v0.16.7
|
rev: v0.12.9
|
||||||
hooks:
|
hooks:
|
||||||
# Run the linter.
|
# Run the linter.
|
||||||
- id: ruff
|
- id: ruff
|
||||||
@@ -28,26 +24,26 @@ repos:
|
|||||||
- id: ruff-format
|
- id: ruff-format
|
||||||
args: [--diff, --target-version, py312]
|
args: [--diff, --target-version, py312]
|
||||||
- repo: https://github.com/pre-commit/mirrors-mypy
|
- repo: https://github.com/pre-commit/mirrors-mypy
|
||||||
rev: v2.3.1
|
rev: v1.17.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: mypy
|
- id: mypy
|
||||||
exclude: ^(docs/|example-plugin/)
|
exclude: ^(docs/|example-plugin/)
|
||||||
args: [--ignore-missing-imports]
|
args: [--ignore-missing-imports]
|
||||||
additional_dependencies: [types-requests, pypdf]
|
additional_dependencies: [types-requests, PyPDF2]
|
||||||
- repo: https://github.com/adrienverge/yamllint.git
|
- repo: https://github.com/adrienverge/yamllint.git
|
||||||
rev: v1.38.0
|
rev: v1.37.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: yamllint
|
- id: yamllint
|
||||||
args: [--strict]
|
args: [--strict]
|
||||||
|
|
||||||
- repo: https://github.com/markdownlint/markdownlint
|
- repo: https://github.com/markdownlint/markdownlint
|
||||||
rev: v0.18.1
|
rev: v0.13.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: markdownlint
|
- id: markdownlint
|
||||||
exclude: "^.github|(^docs/_sidebar\\.md$)"
|
exclude: "^.github|(^docs/_sidebar\\.md$)"
|
||||||
|
|
||||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||||
rev: v0.11.0.1-1
|
rev: v0.11.0.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: shellcheck
|
- id: shellcheck
|
||||||
args: ["--severity=error"]
|
args: ["--severity=error"]
|
||||||
@@ -55,12 +51,12 @@ repos:
|
|||||||
files: "\\.sh$"
|
files: "\\.sh$"
|
||||||
|
|
||||||
- repo: https://github.com/golangci/misspell
|
- repo: https://github.com/golangci/misspell
|
||||||
rev: v0.8.0
|
rev: v0.7.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: misspell
|
- id: misspell
|
||||||
args: ["-i", "charactor"]
|
args: ["-i", "charactor"]
|
||||||
- repo: https://github.com/python-poetry/poetry
|
- repo: https://github.com/python-poetry/poetry
|
||||||
rev: "2.4.1"
|
rev: "2.1.4"
|
||||||
hooks:
|
hooks:
|
||||||
- id: poetry-check
|
- id: poetry-check
|
||||||
- id: poetry-lock
|
- id: poetry-lock
|
||||||
|
|||||||
@@ -26,51 +26,11 @@ yamllint . # YAML linting
|
|||||||
markdownlint . # Markdown linting
|
markdownlint . # Markdown linting
|
||||||
```
|
```
|
||||||
|
|
||||||
### Running Tests
|
### Testing
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Manual testing approach - run individual commands to test functionality
|
# Run tests (no specific test framework configured)
|
||||||
# Test schedule fetching
|
# Project uses manual testing with example PDF files in repository
|
||||||
myice schedule --days 7
|
|
||||||
|
|
||||||
# Test mobile login
|
|
||||||
myice mobile-login
|
|
||||||
|
|
||||||
# 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
|
|
||||||
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
|
## Code Style Guidelines
|
||||||
@@ -113,24 +73,5 @@ uv run fastapi run myice/webapi.py --host 127.0.0.1
|
|||||||
- Typer for CLI interface
|
- Typer for CLI interface
|
||||||
- FastAPI for web API
|
- FastAPI for web API
|
||||||
- requests for HTTP requests
|
- requests for HTTP requests
|
||||||
- pypdf for PDF processing
|
- PyPDF2 for PDF processing
|
||||||
- Use rich for enhanced console output
|
- 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
|
|
||||||
- When fixing JSON parsing issues, follow the pattern established in
|
|
||||||
sanitize_json_response function
|
|
||||||
+10
-51
@@ -1,61 +1,20 @@
|
|||||||
# Multi-stage build to create a minimal image
|
FROM python:3.11
|
||||||
FROM python:3.13-slim AS builder
|
|
||||||
|
|
||||||
# Create working directory
|
RUN install -o www-data -g www-data -d -m 0755 /var/www
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Install tools needed for Tailwind CSS build
|
USER www-data
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
||||||
ca-certificates \
|
|
||||||
curl \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Copy dependency files
|
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||||
COPY requirements.txt ./
|
|
||||||
|
|
||||||
# Install dependencies to a target directory
|
ENV PATH=/var/www/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
|
||||||
pip install --no-deps --disable-pip-version-check -r requirements.txt
|
|
||||||
|
|
||||||
# Build Tailwind CSS
|
COPY README.md pyproject.toml poetry.lock docker-entrypoint.sh index.html favicon.ico /var/www/
|
||||||
COPY index.html style-input.css tailwind.config.js ./
|
COPY myice /var/www/myice
|
||||||
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
|
WORKDIR /var/www
|
||||||
FROM python:3.13-slim AS runtime
|
|
||||||
|
|
||||||
# Create working directory
|
RUN poetry install && . $(poetry env info -p)
|
||||||
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
|
EXPOSE 8000
|
||||||
|
|
||||||
# Run the application
|
ENTRYPOINT [ "/var/www/docker-entrypoint.sh" ]
|
||||||
ENTRYPOINT ["python", "-m", "uvicorn", "myice.webapi:app", "--host", "0.0.0.0", "--port", "8000"]
|
|
||||||
@@ -10,17 +10,13 @@ the PDFs you need.
|
|||||||
with [uv](https://docs.astral.sh/uv/getting-started/installation/):
|
with [uv](https://docs.astral.sh/uv/getting-started/installation/):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
uv tool install \
|
uv tool install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
|
||||||
--extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ \
|
|
||||||
myice
|
|
||||||
```
|
```
|
||||||
|
|
||||||
with [pipx](https://pipx.pypa.io/stable/installation/):
|
with [pipx](https://pipx.pypa.io/stable/installation/):
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
pipx install \
|
pipx install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
|
||||||
--extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ \
|
|
||||||
myice
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## configuration
|
## configuration
|
||||||
@@ -64,20 +60,17 @@ To fetch the `token` and `club_id` using mobile-login:
|
|||||||
myice 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
|
## 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
|
```shell
|
||||||
uv run fastapi run myice/webapi.py
|
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
|
- Select between different configured accounts
|
||||||
- View upcoming games and practices
|
- View upcoming games and practices
|
||||||
@@ -87,28 +80,18 @@ you to:
|
|||||||
|
|
||||||
The web interface supports two authentication methods:
|
The web interface supports two authentication methods:
|
||||||
|
|
||||||
1. **Infomaniak OpenID Connect (Recommended)**: Click the "Se connecter avec
|
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.
|
||||||
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
|
2. **Static API Key**: For development purposes, you can still use `abc` as the token.
|
||||||
the token.
|
|
||||||
|
|
||||||
### Environment Variables
|
### Environment Variables
|
||||||
|
|
||||||
To configure OIDC authentication, set the following 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
|
- `CLIENT_SECRET`: Your OIDC client secret
|
||||||
- `REDIRECT_URI`: The redirect URI (default: `http://localhost:8000/callback`)
|
- `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:
|
The web API provides the following endpoints:
|
||||||
|
|
||||||
@@ -120,8 +103,7 @@ The web API provides the following endpoints:
|
|||||||
- `/callback` - Handle OIDC callback
|
- `/callback` - Handle OIDC callback
|
||||||
- `/userinfo` - Get user information
|
- `/userinfo` - Get user information
|
||||||
|
|
||||||
All endpoints (except `/health`, `/login`, and `/callback`) require an
|
All endpoints (except `/health`, `/login`, and `/callback`) require an Authorization header with a Bearer token.
|
||||||
Authorization header with a Bearer token.
|
|
||||||
|
|
||||||
## mobile functions
|
## mobile functions
|
||||||
|
|
||||||
@@ -216,16 +198,9 @@ To use a specific configuration section:
|
|||||||
```text
|
```text
|
||||||
❯ myice ai
|
❯ myice ai
|
||||||
> prochain match u13 top ?
|
> prochain match u13 top ?
|
||||||
< Le prochain match de l'équipe U13 Top se déroulera le dimanche 10 novembre
|
< Le prochain match de l'équipe U13 Top se déroulera le dimanche 10 novembre 2024 contre HC Ajoie à la Raffeisen Arena de Porrentruy. Le match débutera à 14h00 et se terminera à 16h15.
|
||||||
2024 contre HC Ajoie à la Raffeisen Arena de Porrentruy. Le match débutera
|
|
||||||
à 14h00 et se terminera à 16h15.
|
|
||||||
> et les u13 a ?
|
> et les u13 a ?
|
||||||
< Le prochain match de l'équipe U13 A se déroulera le samedi 9 novembre 2024
|
< Le prochain match de l'équipe U13 A se déroulera le samedi 9 novembre 2024 contre HC Vallorbe à P. du Frézillon, 1337 Vallorbe VD. Le match débutera à 13h00 et se terminera à 15h00. Le prochain match à domicile de l'équipe U13 A se déroulera le dimanche 10 novembre 2024 contre CP Meyrin à Les Vernets, Glace extérieure, 1227 Les Acacias GE. Le match débutera à 13h00 et se terminera à 15h00.
|
||||||
contre HC Vallorbe à P. du Frézillon, 1337 Vallorbe VD. Le match débutera à
|
|
||||||
13h00 et se terminera à 15h00. Le prochain match à domicile de l'équipe
|
|
||||||
U13 A se déroulera le dimanche 10 novembre 2024 contre CP Meyrin à
|
|
||||||
Les Vernets, Glace extérieure, 1227 Les Acacias GE. Le match débutera
|
|
||||||
à 13h00 et se terminera à 15h00.
|
|
||||||
```
|
```
|
||||||
|
|
||||||
To use a specific configuration section:
|
To use a specific configuration section:
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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"
|
|
||||||
Executable
+3
@@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
exec /var/www/.local/bin/poetry run fastapi run myice/webapi.py
|
||||||
+92
-393
@@ -5,95 +5,66 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>MyIce - Games</title>
|
<title>MyIce - Games</title>
|
||||||
<link rel="stylesheet" href="/style.css">
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||||
<link rel="icon" href="favicon.ico" type="image/x-icon">
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body class="bg-gradient-to-br from-blue-50 to-indigo-100 min-h-screen">
|
<body>
|
||||||
<!-- Connected User Panel -->
|
<div id="connectedUser" class="position-fixed top-0 end-0 m-2 p-2 bg-light border rounded"
|
||||||
<div id="connectedUser" class="fixed top-4 right-4 bg-white bg-opacity-80 backdrop-blur-sm rounded-xl shadow-lg p-4 flex items-center hidden z-50">
|
style="display: none; z-index: 1000; font-size: 0.9rem;">
|
||||||
<span class="text-indigo-700 font-medium">Connecté: <span id="userName" class="font-semibold"></span></span>
|
<span>Connecté: <span id="userName"></span></span>
|
||||||
<button id="disconnect" class="ml-3 bg-rose-500 hover:bg-rose-600 text-white text-sm px-3 py-1 rounded-lg transition duration-200">Déco</button>
|
<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>
|
||||||
|
|
||||||
<!-- Login View -->
|
<div class="container-fluid d-flex align-items-center justify-content-center">
|
||||||
<div class="min-h-screen flex items-center justify-center p-4">
|
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<h1 id="loginTitle" class="text-4xl md:text-5xl font-bold text-indigo-800 mb-8">MyIce - Games</h1>
|
<h1 id="loginTitle" class="mb-4">MyIce - Games</h1>
|
||||||
|
|
||||||
<div id="loginContainer" class="mb-6">
|
<div id="loginContainer" class="mb-3">
|
||||||
<div id="oidcLoginSection">
|
<div id="oidcLoginSection">
|
||||||
<button id="oidcLoginBtn" class="bg-gradient-to-r from-indigo-500 to-purple-600 hover:from-indigo-600 hover:to-purple-700 text-white font-semibold text-lg px-8 py-4 rounded-2xl shadow-xl transform hover:scale-105 transition-all duration-300">
|
<button id="oidcLoginBtn" class="btn btn-primary btn-md px-4 py-3 shadow">Se connecter</button>
|
||||||
Se connecter
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mt-8 max-w-md mx-auto">
|
|
||||||
<p class="text-gray-600 text-sm">
|
|
||||||
Connectez-vous pour accéder aux événements et informations de votre équipe
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Main Content -->
|
<div class="container mt-2" id="mainContent" style="display: none;">
|
||||||
<div id="mainContent" class="container mx-auto px-4 py-6 hidden">
|
|
||||||
<!-- Filters Section -->
|
|
||||||
<div id="eventFilters" class="bg-white rounded-2xl shadow-lg p-6 mb-8 hidden">
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-4 gap-4">
|
|
||||||
<div>
|
|
||||||
<label for="account" class="block text-sm font-medium text-gray-700 mb-1">Compte</label>
|
|
||||||
<select id="account" class="w-full rounded-lg border border-gray-300 bg-white py-2 px-3 text-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-300">
|
|
||||||
<option value="default">Défaut</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<div id="eventFilters" style="display: none;">
|
||||||
<label for="agegroup" class="block text-sm font-medium text-gray-700 mb-1">Âge</label>
|
<div class="mb-3">
|
||||||
<select id="agegroup" class="w-full rounded-lg border border-gray-300 bg-white py-2 px-3 text-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-300">
|
<label for="account" class="form-label">Compte</label>
|
||||||
<option value="">Tous</option>
|
<select id="account" class="form-select">
|
||||||
</select>
|
<option value="default">Défaut</option>
|
||||||
</div>
|
</select>
|
||||||
|
<label for="agegroup" class="form-label">Âge</label>
|
||||||
<div>
|
<select id="agegroup" class="form-select">
|
||||||
<label for="subgroup" class="block text-sm font-medium text-gray-700 mb-1">Sous-groupe</label>
|
<option value="">Tous</option>
|
||||||
<select id="subgroup" class="w-full rounded-lg border border-gray-300 bg-white py-2 px-3 text-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-300">
|
</select>
|
||||||
<option value="">Tous</option>
|
<button id="fetchEvents" class="btn btn-primary" style="margin-top: 1.2rem;">Charger</button>
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-end">
|
|
||||||
<button id="fetchEvents" class="w-full bg-indigo-500 hover:bg-indigo-600 text-white font-medium py-2 px-4 rounded-lg transition duration-200">
|
|
||||||
Charger
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Loading Indicator -->
|
<div id="loadingIndicator" class="text-center my-3" style="display: none;">
|
||||||
<div id="loadingIndicator" class="text-center py-12 hidden">
|
<div class="spinner-border text-primary" role="status">
|
||||||
<div class="inline-block animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-indigo-500 mb-4"></div>
|
<span class="visually-hidden">Chargement...</span>
|
||||||
<p class="text-indigo-700 font-medium">Chargement des événements...</p>
|
</div>
|
||||||
|
<p class="mt-2">Chargement des événements...</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Events List -->
|
<div id="eventList" class="row mt-2"></div>
|
||||||
<div id="eventList" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Event Details Modal -->
|
<!-- Modal pour afficher les détails d'un événement -->
|
||||||
<div id="eventDetailsModal" class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center p-4 z-50 hidden">
|
<div class="modal fade" id="eventDetailsModal" tabindex="-1" aria-labelledby="eventDetailsLabel"
|
||||||
<div class="bg-white rounded-2xl shadow-2xl w-full max-w-2xl max-h-[90vh] overflow-y-auto">
|
aria-hidden="true">
|
||||||
<div class="border-b border-gray-200 p-6 flex justify-between items-center">
|
<div class="modal-dialog">
|
||||||
<h5 id="eventDetailsLabel" class="text-2xl font-bold text-gray-800">Détails de l'événement</h5>
|
<div class="modal-content">
|
||||||
<button id="closeModal" class="text-gray-500 hover:text-gray-700">
|
<div class="modal-header">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
<h5 class="modal-title" id="eventDetailsLabel">Détails de l'événement</h5>
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</svg>
|
</div>
|
||||||
</button>
|
<div class="modal-body" id="eventDetailsContent">Chargement...</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="eventDetailsContent" class="p-6">
|
|
||||||
Chargement...
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -106,12 +77,9 @@
|
|||||||
const eventFilters = document.getElementById("eventFilters");
|
const eventFilters = document.getElementById("eventFilters");
|
||||||
const accountSelect = document.getElementById("account");
|
const accountSelect = document.getElementById("account");
|
||||||
const agegroupSelect = document.getElementById("agegroup");
|
const agegroupSelect = document.getElementById("agegroup");
|
||||||
const subgroupSelect = document.getElementById("subgroup");
|
|
||||||
const eventList = document.getElementById("eventList");
|
const eventList = document.getElementById("eventList");
|
||||||
const fetchButton = document.getElementById("fetchEvents");
|
const fetchButton = document.getElementById("fetchEvents");
|
||||||
const eventDetailsContent = document.getElementById("eventDetailsContent");
|
const eventDetailsContent = document.getElementById("eventDetailsContent");
|
||||||
const eventDetailsModal = document.getElementById("eventDetailsModal");
|
|
||||||
const closeModal = document.getElementById("closeModal");
|
|
||||||
const apiBaseUrl = window.location.origin;
|
const apiBaseUrl = window.location.origin;
|
||||||
|
|
||||||
let storedApiKey = localStorage.getItem("apikey");
|
let storedApiKey = localStorage.getItem("apikey");
|
||||||
@@ -119,25 +87,6 @@
|
|||||||
let storedAccount = localStorage.getItem("account") || "default";
|
let storedAccount = localStorage.getItem("account") || "default";
|
||||||
let userInfo = JSON.parse(localStorage.getItem("userInfo") || "null");
|
let userInfo = JSON.parse(localStorage.getItem("userInfo") || "null");
|
||||||
|
|
||||||
// Close modal when close button is clicked
|
|
||||||
closeModal.addEventListener("click", () => {
|
|
||||||
eventDetailsModal.classList.add("hidden");
|
|
||||||
});
|
|
||||||
|
|
||||||
// Close modal when clicking outside the content
|
|
||||||
eventDetailsModal.addEventListener("click", (e) => {
|
|
||||||
if (e.target === eventDetailsModal) {
|
|
||||||
eventDetailsModal.classList.add("hidden");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 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 we have an API key but no userInfo, fetch it from the server
|
||||||
if (storedApiKey && !userInfo) {
|
if (storedApiKey && !userInfo) {
|
||||||
fetch(`${apiBaseUrl}/userinfo`, {
|
fetch(`${apiBaseUrl}/userinfo`, {
|
||||||
@@ -240,18 +189,18 @@
|
|||||||
|
|
||||||
function renderLoginSection() {
|
function renderLoginSection() {
|
||||||
const mainContent = document.getElementById("mainContent");
|
const mainContent = document.getElementById("mainContent");
|
||||||
const loginView = document.querySelector(".min-h-screen.flex");
|
const loginView = document.querySelector(".container-fluid");
|
||||||
const connectedUser = document.getElementById("connectedUser");
|
const connectedUser = document.getElementById("connectedUser");
|
||||||
const loginTitle = document.getElementById("loginTitle");
|
const loginTitle = document.getElementById("loginTitle");
|
||||||
|
|
||||||
if (storedApiKey || userInfo) {
|
if (storedApiKey || userInfo) {
|
||||||
// User is logged in
|
// User is logged in
|
||||||
loginView.classList.add("hidden");
|
loginView.style.display = "none";
|
||||||
mainContent.classList.remove("hidden");
|
mainContent.style.display = "block";
|
||||||
loginTitle.classList.add("hidden");
|
loginTitle.style.display = "none";
|
||||||
|
|
||||||
connectedUser.classList.remove("hidden");
|
connectedUser.style.display = "block";
|
||||||
oidcLoginSection.classList.add("hidden");
|
oidcLoginSection.style.display = "none";
|
||||||
|
|
||||||
const userNameElement = document.getElementById("userName");
|
const userNameElement = document.getElementById("userName");
|
||||||
if (userInfo && userInfo.email) {
|
if (userInfo && userInfo.email) {
|
||||||
@@ -260,17 +209,19 @@
|
|||||||
userNameElement.textContent = "Utilisateur";
|
userNameElement.textContent = "Utilisateur";
|
||||||
}
|
}
|
||||||
|
|
||||||
eventFilters.classList.remove("hidden");
|
eventFilters.style.display = "block";
|
||||||
updateAccountOptionsAndLoadEvents();
|
updateAccountOptions();
|
||||||
|
// Don't automatically fetch events on page load
|
||||||
|
// Wait for user to explicitly select an account or click fetch
|
||||||
} else {
|
} else {
|
||||||
// User is not logged in
|
// User is not logged in
|
||||||
loginView.classList.remove("hidden");
|
loginView.style.display = "flex";
|
||||||
mainContent.classList.add("hidden");
|
mainContent.style.display = "none";
|
||||||
loginTitle.classList.remove("hidden");
|
loginTitle.style.display = "block";
|
||||||
|
|
||||||
connectedUser.classList.add("hidden");
|
connectedUser.style.display = "none";
|
||||||
oidcLoginSection.classList.remove("hidden");
|
oidcLoginSection.style.display = "block";
|
||||||
eventFilters.classList.add("hidden");
|
eventFilters.style.display = "none";
|
||||||
|
|
||||||
// Remove any existing event listeners to prevent duplicates
|
// Remove any existing event listeners to prevent duplicates
|
||||||
const oidcLoginBtn = document.getElementById("oidcLoginBtn");
|
const oidcLoginBtn = document.getElementById("oidcLoginBtn");
|
||||||
@@ -304,7 +255,7 @@
|
|||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateAccountOptionsAndLoadEvents() {
|
function updateAccountOptions() {
|
||||||
// Fetch available accounts from the server
|
// Fetch available accounts from the server
|
||||||
fetch(`${apiBaseUrl}/accounts`, {
|
fetch(`${apiBaseUrl}/accounts`, {
|
||||||
headers: { "Authorization": `Bearer ${storedApiKey}` }
|
headers: { "Authorization": `Bearer ${storedApiKey}` }
|
||||||
@@ -355,9 +306,6 @@
|
|||||||
|
|
||||||
// Set the selected account in the dropdown
|
// Set the selected account in the dropdown
|
||||||
accountSelect.value = accountToSelect;
|
accountSelect.value = accountToSelect;
|
||||||
|
|
||||||
// Automatically fetch events for the selected account
|
|
||||||
fetchEvents(storedApiKey, accountToSelect);
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.error("Erreur lors du chargement des comptes:", error);
|
console.error("Erreur lors du chargement des comptes:", error);
|
||||||
@@ -386,12 +334,6 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
agegroupSelect.addEventListener("change", () => {
|
agegroupSelect.addEventListener("change", () => {
|
||||||
// Update subgroup options based on selected agegroup
|
|
||||||
updateSubgroupOptions(agegroupSelect.value, lastFetchedEvents);
|
|
||||||
displayEvents(lastFetchedEvents);
|
|
||||||
});
|
|
||||||
|
|
||||||
subgroupSelect.addEventListener("change", () => {
|
|
||||||
displayEvents(lastFetchedEvents);
|
displayEvents(lastFetchedEvents);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -399,7 +341,7 @@
|
|||||||
// Show loading indicator
|
// Show loading indicator
|
||||||
const loadingIndicator = document.getElementById("loadingIndicator");
|
const loadingIndicator = document.getElementById("loadingIndicator");
|
||||||
const eventList = document.getElementById("eventList");
|
const eventList = document.getElementById("eventList");
|
||||||
loadingIndicator.classList.remove("hidden");
|
loadingIndicator.style.display = "block";
|
||||||
eventList.innerHTML = ""; // Clear previous events
|
eventList.innerHTML = ""; // Clear previous events
|
||||||
|
|
||||||
fetch(`${apiBaseUrl}/schedule?account=${account}`, {
|
fetch(`${apiBaseUrl}/schedule?account=${account}`, {
|
||||||
@@ -438,7 +380,7 @@
|
|||||||
})
|
})
|
||||||
.then(data => {
|
.then(data => {
|
||||||
// Hide loading indicator
|
// Hide loading indicator
|
||||||
loadingIndicator.classList.add("hidden");
|
loadingIndicator.style.display = "none";
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
// Check if data is an array
|
// Check if data is an array
|
||||||
@@ -454,7 +396,7 @@
|
|||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
// Hide loading indicator on error
|
// Hide loading indicator on error
|
||||||
loadingIndicator.classList.add("hidden");
|
loadingIndicator.style.display = "none";
|
||||||
|
|
||||||
console.error("Erreur lors du chargement des événements:", error);
|
console.error("Erreur lors du chargement des événements:", error);
|
||||||
alert("Erreur lors du chargement des événements: " + error.message);
|
alert("Erreur lors du chargement des événements: " + error.message);
|
||||||
@@ -462,132 +404,38 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateAgeGroupOptions(events) {
|
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>';
|
agegroupSelect.innerHTML = '<option value="">Tous</option>';
|
||||||
Array.from(agegroups).sort().forEach(group => {
|
agegroups.forEach(group => {
|
||||||
const option = document.createElement("option");
|
const option = document.createElement("option");
|
||||||
option.value = group;
|
option.value = group;
|
||||||
option.textContent = group;
|
option.textContent = group;
|
||||||
agegroupSelect.appendChild(option);
|
agegroupSelect.appendChild(option);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset subgroup selector
|
|
||||||
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>';
|
|
||||||
|
|
||||||
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 by removing opponent
|
|
||||||
if (event.name && event.name !== selectedAgegroup) {
|
|
||||||
subgroups.add(extractSubgroup(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) {
|
function displayEvents(events) {
|
||||||
eventList.innerHTML = "";
|
eventList.innerHTML = "";
|
||||||
let selectedAgegroup = agegroupSelect.value;
|
let selectedAgegroup = agegroupSelect.value;
|
||||||
let selectedSubgroup = subgroupSelect.value;
|
let filteredEvents = events.filter(event => event.event === "Jeu" && (selectedAgegroup === "" || `${event.agegroup} ${event.name}` === selectedAgegroup));
|
||||||
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
|
|
||||||
let eventSubgroup = extractSubgroup(event.name);
|
|
||||||
if (selectedSubgroup !== "" && eventSubgroup !== selectedSubgroup) return false;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (filteredEvents.length === 0) {
|
if (filteredEvents.length === 0) {
|
||||||
eventList.innerHTML = "<p class='text-gray-500 text-center py-8'>Aucun événement 'Jeu' trouvé.</p>";
|
eventList.innerHTML = "<p class='text-muted'>Aucun événement 'Jeu' trouvé.</p>";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
filteredEvents.forEach(event => {
|
filteredEvents.forEach(event => {
|
||||||
const eventCard = document.createElement("div");
|
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.className = "col-md-4 mb-3";
|
||||||
|
eventCard.innerHTML = `
|
||||||
const card = document.createElement("div");
|
<div class="card" style="border-left: 5px solid ${event.color}" data-id="${event.id_event}">
|
||||||
card.className = "p-6 border-l-4";
|
<div class="card-body">
|
||||||
card.style.borderColor = event.color || "#818cf8";
|
<h5 class="card-title">${event.title}</h5>
|
||||||
|
<p class="card-text"><strong>Lieu:</strong> ${event.place}</p>
|
||||||
const inner = document.createElement("div");
|
<p class="card-text"><strong>Heure:</strong> ${event.start} - ${event.end}</p>
|
||||||
inner.className = "flex justify-between items-start";
|
</div>
|
||||||
|
</div>
|
||||||
const innerDiv = document.createElement("div");
|
`;
|
||||||
const h3 = document.createElement("h3");
|
|
||||||
h3.className = "text-xl font-bold text-gray-800";
|
|
||||||
h3.textContent = event.agegroup + " - " + event.name;
|
|
||||||
const subtitle = document.createElement("p");
|
|
||||||
subtitle.className = "text-gray-600 mt-1";
|
|
||||||
subtitle.textContent = event.title;
|
|
||||||
innerDiv.appendChild(h3);
|
|
||||||
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));
|
eventCard.addEventListener("click", () => fetchEventDetails(event.id_event));
|
||||||
eventList.appendChild(eventCard);
|
eventList.appendChild(eventCard);
|
||||||
});
|
});
|
||||||
@@ -599,173 +447,24 @@
|
|||||||
headers: { "Authorization": `Bearer ${storedApiKey}` }
|
headers: { "Authorization": `Bearer ${storedApiKey}` }
|
||||||
})
|
})
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
const availablePlayers = data.convocation.available || [];
|
const sortedPlayers = data.convocation.available
|
||||||
const sortedPlayers = availablePlayers
|
.sort((a, b) => (a.number || 0) - (b.number || 0));
|
||||||
.sort((a, b) => (a.number || 0) - (b.number || 0));
|
|
||||||
|
|
||||||
const totalPlayers = sortedPlayers.length;
|
eventDetailsContent.innerHTML = `
|
||||||
const positionCount = {};
|
<h5>${data.title}</h5>
|
||||||
sortedPlayers.forEach(player => {
|
<p><strong>Type:</strong> ${data.type}</p>
|
||||||
const position = player.position || "N/A";
|
<p><strong>Lieu:</strong> ${data.place}</p>
|
||||||
positionCount[position] = (positionCount[position] || 0) + 1;
|
<p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
|
||||||
});
|
<h6>Joueurs convoqués:</h6>
|
||||||
|
<ul>${sortedPlayers.map(player => {
|
||||||
const positionBreakdown = Object.entries(positionCount)
|
let number = player.number ? player.number : "N/A";
|
||||||
.map(([position, count]) => position + ": " + count)
|
let position = player.position ? player.position : "N/A";
|
||||||
.join(", ");
|
return `<li>${number} - ${player.fname} ${player.lname} (${position}, ${player.dob})</li>`;
|
||||||
|
}).join('')}</ul>
|
||||||
const playersByPosition = [...sortedPlayers].sort((a, b) => {
|
`;
|
||||||
const positionA = a.position || "ZZZ";
|
new bootstrap.Modal(document.getElementById('eventDetailsModal')).show();
|
||||||
const positionB = b.position || "ZZZ";
|
})
|
||||||
if (positionA !== positionB) {
|
|
||||||
return positionA.localeCompare(positionB);
|
|
||||||
}
|
|
||||||
const numA = parseInt(a.number) || 0;
|
|
||||||
const numB = parseInt(b.number) || 0;
|
|
||||||
return numA - numB;
|
|
||||||
});
|
|
||||||
|
|
||||||
const staffList = data.convocation.staff || [];
|
|
||||||
const totalStaff = staffList.length;
|
|
||||||
|
|
||||||
eventDetailsContent.innerHTML = "";
|
|
||||||
|
|
||||||
if (totalPlayers === 0 && totalStaff === 0) {
|
|
||||||
const wrapper = document.createElement("div");
|
|
||||||
wrapper.className = "rounded-xl border border-amber-300 bg-amber-50 p-6";
|
|
||||||
const centerDiv = document.createElement("div");
|
|
||||||
centerDiv.className = "text-center";
|
|
||||||
const h5 = document.createElement("h5");
|
|
||||||
h5.className = "text-2xl font-bold text-gray-800 mb-4";
|
|
||||||
h5.textContent = data.title;
|
|
||||||
centerDiv.appendChild(h5);
|
|
||||||
|
|
||||||
const infoDiv = document.createElement("div");
|
|
||||||
infoDiv.className = "space-y-2 text-gray-700 mb-6";
|
|
||||||
const pType = document.createElement("p");
|
|
||||||
pType.innerHTML = "<strong>Type:</strong> ";
|
|
||||||
pType.appendChild(document.createTextNode(data.type));
|
|
||||||
infoDiv.appendChild(pType);
|
|
||||||
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");
|
|
||||||
const h5 = document.createElement("h5");
|
|
||||||
h5.className = "text-2xl font-bold text-gray-800 mb-4";
|
|
||||||
h5.textContent = data.title;
|
|
||||||
container.appendChild(h5);
|
|
||||||
|
|
||||||
const infoDiv = document.createElement("div");
|
|
||||||
infoDiv.className = "space-y-2 text-gray-700 mb-6";
|
|
||||||
const pType = document.createElement("p");
|
|
||||||
pType.innerHTML = "<strong>Type:</strong> ";
|
|
||||||
pType.appendChild(document.createTextNode(data.type));
|
|
||||||
infoDiv.appendChild(pType);
|
|
||||||
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);
|
|
||||||
container.appendChild(infoDiv);
|
|
||||||
|
|
||||||
if (totalPlayers === 0) {
|
|
||||||
const noPlayersDiv = document.createElement("div");
|
|
||||||
noPlayersDiv.className = "bg-amber-100 border border-amber-300 text-amber-800 px-4 py-3 rounded-lg";
|
|
||||||
const noPlayersH6 = document.createElement("h6");
|
|
||||||
noPlayersH6.className = "font-bold mb-1";
|
|
||||||
noPlayersH6.textContent = "Aucun joueur convoqué";
|
|
||||||
noPlayersDiv.appendChild(noPlayersH6);
|
|
||||||
const noPlayersP = document.createElement("p");
|
|
||||||
noPlayersP.textContent = "Il n'y a actuellement aucun joueur convoqué pour ce match.";
|
|
||||||
noPlayersDiv.appendChild(noPlayersP);
|
|
||||||
container.appendChild(noPlayersDiv);
|
|
||||||
} else {
|
|
||||||
const playersP = document.createElement("p");
|
|
||||||
playersP.innerHTML = "<strong>Joueurs convoqués:</strong> ";
|
|
||||||
playersP.appendChild(document.createTextNode(totalPlayers + " joueur" + (totalPlayers > 1 ? "s" : "") + " (" + positionBreakdown + ")"));
|
|
||||||
infoDiv.appendChild(playersP);
|
|
||||||
|
|
||||||
const playersDiv = document.createElement("div");
|
|
||||||
const playersH6 = document.createElement("h6");
|
|
||||||
playersH6.className = "text-xl font-semibold text-gray-800 mb-3";
|
|
||||||
playersH6.textContent = "Liste des joueurs:";
|
|
||||||
playersDiv.appendChild(playersH6);
|
|
||||||
const playersUl = document.createElement("ul");
|
|
||||||
playersUl.className = "grid grid-cols-1 md:grid-cols-2 gap-3";
|
|
||||||
playersByPosition.forEach(player => {
|
|
||||||
const li = document.createElement("li");
|
|
||||||
li.className = "bg-indigo-50 rounded-lg p-3";
|
|
||||||
const number = player.number ? player.number : "N/A";
|
|
||||||
const position = player.position ? player.position : "N/A";
|
|
||||||
li.textContent = "[" + position + "] " + number + " - " + player.fname + " " + player.lname + " (" + player.dob + ")";
|
|
||||||
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");
|
|
||||||
})
|
|
||||||
.catch(error => console.error("Erreur lors du chargement des détails de l'événement:", error));
|
.catch(error => console.error("Erreur lors du chargement des détails de l'événement:", error));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
+40
-120
@@ -13,8 +13,8 @@ import tempfile
|
|||||||
from enum import Enum
|
from enum import Enum
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Annotated
|
from typing import Annotated
|
||||||
|
from typing import List, Tuple
|
||||||
import pypdf
|
import PyPDF2
|
||||||
import requests
|
import requests
|
||||||
import typer
|
import typer
|
||||||
from rich import print
|
from rich import print
|
||||||
@@ -112,8 +112,8 @@ def sanitize_json_response(text):
|
|||||||
|
|
||||||
|
|
||||||
app = typer.Typer(no_args_is_help=True)
|
app = typer.Typer(no_args_is_help=True)
|
||||||
session = requests.Session()
|
session: requests.Session
|
||||||
userid: int = 0
|
userid: int
|
||||||
global_config_section: str = "default"
|
global_config_section: str = "default"
|
||||||
|
|
||||||
|
|
||||||
@@ -140,17 +140,14 @@ class AgeGroup(str, Enum):
|
|||||||
u13a = "U13 (A)"
|
u13a = "U13 (A)"
|
||||||
u13p = "U13 (Prép)"
|
u13p = "U13 (Prép)"
|
||||||
u14ev = "U14 (Elite Vernets)"
|
u14ev = "U14 (Elite Vernets)"
|
||||||
u14sae = "U14 (Groupe SAE)"
|
|
||||||
u14esmv = "U14 (Elite Sous-Moulin/Vergers)"
|
u14esmv = "U14 (Elite Sous-Moulin/Vergers)"
|
||||||
u15t = "U15 (Top)"
|
u15t = "U15 (Top)"
|
||||||
u15a = "U15 (A)"
|
u15a = "U15 (A)"
|
||||||
u16e = "U16 (Elit)"
|
u16e = "U16 (Elite)"
|
||||||
u16t = "U16 (Top GS Ass)"
|
u16t = "U16 (Top GS Ass)"
|
||||||
u18e = "U18 (Elit)"
|
u18e = "U18 (Elite)"
|
||||||
u21e = "U21 (Elit)"
|
u18el = "U18 (Elit)"
|
||||||
u14t = "U14 (Top)"
|
u21e = "U21 (ELIT)"
|
||||||
u14t1 = "U14 (Top1)"
|
|
||||||
u14t2 = "U14 (Top2)"
|
|
||||||
|
|
||||||
|
|
||||||
def normalize_age_group(value: str) -> AgeGroup | None:
|
def normalize_age_group(value: str) -> AgeGroup | None:
|
||||||
@@ -245,6 +242,7 @@ def get_login(
|
|||||||
|
|
||||||
def select_club(club_id: int = 172):
|
def select_club(club_id: int = 172):
|
||||||
"""Select a club by ID after login."""
|
"""Select a club by ID after login."""
|
||||||
|
global session
|
||||||
r = session.get(
|
r = session.get(
|
||||||
f"https://app.myice.hockey/?cl={club_id}", headers={"User-Agent": user_agent}
|
f"https://app.myice.hockey/?cl={club_id}", headers={"User-Agent": user_agent}
|
||||||
)
|
)
|
||||||
@@ -252,12 +250,14 @@ def select_club(club_id: int = 172):
|
|||||||
|
|
||||||
|
|
||||||
def do_login(config_section: str | None = None):
|
def do_login(config_section: str | None = None):
|
||||||
|
global session
|
||||||
global userid
|
global userid
|
||||||
|
global global_config_section
|
||||||
|
|
||||||
# Use provided config_section, or fall back to global one
|
# Use provided config_section, or fall back to global one
|
||||||
section = config_section if config_section is not None else global_config_section
|
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:
|
if userid_tmp is not None:
|
||||||
userid = userid_tmp
|
userid = userid_tmp
|
||||||
r = session.get("https://app.myice.hockey/", headers={"User-Agent": user_agent})
|
r = session.get("https://app.myice.hockey/", headers={"User-Agent": user_agent})
|
||||||
@@ -284,6 +284,7 @@ def do_login(config_section: str | None = None):
|
|||||||
|
|
||||||
|
|
||||||
def get_userid():
|
def get_userid():
|
||||||
|
global session
|
||||||
r = session.get(
|
r = session.get(
|
||||||
"https://app.myice.hockey/players/clubschedule/",
|
"https://app.myice.hockey/players/clubschedule/",
|
||||||
headers={
|
headers={
|
||||||
@@ -302,7 +303,7 @@ def get_userid():
|
|||||||
|
|
||||||
def wrapper_session(func):
|
def wrapper_session(func):
|
||||||
def wrapper(*args, **kwargs):
|
def wrapper(*args, **kwargs):
|
||||||
global session, userid
|
global session, userid, global_config_section
|
||||||
# Use the global config_section
|
# Use the global config_section
|
||||||
config_section = global_config_section
|
config_section = global_config_section
|
||||||
|
|
||||||
@@ -326,9 +327,11 @@ def wrapper_session(func):
|
|||||||
|
|
||||||
@wrapper_session
|
@wrapper_session
|
||||||
def get_schedule(num_days: int) -> str:
|
def get_schedule(num_days: int) -> str:
|
||||||
|
global session
|
||||||
|
global userid
|
||||||
assert session and userid
|
assert session and userid
|
||||||
now = datetime.datetime.now()
|
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)
|
date_end = date_start + datetime.timedelta(days=num_days)
|
||||||
r = session.post(
|
r = session.post(
|
||||||
"https://app.myice.hockey/inc/processclubplanning.php",
|
"https://app.myice.hockey/inc/processclubplanning.php",
|
||||||
@@ -355,6 +358,7 @@ def get_schedule(num_days: int) -> str:
|
|||||||
|
|
||||||
@wrapper_session
|
@wrapper_session
|
||||||
def game_pdf(gameid: int, outfile: Path):
|
def game_pdf(gameid: int, outfile: Path):
|
||||||
|
global session, userid
|
||||||
assert session and userid
|
assert session and userid
|
||||||
r = session.get(
|
r = session.get(
|
||||||
f"https://app.myice.hockey/pdfexports/playerplatgamepdfgenerator.php?id={gameid}",
|
f"https://app.myice.hockey/pdfexports/playerplatgamepdfgenerator.php?id={gameid}",
|
||||||
@@ -371,6 +375,7 @@ def game_pdf(gameid: int, outfile: Path):
|
|||||||
|
|
||||||
@wrapper_session
|
@wrapper_session
|
||||||
def practice_pdf(gameid: int, outfile: Path):
|
def practice_pdf(gameid: int, outfile: Path):
|
||||||
|
global session, userid
|
||||||
assert session and userid
|
assert session and userid
|
||||||
r = session.get(
|
r = session.get(
|
||||||
f"https://app.myice.hockey/pdfexports/playerplatpracticepdf.php?practice={gameid}",
|
f"https://app.myice.hockey/pdfexports/playerplatpracticepdf.php?practice={gameid}",
|
||||||
@@ -398,6 +403,7 @@ def schedule(
|
|||||||
"""
|
"""
|
||||||
Fetch schedule as json
|
Fetch schedule as json
|
||||||
"""
|
"""
|
||||||
|
global global_config_section
|
||||||
schedule = get_schedule(num_days)
|
schedule = get_schedule(num_days)
|
||||||
if outfile:
|
if outfile:
|
||||||
with outfile.open("w") as f:
|
with outfile.open("w") as f:
|
||||||
@@ -409,31 +415,27 @@ def schedule(
|
|||||||
|
|
||||||
|
|
||||||
def os_open(file: str) -> None:
|
def os_open(file: str) -> None:
|
||||||
import subprocess
|
|
||||||
|
|
||||||
if os.uname().sysname == "Linux":
|
if os.uname().sysname == "Linux":
|
||||||
subprocess.run(["xdg-open", file])
|
os.system(f"xdg-open {file}")
|
||||||
else:
|
else:
|
||||||
print(f"Opening file {file}", file=sys.stderr)
|
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)
|
reader = PyPDF2.PdfReader(pdf_file)
|
||||||
page = reader.pages[0]
|
page = reader.pages[0]
|
||||||
|
|
||||||
players = []
|
players = []
|
||||||
|
|
||||||
def visitor_body(text, cm, tm, fontDict, fontSize):
|
def visitor_body(text, cm, tm, fontDict, fontSize):
|
||||||
global last_text
|
|
||||||
if text:
|
|
||||||
last_text = text
|
|
||||||
(x, y) = (tm[4], tm[5])
|
(x, y) = (tm[4], tm[5])
|
||||||
|
# print(tm, text)
|
||||||
if x > 79 and x < 80 and y < 741.93:
|
if x > 79 and x < 80 and y < 741.93:
|
||||||
# and y < 741.93 and y > 741.93 - 585.18:
|
# and y < 741.93 and y > 741.93 - 585.18:
|
||||||
players.append(last_text.strip())
|
players.append(text)
|
||||||
|
|
||||||
page.extract_text(visitor_text=visitor_body, extraction_mode="plain")
|
page.extract_text(visitor_text=visitor_body)
|
||||||
return players
|
return players
|
||||||
|
|
||||||
|
|
||||||
@@ -445,6 +447,7 @@ def get_game_pdf(
|
|||||||
"""
|
"""
|
||||||
Genate the pdf for the game invitation
|
Genate the pdf for the game invitation
|
||||||
"""
|
"""
|
||||||
|
global global_config_section
|
||||||
if open_file:
|
if open_file:
|
||||||
output_filename = f"game_{game_id}.pdf"
|
output_filename = f"game_{game_id}.pdf"
|
||||||
else:
|
else:
|
||||||
@@ -465,6 +468,7 @@ def get_practice_pdf(
|
|||||||
"""
|
"""
|
||||||
Genate the pdf for the practice invitation
|
Genate the pdf for the practice invitation
|
||||||
"""
|
"""
|
||||||
|
global global_config_section
|
||||||
output_filename = f"practice_{game_id}.pdf"
|
output_filename = f"practice_{game_id}.pdf"
|
||||||
practice_pdf(game_id, Path(output_filename))
|
practice_pdf(game_id, Path(output_filename))
|
||||||
os_open(output_filename)
|
os_open(output_filename)
|
||||||
@@ -484,6 +488,7 @@ def parse_schedule(
|
|||||||
"""
|
"""
|
||||||
Parse schedule.json to look for specific games or practices
|
Parse schedule.json to look for specific games or practices
|
||||||
"""
|
"""
|
||||||
|
global global_config_section
|
||||||
try:
|
try:
|
||||||
with schedule_file.open("r") as f:
|
with schedule_file.open("r") as f:
|
||||||
data = json.load(f)
|
data = json.load(f)
|
||||||
@@ -533,6 +538,7 @@ def check_with_ai(
|
|||||||
"""
|
"""
|
||||||
Search through the schedule with natural language using Infomaniak LLM API
|
Search through the schedule with natural language using Infomaniak LLM API
|
||||||
"""
|
"""
|
||||||
|
global global_config_section
|
||||||
if not utils.init():
|
if not utils.init():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
with schedule_file.open("r") as f:
|
with schedule_file.open("r") as f:
|
||||||
@@ -547,7 +553,7 @@ def check_with_ai(
|
|||||||
system = "\n".join(
|
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.",
|
"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",
|
"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",
|
"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",
|
"ne confond pas top, elite, a, prép",
|
||||||
@@ -556,7 +562,7 @@ def check_with_ai(
|
|||||||
"```",
|
"```",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
history: list[tuple[str, str]] = []
|
history: List[Tuple[str, str]] = []
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
question = input("> ")
|
question = input("> ")
|
||||||
@@ -581,19 +587,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):
|
def mobile_login(config_section: str | None = None):
|
||||||
|
global global_config_section
|
||||||
import base64
|
import base64
|
||||||
|
|
||||||
# Use provided config_section, or fall back to global one
|
# Use provided config_section, or fall back to global one
|
||||||
@@ -604,13 +599,10 @@ def mobile_login(config_section: str | None = None):
|
|||||||
return {"id": 0, "token": token, "id_club": club_id}
|
return {"id": 0, "token": token, "id_club": club_id}
|
||||||
|
|
||||||
print("Requesting token", file=sys.stderr)
|
print("Requesting token", file=sys.stderr)
|
||||||
# Print curl equivalent for debugging
|
|
||||||
# print(curl_for_mobile_login(username, password), file=sys.stderr)
|
|
||||||
with requests.post(
|
with requests.post(
|
||||||
"https://app.myice.hockey/api/mobilerest/login",
|
"https://app.myice.hockey/api/mobilerest/login",
|
||||||
headers=mobile_headers,
|
headers=mobile_headers,
|
||||||
data=f"login_email={base64.b64encode(username.encode()).decode()}&login_password={base64.b64encode(password.encode()).decode()}&language=FR&v=2",
|
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,
|
# verify=False,
|
||||||
) as r:
|
) as r:
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
@@ -629,26 +621,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(
|
with requests.post(
|
||||||
"https://app.myice.hockey/api/mobilerest/refreshdata",
|
"https://app.myice.hockey/api/mobilerest/refreshdata",
|
||||||
headers=mobile_headers,
|
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,
|
# verify=False,
|
||||||
) as r:
|
) as r:
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
@@ -672,14 +649,14 @@ def refresh_data(user_data=None):
|
|||||||
|
|
||||||
@app.command("mobile-login")
|
@app.command("mobile-login")
|
||||||
def do_mobile_login():
|
def do_mobile_login():
|
||||||
global userdata
|
global userdata, global_config_section
|
||||||
userdata = mobile_login(config_section=global_config_section)
|
userdata = mobile_login(config_section=global_config_section)
|
||||||
print(json.dumps(userdata, indent=2))
|
print(json.dumps(userdata, indent=2))
|
||||||
|
|
||||||
|
|
||||||
@app.command("mobile")
|
@app.command("mobile")
|
||||||
def mobile():
|
def mobile():
|
||||||
global userdata
|
global userdata, global_config_section
|
||||||
userdata = mobile_login(config_section=global_config_section)
|
userdata = mobile_login(config_section=global_config_section)
|
||||||
games = [x for x in refresh_data().get("club_games")]
|
games = [x for x in refresh_data().get("club_games")]
|
||||||
# Use built-in print to avoid rich formatting issues
|
# Use built-in print to avoid rich formatting issues
|
||||||
@@ -688,22 +665,12 @@ def mobile():
|
|||||||
builtins.print(json.dumps(games, indent=2, ensure_ascii=False))
|
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")
|
@app.command("mobile-game")
|
||||||
def mobile_game(
|
def mobile_game(
|
||||||
game_id: Annotated[int, typer.Argument(help="game id")],
|
game_id: Annotated[int, typer.Argument(help="game id")],
|
||||||
raw: Annotated[bool, typer.Option(help="display raw output")] = False,
|
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)
|
userdata = mobile_login(config_section=global_config_section)
|
||||||
|
|
||||||
with requests.post(
|
with requests.post(
|
||||||
@@ -720,53 +687,6 @@ def mobile_game(
|
|||||||
]
|
]
|
||||||
),
|
),
|
||||||
# verify=False,
|
# verify=False,
|
||||||
) as r:
|
|
||||||
try:
|
|
||||||
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['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']})"
|
|
||||||
)
|
|
||||||
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:
|
) as r:
|
||||||
data = json.loads(sanitize_json_response(r.text))["eventData"]
|
data = json.loads(sanitize_json_response(r.text))["eventData"]
|
||||||
|
|
||||||
@@ -774,7 +694,7 @@ def mobile_practice(
|
|||||||
if raw:
|
if raw:
|
||||||
print(data)
|
print(data)
|
||||||
print(
|
print(
|
||||||
f"Game {game_id}: {data['title']} ({data['type']}, {data.get('is_away')}) at {data['time_start']}"
|
f"Game {game_id}: {data['title']} ({data['type']}, {data['is_away']}) at {data['time_start']}"
|
||||||
)
|
)
|
||||||
print(f"{len(players)} players")
|
print(f"{len(players)} players")
|
||||||
for player in sorted(
|
for player in sorted(
|
||||||
|
|||||||
+76
-181
@@ -1,33 +1,19 @@
|
|||||||
import base64
|
|
||||||
import hashlib
|
|
||||||
import logging
|
import logging
|
||||||
|
import requests
|
||||||
import os
|
import os
|
||||||
from typing import Annotated
|
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.middleware.cors import CORSMiddleware
|
||||||
from fastapi.responses import FileResponse, RedirectResponse
|
from fastapi.responses import FileResponse, RedirectResponse
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
from . import myice
|
from . import myice
|
||||||
|
|
||||||
# OIDC Configuration
|
# OIDC Configuration
|
||||||
CLIENT_ID = os.environ.get("CLIENT_ID", "8ea04fbb-4237-4b1d-a895-0b3575a3af3f")
|
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"
|
AUTHORIZATION_ENDPOINT = "https://login.infomaniak.com/authorize"
|
||||||
TOKEN_ENDPOINT = "https://login.infomaniak.com/token"
|
TOKEN_ENDPOINT = "https://login.infomaniak.com/token"
|
||||||
USERINFO_ENDPOINT = "https://login.infomaniak.com/oauth2/userinfo"
|
USERINFO_ENDPOINT = "https://login.infomaniak.com/oauth2/userinfo"
|
||||||
@@ -40,20 +26,16 @@ ALLOWED_USERS = (
|
|||||||
else []
|
else []
|
||||||
)
|
)
|
||||||
|
|
||||||
origins = (
|
origins = ["*"]
|
||||||
os.environ.get("ALLOWED_ORIGINS", "").split(",")
|
|
||||||
if os.environ.get("ALLOWED_ORIGINS")
|
|
||||||
else []
|
|
||||||
)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
|
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
allow_origins=origins,
|
allow_origins=origins,
|
||||||
allow_credentials=True,
|
allow_credentials=True,
|
||||||
allow_methods=["GET", "POST"],
|
allow_methods=["*"],
|
||||||
allow_headers=["Authorization", "Content-Type"],
|
allow_headers=["*"],
|
||||||
)
|
)
|
||||||
|
|
||||||
block_endpoints = ["/health"]
|
block_endpoints = ["/health"]
|
||||||
@@ -61,9 +43,10 @@ block_endpoints = ["/health"]
|
|||||||
|
|
||||||
class LogFilter(logging.Filter):
|
class LogFilter(logging.Filter):
|
||||||
def filter(self, record):
|
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")
|
uvicorn_logger = logging.getLogger("uvicorn.access")
|
||||||
@@ -84,8 +67,13 @@ class AuthHeaders(BaseModel):
|
|||||||
if not token:
|
if not token:
|
||||||
return False
|
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:
|
def validate_oidc_token(self) -> bool:
|
||||||
try:
|
try:
|
||||||
@@ -93,39 +81,39 @@ class AuthHeaders(BaseModel):
|
|||||||
if not token:
|
if not token:
|
||||||
return False
|
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/",
|
|
||||||
)
|
|
||||||
user_email = payload_data.get("email")
|
|
||||||
return not (
|
|
||||||
ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS
|
|
||||||
)
|
|
||||||
|
|
||||||
# Fallback: validate opaque tokens by calling userinfo endpoint
|
# Decode payload (part 1)
|
||||||
userinfo_response = requests.get(
|
payload = parts[1]
|
||||||
USERINFO_ENDPOINT, headers={"Authorization": f"Bearer {token}"}
|
if not payload:
|
||||||
)
|
|
||||||
if userinfo_response.status_code != 200:
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
userinfo = userinfo_response.json()
|
# Add padding if needed
|
||||||
user_email = userinfo.get("email")
|
payload += "=" * (4 - len(payload) % 4)
|
||||||
return not (
|
decoded_payload = base64.urlsafe_b64decode(payload)
|
||||||
ALLOWED_USERS and user_email and user_email not in ALLOWED_USERS
|
payload_data = json.loads(decoded_payload)
|
||||||
)
|
|
||||||
except Exception:
|
# Check if user is in allowed list
|
||||||
return False
|
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):
|
class HealthCheck(BaseModel):
|
||||||
@@ -148,32 +136,21 @@ def get_health() -> HealthCheck:
|
|||||||
return HealthCheck(status="OK")
|
return HealthCheck(status="OK")
|
||||||
|
|
||||||
|
|
||||||
@app.get("/style.css")
|
|
||||||
async def style_css():
|
|
||||||
return FileResponse("style.css")
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/favicon.ico")
|
@app.get("/favicon.ico")
|
||||||
async def favico():
|
async def favico():
|
||||||
return FileResponse("favicon.ico")
|
return FileResponse("favicon.ico")
|
||||||
|
|
||||||
|
|
||||||
@app.get("/login")
|
@app.get("/login")
|
||||||
async def login(request: Request, redirect_uri: str | None = None):
|
async def login(request: Request):
|
||||||
"""Redirect to Infomaniak OIDC login"""
|
"""Redirect to Infomaniak OIDC login"""
|
||||||
import secrets
|
|
||||||
import urllib.parse
|
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 = (
|
auth_url = (
|
||||||
f"{AUTHORIZATION_ENDPOINT}"
|
f"{AUTHORIZATION_ENDPOINT}"
|
||||||
@@ -183,63 +160,14 @@ async def login(request: Request, redirect_uri: str | None = None):
|
|||||||
f"&scope=openid email profile"
|
f"&scope=openid email profile"
|
||||||
f"&state={state}"
|
f"&state={state}"
|
||||||
f"&nonce={nonce}"
|
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")
|
@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"""
|
"""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
|
# Exchange authorization code for access token
|
||||||
token_data = {
|
token_data = {
|
||||||
"grant_type": "authorization_code",
|
"grant_type": "authorization_code",
|
||||||
@@ -247,26 +175,18 @@ async def callback(request: Request, code: str, state: str):
|
|||||||
"client_secret": CLIENT_SECRET,
|
"client_secret": CLIENT_SECRET,
|
||||||
"code": code,
|
"code": code,
|
||||||
"redirect_uri": REDIRECT_URI,
|
"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:
|
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
|
# Redirect back to frontend with error
|
||||||
|
frontend_url = os.environ.get("FRONTEND_URL", "/")
|
||||||
error_detail = token_response.get(
|
error_detail = token_response.get(
|
||||||
"error_description", "Failed to obtain access token"
|
"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"]
|
access_token = token_response["access_token"]
|
||||||
|
|
||||||
@@ -281,35 +201,17 @@ async def callback(request: Request, code: str, state: str):
|
|||||||
user_email = userinfo.get("email")
|
user_email = userinfo.get("email")
|
||||||
if ALLOWED_USERS and user_email not in ALLOWED_USERS:
|
if ALLOWED_USERS and user_email not in ALLOWED_USERS:
|
||||||
# Redirect back to frontend with error
|
# 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
|
# 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")
|
@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"""
|
"""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
|
# Exchange authorization code for access token
|
||||||
token_data = {
|
token_data = {
|
||||||
"grant_type": "authorization_code",
|
"grant_type": "authorization_code",
|
||||||
@@ -317,7 +219,6 @@ async def exchange_token(
|
|||||||
"client_secret": CLIENT_SECRET,
|
"client_secret": CLIENT_SECRET,
|
||||||
"code": code,
|
"code": code,
|
||||||
"redirect_uri": REDIRECT_URI,
|
"redirect_uri": REDIRECT_URI,
|
||||||
"code_verifier": code_verifier,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
response = requests.post(TOKEN_ENDPOINT, data=token_data)
|
response = requests.post(TOKEN_ENDPOINT, data=token_data)
|
||||||
@@ -353,9 +254,6 @@ async def exchange_token(
|
|||||||
@app.get("/userinfo")
|
@app.get("/userinfo")
|
||||||
async def userinfo(headers: Annotated[AuthHeaders, Header()]):
|
async def userinfo(headers: Annotated[AuthHeaders, Header()]):
|
||||||
"""Get user info from access token"""
|
"""Get user info from access token"""
|
||||||
if not headers.authorized():
|
|
||||||
raise HTTPException(401, detail="get out")
|
|
||||||
|
|
||||||
access_token = headers.token()
|
access_token = headers.token()
|
||||||
|
|
||||||
userinfo_response = requests.get(
|
userinfo_response = requests.get(
|
||||||
@@ -374,26 +272,26 @@ async def schedule(
|
|||||||
raise HTTPException(401, detail="get out")
|
raise HTTPException(401, detail="get out")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
_username, _password, userid, existing_token, club_id = myice.get_login(
|
username, password, userid, existing_token, club_id = myice.get_login(
|
||||||
config_section=account
|
config_section=account
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
400,
|
400,
|
||||||
detail=f"Configuration error: {e!s}. Available accounts: isaac, leonard",
|
detail=f"Configuration error: {str(e)}. Available accounts: isaac, leonard",
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if existing_token:
|
if existing_token:
|
||||||
user_data = {
|
myice.userdata = {
|
||||||
"id": userid,
|
"id": userid,
|
||||||
"id_club": club_id or 186,
|
"id_club": club_id or 186,
|
||||||
"token": existing_token,
|
"token": existing_token,
|
||||||
}
|
}
|
||||||
else:
|
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:
|
if "club_games" in data:
|
||||||
return data["club_games"]
|
return data["club_games"]
|
||||||
else:
|
else:
|
||||||
@@ -459,20 +357,17 @@ async def game(
|
|||||||
game_id: int,
|
game_id: int,
|
||||||
account: str = "default",
|
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
|
config_section=account
|
||||||
)
|
)
|
||||||
if existing_token:
|
if existing_token:
|
||||||
user_data = {
|
myice.userdata = {
|
||||||
"id": userid,
|
"id": userid,
|
||||||
"id_club": club_id or 186,
|
"id_club": club_id or 186,
|
||||||
"token": existing_token,
|
"token": existing_token,
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
user_data = myice.mobile_login(config_section=account)
|
myice.userdata = myice.mobile_login(config_section=account)
|
||||||
|
|
||||||
# data = refresh_data()
|
# data = refresh_data()
|
||||||
with requests.post(
|
with requests.post(
|
||||||
@@ -480,11 +375,11 @@ async def game(
|
|||||||
headers=myice.mobile_headers,
|
headers=myice.mobile_headers,
|
||||||
data="&".join(
|
data="&".join(
|
||||||
[
|
[
|
||||||
f"token={user_data['token']}",
|
f"token={myice.userdata['token']}",
|
||||||
f"id_event={game_id}",
|
f"id_event={game_id}",
|
||||||
"type=games",
|
"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",
|
"language=FR",
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
|
|||||||
Generated
+1476
-2022
File diff suppressed because it is too large.
Load diff
+10
-19
@@ -1,29 +1,29 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "myice"
|
name = "myice"
|
||||||
version = "v0.6.1"
|
version = "v0.5.3"
|
||||||
description = "myice parsing"
|
description = "myice parsing"
|
||||||
authors = [
|
authors = [
|
||||||
{ name = "Rene Luria", "email" = "<rene@luria.ch>"},
|
{ name = "Rene Luria", "email" = "<rene@luria.ch>"},
|
||||||
]
|
]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.11"
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"requests (>=2.34.2)",
|
"requests (>=2.32.3,<2.33.0)",
|
||||||
"typer (>=0.27.2)",
|
"typer (>=0.15.1,<0.16.0)",
|
||||||
"pypdf (>=6.19.0)",
|
"pypdf2 (>=3.0.1)",
|
||||||
"rl-ai-tools >=1.17.3",
|
"rl-ai-tools >=1.9.0",
|
||||||
"fastapi[standard] (>=0.141.1)",
|
"fastapi[standard] (>=0.115.11,<0.116.0)",
|
||||||
"pyjwt[crypto] (>=2.14.0)",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
rl-ai-tools = { source = "infomaniak" }
|
rl-ai-tools = { source = "infomaniak" }
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[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]]
|
[[tool.poetry.source]]
|
||||||
@@ -31,15 +31,6 @@ name = "infomaniak"
|
|||||||
url = "https://pypi.purple.infomaniak.ch"
|
url = "https://pypi.purple.infomaniak.ch"
|
||||||
priority = "supplemental"
|
priority = "supplemental"
|
||||||
|
|
||||||
[tool.ruff.lint]
|
|
||||||
ignore = [
|
|
||||||
"ASYNC210",
|
|
||||||
"BLE001",
|
|
||||||
"DTZ005",
|
|
||||||
"PLW1510",
|
|
||||||
"SIM115",
|
|
||||||
]
|
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core"]
|
requires = ["poetry-core"]
|
||||||
build-backend = "poetry.core.masonry.api"
|
build-backend = "poetry.core.masonry.api"
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
--extra-index-url https://pypi.purple.infomaniak.ch
|
|
||||||
|
|
||||||
agent-detector==2.0.0 ; python_version >= "3.13"
|
|
||||||
annotated-doc==0.0.5 ; python_version >= "3.13"
|
|
||||||
annotated-types==0.8.0 ; python_version >= "3.13"
|
|
||||||
anyio==4.15.1 ; python_version >= "3.13"
|
|
||||||
certifi==2026.7.22 ; python_version >= "3.13"
|
|
||||||
cffi==2.1.1 ; python_version >= "3.13" and platform_python_implementation != "PyPy"
|
|
||||||
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-cloud-cli==0.26.0 ; python_version >= "3.13"
|
|
||||||
fastapi==0.141.1 ; 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"
|
|
||||||
httpx==0.28.1 ; python_version >= "3.13"
|
|
||||||
idna==3.19 ; python_version >= "3.13"
|
|
||||||
jinja2==3.1.6 ; python_version >= "3.13"
|
|
||||||
markdown-it-py==4.2.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.46.5 ; python_version >= "3.13"
|
|
||||||
pydantic-extra-types==2.11.1 ; python_version >= "3.13"
|
|
||||||
pydantic-settings==2.15.0 ; python_version >= "3.13"
|
|
||||||
pydantic==2.13.5 ; python_version >= "3.13"
|
|
||||||
pygments==2.21.0 ; 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"
|
|
||||||
rich-toolkit==0.20.5 ; python_version >= "3.13"
|
|
||||||
rich==15.0.0 ; python_version >= "3.13"
|
|
||||||
rignore==0.8.1 ; python_version >= "3.13"
|
|
||||||
rl-ai-tools==1.17.3 ; python_version >= "3.13"
|
|
||||||
sentry-sdk==2.69.2 ; python_version >= "3.13"
|
|
||||||
shellingham==1.5.4 ; python_version >= "3.13"
|
|
||||||
starlette==1.6.0 ; python_version >= "3.13"
|
|
||||||
typer==0.27.2 ; python_version >= "3.13"
|
|
||||||
typing-extensions==4.16.0 ; python_version >= "3.13"
|
|
||||||
typing-inspection==0.4.4 ; python_version >= "3.13"
|
|
||||||
urllib3==2.8.0 ; python_version >= "3.13"
|
|
||||||
uvicorn==0.53.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"
|
|
||||||
watchfiles==1.2.0 ; python_version >= "3.13"
|
|
||||||
websockets==17.1 ; python_version >= "3.13"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
@tailwind base;
|
|
||||||
@tailwind components;
|
|
||||||
@tailwind utilities;
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
|
||||||
module.exports = {
|
|
||||||
content: ["./index.html"],
|
|
||||||
theme: {
|
|
||||||
extend: {},
|
|
||||||
},
|
|
||||||
plugins: [],
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user