Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b433e01fa8 | ||
|
|
5eb74aa64a | ||
|
|
d167b64188 | ||
|
|
2f97e4d434 | ||
|
|
07ea8d21dc |
@@ -1,40 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
# Frontend — npm
|
|
||||||
- package-ecosystem: "npm"
|
|
||||||
directory: "/apps/frontend"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
open-pull-requests-limit: 5
|
|
||||||
groups:
|
|
||||||
frontend-dependencies:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
# Backend — uv (lit pyproject.toml / uv.lock)
|
|
||||||
- package-ecosystem: "uv"
|
|
||||||
directory: "/apps/backend"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
open-pull-requests-limit: 5
|
|
||||||
groups:
|
|
||||||
backend-dependencies:
|
|
||||||
patterns:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
# Les workflows GitHub Actions eux-mêmes ont aussi des dépendances à jour
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
|
|
||||||
# Si un Dockerfile existe pour le backend
|
|
||||||
- package-ecosystem: "docker"
|
|
||||||
directory: "/apps/backend"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
|
|
||||||
- package-ecosystem: "docker"
|
|
||||||
directory: "/apps/frontend"
|
|
||||||
schedule:
|
|
||||||
interval: "weekly"
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
name: ML
|
|
||||||
|
|
||||||
# Piège : la version de Python vient de ml/.python-version, et doit rester en 3.14 (cf.
|
|
||||||
# .github/workflows/backend.yml, même contrainte).
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
paths:
|
|
||||||
- "ml/**"
|
|
||||||
- ".github/workflows/ml.yml"
|
|
||||||
pull_request:
|
|
||||||
paths:
|
|
||||||
- "ml/**"
|
|
||||||
- ".github/workflows/ml.yml"
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ml-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
verification:
|
|
||||||
name: Lint, typage et tests
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
working-directory: ml
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Récupère le dépôt
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Installe uv
|
|
||||||
uses: astral-sh/setup-uv@v5
|
|
||||||
with:
|
|
||||||
enable-cache: true
|
|
||||||
cache-dependency-glob: ml/uv.lock
|
|
||||||
|
|
||||||
- name: Installe l'interpréteur déclaré par .python-version
|
|
||||||
run: uv python install
|
|
||||||
|
|
||||||
- name: Synchronise les dépendances sans dévier du verrou
|
|
||||||
run: uv sync --all-groups --frozen
|
|
||||||
|
|
||||||
- name: Vérifie le formatage
|
|
||||||
run: uv run ruff format --check .
|
|
||||||
|
|
||||||
- name: Analyse statique
|
|
||||||
run: uv run ruff check --output-format=github .
|
|
||||||
|
|
||||||
- name: Typage
|
|
||||||
run: uv run mypy enervision_ml tests
|
|
||||||
|
|
||||||
# Aucun test ne touche PostgreSQL ni MLflow distant : tout tourne sur donnees
|
|
||||||
# synthetiques ou un magasin SQLite local jetable (cf. ml/tests/test_train.py).
|
|
||||||
- name: Tests
|
|
||||||
run: uv run pytest
|
|
||||||
@@ -58,14 +58,6 @@ data/raw/*
|
|||||||
monitoring/grafana/data/
|
monitoring/grafana/data/
|
||||||
monitoring/prometheus/data/
|
monitoring/prometheus/data/
|
||||||
|
|
||||||
# ML : jeu de donnees, modeles entraines et suivi MLflow local, tous generes/volumineux
|
|
||||||
ml/data/
|
|
||||||
ml/models/*
|
|
||||||
!ml/models/.gitkeep
|
|
||||||
ml/mlruns/
|
|
||||||
ml/mlartifacts/
|
|
||||||
ml/mlflow.db
|
|
||||||
|
|
||||||
# IDE et OS
|
# IDE et OS
|
||||||
.idea/
|
.idea/
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|||||||
@@ -1,17 +1,15 @@
|
|||||||
BACKEND := apps/backend
|
BACKEND := apps/backend
|
||||||
FRONTEND := apps/frontend
|
FRONTEND := apps/frontend
|
||||||
ML := ml
|
|
||||||
|
|
||||||
.DEFAULT_GOAL := help
|
.DEFAULT_GOAL := help
|
||||||
.PHONY: help install install-backend install-frontend install-ml dev dev-backend dev-frontend \
|
.PHONY: help install install-backend install-frontend dev dev-backend dev-frontend \
|
||||||
lint format typecheck test test-cov test-integration check \
|
lint format typecheck test test-cov test-integration check \
|
||||||
openapi docker-build db-up db-down db-reset db-logs db-psql migrate bootstrap-admin \
|
openapi docker-build db-up db-down db-reset db-logs db-psql migrate bootstrap-admin
|
||||||
ml-lint ml-typecheck ml-test ml-check ml-train
|
|
||||||
|
|
||||||
help: ## Liste les cibles disponibles
|
help: ## Liste les cibles disponibles
|
||||||
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[36m%-16s\033[0m %s\n", $$1, $$2}'
|
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[36m%-16s\033[0m %s\n", $$1, $$2}'
|
||||||
|
|
||||||
install: install-backend install-frontend install-ml ## Installe les dépendances backend, frontend et ML
|
install: install-backend install-frontend ## Installe les dépendances backend et frontend
|
||||||
|
|
||||||
install-backend: ## Installe les dépendances du backend
|
install-backend: ## Installe les dépendances du backend
|
||||||
cd $(BACKEND) && uv sync --all-groups
|
cd $(BACKEND) && uv sync --all-groups
|
||||||
@@ -19,9 +17,6 @@ install-backend: ## Installe les dépendances du backend
|
|||||||
install-frontend: ## Installe les dépendances du frontend
|
install-frontend: ## Installe les dépendances du frontend
|
||||||
cd $(FRONTEND) && npm ci
|
cd $(FRONTEND) && npm ci
|
||||||
|
|
||||||
install-ml: ## Installe les dépendances du pipeline ML
|
|
||||||
cd $(ML) && uv sync --all-groups
|
|
||||||
|
|
||||||
dev: ## Lance toute la stack (backend + frontend) en rechargement à chaud
|
dev: ## Lance toute la stack (backend + frontend) en rechargement à chaud
|
||||||
@trap 'kill 0' EXIT INT TERM; \
|
@trap 'kill 0' EXIT INT TERM; \
|
||||||
$(MAKE) --no-print-directory dev-backend & \
|
$(MAKE) --no-print-directory dev-backend & \
|
||||||
@@ -60,20 +55,6 @@ check: lint typecheck test ## Chaîne de vérification complète
|
|||||||
openapi: ## Régénère apps/backend/openapi.json depuis les routes déclarées
|
openapi: ## Régénère apps/backend/openapi.json depuis les routes déclarées
|
||||||
cd $(BACKEND) && uv run python -m app.cli export-openapi
|
cd $(BACKEND) && uv run python -m app.cli export-openapi
|
||||||
|
|
||||||
ml-lint: ## Analyse statique du pipeline ML
|
|
||||||
cd $(ML) && uv run ruff check .
|
|
||||||
|
|
||||||
ml-typecheck: ## Vérifie le typage du pipeline ML
|
|
||||||
cd $(ML) && uv run mypy enervision_ml tests
|
|
||||||
|
|
||||||
ml-test: ## Exécute les tests du pipeline ML (donnees synthetiques, sans base ni serveur MLflow)
|
|
||||||
cd $(ML) && uv run pytest
|
|
||||||
|
|
||||||
ml-check: ml-lint ml-typecheck ml-test ## Chaîne de vérification complète du pipeline ML
|
|
||||||
|
|
||||||
ml-train: ## Entraine le modele LightGBM. CSV=chemin optionnel, sinon lit ML_DATABASE_URL
|
|
||||||
cd $(ML) && uv run python -m enervision_ml.train $(if $(CSV),--csv $(CSV),)
|
|
||||||
|
|
||||||
docker-build: ## Construit l'image du backend
|
docker-build: ## Construit l'image du backend
|
||||||
docker build -t enervision-backend:local $(BACKEND)
|
docker build -t enervision-backend:local $(BACKEND)
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ Ce que la documentation apporte à chacun : [docs/architecture/00-vue-ensemble.m
|
|||||||
| Infra | Terraform (k3s single-node) | `infra/terraform` | Initialise |
|
| Infra | Terraform (k3s single-node) | `infra/terraform` | Initialise |
|
||||||
| CI/CD | GitHub Actions | `.github/workflows` | Backend en place |
|
| CI/CD | GitHub Actions | `.github/workflows` | Backend en place |
|
||||||
| Monitoring | Prometheus, Grafana, Alertmanager | `monitoring` | A initialiser |
|
| Monitoring | Prometheus, Grafana, Alertmanager | `monitoring` | A initialiser |
|
||||||
| ML | LightGBM, MLflow | `ml` | Entrainement initialise |
|
|
||||||
|
|
||||||
Le backend, la base et l'infrastructure (Terraform/k3s) sont initialises a ce stade. Le frontend
|
Le backend, la base et l'infrastructure (Terraform/k3s) sont initialises a ce stade. Le frontend
|
||||||
sert un tableau de bord sur `/dashboard`, dont les données proviennent de fixtures : les endpoints
|
sert un tableau de bord sur `/dashboard`, dont les données proviennent de fixtures : les endpoints
|
||||||
@@ -54,7 +53,6 @@ L'etat detaille de chaque brique et les vues d'architecture sont dans
|
|||||||
├── infra/terraform/
|
├── infra/terraform/
|
||||||
│ ├── modules/ Modules reutilisables
|
│ ├── modules/ Modules reutilisables
|
||||||
│ └── environments/ Racines Terraform, une par environnement
|
│ └── environments/ Racines Terraform, une par environnement
|
||||||
├── ml/ Pipeline d'entrainement LightGBM, suivi MLflow
|
|
||||||
├── monitoring/
|
├── monitoring/
|
||||||
│ ├── prometheus/ Collecte et regles d'alerte
|
│ ├── prometheus/ Collecte et regles d'alerte
|
||||||
│ ├── grafana/ Provisioning et dashboards
|
│ ├── grafana/ Provisioning et dashboards
|
||||||
|
|||||||
@@ -8,13 +8,3 @@ APP_SECRET_KEY=change_me
|
|||||||
|
|
||||||
APP_CORS_ORIGINS=http://localhost:4200
|
APP_CORS_ORIGINS=http://localhost:4200
|
||||||
DATABASE_URL=postgresql+asyncpg://enervision:change_me@localhost:5433/enervision
|
DATABASE_URL=postgresql+asyncpg://enervision:change_me@localhost:5433/enervision
|
||||||
|
|
||||||
# Mot de passe oublié : lien à usage unique valable 15 minutes par défaut.
|
|
||||||
APP_FRONTEND_RESET_PASSWORD_URL=http://localhost:4200/reset-password
|
|
||||||
|
|
||||||
# SMTP local de dev (Mailpit, cf. docker-compose.yml) : aucune authentification, aucun TLS.
|
|
||||||
# À remplacer par un vrai relais en staging/prod.
|
|
||||||
APP_SMTP_HOST=localhost
|
|
||||||
APP_SMTP_PORT=1025
|
|
||||||
APP_SMTP_USE_TLS=false
|
|
||||||
APP_SMTP_FROM_ADDRESS=no-reply@enervision.fr
|
|
||||||
|
|||||||
@@ -103,8 +103,6 @@ Le sens de dependance est unique : `endpoints` vers `services` vers `repositorie
|
|||||||
| `/api/v1/auth/logout` | Ferme la session courante | cookie, idempotente |
|
| `/api/v1/auth/logout` | Ferme la session courante | cookie, idempotente |
|
||||||
| `/api/v1/auth/logout-all` | Ferme toutes les sessions du compte | jeton |
|
| `/api/v1/auth/logout-all` | Ferme toutes les sessions du compte | jeton |
|
||||||
| `/api/v1/auth/password` | Change son propre mot de passe | jeton |
|
| `/api/v1/auth/password` | Change son propre mot de passe | jeton |
|
||||||
| `/api/v1/auth/forgot-password` | Demande un lien de réinitialisation par email | public |
|
|
||||||
| `/api/v1/auth/reset-password` | Choisit un nouveau mot de passe depuis ce lien | public |
|
|
||||||
| `/api/v1/auth/me` | Décrit le compte connecté | jeton |
|
| `/api/v1/auth/me` | Décrit le compte connecté | jeton |
|
||||||
| `/api/v1/users` | Liste et crée des comptes | `admin` |
|
| `/api/v1/users` | Liste et crée des comptes | `admin` |
|
||||||
| `/api/v1/users/{id}` | Change le rôle ou l'activation | `admin` |
|
| `/api/v1/users/{id}` | Change le rôle ou l'activation | `admin` |
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
"""jetons et tentatives de reinitialisation de mot de passe
|
|
||||||
|
|
||||||
Revision ID: c0adab96238c
|
|
||||||
Revises: e6d2026091501
|
|
||||||
Create Date: 2026-09-17 10:37:12.571314
|
|
||||||
|
|
||||||
Meme schema que `refresh_token` pour `password_reset_token` : seule l'empreinte SHA-256 du
|
|
||||||
jeton est stockee, jamais le jeton lui-meme, pour la meme raison (revocation en cascade,
|
|
||||||
aucune session utilisable dans un pg_dump qui fuiterait).
|
|
||||||
|
|
||||||
`password_reset_attempt` vit hors de `audit_log`, comme `login_attempt`, car son volume est
|
|
||||||
pilote par l'attaquant : une campagne de demandes y ecrirait des lignes que l'audit, en ajout
|
|
||||||
seul, ne devrait jamais purger.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from collections.abc import Sequence
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from alembic import op
|
|
||||||
from sqlalchemy.dialects import postgresql
|
|
||||||
|
|
||||||
revision: str = "c0adab96238c"
|
|
||||||
down_revision: str | Sequence[str] | None = "e6d2026091501"
|
|
||||||
branch_labels: str | Sequence[str] | None = None
|
|
||||||
depends_on: str | Sequence[str] | None = None
|
|
||||||
|
|
||||||
JETONS_VIVANTS = "consumed_at is null"
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.create_table(
|
|
||||||
"password_reset_attempt",
|
|
||||||
sa.Column("id", sa.BigInteger(), sa.Identity(always=True), nullable=False),
|
|
||||||
sa.Column(
|
|
||||||
"occurred_at",
|
|
||||||
sa.DateTime(timezone=True),
|
|
||||||
server_default=sa.text("now()"),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("email_tried", sa.String(length=320), nullable=False),
|
|
||||||
sa.Column("client_ip", postgresql.INET(), nullable=True),
|
|
||||||
sa.PrimaryKeyConstraint("id", name="pk_password_reset_attempt"),
|
|
||||||
)
|
|
||||||
op.create_index(
|
|
||||||
"ix_password_reset_attempt_email_date",
|
|
||||||
"password_reset_attempt",
|
|
||||||
["email_tried", "occurred_at"],
|
|
||||||
)
|
|
||||||
op.create_index(
|
|
||||||
"ix_password_reset_attempt_ip_date", "password_reset_attempt", ["client_ip", "occurred_at"]
|
|
||||||
)
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"password_reset_token",
|
|
||||||
sa.Column("id", sa.UUID(), server_default=sa.text("gen_random_uuid()"), nullable=False),
|
|
||||||
sa.Column("user_id", sa.UUID(), nullable=False),
|
|
||||||
sa.Column("token_hash", sa.LargeBinary(), nullable=False),
|
|
||||||
sa.Column(
|
|
||||||
"issued_at",
|
|
||||||
sa.DateTime(timezone=True),
|
|
||||||
server_default=sa.text("now()"),
|
|
||||||
nullable=False,
|
|
||||||
),
|
|
||||||
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False),
|
|
||||||
sa.Column("consumed_at", sa.DateTime(timezone=True), nullable=True),
|
|
||||||
sa.Column("client_ip", postgresql.INET(), nullable=True),
|
|
||||||
sa.Column("user_agent", sa.Text(), nullable=True),
|
|
||||||
sa.ForeignKeyConstraint(
|
|
||||||
["user_id"],
|
|
||||||
["app_user.id"],
|
|
||||||
name="fk_password_reset_token_user",
|
|
||||||
ondelete="CASCADE",
|
|
||||||
),
|
|
||||||
sa.PrimaryKeyConstraint("id", name="pk_password_reset_token"),
|
|
||||||
sa.UniqueConstraint("token_hash", name="uq_password_reset_token_hash"),
|
|
||||||
)
|
|
||||||
op.create_index("ix_password_reset_token_user", "password_reset_token", ["user_id"])
|
|
||||||
op.create_index(
|
|
||||||
"ix_password_reset_token_vivants",
|
|
||||||
"password_reset_token",
|
|
||||||
["user_id"],
|
|
||||||
postgresql_where=JETONS_VIVANTS,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index(
|
|
||||||
"ix_password_reset_token_vivants",
|
|
||||||
table_name="password_reset_token",
|
|
||||||
postgresql_where=JETONS_VIVANTS,
|
|
||||||
)
|
|
||||||
op.drop_index("ix_password_reset_token_user", table_name="password_reset_token")
|
|
||||||
op.drop_table("password_reset_token")
|
|
||||||
op.drop_index("ix_password_reset_attempt_ip_date", table_name="password_reset_attempt")
|
|
||||||
op.drop_index("ix_password_reset_attempt_email_date", table_name="password_reset_attempt")
|
|
||||||
op.drop_table("password_reset_attempt")
|
|
||||||
@@ -16,7 +16,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
|||||||
|
|
||||||
from app.core.config import Settings, get_settings
|
from app.core.config import Settings, get_settings
|
||||||
from app.core.hashing import Argon2Hasher, build_hasher
|
from app.core.hashing import Argon2Hasher, build_hasher
|
||||||
from app.core.mailer import Mailer, SmtpConfig
|
|
||||||
from app.core.principal import Principal
|
from app.core.principal import Principal
|
||||||
from app.core.roles import AccountKind, Role, has_at_least
|
from app.core.roles import AccountKind, Role, has_at_least
|
||||||
from app.core.security import TokenExpiredError, TokenInvalidError, TokenPolicy
|
from app.core.security import TokenExpiredError, TokenInvalidError, TokenPolicy
|
||||||
@@ -25,15 +24,13 @@ from app.db.session import get_session
|
|||||||
from app.repositories.alert import AlertRepository
|
from app.repositories.alert import AlertRepository
|
||||||
from app.repositories.audit_log import AuditLogRepository
|
from app.repositories.audit_log import AuditLogRepository
|
||||||
from app.repositories.login_attempt import LoginAttemptRepository
|
from app.repositories.login_attempt import LoginAttemptRepository
|
||||||
from app.repositories.password_reset_attempt import PasswordResetAttemptRepository
|
|
||||||
from app.repositories.password_reset_token import PasswordResetTokenRepository
|
|
||||||
from app.repositories.reading import ReadingRepository
|
from app.repositories.reading import ReadingRepository
|
||||||
from app.repositories.recommendation import RecommendationRepository
|
from app.repositories.recommendation import RecommendationRepository
|
||||||
from app.repositories.refresh_token import RefreshTokenRepository
|
from app.repositories.refresh_token import RefreshTokenRepository
|
||||||
from app.repositories.site import SiteRepository
|
from app.repositories.site import SiteRepository
|
||||||
from app.repositories.user import UserRepository
|
from app.repositories.user import UserRepository
|
||||||
from app.services.alert import AlertService
|
from app.services.alert import AlertService
|
||||||
from app.services.auth import AuthService, LoginPolicy, PasswordResetPolicy
|
from app.services.auth import AuthService, LoginPolicy
|
||||||
from app.services.reading import ReadingService
|
from app.services.reading import ReadingService
|
||||||
from app.services.recommendation import RecommendationService
|
from app.services.recommendation import RecommendationService
|
||||||
from app.services.sensor import SensorService
|
from app.services.sensor import SensorService
|
||||||
@@ -101,27 +98,11 @@ def get_client_ip(request: Request, settings: SettingsDep) -> str | None:
|
|||||||
return request.client.host if request.client else None
|
return request.client.host if request.client else None
|
||||||
|
|
||||||
|
|
||||||
def get_mailer(settings: SettingsDep) -> Mailer:
|
|
||||||
return Mailer(
|
|
||||||
SmtpConfig(
|
|
||||||
host=settings.smtp_host,
|
|
||||||
port=settings.smtp_port,
|
|
||||||
username=settings.smtp_username,
|
|
||||||
password=(
|
|
||||||
settings.smtp_password.get_secret_value() if settings.smtp_password else None
|
|
||||||
),
|
|
||||||
use_tls=settings.smtp_use_tls,
|
|
||||||
from_address=settings.smtp_from_address,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def get_auth_service(
|
def get_auth_service(
|
||||||
session: SessionDep,
|
session: SessionDep,
|
||||||
settings: SettingsDep,
|
settings: SettingsDep,
|
||||||
hasher: Annotated[Argon2Hasher, Depends(get_hasher)],
|
hasher: Annotated[Argon2Hasher, Depends(get_hasher)],
|
||||||
token_policy: Annotated[TokenPolicy, Depends(get_token_policy)],
|
token_policy: Annotated[TokenPolicy, Depends(get_token_policy)],
|
||||||
mailer: Annotated[Mailer, Depends(get_mailer)],
|
|
||||||
) -> AuthService:
|
) -> AuthService:
|
||||||
return AuthService(
|
return AuthService(
|
||||||
users=UserRepository(session),
|
users=UserRepository(session),
|
||||||
@@ -138,16 +119,6 @@ def get_auth_service(
|
|||||||
max_failures_per_identifier=settings.login_max_failures_per_identifier,
|
max_failures_per_identifier=settings.login_max_failures_per_identifier,
|
||||||
),
|
),
|
||||||
refresh_ttl=timedelta(seconds=settings.refresh_token_ttl_seconds),
|
refresh_ttl=timedelta(seconds=settings.refresh_token_ttl_seconds),
|
||||||
reset_tokens=PasswordResetTokenRepository(session),
|
|
||||||
reset_attempts=PasswordResetAttemptRepository(session),
|
|
||||||
reset_policy=PasswordResetPolicy(
|
|
||||||
window_seconds=settings.password_reset_window_seconds,
|
|
||||||
max_requests_per_identifier=settings.password_reset_max_requests_per_identifier,
|
|
||||||
max_requests_per_ip=settings.password_reset_max_requests_per_ip,
|
|
||||||
token_ttl=timedelta(seconds=settings.password_reset_ttl_seconds),
|
|
||||||
frontend_reset_url=settings.frontend_reset_password_url,
|
|
||||||
),
|
|
||||||
mailer=mailer,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -171,7 +142,7 @@ UserServiceDep = Annotated[UserService, Depends(get_user_service)]
|
|||||||
|
|
||||||
|
|
||||||
def get_site_service(session: SessionDep) -> SiteService:
|
def get_site_service(session: SessionDep) -> SiteService:
|
||||||
return SiteService(sites=SiteRepository(session))
|
return SiteService(sites=SiteRepository(session), readings=ReadingRepository(session))
|
||||||
|
|
||||||
|
|
||||||
SiteServiceDep = Annotated[SiteService, Depends(get_site_service)]
|
SiteServiceDep = Annotated[SiteService, Depends(get_site_service)]
|
||||||
|
|||||||
@@ -164,16 +164,3 @@ REPONSE_ORIGINE_REFUSEE: Final[Reponses] = {
|
|||||||
"description": "Origine non autorisée (protection CSRF de `require_trusted_origin`).",
|
"description": "Origine non autorisée (protection CSRF de `require_trusted_origin`).",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
REPONSE_LIMITE: Final[Reponses] = {
|
|
||||||
429: {
|
|
||||||
"model": ErrorResponse,
|
|
||||||
"description": "Trop de demandes sur cette fenêtre glissante.",
|
|
||||||
"headers": {
|
|
||||||
"Retry-After": {
|
|
||||||
"description": "Secondes à attendre avant une nouvelle tentative.",
|
|
||||||
"schema": {"type": "integer"},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# d'accès ne va jamais dans un cookie. C'est ce qui réduit la surface CSRF aux trois routes de
|
# d'accès ne va jamais dans un cookie. C'est ce qui réduit la surface CSRF aux trois routes de
|
||||||
# ce module : partout ailleurs, le navigateur n'attache rien de lui-même.
|
# ce module : partout ailleurs, le navigateur n'attache rien de lui-même.
|
||||||
|
|
||||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Request, Response, status
|
from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
|
||||||
|
|
||||||
from app.api.deps import (
|
from app.api.deps import (
|
||||||
AuthServiceDep,
|
AuthServiceDep,
|
||||||
@@ -12,7 +12,6 @@ from app.api.deps import (
|
|||||||
require_trusted_origin,
|
require_trusted_origin,
|
||||||
)
|
)
|
||||||
from app.api.openapi import (
|
from app.api.openapi import (
|
||||||
REPONSE_LIMITE,
|
|
||||||
REPONSE_ORIGINE_REFUSEE,
|
REPONSE_ORIGINE_REFUSEE,
|
||||||
REPONSE_VALIDATION,
|
REPONSE_VALIDATION,
|
||||||
REPONSES_AUTHENTIFIEES,
|
REPONSES_AUTHENTIFIEES,
|
||||||
@@ -22,19 +21,15 @@ from app.api.openapi import (
|
|||||||
from app.core.cookies import RefreshCookie, cookie_name
|
from app.core.cookies import RefreshCookie, cookie_name
|
||||||
from app.core.logging import get_logger
|
from app.core.logging import get_logger
|
||||||
from app.schemas.auth import (
|
from app.schemas.auth import (
|
||||||
ForgotPasswordRequest,
|
|
||||||
LoginRequest,
|
LoginRequest,
|
||||||
PasswordChangeRequest,
|
PasswordChangeRequest,
|
||||||
PrincipalResponse,
|
PrincipalResponse,
|
||||||
ResetPasswordRequest,
|
|
||||||
ResetTokenValidationResponse,
|
|
||||||
TokenResponse,
|
TokenResponse,
|
||||||
)
|
)
|
||||||
from app.schemas.errors import ErrorResponse
|
from app.schemas.errors import ErrorResponse
|
||||||
from app.services.auth import (
|
from app.services.auth import (
|
||||||
AuthenticatedSession,
|
AuthenticatedSession,
|
||||||
InvalidCredentialsError,
|
InvalidCredentialsError,
|
||||||
InvalidOrExpiredResetTokenError,
|
|
||||||
RateLimitedError,
|
RateLimitedError,
|
||||||
SessionRejectedError,
|
SessionRejectedError,
|
||||||
)
|
)
|
||||||
@@ -44,7 +39,6 @@ logger = get_logger(__name__)
|
|||||||
|
|
||||||
DETAIL_IDENTIFIANTS = "Identifiants invalides"
|
DETAIL_IDENTIFIANTS = "Identifiants invalides"
|
||||||
DETAIL_SESSION = "Session invalide"
|
DETAIL_SESSION = "Session invalide"
|
||||||
DETAIL_LIEN_RESET = "Lien invalide ou expiré"
|
|
||||||
|
|
||||||
REPONSES_LOGIN: Reponses = {
|
REPONSES_LOGIN: Reponses = {
|
||||||
**REPONSE_VALIDATION,
|
**REPONSE_VALIDATION,
|
||||||
@@ -91,20 +85,6 @@ REPONSES_MOT_DE_PASSE: Reponses = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
REPONSES_FORGOT_PASSWORD: Reponses = {
|
|
||||||
**REPONSE_VALIDATION,
|
|
||||||
**REPONSE_LIMITE,
|
|
||||||
}
|
|
||||||
|
|
||||||
REPONSES_RESET_PASSWORD: Reponses = {
|
|
||||||
**REPONSE_VALIDATION,
|
|
||||||
**REPONSE_ORIGINE_REFUSEE,
|
|
||||||
400: {
|
|
||||||
"model": ErrorResponse,
|
|
||||||
"description": "Lien invalide, déjà utilisé, ou expiré (durée de vie : 15 minutes).",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def repond(
|
def repond(
|
||||||
response: Response, settings: SettingsDep, session: AuthenticatedSession
|
response: Response, settings: SettingsDep, session: AuthenticatedSession
|
||||||
@@ -287,79 +267,3 @@ async def change_password(
|
|||||||
|
|
||||||
logger.info("auth.password_changed user_id=%s", principal.id)
|
logger.info("auth.password_changed user_id=%s", principal.id)
|
||||||
return repond(response, settings, session)
|
return repond(response, settings, session)
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
|
||||||
"/forgot-password",
|
|
||||||
status_code=status.HTTP_202_ACCEPTED,
|
|
||||||
summary="Demande un lien de réinitialisation par email",
|
|
||||||
responses=REPONSES_FORGOT_PASSWORD,
|
|
||||||
)
|
|
||||||
async def forgot_password(
|
|
||||||
payload: ForgotPasswordRequest,
|
|
||||||
request: Request,
|
|
||||||
response: Response,
|
|
||||||
service: AuthServiceDep,
|
|
||||||
background_tasks: BackgroundTasks,
|
|
||||||
client_ip: str | None = Depends(get_client_ip),
|
|
||||||
) -> None:
|
|
||||||
response.headers["Cache-Control"] = "no-store"
|
|
||||||
|
|
||||||
try:
|
|
||||||
await service.request_password_reset(
|
|
||||||
email=payload.email,
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=request.headers.get("user-agent"),
|
|
||||||
background_tasks=background_tasks,
|
|
||||||
)
|
|
||||||
except RateLimitedError as erreur:
|
|
||||||
logger.warning("auth.password_reset.rate_limited ip=%s", client_ip)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_429_TOO_MANY_REQUESTS,
|
|
||||||
detail="Trop de demandes, réessayez plus tard",
|
|
||||||
headers={"Retry-After": str(erreur.retry_after)},
|
|
||||||
) from erreur
|
|
||||||
|
|
||||||
|
|
||||||
@router.get(
|
|
||||||
"/reset-password/validate",
|
|
||||||
response_model=ResetTokenValidationResponse,
|
|
||||||
summary="Vérifie sans le consommer si un lien de réinitialisation est encore valide",
|
|
||||||
responses=REPONSE_VALIDATION,
|
|
||||||
)
|
|
||||||
async def validate_reset_token(token: str, service: AuthServiceDep) -> ResetTokenValidationResponse:
|
|
||||||
return ResetTokenValidationResponse(valid=await service.is_reset_token_valid(token=token))
|
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
|
||||||
"/reset-password",
|
|
||||||
response_model=TokenResponse,
|
|
||||||
summary="Choisit un nouveau mot de passe depuis un lien reçu par email",
|
|
||||||
dependencies=[Depends(require_trusted_origin)],
|
|
||||||
responses=REPONSES_RESET_PASSWORD,
|
|
||||||
)
|
|
||||||
async def reset_password(
|
|
||||||
payload: ResetPasswordRequest,
|
|
||||||
request: Request,
|
|
||||||
response: Response,
|
|
||||||
settings: SettingsDep,
|
|
||||||
service: AuthServiceDep,
|
|
||||||
client_ip: str | None = Depends(get_client_ip),
|
|
||||||
) -> TokenResponse:
|
|
||||||
response.headers["Cache-Control"] = "no-store"
|
|
||||||
|
|
||||||
try:
|
|
||||||
session = await service.confirm_password_reset(
|
|
||||||
token=payload.token,
|
|
||||||
new_password=payload.new_password,
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=request.headers.get("user-agent"),
|
|
||||||
)
|
|
||||||
except InvalidOrExpiredResetTokenError as erreur:
|
|
||||||
logger.warning("auth.password_reset.invalid_token ip=%s", client_ip)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST, detail=DETAIL_LIEN_RESET
|
|
||||||
) from erreur
|
|
||||||
|
|
||||||
logger.info("auth.password_reset.success user_id=%s", session.principal.id)
|
|
||||||
return repond(response, settings, session)
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from fastapi import APIRouter, HTTPException, status
|
|||||||
from app.api.deps import LecteurDep, SiteServiceDep
|
from app.api.deps import LecteurDep, SiteServiceDep
|
||||||
from app.api.openapi import REPONSE_VALIDATION, Reponses
|
from app.api.openapi import REPONSE_VALIDATION, Reponses
|
||||||
from app.schemas.errors import ErrorResponse
|
from app.schemas.errors import ErrorResponse
|
||||||
from app.schemas.site import SiteResponse
|
from app.schemas.site import SiteCurrentResponse, SiteResponse
|
||||||
from app.services.site import SiteNotFoundError
|
from app.services.site import SiteNotFoundError
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
@@ -34,3 +34,19 @@ async def get_site(site_id: str, _: LecteurDep, service: SiteServiceDep) -> Site
|
|||||||
status_code=status.HTTP_404_NOT_FOUND, detail="Site introuvable"
|
status_code=status.HTTP_404_NOT_FOUND, detail="Site introuvable"
|
||||||
) from erreur
|
) from erreur
|
||||||
return SiteResponse.model_validate(site)
|
return SiteResponse.model_validate(site)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/{site_id}/current",
|
||||||
|
response_model=SiteCurrentResponse,
|
||||||
|
summary="Dernière mesure d'un site",
|
||||||
|
responses=REPONSES_INTROUVABLE,
|
||||||
|
)
|
||||||
|
async def get_current(site_id: str, _: LecteurDep, service: SiteServiceDep) -> SiteCurrentResponse:
|
||||||
|
try:
|
||||||
|
actuel = await service.current(site_id)
|
||||||
|
except SiteNotFoundError as erreur:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND, detail="Site introuvable"
|
||||||
|
) from erreur
|
||||||
|
return SiteCurrentResponse.model_validate(actuel)
|
||||||
|
|||||||
+4
-24
@@ -9,7 +9,6 @@ import argparse
|
|||||||
import asyncio
|
import asyncio
|
||||||
import json
|
import json
|
||||||
import secrets
|
import secrets
|
||||||
import string
|
|
||||||
import sys
|
import sys
|
||||||
from getpass import getpass
|
from getpass import getpass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -23,9 +22,9 @@ from app.core.roles import Role
|
|||||||
from app.db.session import get_session_factory
|
from app.db.session import get_session_factory
|
||||||
from app.main import create_app
|
from app.main import create_app
|
||||||
from app.repositories.user import UserRepository
|
from app.repositories.user import UserRepository
|
||||||
from app.schemas.auth import PASSWORD_MIN_LENGTH, SPECIAL_CHARACTERS, valide_complexite
|
|
||||||
|
|
||||||
LONGUEUR_MOT_DE_PASSE_GENERE = 24
|
LONGUEUR_MOT_DE_PASSE_GENERE = 24
|
||||||
|
LONGUEUR_MINIMALE = 12
|
||||||
CHEMIN_CONTRAT = Path(__file__).resolve().parent.parent / "openapi.json"
|
CHEMIN_CONTRAT = Path(__file__).resolve().parent.parent / "openapi.json"
|
||||||
|
|
||||||
|
|
||||||
@@ -112,34 +111,15 @@ def build_parser() -> argparse.ArgumentParser:
|
|||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
def genere_mot_de_passe() -> str:
|
|
||||||
tirage = secrets.SystemRandom()
|
|
||||||
classes = [
|
|
||||||
string.ascii_uppercase,
|
|
||||||
string.ascii_lowercase,
|
|
||||||
string.digits,
|
|
||||||
SPECIAL_CHARACTERS,
|
|
||||||
]
|
|
||||||
reste = LONGUEUR_MOT_DE_PASSE_GENERE - len(classes)
|
|
||||||
caracteres = [tirage.choice(classe) for classe in classes]
|
|
||||||
caracteres += [tirage.choice("".join(classes)) for _ in range(reste)]
|
|
||||||
tirage.shuffle(caracteres)
|
|
||||||
return "".join(caracteres)
|
|
||||||
|
|
||||||
|
|
||||||
def read_password(*, generate: bool) -> str:
|
def read_password(*, generate: bool) -> str:
|
||||||
if generate:
|
if generate:
|
||||||
mot_de_passe = genere_mot_de_passe()
|
mot_de_passe = secrets.token_urlsafe(LONGUEUR_MOT_DE_PASSE_GENERE)
|
||||||
print(f"Mot de passe généré, il ne sera plus affiché : {mot_de_passe}")
|
print(f"Mot de passe généré, il ne sera plus affiché : {mot_de_passe}")
|
||||||
return mot_de_passe
|
return mot_de_passe
|
||||||
|
|
||||||
mot_de_passe = getpass("Mot de passe : ")
|
mot_de_passe = getpass("Mot de passe : ")
|
||||||
if len(mot_de_passe) < PASSWORD_MIN_LENGTH:
|
if len(mot_de_passe) < LONGUEUR_MINIMALE:
|
||||||
raise SystemExit(f"Le mot de passe doit faire au moins {PASSWORD_MIN_LENGTH} caractères")
|
raise SystemExit(f"Le mot de passe doit faire au moins {LONGUEUR_MINIMALE} caractères")
|
||||||
try:
|
|
||||||
valide_complexite(mot_de_passe)
|
|
||||||
except ValueError as erreur:
|
|
||||||
raise SystemExit(str(erreur)) from erreur
|
|
||||||
if mot_de_passe != getpass("Confirmation : "):
|
if mot_de_passe != getpass("Confirmation : "):
|
||||||
raise SystemExit("Les deux saisies diffèrent")
|
raise SystemExit("Les deux saisies diffèrent")
|
||||||
return mot_de_passe
|
return mot_de_passe
|
||||||
|
|||||||
@@ -54,19 +54,6 @@ class Settings(BaseSettings):
|
|||||||
login_max_failures_per_ip: int = Field(default=20, ge=1)
|
login_max_failures_per_ip: int = Field(default=20, ge=1)
|
||||||
login_max_failures_per_identifier: int = Field(default=50, ge=1)
|
login_max_failures_per_identifier: int = Field(default=50, ge=1)
|
||||||
|
|
||||||
password_reset_ttl_seconds: int = Field(default=900, ge=60, le=3600)
|
|
||||||
password_reset_window_seconds: int = Field(default=900, ge=60)
|
|
||||||
password_reset_max_requests_per_identifier: int = Field(default=3, ge=1)
|
|
||||||
password_reset_max_requests_per_ip: int = Field(default=10, ge=1)
|
|
||||||
|
|
||||||
smtp_host: str = "localhost"
|
|
||||||
smtp_port: int = Field(default=587, ge=1, le=65535)
|
|
||||||
smtp_username: str | None = None
|
|
||||||
smtp_password: SecretStr | None = None
|
|
||||||
smtp_use_tls: bool = False
|
|
||||||
smtp_from_address: str = "no-reply@enervision.fr"
|
|
||||||
frontend_reset_password_url: str = "http://localhost:4200/reset-password" # noqa: S105
|
|
||||||
|
|
||||||
trust_proxy_headers: bool = False
|
trust_proxy_headers: bool = False
|
||||||
expose_api_docs: bool | None = None
|
expose_api_docs: bool | None = None
|
||||||
metrics_token: SecretStr | None = None
|
metrics_token: SecretStr | None = None
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
# Piège : l'URL de réinitialisation porte le jeton en clair. Ne jamais la journaliser :
|
|
||||||
# `send_password_reset_email()` ne logue que le destinataire, jamais `reset_url`.
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from email.message import EmailMessage
|
|
||||||
|
|
||||||
import aiosmtplib
|
|
||||||
|
|
||||||
from app.core.logging import get_logger
|
|
||||||
|
|
||||||
logger = get_logger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
|
||||||
class SmtpConfig:
|
|
||||||
host: str
|
|
||||||
port: int
|
|
||||||
username: str | None
|
|
||||||
password: str | None
|
|
||||||
use_tls: bool
|
|
||||||
from_address: str
|
|
||||||
|
|
||||||
|
|
||||||
class Mailer:
|
|
||||||
def __init__(self, config: SmtpConfig) -> None:
|
|
||||||
self._config = config
|
|
||||||
|
|
||||||
async def send_password_reset_email(self, *, to: str, reset_url: str) -> None:
|
|
||||||
message = EmailMessage()
|
|
||||||
message["From"] = self._config.from_address
|
|
||||||
message["To"] = to
|
|
||||||
message["Subject"] = "Réinitialisation de votre mot de passe EnerVision"
|
|
||||||
message.set_content(
|
|
||||||
"Une réinitialisation de mot de passe a été demandée pour ce compte.\n\n"
|
|
||||||
f"Ouvrez ce lien dans les 15 minutes pour choisir un nouveau mot de passe : "
|
|
||||||
f"{reset_url}\n\n"
|
|
||||||
"Si vous n'êtes pas à l'origine de cette demande, ignorez cet email."
|
|
||||||
)
|
|
||||||
|
|
||||||
_, message_recu = await aiosmtplib.send(
|
|
||||||
message,
|
|
||||||
hostname=self._config.host,
|
|
||||||
port=self._config.port,
|
|
||||||
username=self._config.username,
|
|
||||||
password=self._config.password,
|
|
||||||
use_tls=self._config.use_tls,
|
|
||||||
)
|
|
||||||
logger.info("mailer.password_reset_sent to=%s smtp_response=%s", to, message_recu)
|
|
||||||
@@ -1,14 +1,9 @@
|
|||||||
from collections.abc import AsyncIterator
|
from collections.abc import AsyncIterator
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from fastapi import Depends, FastAPI
|
from fastapi import Depends, FastAPI
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
|
|
||||||
from fastapi.staticfiles import StaticFiles
|
|
||||||
from prometheus_fastapi_instrumentator import Instrumentator
|
from prometheus_fastapi_instrumentator import Instrumentator
|
||||||
from starlette.requests import Request
|
|
||||||
from starlette.responses import HTMLResponse
|
|
||||||
|
|
||||||
from app.api.errors import register_error_handlers
|
from app.api.errors import register_error_handlers
|
||||||
from app.api.middleware import SecurityHeadersMiddleware
|
from app.api.middleware import SecurityHeadersMiddleware
|
||||||
@@ -23,8 +18,6 @@ logger = get_logger(__name__)
|
|||||||
|
|
||||||
METHODES_AUTORISEES = ["GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS"]
|
METHODES_AUTORISEES = ["GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS"]
|
||||||
EN_TETES_AUTORISES = ["Authorization", "Content-Type"]
|
EN_TETES_AUTORISES = ["Authorization", "Content-Type"]
|
||||||
STATIC_DIR = Path(__file__).parent / "static"
|
|
||||||
LOGO_URL = "/static/logo-icon.png"
|
|
||||||
|
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
@@ -50,41 +43,11 @@ def create_app(settings: Settings | None = None) -> FastAPI:
|
|||||||
openapi_tags=TAGS,
|
openapi_tags=TAGS,
|
||||||
debug=resolved.debug,
|
debug=resolved.debug,
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
docs_url=None,
|
docs_url="/docs" if documentee else None,
|
||||||
redoc_url=None,
|
redoc_url="/redoc" if documentee else None,
|
||||||
openapi_url="/openapi.json" if documentee else None,
|
openapi_url="/openapi.json" if documentee else None,
|
||||||
)
|
)
|
||||||
|
|
||||||
if documentee:
|
|
||||||
application.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
|
|
||||||
|
|
||||||
# ReDoc supporte nativement `info.x-logo` (extension Redocly) pour afficher un logo
|
|
||||||
# en en-tête ; Swagger UI n'a pas d'equivalent, il ne reprend que le favicon.
|
|
||||||
openapi_original = application.openapi
|
|
||||||
|
|
||||||
def openapi_avec_logo() -> dict[str, object]:
|
|
||||||
schema = openapi_original()
|
|
||||||
schema["info"]["x-logo"] = {"url": LOGO_URL, "altText": "EnerVision"}
|
|
||||||
return schema
|
|
||||||
|
|
||||||
application.openapi = openapi_avec_logo # type: ignore[method-assign]
|
|
||||||
|
|
||||||
@application.get("/docs", include_in_schema=False)
|
|
||||||
async def docs_swagger(_: Request) -> HTMLResponse:
|
|
||||||
return get_swagger_ui_html(
|
|
||||||
openapi_url="/openapi.json",
|
|
||||||
title=f"{application.title} · Swagger UI",
|
|
||||||
swagger_favicon_url=LOGO_URL,
|
|
||||||
)
|
|
||||||
|
|
||||||
@application.get("/redoc", include_in_schema=False)
|
|
||||||
async def docs_redoc(_: Request) -> HTMLResponse:
|
|
||||||
return get_redoc_html(
|
|
||||||
openapi_url="/openapi.json",
|
|
||||||
title=f"{application.title} · ReDoc",
|
|
||||||
redoc_favicon_url=LOGO_URL,
|
|
||||||
)
|
|
||||||
|
|
||||||
application.add_middleware(SecurityHeadersMiddleware)
|
application.add_middleware(SecurityHeadersMiddleware)
|
||||||
|
|
||||||
if resolved.allowed_origins:
|
if resolved.allowed_origins:
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
from app.models.audit_log import AuditLog
|
from app.models.audit_log import AuditLog
|
||||||
from app.models.energy import Alert, Dataset, Prediction, Reading, Recommendation, Site
|
from app.models.energy import Alert, Dataset, Prediction, Reading, Recommendation, Site
|
||||||
from app.models.login_attempt import LoginAttempt
|
from app.models.login_attempt import LoginAttempt
|
||||||
from app.models.password_reset_attempt import PasswordResetAttempt
|
|
||||||
from app.models.password_reset_token import PasswordResetToken
|
|
||||||
from app.models.refresh_token import RefreshToken
|
from app.models.refresh_token import RefreshToken
|
||||||
from app.models.user import AppUser
|
from app.models.user import AppUser
|
||||||
|
|
||||||
@@ -15,8 +13,6 @@ __all__ = [
|
|||||||
"AuditLog",
|
"AuditLog",
|
||||||
"Dataset",
|
"Dataset",
|
||||||
"LoginAttempt",
|
"LoginAttempt",
|
||||||
"PasswordResetAttempt",
|
|
||||||
"PasswordResetToken",
|
|
||||||
"Prediction",
|
"Prediction",
|
||||||
"Reading",
|
"Reading",
|
||||||
"Recommendation",
|
"Recommendation",
|
||||||
|
|||||||
@@ -29,8 +29,6 @@ class AuditAction(StrEnum):
|
|||||||
COMPTE_ACTIVE = "user.enabled"
|
COMPTE_ACTIVE = "user.enabled"
|
||||||
COMPTE_MOT_DE_PASSE_REINITIALISE = "user.password_reset_by_admin"
|
COMPTE_MOT_DE_PASSE_REINITIALISE = "user.password_reset_by_admin"
|
||||||
COMPTE_MOT_DE_PASSE_CHANGE = "user.password_changed"
|
COMPTE_MOT_DE_PASSE_CHANGE = "user.password_changed"
|
||||||
MOT_DE_PASSE_OUBLIE_DEMANDE = "auth.password_reset_requested"
|
|
||||||
MOT_DE_PASSE_REINITIALISE_PAR_SOI = "auth.password_reset_self_service"
|
|
||||||
REFRESH_REUTILISE = "auth.refresh_reuse_detected"
|
REFRESH_REUTILISE = "auth.refresh_reuse_detected"
|
||||||
SESSIONS_REVOQUEES = "auth.all_sessions_revoked"
|
SESSIONS_REVOQUEES = "auth.all_sessions_revoked"
|
||||||
LIMITE_PAR_IDENTIFIANT = "auth.identifier_throttled"
|
LIMITE_PAR_IDENTIFIANT = "auth.identifier_throttled"
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
# Pourquoi : même séparation que `login_attempt` par rapport à `audit_log` : ce compteur est
|
|
||||||
# piloté par l'attaquant (une campagne de demandes) et se purge, l'audit log est en ajout seul.
|
|
||||||
# Piège : la tentative est enregistrée même quand l'email est inconnu, sinon le 429 apprendrait
|
|
||||||
# qu'un compte existe.
|
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from sqlalchemy import BigInteger, DateTime, Identity, Index, String, func
|
|
||||||
from sqlalchemy.dialects.postgresql import INET
|
|
||||||
from sqlalchemy.orm import Mapped, mapped_column
|
|
||||||
|
|
||||||
from app.db.base import Base
|
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetAttempt(Base):
|
|
||||||
__tablename__ = "password_reset_attempt"
|
|
||||||
__table_args__ = (
|
|
||||||
Index("ix_password_reset_attempt_email_date", "email_tried", "occurred_at"),
|
|
||||||
Index("ix_password_reset_attempt_ip_date", "client_ip", "occurred_at"),
|
|
||||||
)
|
|
||||||
|
|
||||||
id: Mapped[int] = mapped_column(BigInteger, Identity(always=True), primary_key=True)
|
|
||||||
occurred_at: Mapped[datetime] = mapped_column(
|
|
||||||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
|
||||||
)
|
|
||||||
email_tried: Mapped[str] = mapped_column(String(320), nullable=False)
|
|
||||||
client_ip: Mapped[str | None] = mapped_column(INET, nullable=True)
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Pourquoi : même schéma que `refresh_token` (chaîne opaque, jamais un JWT) pour la même
|
|
||||||
# raison : un jeton de réinitialisation doit être révocable d'un coup, et un JWT ne figure
|
|
||||||
# dans aucune ligne à invalider.
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from sqlalchemy import DateTime, ForeignKey, Index, LargeBinary, Text, func
|
|
||||||
from sqlalchemy.dialects.postgresql import INET
|
|
||||||
from sqlalchemy.dialects.postgresql import UUID as PG_UUID
|
|
||||||
from sqlalchemy.orm import Mapped, mapped_column
|
|
||||||
|
|
||||||
from app.db.base import Base
|
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetToken(Base):
|
|
||||||
__tablename__ = "password_reset_token"
|
|
||||||
__table_args__ = (
|
|
||||||
Index("ix_password_reset_token_user", "user_id"),
|
|
||||||
Index(
|
|
||||||
"ix_password_reset_token_vivants",
|
|
||||||
"user_id",
|
|
||||||
postgresql_where="consumed_at is null",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
id: Mapped[uuid.UUID] = mapped_column(
|
|
||||||
PG_UUID(as_uuid=True), primary_key=True, server_default=func.gen_random_uuid()
|
|
||||||
)
|
|
||||||
user_id: Mapped[uuid.UUID] = mapped_column(
|
|
||||||
PG_UUID(as_uuid=True), ForeignKey("app_user.id", ondelete="CASCADE"), nullable=False
|
|
||||||
)
|
|
||||||
token_hash: Mapped[bytes] = mapped_column(LargeBinary, nullable=False, unique=True)
|
|
||||||
issued_at: Mapped[datetime] = mapped_column(
|
|
||||||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
|
||||||
)
|
|
||||||
expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
|
||||||
consumed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
||||||
client_ip: Mapped[str | None] = mapped_column(INET, nullable=True)
|
|
||||||
user_agent: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
from dataclasses import dataclass
|
|
||||||
from datetime import UTC, datetime, timedelta
|
|
||||||
|
|
||||||
from sqlalchemy import func, select
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
|
||||||
|
|
||||||
from app.models.password_reset_attempt import PasswordResetAttempt
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
|
||||||
class ResetRequestCounts:
|
|
||||||
per_identifier: int
|
|
||||||
per_ip: int
|
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetAttemptRepository:
|
|
||||||
def __init__(self, session: AsyncSession) -> None:
|
|
||||||
self._session = session
|
|
||||||
|
|
||||||
async def record(self, *, email: str, client_ip: str | None) -> None:
|
|
||||||
self._session.add(
|
|
||||||
PasswordResetAttempt(email_tried=email.strip().lower(), client_ip=client_ip)
|
|
||||||
)
|
|
||||||
|
|
||||||
async def count_recent(
|
|
||||||
self, *, email: str, client_ip: str | None, window_seconds: int
|
|
||||||
) -> ResetRequestCounts:
|
|
||||||
identifiant = email.strip().lower()
|
|
||||||
meme_email = PasswordResetAttempt.email_tried == identifiant
|
|
||||||
meme_ip = PasswordResetAttempt.client_ip == client_ip
|
|
||||||
|
|
||||||
requete = select(
|
|
||||||
func.count().filter(meme_email),
|
|
||||||
func.count().filter(meme_ip),
|
|
||||||
).where(
|
|
||||||
PasswordResetAttempt.occurred_at
|
|
||||||
> datetime.now(UTC) - timedelta(seconds=window_seconds),
|
|
||||||
meme_email | meme_ip,
|
|
||||||
)
|
|
||||||
|
|
||||||
par_identifiant, par_ip = (await self._session.execute(requete)).one()
|
|
||||||
return ResetRequestCounts(per_identifier=par_identifiant, per_ip=par_ip)
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
# Piège : `consume()` est une seule instruction, sur le modèle de `claim_for_rotation()` du
|
|
||||||
# jeton de rafraîchissement. Un SELECT puis un UPDATE laisseraient une fenêtre où deux
|
|
||||||
# soumissions concurrentes du même lien réussiraient toutes les deux.
|
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime
|
|
||||||
from uuid import UUID
|
|
||||||
|
|
||||||
from sqlalchemy import func, select, update
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
|
||||||
|
|
||||||
from app.models.password_reset_token import PasswordResetToken
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
|
||||||
class ConsumedResetToken:
|
|
||||||
id: UUID
|
|
||||||
user_id: UUID
|
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetTokenRepository:
|
|
||||||
def __init__(self, session: AsyncSession) -> None:
|
|
||||||
self._session = session
|
|
||||||
|
|
||||||
async def create(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
user_id: UUID,
|
|
||||||
token_hash: bytes,
|
|
||||||
expires_at: datetime,
|
|
||||||
client_ip: str | None,
|
|
||||||
user_agent: str | None,
|
|
||||||
) -> PasswordResetToken:
|
|
||||||
jeton = PasswordResetToken(
|
|
||||||
user_id=user_id,
|
|
||||||
token_hash=token_hash,
|
|
||||||
expires_at=expires_at,
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=user_agent,
|
|
||||||
)
|
|
||||||
self._session.add(jeton)
|
|
||||||
await self._session.flush()
|
|
||||||
return jeton
|
|
||||||
|
|
||||||
async def consume(self, token_hash: bytes) -> ConsumedResetToken | None:
|
|
||||||
requete = (
|
|
||||||
update(PasswordResetToken)
|
|
||||||
.where(
|
|
||||||
PasswordResetToken.token_hash == token_hash,
|
|
||||||
PasswordResetToken.consumed_at.is_(None),
|
|
||||||
PasswordResetToken.expires_at > func.clock_timestamp(),
|
|
||||||
)
|
|
||||||
.values(consumed_at=func.clock_timestamp())
|
|
||||||
.returning(PasswordResetToken.id, PasswordResetToken.user_id)
|
|
||||||
)
|
|
||||||
ligne = (await self._session.execute(requete)).one_or_none()
|
|
||||||
if ligne is None:
|
|
||||||
return None
|
|
||||||
return ConsumedResetToken(id=ligne.id, user_id=ligne.user_id)
|
|
||||||
|
|
||||||
# Piège : simple SELECT, volontairement pas atomique avec la consommation. Sert seulement
|
|
||||||
# au feedback UX (jeton encore valide ?) ; `consume()` reste la seule source de vérité.
|
|
||||||
async def exists_valid(self, token_hash: bytes) -> bool:
|
|
||||||
requete = select(PasswordResetToken.id).where(
|
|
||||||
PasswordResetToken.token_hash == token_hash,
|
|
||||||
PasswordResetToken.consumed_at.is_(None),
|
|
||||||
PasswordResetToken.expires_at > func.clock_timestamp(),
|
|
||||||
)
|
|
||||||
return (await self._session.execute(requete)).first() is not None
|
|
||||||
|
|
||||||
async def invalidate_all_for_user(self, user_id: UUID) -> int:
|
|
||||||
resultat = await self._session.execute(
|
|
||||||
update(PasswordResetToken)
|
|
||||||
.where(PasswordResetToken.user_id == user_id, PasswordResetToken.consumed_at.is_(None))
|
|
||||||
.values(consumed_at=func.clock_timestamp())
|
|
||||||
.returning(PasswordResetToken.id)
|
|
||||||
)
|
|
||||||
return len(resultat.all())
|
|
||||||
@@ -13,14 +13,27 @@ class ReadingRepository:
|
|||||||
|
|
||||||
async def latest_by_site(self) -> Sequence[Reading]:
|
async def latest_by_site(self) -> Sequence[Reading]:
|
||||||
# `.distinct(site_id)` compile en `DISTINCT ON (site_id)` sous PostgreSQL : une seule
|
# `.distinct(site_id)` compile en `DISTINCT ON (site_id)` sous PostgreSQL : une seule
|
||||||
# ligne par site, la plus récente grâce à l'ordre composite qui suit.
|
# ligne par site, la plus récente grâce à l'ordre composite qui suit. `reading_id` départage
|
||||||
|
# les égalités de timestamp, que `uq_reading_source` autorise à `source` différente.
|
||||||
requete = (
|
requete = (
|
||||||
select(Reading)
|
select(Reading)
|
||||||
.distinct(Reading.site_id)
|
.distinct(Reading.site_id)
|
||||||
.order_by(Reading.site_id, Reading.timestamp.desc())
|
.order_by(Reading.site_id, Reading.timestamp.desc(), Reading.reading_id.desc())
|
||||||
)
|
)
|
||||||
return (await self._session.execute(requete)).scalars().all()
|
return (await self._session.execute(requete)).scalars().all()
|
||||||
|
|
||||||
|
async def latest_for_site(self, site_id: str) -> Reading | None:
|
||||||
|
# Piège : `uq_reading_source` autorise deux lignes au même `site_id`+`timestamp` quand la
|
||||||
|
# `source` diffère. Sans `reading_id` en départage, le `LIMIT 1` renverrait au hasard.
|
||||||
|
requete = (
|
||||||
|
select(Reading)
|
||||||
|
.where(Reading.site_id == site_id)
|
||||||
|
.order_by(Reading.timestamp.desc(), Reading.reading_id.desc())
|
||||||
|
.limit(1)
|
||||||
|
)
|
||||||
|
lecture: Reading | None = await self._session.scalar(requete)
|
||||||
|
return lecture
|
||||||
|
|
||||||
async def list_history(
|
async def list_history(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
|
|||||||
@@ -1,45 +1,17 @@
|
|||||||
# Contrainte : le mot de passe est borné à 128 caractères. Sans plafond, une chaîne de dix
|
# Contrainte : le mot de passe est borné à 128 caractères. Sans plafond, une chaîne de dix
|
||||||
# mégaoctets ferait travailler Argon2 gratuitement, à la charge du serveur.
|
# mégaoctets ferait travailler Argon2 gratuitement, à la charge du serveur.
|
||||||
# Contrainte : `SPECIAL_CHARACTERS` doit rester identique à `password.validator.ts` côté
|
|
||||||
# frontend. `\w`/`\d` divergent entre Python (Unicode) et JavaScript (ASCII) : une classe
|
|
||||||
# explicite, plutôt qu'une négation, évite qu'un mot de passe soit accepté d'un côté et
|
|
||||||
# rejeté de l'autre (ex. "Sécurité1", où "é" comptait comme "spécial" pour Python seul).
|
|
||||||
|
|
||||||
import re
|
|
||||||
from typing import Literal, Self
|
from typing import Literal, Self
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, EmailStr, Field, field_validator
|
from pydantic import BaseModel, ConfigDict, EmailStr, Field
|
||||||
|
|
||||||
from app.core.principal import Principal
|
from app.core.principal import Principal
|
||||||
from app.core.roles import AccountKind, Role
|
from app.core.roles import AccountKind, Role
|
||||||
|
|
||||||
PASSWORD_MIN_LENGTH = 8
|
PASSWORD_MIN_LENGTH = 12
|
||||||
PASSWORD_MAX_LENGTH = 128
|
PASSWORD_MAX_LENGTH = 128
|
||||||
|
|
||||||
SPECIAL_CHARACTERS = "!@#$%^&*()-_=+[]{};:,.?"
|
|
||||||
|
|
||||||
_MAJUSCULE = re.compile(r"[A-ZÀ-ÖØ-Þ]")
|
|
||||||
_MINUSCULE = re.compile(r"[a-zà-öø-þ]")
|
|
||||||
_CHIFFRE = re.compile(r"[0-9]")
|
|
||||||
_SPECIAL = re.compile(r"[" + re.escape(SPECIAL_CHARACTERS) + r"]")
|
|
||||||
|
|
||||||
|
|
||||||
def valide_complexite(mot_de_passe: str) -> str:
|
|
||||||
manquants = [
|
|
||||||
nom
|
|
||||||
for nom, motif in (
|
|
||||||
("une majuscule", _MAJUSCULE),
|
|
||||||
("une minuscule", _MINUSCULE),
|
|
||||||
("un chiffre", _CHIFFRE),
|
|
||||||
("un caractère spécial", _SPECIAL),
|
|
||||||
)
|
|
||||||
if not motif.search(mot_de_passe)
|
|
||||||
]
|
|
||||||
if manquants:
|
|
||||||
raise ValueError(f"Le mot de passe doit contenir au moins {', '.join(manquants)}")
|
|
||||||
return mot_de_passe
|
|
||||||
|
|
||||||
|
|
||||||
class LoginRequest(BaseModel):
|
class LoginRequest(BaseModel):
|
||||||
email: EmailStr
|
email: EmailStr
|
||||||
@@ -50,25 +22,6 @@ class PasswordChangeRequest(BaseModel):
|
|||||||
current_password: str = Field(min_length=1, max_length=PASSWORD_MAX_LENGTH)
|
current_password: str = Field(min_length=1, max_length=PASSWORD_MAX_LENGTH)
|
||||||
new_password: str = Field(min_length=PASSWORD_MIN_LENGTH, max_length=PASSWORD_MAX_LENGTH)
|
new_password: str = Field(min_length=PASSWORD_MIN_LENGTH, max_length=PASSWORD_MAX_LENGTH)
|
||||||
|
|
||||||
@field_validator("new_password")
|
|
||||||
@classmethod
|
|
||||||
def _new_password_est_complexe(cls, valeur: str) -> str:
|
|
||||||
return valide_complexite(valeur)
|
|
||||||
|
|
||||||
|
|
||||||
class ForgotPasswordRequest(BaseModel):
|
|
||||||
email: EmailStr
|
|
||||||
|
|
||||||
|
|
||||||
class ResetPasswordRequest(BaseModel):
|
|
||||||
token: str = Field(min_length=1)
|
|
||||||
new_password: str = Field(min_length=PASSWORD_MIN_LENGTH, max_length=PASSWORD_MAX_LENGTH)
|
|
||||||
|
|
||||||
@field_validator("new_password")
|
|
||||||
@classmethod
|
|
||||||
def _new_password_est_complexe(cls, valeur: str) -> str:
|
|
||||||
return valide_complexite(valeur)
|
|
||||||
|
|
||||||
|
|
||||||
class PrincipalResponse(BaseModel):
|
class PrincipalResponse(BaseModel):
|
||||||
model_config = ConfigDict(from_attributes=True)
|
model_config = ConfigDict(from_attributes=True)
|
||||||
@@ -84,10 +37,6 @@ class PrincipalResponse(BaseModel):
|
|||||||
return cls.model_validate(principal)
|
return cls.model_validate(principal)
|
||||||
|
|
||||||
|
|
||||||
class ResetTokenValidationResponse(BaseModel):
|
|
||||||
valid: bool
|
|
||||||
|
|
||||||
|
|
||||||
class TokenResponse(BaseModel):
|
class TokenResponse(BaseModel):
|
||||||
access_token: str
|
access_token: str
|
||||||
token_type: Literal["bearer"] = "bearer" # noqa: S105
|
token_type: Literal["bearer"] = "bearer" # noqa: S105
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
from datetime import datetime
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict
|
from pydantic import BaseModel, ConfigDict
|
||||||
|
|
||||||
|
|
||||||
@@ -10,3 +13,20 @@ class SiteResponse(BaseModel):
|
|||||||
location: str | None
|
location: str | None
|
||||||
capacity_kw: float | None
|
capacity_kw: float | None
|
||||||
status: str | None
|
status: str | None
|
||||||
|
|
||||||
|
|
||||||
|
class SiteCurrentResponse(BaseModel):
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
timestamp: datetime | None
|
||||||
|
site_id: str
|
||||||
|
site_type: str
|
||||||
|
consumption_kw: float | None
|
||||||
|
consumption_kwh: float | None
|
||||||
|
voltage_v: float | None
|
||||||
|
current_a: float | None
|
||||||
|
power_factor: float | None
|
||||||
|
temperature_celsius: float | None
|
||||||
|
humidity_percent: float | None
|
||||||
|
null_reasons: list[str]
|
||||||
|
data_quality: Literal["good", "partial", "degraded", "critical"]
|
||||||
|
|||||||
@@ -14,11 +14,7 @@ from datetime import UTC, datetime, timedelta
|
|||||||
from typing import NoReturn, Protocol
|
from typing import NoReturn, Protocol
|
||||||
from uuid import UUID, uuid4
|
from uuid import UUID, uuid4
|
||||||
|
|
||||||
from fastapi import BackgroundTasks
|
|
||||||
|
|
||||||
from app.core.hashing import Argon2Hasher
|
from app.core.hashing import Argon2Hasher
|
||||||
from app.core.logging import get_logger
|
|
||||||
from app.core.mailer import Mailer
|
|
||||||
from app.core.principal import Principal
|
from app.core.principal import Principal
|
||||||
from app.core.roles import AccountKind, Role
|
from app.core.roles import AccountKind, Role
|
||||||
from app.core.security import (
|
from app.core.security import (
|
||||||
@@ -32,13 +28,9 @@ from app.models.login_attempt import LoginOutcome
|
|||||||
from app.models.refresh_token import RevocationReason
|
from app.models.refresh_token import RevocationReason
|
||||||
from app.repositories.audit_log import AuditLogRepository
|
from app.repositories.audit_log import AuditLogRepository
|
||||||
from app.repositories.login_attempt import LoginAttemptRepository
|
from app.repositories.login_attempt import LoginAttemptRepository
|
||||||
from app.repositories.password_reset_attempt import PasswordResetAttemptRepository
|
|
||||||
from app.repositories.password_reset_token import PasswordResetTokenRepository
|
|
||||||
from app.repositories.refresh_token import RefreshTokenRepository
|
from app.repositories.refresh_token import RefreshTokenRepository
|
||||||
from app.repositories.user import UserRepository
|
from app.repositories.user import UserRepository
|
||||||
|
|
||||||
logger = get_logger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class Transaction(Protocol):
|
class Transaction(Protocol):
|
||||||
async def commit(self) -> None: ...
|
async def commit(self) -> None: ...
|
||||||
@@ -62,10 +54,6 @@ class RateLimitedError(AuthError):
|
|||||||
self.retry_after = retry_after
|
self.retry_after = retry_after
|
||||||
|
|
||||||
|
|
||||||
class InvalidOrExpiredResetTokenError(AuthError):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
@dataclass(frozen=True, slots=True)
|
||||||
class LoginPolicy:
|
class LoginPolicy:
|
||||||
window_seconds: int
|
window_seconds: int
|
||||||
@@ -74,15 +62,6 @@ class LoginPolicy:
|
|||||||
max_failures_per_identifier: int
|
max_failures_per_identifier: int
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
|
||||||
class PasswordResetPolicy:
|
|
||||||
window_seconds: int
|
|
||||||
max_requests_per_identifier: int
|
|
||||||
max_requests_per_ip: int
|
|
||||||
token_ttl: timedelta
|
|
||||||
frontend_reset_url: str
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
@dataclass(frozen=True, slots=True)
|
||||||
class AuthenticatedSession:
|
class AuthenticatedSession:
|
||||||
principal: Principal
|
principal: Principal
|
||||||
@@ -104,10 +83,6 @@ class AuthService:
|
|||||||
token_policy: TokenPolicy,
|
token_policy: TokenPolicy,
|
||||||
login_policy: LoginPolicy,
|
login_policy: LoginPolicy,
|
||||||
refresh_ttl: timedelta,
|
refresh_ttl: timedelta,
|
||||||
reset_tokens: PasswordResetTokenRepository,
|
|
||||||
reset_attempts: PasswordResetAttemptRepository,
|
|
||||||
reset_policy: PasswordResetPolicy,
|
|
||||||
mailer: Mailer,
|
|
||||||
) -> None:
|
) -> None:
|
||||||
self._users = users
|
self._users = users
|
||||||
self._attempts = attempts
|
self._attempts = attempts
|
||||||
@@ -118,10 +93,6 @@ class AuthService:
|
|||||||
self._token_policy = token_policy
|
self._token_policy = token_policy
|
||||||
self._login_policy = login_policy
|
self._login_policy = login_policy
|
||||||
self._refresh_ttl = refresh_ttl
|
self._refresh_ttl = refresh_ttl
|
||||||
self._reset_tokens = reset_tokens
|
|
||||||
self._reset_attempts = reset_attempts
|
|
||||||
self._reset_policy = reset_policy
|
|
||||||
self._mailer = mailer
|
|
||||||
|
|
||||||
async def authenticate(
|
async def authenticate(
|
||||||
self, *, email: str, password: str, client_ip: str | None, user_agent: str | None
|
self, *, email: str, password: str, client_ip: str | None, user_agent: str | None
|
||||||
@@ -229,102 +200,6 @@ class AuthService:
|
|||||||
rafraichi = await self._users.get_by_id(principal.id)
|
rafraichi = await self._users.get_by_id(principal.id)
|
||||||
return self._session(self._en_principal(rafraichi or compte), secret)
|
return self._session(self._en_principal(rafraichi or compte), secret)
|
||||||
|
|
||||||
async def request_password_reset(
|
|
||||||
self,
|
|
||||||
*,
|
|
||||||
email: str,
|
|
||||||
client_ip: str | None,
|
|
||||||
user_agent: str | None,
|
|
||||||
background_tasks: BackgroundTasks,
|
|
||||||
) -> None:
|
|
||||||
await self._refuse_si_limite_reset(email=email, client_ip=client_ip)
|
|
||||||
|
|
||||||
compte = await self._users.get_by_email(email)
|
|
||||||
# Piège : le hachage factice équilibre le temps de réponse sur un compte inconnu, comme
|
|
||||||
# `authenticate()`. La réponse et sa forme restent identiques dans tous les cas : compte
|
|
||||||
# inconnu, compte inactif, ou email envoyé avec succès. L'envoi SMTP lui-même est différé
|
|
||||||
# en tâche de fond : le laisser dans le chemin de réponse rouvrirait le même oracle par le
|
|
||||||
# temps (aller-retour réseau) et par la forme (500 si le relais SMTP échoue, contre 202).
|
|
||||||
if compte is None or not compte.is_active or compte.kind != AccountKind.HUMAIN.value:
|
|
||||||
await self._hasher.verify_dummy()
|
|
||||||
await self._reset_attempts.record(email=email, client_ip=client_ip)
|
|
||||||
await self._transaction.commit()
|
|
||||||
return
|
|
||||||
|
|
||||||
await self._reset_tokens.invalidate_all_for_user(compte.id)
|
|
||||||
secret = generate_refresh_secret()
|
|
||||||
await self._reset_tokens.create(
|
|
||||||
user_id=compte.id,
|
|
||||||
token_hash=fingerprint_refresh(secret),
|
|
||||||
expires_at=datetime.now(UTC) + self._reset_policy.token_ttl,
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=user_agent,
|
|
||||||
)
|
|
||||||
await self._reset_attempts.record(email=email, client_ip=client_ip)
|
|
||||||
await self._audit.record(
|
|
||||||
action=AuditAction.MOT_DE_PASSE_OUBLIE_DEMANDE,
|
|
||||||
actor_label=compte.email,
|
|
||||||
target_type="app_user",
|
|
||||||
target_id=str(compte.id),
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=user_agent,
|
|
||||||
)
|
|
||||||
await self._transaction.commit()
|
|
||||||
|
|
||||||
lien = f"{self._reset_policy.frontend_reset_url}?token={secret}"
|
|
||||||
background_tasks.add_task(self._envoie_email_reset, compte.email, lien)
|
|
||||||
|
|
||||||
async def _envoie_email_reset(self, email: str, reset_url: str) -> None:
|
|
||||||
try:
|
|
||||||
await self._mailer.send_password_reset_email(to=email, reset_url=reset_url)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("auth.password_reset.mail_failed")
|
|
||||||
|
|
||||||
# Piège : lecture seule, pas d'appel à `consume()`. Aucune limitation de débit n'est
|
|
||||||
# nécessaire ici : le jeton est un secret de 256 bits (`generate_refresh_secret`), donc
|
|
||||||
# non brute-forçable, et cette route n'apprend rien sur l'existence d'un compte ou d'un
|
|
||||||
# email, seulement si le lien déjà en main du visiteur est encore valide.
|
|
||||||
async def is_reset_token_valid(self, token: str) -> bool:
|
|
||||||
return await self._reset_tokens.exists_valid(fingerprint_refresh(token))
|
|
||||||
|
|
||||||
async def confirm_password_reset(
|
|
||||||
self, *, token: str, new_password: str, client_ip: str | None, user_agent: str | None
|
|
||||||
) -> AuthenticatedSession:
|
|
||||||
revendique = await self._reset_tokens.consume(fingerprint_refresh(token))
|
|
||||||
if revendique is None:
|
|
||||||
raise InvalidOrExpiredResetTokenError("Lien invalide ou expiré")
|
|
||||||
|
|
||||||
# Piège : le jeton peut avoir été émis avant une désactivation du compte. Sans cette
|
|
||||||
# relecture, un lien encore valide (15 min) changerait quand même le mot de passe d'un
|
|
||||||
# compte désactivé, réutilisable dès sa réactivation.
|
|
||||||
compte = await self._users.get_by_id(revendique.user_id)
|
|
||||||
if compte is None or not compte.is_active or compte.kind != AccountKind.HUMAIN.value:
|
|
||||||
raise InvalidOrExpiredResetTokenError("Lien invalide ou expiré")
|
|
||||||
|
|
||||||
await self._users.update_password(
|
|
||||||
revendique.user_id, await self._hasher.hash(new_password), must_change_password=False
|
|
||||||
)
|
|
||||||
revoquees = await self._refresh.revoke_all_for_user(
|
|
||||||
revendique.user_id, RevocationReason.CHANGEMENT_MOT_DE_PASSE
|
|
||||||
)
|
|
||||||
secret = await self._ouvre_une_famille(
|
|
||||||
user_id=revendique.user_id, client_ip=client_ip, user_agent=user_agent
|
|
||||||
)
|
|
||||||
await self._audit.record(
|
|
||||||
action=AuditAction.MOT_DE_PASSE_REINITIALISE_PAR_SOI,
|
|
||||||
target_type="app_user",
|
|
||||||
target_id=str(revendique.user_id),
|
|
||||||
client_ip=client_ip,
|
|
||||||
user_agent=user_agent,
|
|
||||||
detail={"sessions_revoquees": revoquees},
|
|
||||||
)
|
|
||||||
await self._transaction.commit()
|
|
||||||
|
|
||||||
compte = await self._users.get_by_id(revendique.user_id)
|
|
||||||
if compte is None:
|
|
||||||
raise SessionRejectedError("Compte introuvable")
|
|
||||||
return self._session(self._en_principal(compte), secret)
|
|
||||||
|
|
||||||
async def logout_all(self, principal: Principal) -> int:
|
async def logout_all(self, principal: Principal) -> int:
|
||||||
revoquees = await self._refresh.revoke_all_for_user(
|
revoquees = await self._refresh.revoke_all_for_user(
|
||||||
principal.id, RevocationReason.DECONNEXION
|
principal.id, RevocationReason.DECONNEXION
|
||||||
@@ -432,23 +307,6 @@ class AuthService:
|
|||||||
await self._transaction.commit()
|
await self._transaction.commit()
|
||||||
raise RateLimitedError(politique.window_seconds)
|
raise RateLimitedError(politique.window_seconds)
|
||||||
|
|
||||||
async def _refuse_si_limite_reset(self, *, email: str, client_ip: str | None) -> None:
|
|
||||||
politique = self._reset_policy
|
|
||||||
compteurs = await self._reset_attempts.count_recent(
|
|
||||||
email=email, client_ip=client_ip, window_seconds=politique.window_seconds
|
|
||||||
)
|
|
||||||
|
|
||||||
depasse = (
|
|
||||||
compteurs.per_identifier >= politique.max_requests_per_identifier
|
|
||||||
or compteurs.per_ip >= politique.max_requests_per_ip
|
|
||||||
)
|
|
||||||
if not depasse:
|
|
||||||
return
|
|
||||||
|
|
||||||
await self._reset_attempts.record(email=email, client_ip=client_ip)
|
|
||||||
await self._transaction.commit()
|
|
||||||
raise RateLimitedError(politique.window_seconds)
|
|
||||||
|
|
||||||
async def _echoue(
|
async def _echoue(
|
||||||
self,
|
self,
|
||||||
email: str,
|
email: str,
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Contrainte : `ck_reading_quality` accepte NULL et quatre valeurs seulement, alors que le contrat
|
||||||
|
# frontend n'a aucune valeur pour l'absence de qualité. `qualite_ou_critique()` replie donc sur
|
||||||
|
# `critical`, la seule des quatre qui n'induise pas une confiance qu'on n'a pas. `QUALITES_CONNUES`
|
||||||
|
# reste exposé pour les appelants qui doivent distinguer un `critical` stocké d'un repli.
|
||||||
|
|
||||||
|
from typing import Literal, get_args
|
||||||
|
|
||||||
|
DataQuality = Literal["good", "partial", "degraded", "critical"]
|
||||||
|
|
||||||
|
QUALITES_CONNUES: frozenset[str] = frozenset(get_args(DataQuality))
|
||||||
|
|
||||||
|
_PAR_VALEUR: dict[str, DataQuality] = {valeur: valeur for valeur in get_args(DataQuality)}
|
||||||
|
|
||||||
|
|
||||||
|
def qualite_ou_critique(valeur: str | None) -> DataQuality:
|
||||||
|
if valeur is None:
|
||||||
|
return "critical"
|
||||||
|
return _PAR_VALEUR.get(valeur, "critical")
|
||||||
@@ -5,12 +5,11 @@ from typing import Literal
|
|||||||
from app.models.energy import Reading, Site
|
from app.models.energy import Reading, Site
|
||||||
from app.repositories.reading import ReadingRepository
|
from app.repositories.reading import ReadingRepository
|
||||||
from app.repositories.site import SiteRepository
|
from app.repositories.site import SiteRepository
|
||||||
|
from app.services.data_quality import qualite_ou_critique
|
||||||
|
|
||||||
CapteurStatus = Literal["ok", "failing"]
|
CapteurStatus = Literal["ok", "failing"]
|
||||||
OverallStatus = Literal["ok", "degraded", "critical"]
|
OverallStatus = Literal["ok", "degraded", "critical"]
|
||||||
|
|
||||||
QUALITES_CONNUES: frozenset[str] = frozenset({"good", "partial", "degraded", "critical"})
|
|
||||||
|
|
||||||
RAISON_VERS_CAPTEUR: dict[str, str] = {
|
RAISON_VERS_CAPTEUR: dict[str, str] = {
|
||||||
"consumption_sensor_failure": "consumption",
|
"consumption_sensor_failure": "consumption",
|
||||||
"electrical_sensor_failure": "electrical",
|
"electrical_sensor_failure": "electrical",
|
||||||
@@ -80,7 +79,7 @@ def _sante_site(site: Site, derniere: Reading | None) -> SanteSite:
|
|||||||
overall="critical",
|
overall="critical",
|
||||||
)
|
)
|
||||||
|
|
||||||
qualite = derniere.data_quality if derniere.data_quality in QUALITES_CONNUES else "critical"
|
qualite = qualite_ou_critique(derniere.data_quality)
|
||||||
overall = _overall_depuis_qualite(qualite)
|
overall = _overall_depuis_qualite(qualite)
|
||||||
|
|
||||||
if overall == "critical":
|
if overall == "critical":
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
from collections.abc import Sequence
|
from collections.abc import Sequence
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
from app.models.energy import Site
|
from app.models.energy import Site
|
||||||
|
from app.repositories.reading import ReadingRepository
|
||||||
from app.repositories.site import SiteRepository
|
from app.repositories.site import SiteRepository
|
||||||
|
from app.services.data_quality import DataQuality, qualite_ou_critique
|
||||||
|
|
||||||
|
|
||||||
class SiteError(Exception):
|
class SiteError(Exception):
|
||||||
@@ -12,9 +16,26 @@ class SiteNotFoundError(SiteError):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True, slots=True)
|
||||||
|
class SiteCurrentReading:
|
||||||
|
timestamp: datetime | None
|
||||||
|
site_id: str
|
||||||
|
site_type: str
|
||||||
|
consumption_kw: float | None
|
||||||
|
consumption_kwh: float | None
|
||||||
|
voltage_v: float | None
|
||||||
|
current_a: float | None
|
||||||
|
power_factor: float | None
|
||||||
|
temperature_celsius: float | None
|
||||||
|
humidity_percent: float | None
|
||||||
|
null_reasons: list[str]
|
||||||
|
data_quality: DataQuality
|
||||||
|
|
||||||
|
|
||||||
class SiteService:
|
class SiteService:
|
||||||
def __init__(self, *, sites: SiteRepository) -> None:
|
def __init__(self, *, sites: SiteRepository, readings: ReadingRepository) -> None:
|
||||||
self._sites = sites
|
self._sites = sites
|
||||||
|
self._readings = readings
|
||||||
|
|
||||||
async def list_all(self) -> Sequence[Site]:
|
async def list_all(self) -> Sequence[Site]:
|
||||||
return await self._sites.list_all()
|
return await self._sites.list_all()
|
||||||
@@ -24,3 +45,38 @@ class SiteService:
|
|||||||
if site is None:
|
if site is None:
|
||||||
raise SiteNotFoundError(site_id)
|
raise SiteNotFoundError(site_id)
|
||||||
return site
|
return site
|
||||||
|
|
||||||
|
async def current(self, site_id: str) -> SiteCurrentReading:
|
||||||
|
site = await self.get_by_id(site_id)
|
||||||
|
derniere = await self._readings.latest_for_site(site_id)
|
||||||
|
|
||||||
|
if derniere is None:
|
||||||
|
return SiteCurrentReading(
|
||||||
|
timestamp=None,
|
||||||
|
site_id=site.site_id,
|
||||||
|
site_type=site.site_type,
|
||||||
|
consumption_kw=None,
|
||||||
|
consumption_kwh=None,
|
||||||
|
voltage_v=None,
|
||||||
|
current_a=None,
|
||||||
|
power_factor=None,
|
||||||
|
temperature_celsius=None,
|
||||||
|
humidity_percent=None,
|
||||||
|
null_reasons=[],
|
||||||
|
data_quality="critical",
|
||||||
|
)
|
||||||
|
|
||||||
|
return SiteCurrentReading(
|
||||||
|
timestamp=derniere.timestamp,
|
||||||
|
site_id=site.site_id,
|
||||||
|
site_type=site.site_type,
|
||||||
|
consumption_kw=derniere.consumption_kw,
|
||||||
|
consumption_kwh=derniere.consumption_kwh,
|
||||||
|
voltage_v=derniere.voltage_v,
|
||||||
|
current_a=derniere.current_a,
|
||||||
|
power_factor=derniere.power_factor,
|
||||||
|
temperature_celsius=derniere.temperature_celsius,
|
||||||
|
humidity_percent=derniere.humidity_percent,
|
||||||
|
null_reasons=derniere.null_reasons or [],
|
||||||
|
data_quality=qualite_ou_critique(derniere.data_quality),
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from datetime import UTC, datetime
|
from datetime import UTC, datetime
|
||||||
from typing import Literal
|
|
||||||
|
|
||||||
from app.models.energy import Reading, Site
|
from app.models.energy import Reading, Site
|
||||||
from app.repositories.reading import ReadingRepository
|
from app.repositories.reading import ReadingRepository
|
||||||
from app.repositories.site import SiteRepository
|
from app.repositories.site import SiteRepository
|
||||||
|
from app.services.data_quality import QUALITES_CONNUES, DataQuality, qualite_ou_critique
|
||||||
DataQuality = Literal["good", "partial", "degraded", "critical"]
|
|
||||||
|
|
||||||
QUALITES_CONNUES: frozenset[str] = frozenset({"good", "partial", "degraded", "critical"})
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True, slots=True)
|
@dataclass(frozen=True, slots=True)
|
||||||
@@ -58,13 +54,10 @@ class StatsService:
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def _resume_site(site: Site, derniere: Reading | None) -> SiteConsumption:
|
def _resume_site(site: Site, derniere: Reading | None) -> SiteConsumption:
|
||||||
capacite = site.capacity_kw or 0
|
capacite = site.capacity_kw or 0
|
||||||
# Piège : `data_quality` est nul dès qu'un site n'a jamais reçu de lecture, ou que le
|
|
||||||
# producteur n'a pas su la qualifier. Le contrat frontend n'a pas de valeur pour ce cas,
|
|
||||||
# `critical` est la seule des quatre qui n'induit pas une confiance qu'on n'a pas.
|
|
||||||
qualite: DataQuality = "critical"
|
qualite: DataQuality = "critical"
|
||||||
consommation = None
|
consommation = None
|
||||||
if derniere is not None and derniere.data_quality in QUALITES_CONNUES:
|
if derniere is not None and derniere.data_quality in QUALITES_CONNUES:
|
||||||
qualite = derniere.data_quality # type: ignore[assignment]
|
qualite = qualite_ou_critique(derniere.data_quality)
|
||||||
consommation = derniere.consumption_kw
|
consommation = derniere.consumption_kw
|
||||||
|
|
||||||
charge = (
|
charge = (
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
+223
-244
@@ -4,11 +4,7 @@
|
|||||||
"title": "EnerVision API",
|
"title": "EnerVision API",
|
||||||
"summary": "Collecte, analyse et restitution de séries temporelles énergétiques.",
|
"summary": "Collecte, analyse et restitution de séries temporelles énergétiques.",
|
||||||
"description": "\nToutes les routes sont préfixées par `/api/v1`.\n\n**Authentification.** Le jeton d'accès se présente dans l'en-tête `Authorization: Bearer ...`.\nLe jeton de rafraîchissement est un cookie `HttpOnly` que le code client ne voit jamais : il\nsuffit d'émettre les requêtes avec les identifiants de session. `POST /auth/refresh` rend un\nnouveau jeton d'accès et fait tourner le cookie.\n\n**Rôles.** `lecteur`, puis `operateur`, puis `admin`. Chaque rôle couvre les droits du\nprécédent.\n\n**Erreurs.** Le corps porte toujours une clé `detail`. Un `403` dont le `detail` vaut\n`password_change_required` n'est pas un refus de droits : il exige le changement du mot de passe\nprovisoire avant toute autre action.\n\nLe parcours de session complet est décrit dans\n`docs/architecture/31-contrat-authentification.md`.\n",
|
"description": "\nToutes les routes sont préfixées par `/api/v1`.\n\n**Authentification.** Le jeton d'accès se présente dans l'en-tête `Authorization: Bearer ...`.\nLe jeton de rafraîchissement est un cookie `HttpOnly` que le code client ne voit jamais : il\nsuffit d'émettre les requêtes avec les identifiants de session. `POST /auth/refresh` rend un\nnouveau jeton d'accès et fait tourner le cookie.\n\n**Rôles.** `lecteur`, puis `operateur`, puis `admin`. Chaque rôle couvre les droits du\nprécédent.\n\n**Erreurs.** Le corps porte toujours une clé `detail`. Un `403` dont le `detail` vaut\n`password_change_required` n'est pas un refus de droits : il exige le changement du mot de passe\nprovisoire avant toute autre action.\n\nLe parcours de session complet est décrit dans\n`docs/architecture/31-contrat-authentification.md`.\n",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0"
|
||||||
"x-logo": {
|
|
||||||
"url": "/static/logo-icon.png",
|
|
||||||
"altText": "EnerVision"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"paths": {
|
"paths": {
|
||||||
"/api/v1/health/live": {
|
"/api/v1/health/live": {
|
||||||
@@ -428,196 +424,6 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"/api/v1/auth/forgot-password": {
|
|
||||||
"post": {
|
|
||||||
"tags": [
|
|
||||||
"auth"
|
|
||||||
],
|
|
||||||
"summary": "Demande un lien de réinitialisation par email",
|
|
||||||
"operationId": "forgot_password_api_v1_auth_forgot_password_post",
|
|
||||||
"requestBody": {
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ForgotPasswordRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
"responses": {
|
|
||||||
"202": {
|
|
||||||
"description": "Successful Response",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Erreur interne. `correlation` identifie la trace côté serveur, qui n'est pas renvoyée au client.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/InternalErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"422": {
|
|
||||||
"description": "Corps invalide. Le détail nomme le champ fautif et le type d'erreur, jamais la valeur envoyée.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ValidationErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"429": {
|
|
||||||
"description": "Trop de demandes sur cette fenêtre glissante.",
|
|
||||||
"headers": {
|
|
||||||
"Retry-After": {
|
|
||||||
"description": "Secondes à attendre avant une nouvelle tentative.",
|
|
||||||
"schema": {
|
|
||||||
"type": "integer"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/v1/auth/reset-password/validate": {
|
|
||||||
"get": {
|
|
||||||
"tags": [
|
|
||||||
"auth"
|
|
||||||
],
|
|
||||||
"summary": "Vérifie sans le consommer si un lien de réinitialisation est encore valide",
|
|
||||||
"operationId": "validate_reset_token_api_v1_auth_reset_password_validate_get",
|
|
||||||
"parameters": [
|
|
||||||
{
|
|
||||||
"name": "token",
|
|
||||||
"in": "query",
|
|
||||||
"required": true,
|
|
||||||
"schema": {
|
|
||||||
"type": "string",
|
|
||||||
"title": "Token"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "Successful Response",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ResetTokenValidationResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Erreur interne. `correlation` identifie la trace côté serveur, qui n'est pas renvoyée au client.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/InternalErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"422": {
|
|
||||||
"description": "Corps invalide. Le détail nomme le champ fautif et le type d'erreur, jamais la valeur envoyée.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ValidationErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/v1/auth/reset-password": {
|
|
||||||
"post": {
|
|
||||||
"tags": [
|
|
||||||
"auth"
|
|
||||||
],
|
|
||||||
"summary": "Choisit un nouveau mot de passe depuis un lien reçu par email",
|
|
||||||
"operationId": "reset_password_api_v1_auth_reset_password_post",
|
|
||||||
"requestBody": {
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ResetPasswordRequest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"required": true
|
|
||||||
},
|
|
||||||
"responses": {
|
|
||||||
"200": {
|
|
||||||
"description": "Successful Response",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/TokenResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"500": {
|
|
||||||
"description": "Erreur interne. `correlation` identifie la trace côté serveur, qui n'est pas renvoyée au client.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/InternalErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"422": {
|
|
||||||
"description": "Corps invalide. Le détail nomme le champ fautif et le type d'erreur, jamais la valeur envoyée.",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ValidationErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"403": {
|
|
||||||
"description": "Origine non autorisée (protection CSRF de `require_trusted_origin`).",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"400": {
|
|
||||||
"description": "Lien invalide, déjà utilisé, ou expiré (durée de vie : 15 minutes).",
|
|
||||||
"content": {
|
|
||||||
"application/json": {
|
|
||||||
"schema": {
|
|
||||||
"$ref": "#/components/schemas/ErrorResponse"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"/api/v1/users": {
|
"/api/v1/users": {
|
||||||
"get": {
|
"get": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@@ -1115,6 +921,93 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/api/v1/sites/{site_id}/current": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"sites"
|
||||||
|
],
|
||||||
|
"summary": "Dernière mesure d'un site",
|
||||||
|
"operationId": "get_current_api_v1_sites__site_id__current_get",
|
||||||
|
"security": [
|
||||||
|
{
|
||||||
|
"Jeton d'accès": []
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "site_id",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "Site Id"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful Response",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/SiteCurrentResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"500": {
|
||||||
|
"description": "Erreur interne. `correlation` identifie la trace côté serveur, qui n'est pas renvoyée au client.",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/InternalErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"401": {
|
||||||
|
"description": "Jeton absent, illisible, périmé, ou rendu caduc par un changement de rôle ou une désactivation. L'en-tête `WWW-Authenticate` porte la cause dans `error=`.",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"403": {
|
||||||
|
"description": "Mot de passe provisoire à changer (`detail` vaut `password_change_required`).",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"422": {
|
||||||
|
"description": "Corps invalide. Le détail nomme le champ fautif et le type d'erreur, jamais la valeur envoyée.",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ValidationErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"404": {
|
||||||
|
"description": "Aucun site ne porte cet identifiant.",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/ErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/api/v1/alerts": {
|
"/api/v1/alerts": {
|
||||||
"get": {
|
"get": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@@ -1781,20 +1674,6 @@
|
|||||||
],
|
],
|
||||||
"title": "FieldError"
|
"title": "FieldError"
|
||||||
},
|
},
|
||||||
"ForgotPasswordRequest": {
|
|
||||||
"properties": {
|
|
||||||
"email": {
|
|
||||||
"type": "string",
|
|
||||||
"format": "email",
|
|
||||||
"title": "Email"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "object",
|
|
||||||
"required": [
|
|
||||||
"email"
|
|
||||||
],
|
|
||||||
"title": "ForgotPasswordRequest"
|
|
||||||
},
|
|
||||||
"InternalErrorResponse": {
|
"InternalErrorResponse": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"detail": {
|
"detail": {
|
||||||
@@ -1874,7 +1753,7 @@
|
|||||||
"new_password": {
|
"new_password": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"maxLength": 128,
|
"maxLength": 128,
|
||||||
"minLength": 8,
|
"minLength": 12,
|
||||||
"title": "New Password"
|
"title": "New Password"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2201,40 +2080,6 @@
|
|||||||
],
|
],
|
||||||
"title": "RecommendationResponse"
|
"title": "RecommendationResponse"
|
||||||
},
|
},
|
||||||
"ResetPasswordRequest": {
|
|
||||||
"properties": {
|
|
||||||
"token": {
|
|
||||||
"type": "string",
|
|
||||||
"minLength": 1,
|
|
||||||
"title": "Token"
|
|
||||||
},
|
|
||||||
"new_password": {
|
|
||||||
"type": "string",
|
|
||||||
"maxLength": 128,
|
|
||||||
"minLength": 8,
|
|
||||||
"title": "New Password"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "object",
|
|
||||||
"required": [
|
|
||||||
"token",
|
|
||||||
"new_password"
|
|
||||||
],
|
|
||||||
"title": "ResetPasswordRequest"
|
|
||||||
},
|
|
||||||
"ResetTokenValidationResponse": {
|
|
||||||
"properties": {
|
|
||||||
"valid": {
|
|
||||||
"type": "boolean",
|
|
||||||
"title": "Valid"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"type": "object",
|
|
||||||
"required": [
|
|
||||||
"valid"
|
|
||||||
],
|
|
||||||
"title": "ResetTokenValidationResponse"
|
|
||||||
},
|
|
||||||
"Role": {
|
"Role": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"enum": [
|
"enum": [
|
||||||
@@ -2297,6 +2142,140 @@
|
|||||||
],
|
],
|
||||||
"title": "SensorStatusResponse"
|
"title": "SensorStatusResponse"
|
||||||
},
|
},
|
||||||
|
"SiteCurrentResponse": {
|
||||||
|
"properties": {
|
||||||
|
"timestamp": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "string",
|
||||||
|
"format": "date-time"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Timestamp"
|
||||||
|
},
|
||||||
|
"site_id": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "Site Id"
|
||||||
|
},
|
||||||
|
"site_type": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "Site Type"
|
||||||
|
},
|
||||||
|
"consumption_kw": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Consumption Kw"
|
||||||
|
},
|
||||||
|
"consumption_kwh": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Consumption Kwh"
|
||||||
|
},
|
||||||
|
"voltage_v": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Voltage V"
|
||||||
|
},
|
||||||
|
"current_a": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Current A"
|
||||||
|
},
|
||||||
|
"power_factor": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Power Factor"
|
||||||
|
},
|
||||||
|
"temperature_celsius": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Temperature Celsius"
|
||||||
|
},
|
||||||
|
"humidity_percent": {
|
||||||
|
"anyOf": [
|
||||||
|
{
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "null"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Humidity Percent"
|
||||||
|
},
|
||||||
|
"null_reasons": {
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"type": "array",
|
||||||
|
"title": "Null Reasons"
|
||||||
|
},
|
||||||
|
"data_quality": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"good",
|
||||||
|
"partial",
|
||||||
|
"degraded",
|
||||||
|
"critical"
|
||||||
|
],
|
||||||
|
"title": "Data Quality"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"timestamp",
|
||||||
|
"site_id",
|
||||||
|
"site_type",
|
||||||
|
"consumption_kw",
|
||||||
|
"consumption_kwh",
|
||||||
|
"voltage_v",
|
||||||
|
"current_a",
|
||||||
|
"power_factor",
|
||||||
|
"temperature_celsius",
|
||||||
|
"humidity_percent",
|
||||||
|
"null_reasons",
|
||||||
|
"data_quality"
|
||||||
|
],
|
||||||
|
"title": "SiteCurrentResponse"
|
||||||
|
},
|
||||||
"SiteResponse": {
|
"SiteResponse": {
|
||||||
"properties": {
|
"properties": {
|
||||||
"site_id": {
|
"site_id": {
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ dependencies = [
|
|||||||
"pyjwt>=2.10",
|
"pyjwt>=2.10",
|
||||||
"argon2-cffi>=23.1",
|
"argon2-cffi>=23.1",
|
||||||
"anyio>=4.0",
|
"anyio>=4.0",
|
||||||
"aiosmtplib>=5.1.3",
|
|
||||||
"pandas>=3.0.5",
|
"pandas>=3.0.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ from app.core.roles import AccountKind, Role
|
|||||||
from app.services.auth import (
|
from app.services.auth import (
|
||||||
AuthenticatedSession,
|
AuthenticatedSession,
|
||||||
InvalidCredentialsError,
|
InvalidCredentialsError,
|
||||||
InvalidOrExpiredResetTokenError,
|
|
||||||
RateLimitedError,
|
RateLimitedError,
|
||||||
SessionRejectedError,
|
SessionRejectedError,
|
||||||
)
|
)
|
||||||
@@ -28,27 +27,15 @@ PRINCIPAL = Principal(
|
|||||||
|
|
||||||
|
|
||||||
class FauxService:
|
class FauxService:
|
||||||
def __init__(self, erreur: Exception | None = None, *, jeton_valide: bool = True) -> None:
|
def __init__(self, erreur: Exception | None = None) -> None:
|
||||||
self._erreur = erreur
|
self._erreur = erreur
|
||||||
self._jeton_valide = jeton_valide
|
|
||||||
|
|
||||||
async def refresh(self, **_: object) -> AuthenticatedSession:
|
async def refresh(self, **_: object) -> AuthenticatedSession:
|
||||||
return await self.authenticate()
|
return await self.authenticate()
|
||||||
|
|
||||||
async def is_reset_token_valid(self, **_: object) -> bool:
|
|
||||||
return self._jeton_valide
|
|
||||||
|
|
||||||
async def logout(self, **_: object) -> None:
|
async def logout(self, **_: object) -> None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
async def request_password_reset(self, **_: object) -> None:
|
|
||||||
if self._erreur is not None:
|
|
||||||
raise self._erreur
|
|
||||||
return None
|
|
||||||
|
|
||||||
async def confirm_password_reset(self, **_: object) -> AuthenticatedSession:
|
|
||||||
return await self.authenticate()
|
|
||||||
|
|
||||||
async def authenticate(self, **_: object) -> AuthenticatedSession:
|
async def authenticate(self, **_: object) -> AuthenticatedSession:
|
||||||
if self._erreur is not None:
|
if self._erreur is not None:
|
||||||
raise self._erreur
|
raise self._erreur
|
||||||
@@ -219,126 +206,3 @@ async def test_a_cookie_bearing_route_accepts_a_request_without_origin(
|
|||||||
response = await client.post("/api/v1/auth/logout")
|
response = await client.post("/api/v1/auth/logout")
|
||||||
|
|
||||||
assert response.status_code != 403
|
assert response.status_code != 403
|
||||||
|
|
||||||
|
|
||||||
async def test_forgot_password_answers_202_when_the_account_exists(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/forgot-password", json={"email": "operateur@enervision.fr"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 202
|
|
||||||
assert response.headers["cache-control"] == "no-store"
|
|
||||||
|
|
||||||
|
|
||||||
async def test_forgot_password_answers_202_identically_when_the_account_is_unknown(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/forgot-password", json={"email": "inconnu@enervision.fr"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 202
|
|
||||||
|
|
||||||
|
|
||||||
async def test_forgot_password_returns_429_with_a_retry_after_when_the_rate_limit_is_reached(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
fake_auth_service[0] = RateLimitedError(900)
|
|
||||||
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/forgot-password", json={"email": "operateur@enervision.fr"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 429
|
|
||||||
assert response.headers["retry-after"] == "900"
|
|
||||||
|
|
||||||
|
|
||||||
async def test_forgot_password_rejects_a_malformed_email(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post("/api/v1/auth/forgot-password", json={"email": "pas-un-email"})
|
|
||||||
|
|
||||||
assert response.status_code == 422
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def fake_auth_service_reset_validity(app: FastAPI) -> Iterator[list[bool]]:
|
|
||||||
programme = [True]
|
|
||||||
app.dependency_overrides[get_auth_service] = lambda: FauxService(jeton_valide=programme[0])
|
|
||||||
yield programme
|
|
||||||
app.dependency_overrides.pop(get_auth_service, None)
|
|
||||||
|
|
||||||
|
|
||||||
async def test_validate_reset_token_reports_a_living_token(
|
|
||||||
fake_auth_service_reset_validity: list[bool], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.get(
|
|
||||||
"/api/v1/auth/reset-password/validate", params={"token": "un-secret-opaque"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.json() == {"valid": True}
|
|
||||||
|
|
||||||
|
|
||||||
async def test_validate_reset_token_reports_an_invalid_or_expired_token(
|
|
||||||
fake_auth_service_reset_validity: list[bool], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
fake_auth_service_reset_validity[0] = False
|
|
||||||
|
|
||||||
response = await client.get(
|
|
||||||
"/api/v1/auth/reset-password/validate", params={"token": "un-secret-perime"}
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.json() == {"valid": False}
|
|
||||||
|
|
||||||
|
|
||||||
async def test_reset_password_returns_the_token_and_the_cookie_on_success(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/reset-password",
|
|
||||||
json={"token": "un-secret-opaque", "new_password": "Un-nouveau-mot-de-passe1!"},
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.cookies.get("ev_refresh") is not None
|
|
||||||
assert "refresh_secret" not in response.text
|
|
||||||
|
|
||||||
|
|
||||||
async def test_reset_password_rejects_an_invalid_or_expired_token(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
fake_auth_service[0] = InvalidOrExpiredResetTokenError("Lien invalide ou expiré")
|
|
||||||
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/reset-password",
|
|
||||||
json={"token": "un-secret-perime", "new_password": "Un-nouveau-mot-de-passe1!"},
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 400
|
|
||||||
|
|
||||||
|
|
||||||
async def test_reset_password_rejects_a_weak_password(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/reset-password",
|
|
||||||
json={"token": "un-secret-opaque", "new_password": "trop-simple"},
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 422
|
|
||||||
|
|
||||||
|
|
||||||
async def test_reset_password_refuses_a_foreign_origin(
|
|
||||||
fake_auth_service: list[Exception | None], client: AsyncClient
|
|
||||||
) -> None:
|
|
||||||
response = await client.post(
|
|
||||||
"/api/v1/auth/reset-password",
|
|
||||||
json={"token": "un-secret-opaque", "new_password": "Un-nouveau-mot-de-passe1!"},
|
|
||||||
headers={"Origin": "https://malveillant.example"},
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 403
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ ROUTES_A_ROLE = {
|
|||||||
("POST", "/api/v1/users/{id}/password-reset"),
|
("POST", "/api/v1/users/{id}/password-reset"),
|
||||||
("GET", "/api/v1/sites"),
|
("GET", "/api/v1/sites"),
|
||||||
("GET", "/api/v1/sites/{site_id}"),
|
("GET", "/api/v1/sites/{site_id}"),
|
||||||
|
("GET", "/api/v1/sites/{site_id}/current"),
|
||||||
("GET", "/api/v1/alerts"),
|
("GET", "/api/v1/alerts"),
|
||||||
("GET", "/api/v1/recommendations"),
|
("GET", "/api/v1/recommendations"),
|
||||||
("GET", "/api/v1/recommendations/{recommendation_id}"),
|
("GET", "/api/v1/recommendations/{recommendation_id}"),
|
||||||
|
|||||||
@@ -18,13 +18,6 @@ ROUTES_PUBLIQUES = frozenset(
|
|||||||
("POST", "/api/v1/auth/login"),
|
("POST", "/api/v1/auth/login"),
|
||||||
# Sans cookie, la déconnexion ne fait rien et répond 204 : elle est idempotente.
|
# Sans cookie, la déconnexion ne fait rien et répond 204 : elle est idempotente.
|
||||||
("POST", "/api/v1/auth/logout"),
|
("POST", "/api/v1/auth/logout"),
|
||||||
("POST", "/api/v1/auth/forgot-password"),
|
|
||||||
# Protégée par le jeton dans le corps de la requête, pas par un `Principal` : aucune
|
|
||||||
# authentification préalable ne s'applique, c'est la validité du jeton qui tranche.
|
|
||||||
("POST", "/api/v1/auth/reset-password"),
|
|
||||||
# Même raison : lecture seule, protégée par le jeton passé en paramètre, pas par un
|
|
||||||
# `Principal`. Le jeton est un secret de 256 bits, non brute-forçable.
|
|
||||||
("GET", "/api/v1/auth/reset-password/validate"),
|
|
||||||
("GET", "/metrics"),
|
("GET", "/metrics"),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -81,18 +74,3 @@ async def test_the_declared_routes_are_actually_reachable(app: FastAPI) -> None:
|
|||||||
)
|
)
|
||||||
def test_the_health_probes_stay_public(app: FastAPI, chemin: str) -> None:
|
def test_the_health_probes_stay_public(app: FastAPI, chemin: str) -> None:
|
||||||
assert ("GET", chemin) in ROUTES_PUBLIQUES
|
assert ("GET", chemin) in ROUTES_PUBLIQUES
|
||||||
|
|
||||||
|
|
||||||
# Piège : ni les routes `include_in_schema=False` (/docs, /redoc) ni un `Mount` Starlette
|
|
||||||
# (/static) n'apparaissent dans `app.openapi()["paths"]`. `routes_declarees()` ne les voit
|
|
||||||
# donc jamais, et elles échapperaient silencieusement au garde-fou ci-dessus.
|
|
||||||
@pytest.mark.parametrize(
|
|
||||||
"chemin",
|
|
||||||
["/docs", "/redoc", "/static/logo-icon.png"],
|
|
||||||
ids=["swagger_ui", "redoc", "logo_statique"],
|
|
||||||
)
|
|
||||||
async def test_the_documentation_routes_are_public_by_design(
|
|
||||||
app: FastAPI, client: AsyncClient, chemin: str
|
|
||||||
) -> None:
|
|
||||||
response = await client.get(chemin)
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from collections.abc import Callable, Iterator
|
from collections.abc import Callable, Iterator
|
||||||
|
from datetime import UTC, datetime
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
@@ -9,7 +10,9 @@ from app.api.deps import get_current_principal, get_site_service
|
|||||||
from app.core.principal import Principal
|
from app.core.principal import Principal
|
||||||
from app.core.roles import AccountKind, Role
|
from app.core.roles import AccountKind, Role
|
||||||
from app.models.energy import Site
|
from app.models.energy import Site
|
||||||
from app.services.site import SiteNotFoundError
|
from app.services.site import SiteCurrentReading, SiteNotFoundError
|
||||||
|
|
||||||
|
TIMESTAMP = datetime(2026, 9, 16, 12, 0, tzinfo=UTC)
|
||||||
|
|
||||||
|
|
||||||
def principal(role: Role = Role.LECTEUR) -> Principal:
|
def principal(role: Role = Role.LECTEUR) -> Principal:
|
||||||
@@ -33,10 +36,28 @@ def site(site_id: str = "site-1") -> Site:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def lecture_actuelle(site_id: str = "site-1") -> SiteCurrentReading:
|
||||||
|
return SiteCurrentReading(
|
||||||
|
timestamp=TIMESTAMP,
|
||||||
|
site_id=site_id,
|
||||||
|
site_type="industriel",
|
||||||
|
consumption_kw=87.34,
|
||||||
|
consumption_kwh=87.34,
|
||||||
|
voltage_v=401.2,
|
||||||
|
current_a=132.5,
|
||||||
|
power_factor=0.923,
|
||||||
|
temperature_celsius=22.1,
|
||||||
|
humidity_percent=58.4,
|
||||||
|
null_reasons=[],
|
||||||
|
data_quality="good",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class FauxService:
|
class FauxService:
|
||||||
def __init__(self, erreur: Exception | None = None) -> None:
|
def __init__(self, erreur: Exception | None = None) -> None:
|
||||||
self._erreur = erreur
|
self._erreur = erreur
|
||||||
self.site = site()
|
self.site = site()
|
||||||
|
self.actuel = lecture_actuelle()
|
||||||
|
|
||||||
async def list_all(self) -> list[Site]:
|
async def list_all(self) -> list[Site]:
|
||||||
return [self.site]
|
return [self.site]
|
||||||
@@ -46,6 +67,11 @@ class FauxService:
|
|||||||
raise self._erreur
|
raise self._erreur
|
||||||
return self.site
|
return self.site
|
||||||
|
|
||||||
|
async def current(self, site_id: str) -> SiteCurrentReading:
|
||||||
|
if self._erreur is not None:
|
||||||
|
raise self._erreur
|
||||||
|
return self.actuel
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def lecteur_connecte(app: FastAPI) -> Iterator[None]:
|
def lecteur_connecte(app: FastAPI) -> Iterator[None]:
|
||||||
@@ -109,6 +135,30 @@ async def test_get_site_returns_404_for_an_unknown_site(
|
|||||||
assert response.status_code == 404
|
assert response.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
|
async def test_get_current_returns_the_latest_reading(
|
||||||
|
servi: Callable[..., FauxService], client: AsyncClient
|
||||||
|
) -> None:
|
||||||
|
servi()
|
||||||
|
|
||||||
|
response = await client.get("/api/v1/sites/site-1/current")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
corps = response.json()
|
||||||
|
assert corps["site_id"] == "site-1"
|
||||||
|
assert corps["data_quality"] == "good"
|
||||||
|
assert corps["consumption_kw"] == 87.34
|
||||||
|
|
||||||
|
|
||||||
|
async def test_get_current_returns_404_for_an_unknown_site(
|
||||||
|
servi: Callable[..., FauxService], client: AsyncClient
|
||||||
|
) -> None:
|
||||||
|
servi(SiteNotFoundError("site-inconnu"))
|
||||||
|
|
||||||
|
response = await client.get("/api/v1/sites/site-inconnu/current")
|
||||||
|
|
||||||
|
assert response.status_code == 404
|
||||||
|
|
||||||
|
|
||||||
async def test_list_sites_reaches_the_repository_through_the_session(
|
async def test_list_sites_reaches_the_repository_through_the_session(
|
||||||
lecteur_connecte: None, fake_session: Callable[..., None], client: AsyncClient
|
lecteur_connecte: None, fake_session: Callable[..., None], client: AsyncClient
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|||||||
@@ -1,142 +0,0 @@
|
|||||||
# Le premier test démontre l'atomicité de `consume()` : sur un double, deux soumissions
|
|
||||||
# concurrentes du même lien réussiraient toutes les deux.
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
from datetime import UTC, datetime, timedelta
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from sqlalchemy.exc import IntegrityError
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
|
||||||
|
|
||||||
from app.core.roles import Role
|
|
||||||
from app.core.security import fingerprint_refresh, generate_refresh_secret
|
|
||||||
from app.repositories.password_reset_token import PasswordResetTokenRepository
|
|
||||||
from app.repositories.user import UserRepository
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.integration
|
|
||||||
|
|
||||||
DUREE = timedelta(minutes=15)
|
|
||||||
|
|
||||||
|
|
||||||
async def un_compte(session: AsyncSession) -> uuid.UUID:
|
|
||||||
compte = await UserRepository(session).create(
|
|
||||||
email=f"reset-{uuid.uuid4().hex[:12]}@enervision.fr",
|
|
||||||
password_hash="$argon2id$x",
|
|
||||||
role=Role.LECTEUR,
|
|
||||||
)
|
|
||||||
return compte.id
|
|
||||||
|
|
||||||
|
|
||||||
async def un_jeton(
|
|
||||||
depot: PasswordResetTokenRepository, user_id: uuid.UUID, *, duree: timedelta = DUREE
|
|
||||||
) -> str:
|
|
||||||
secret = generate_refresh_secret()
|
|
||||||
await depot.create(
|
|
||||||
user_id=user_id,
|
|
||||||
token_hash=fingerprint_refresh(secret),
|
|
||||||
expires_at=datetime.now(UTC) + duree,
|
|
||||||
client_ip="203.0.113.10",
|
|
||||||
user_agent="pytest",
|
|
||||||
)
|
|
||||||
return secret
|
|
||||||
|
|
||||||
|
|
||||||
async def test_consume_only_succeeds_once(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
secret = await un_jeton(depot, await un_compte(session))
|
|
||||||
|
|
||||||
premier = await depot.consume(fingerprint_refresh(secret))
|
|
||||||
second = await depot.consume(fingerprint_refresh(secret))
|
|
||||||
await session.rollback()
|
|
||||||
|
|
||||||
assert premier is not None
|
|
||||||
assert second is None
|
|
||||||
|
|
||||||
|
|
||||||
async def test_consume_refuses_an_expired_token(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
secret = await un_jeton(depot, await un_compte(session), duree=-timedelta(minutes=1))
|
|
||||||
|
|
||||||
revendique = await depot.consume(fingerprint_refresh(secret))
|
|
||||||
await session.rollback()
|
|
||||||
|
|
||||||
assert revendique is None
|
|
||||||
|
|
||||||
|
|
||||||
async def test_consume_returns_nothing_for_an_unknown_fingerprint(
|
|
||||||
session: AsyncSession,
|
|
||||||
) -> None:
|
|
||||||
revendique = await PasswordResetTokenRepository(session).consume(
|
|
||||||
fingerprint_refresh(generate_refresh_secret())
|
|
||||||
)
|
|
||||||
|
|
||||||
assert revendique is None
|
|
||||||
|
|
||||||
|
|
||||||
async def test_invalidate_all_for_user_only_touches_living_tokens(
|
|
||||||
session: AsyncSession,
|
|
||||||
) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
compte = await un_compte(session)
|
|
||||||
await un_jeton(depot, compte)
|
|
||||||
await un_jeton(depot, compte)
|
|
||||||
|
|
||||||
invalides = await depot.invalidate_all_for_user(compte)
|
|
||||||
second_passage = await depot.invalidate_all_for_user(compte)
|
|
||||||
await session.rollback()
|
|
||||||
|
|
||||||
assert invalides == 2
|
|
||||||
assert second_passage == 0
|
|
||||||
|
|
||||||
|
|
||||||
async def test_exists_valid_is_true_for_a_living_token(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
secret = await un_jeton(depot, await un_compte(session))
|
|
||||||
|
|
||||||
assert await depot.exists_valid(fingerprint_refresh(secret)) is True
|
|
||||||
|
|
||||||
|
|
||||||
async def test_exists_valid_is_false_for_an_expired_token(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
secret = await un_jeton(depot, await un_compte(session), duree=-timedelta(minutes=1))
|
|
||||||
|
|
||||||
assert await depot.exists_valid(fingerprint_refresh(secret)) is False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_exists_valid_is_false_once_the_token_is_consumed(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
secret = await un_jeton(depot, await un_compte(session))
|
|
||||||
await depot.consume(fingerprint_refresh(secret))
|
|
||||||
|
|
||||||
assert await depot.exists_valid(fingerprint_refresh(secret)) is False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_exists_valid_is_false_for_an_unknown_fingerprint(session: AsyncSession) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
|
|
||||||
assert await depot.exists_valid(fingerprint_refresh(generate_refresh_secret())) is False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_the_database_refuses_two_tokens_sharing_a_fingerprint(
|
|
||||||
session: AsyncSession,
|
|
||||||
) -> None:
|
|
||||||
depot = PasswordResetTokenRepository(session)
|
|
||||||
compte = await un_compte(session)
|
|
||||||
secret = generate_refresh_secret()
|
|
||||||
await depot.create(
|
|
||||||
user_id=compte,
|
|
||||||
token_hash=fingerprint_refresh(secret),
|
|
||||||
expires_at=datetime.now(UTC) + DUREE,
|
|
||||||
client_ip=None,
|
|
||||||
user_agent=None,
|
|
||||||
)
|
|
||||||
|
|
||||||
with pytest.raises(IntegrityError):
|
|
||||||
await depot.create(
|
|
||||||
user_id=compte,
|
|
||||||
token_hash=fingerprint_refresh(secret),
|
|
||||||
expires_at=datetime.now(UTC) + DUREE,
|
|
||||||
client_ip=None,
|
|
||||||
user_agent=None,
|
|
||||||
)
|
|
||||||
await session.rollback()
|
|
||||||
@@ -88,6 +88,73 @@ async def test_latest_by_site_returns_one_row_per_site(session: AsyncSession) ->
|
|||||||
assert identifiants == {premier, second}
|
assert identifiants == {premier, second}
|
||||||
|
|
||||||
|
|
||||||
|
async def test_latest_by_site_breaks_a_timestamp_tie_on_the_last_written_reading(
|
||||||
|
session: AsyncSession,
|
||||||
|
) -> None:
|
||||||
|
site = await creer_site(session)
|
||||||
|
depot = ReadingRepository(session)
|
||||||
|
horodatage = datetime(2026, 9, 15, tzinfo=UTC)
|
||||||
|
await creer_lecture(
|
||||||
|
session, site_id=site.site_id, timestamp=horodatage, source="api_history", consumption_kw=10
|
||||||
|
)
|
||||||
|
derniere = await creer_lecture(
|
||||||
|
session, site_id=site.site_id, timestamp=horodatage, source="api_current", consumption_kw=42
|
||||||
|
)
|
||||||
|
|
||||||
|
resultats = await depot.latest_by_site()
|
||||||
|
retenues = [r.reading_id for r in resultats if r.site_id == site.site_id]
|
||||||
|
await session.rollback()
|
||||||
|
|
||||||
|
assert retenues == [derniere.reading_id]
|
||||||
|
|
||||||
|
|
||||||
|
async def test_latest_for_site_returns_the_most_recent_reading(session: AsyncSession) -> None:
|
||||||
|
site = await creer_site(session)
|
||||||
|
depot = ReadingRepository(session)
|
||||||
|
await creer_lecture(session, site_id=site.site_id, timestamp=datetime(2026, 9, 1, tzinfo=UTC))
|
||||||
|
recente = await creer_lecture(
|
||||||
|
session, site_id=site.site_id, timestamp=datetime(2026, 9, 15, tzinfo=UTC)
|
||||||
|
)
|
||||||
|
|
||||||
|
trouvee = await depot.latest_for_site(site.site_id)
|
||||||
|
reading_id = trouvee.reading_id if trouvee else None
|
||||||
|
await session.rollback()
|
||||||
|
|
||||||
|
assert reading_id == recente.reading_id
|
||||||
|
|
||||||
|
|
||||||
|
async def test_latest_for_site_breaks_a_timestamp_tie_on_the_last_written_reading(
|
||||||
|
session: AsyncSession,
|
||||||
|
) -> None:
|
||||||
|
site = await creer_site(session)
|
||||||
|
depot = ReadingRepository(session)
|
||||||
|
horodatage = datetime(2026, 9, 15, tzinfo=UTC)
|
||||||
|
await creer_lecture(session, site_id=site.site_id, timestamp=horodatage, source="api_history")
|
||||||
|
derniere = await creer_lecture(
|
||||||
|
session, site_id=site.site_id, timestamp=horodatage, source="api_current"
|
||||||
|
)
|
||||||
|
|
||||||
|
trouvee = await depot.latest_for_site(site.site_id)
|
||||||
|
reading_id = trouvee.reading_id if trouvee else None
|
||||||
|
await session.rollback()
|
||||||
|
|
||||||
|
assert reading_id == derniere.reading_id
|
||||||
|
|
||||||
|
|
||||||
|
async def test_latest_for_site_ignores_the_readings_of_the_other_sites(
|
||||||
|
session: AsyncSession,
|
||||||
|
) -> None:
|
||||||
|
sans_lecture = await creer_site(session)
|
||||||
|
autre = await creer_site(session)
|
||||||
|
depot = ReadingRepository(session)
|
||||||
|
await creer_lecture(session, site_id=autre.site_id)
|
||||||
|
|
||||||
|
trouvee = await depot.latest_for_site(sans_lecture.site_id)
|
||||||
|
await session.rollback()
|
||||||
|
|
||||||
|
assert trouvee is None
|
||||||
|
|
||||||
|
|
||||||
async def test_list_history_orders_the_readings_by_timestamp_descending(
|
async def test_list_history_orders_the_readings_by_timestamp_descending(
|
||||||
session: AsyncSession,
|
session: AsyncSession,
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
import pytest
|
|
||||||
from pydantic import ValidationError
|
|
||||||
|
|
||||||
from app.schemas.auth import PasswordChangeRequest, valide_complexite
|
|
||||||
|
|
||||||
MOT_DE_PASSE_VALIDE = "Un-mot-de-passe1!"
|
|
||||||
|
|
||||||
|
|
||||||
def test_password_change_request_accepts_a_password_covering_the_four_classes() -> None:
|
|
||||||
requete = PasswordChangeRequest(
|
|
||||||
current_password="peu-importe", new_password=MOT_DE_PASSE_VALIDE
|
|
||||||
)
|
|
||||||
|
|
||||||
assert requete.new_password == MOT_DE_PASSE_VALIDE
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
|
||||||
"new_password",
|
|
||||||
[
|
|
||||||
"un-mot-de-passe1!",
|
|
||||||
"UN-MOT-DE-PASSE1!",
|
|
||||||
"Un-mot-de-passe!",
|
|
||||||
"Un mot de passe 1",
|
|
||||||
],
|
|
||||||
ids=["sans_majuscule", "sans_minuscule", "sans_chiffre", "sans_caractere_special"],
|
|
||||||
)
|
|
||||||
def test_password_change_request_rejects_a_password_missing_a_character_class(
|
|
||||||
new_password: str,
|
|
||||||
) -> None:
|
|
||||||
with pytest.raises(ValidationError):
|
|
||||||
PasswordChangeRequest(current_password="peu-importe", new_password=new_password)
|
|
||||||
|
|
||||||
|
|
||||||
def test_password_change_request_rejects_a_password_below_the_minimum_length() -> None:
|
|
||||||
with pytest.raises(ValidationError):
|
|
||||||
PasswordChangeRequest(current_password="peu-importe", new_password="Ab1!")
|
|
||||||
|
|
||||||
|
|
||||||
def test_valide_complexite_names_every_missing_class_in_the_error() -> None:
|
|
||||||
with pytest.raises(ValueError, match=r"majuscule.*chiffre|chiffre.*majuscule"):
|
|
||||||
valide_complexite("minuscules-seulement")
|
|
||||||
|
|
||||||
|
|
||||||
def test_valide_complexite_accepts_an_accented_password() -> None:
|
|
||||||
assert valide_complexite("Sécurité1!") == "Sécurité1!"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("mot_de_passe", ["abcdefg1×", "abcdefg1÷"]) # noqa: RUF001
|
|
||||||
def test_valide_complexite_rejects_a_password_without_uppercase_despite_times_or_divide(
|
|
||||||
mot_de_passe: str,
|
|
||||||
) -> None:
|
|
||||||
with pytest.raises(ValueError, match="majuscule"):
|
|
||||||
valide_complexite(mot_de_passe)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("mot_de_passe", ["ABCDEFG1×", "ABCDEFG1÷"]) # noqa: RUF001
|
|
||||||
def test_valide_complexite_rejects_a_password_without_lowercase_despite_times_or_divide(
|
|
||||||
mot_de_passe: str,
|
|
||||||
) -> None:
|
|
||||||
with pytest.raises(ValueError, match="minuscule"):
|
|
||||||
valide_complexite(mot_de_passe)
|
|
||||||
@@ -5,7 +5,6 @@ from typing import Any
|
|||||||
from uuid import UUID, uuid4
|
from uuid import UUID, uuid4
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from fastapi import BackgroundTasks
|
|
||||||
|
|
||||||
from app.core.principal import Principal
|
from app.core.principal import Principal
|
||||||
from app.core.roles import AccountKind, Role
|
from app.core.roles import AccountKind, Role
|
||||||
@@ -17,15 +16,11 @@ from app.core.security import (
|
|||||||
from app.models.login_attempt import LoginOutcome
|
from app.models.login_attempt import LoginOutcome
|
||||||
from app.models.refresh_token import RevocationReason
|
from app.models.refresh_token import RevocationReason
|
||||||
from app.repositories.login_attempt import FailureCounts
|
from app.repositories.login_attempt import FailureCounts
|
||||||
from app.repositories.password_reset_attempt import ResetRequestCounts
|
|
||||||
from app.repositories.password_reset_token import ConsumedResetToken
|
|
||||||
from app.repositories.refresh_token import ClaimedToken
|
from app.repositories.refresh_token import ClaimedToken
|
||||||
from app.services.auth import (
|
from app.services.auth import (
|
||||||
AuthService,
|
AuthService,
|
||||||
InvalidCredentialsError,
|
InvalidCredentialsError,
|
||||||
InvalidOrExpiredResetTokenError,
|
|
||||||
LoginPolicy,
|
LoginPolicy,
|
||||||
PasswordResetPolicy,
|
|
||||||
RateLimitedError,
|
RateLimitedError,
|
||||||
SessionRejectedError,
|
SessionRejectedError,
|
||||||
)
|
)
|
||||||
@@ -42,13 +37,6 @@ POLITIQUE_CONNEXION = LoginPolicy(
|
|||||||
max_failures_per_ip=20,
|
max_failures_per_ip=20,
|
||||||
max_failures_per_identifier=50,
|
max_failures_per_identifier=50,
|
||||||
)
|
)
|
||||||
POLITIQUE_RESET = PasswordResetPolicy(
|
|
||||||
window_seconds=900,
|
|
||||||
max_requests_per_identifier=3,
|
|
||||||
max_requests_per_ip=10,
|
|
||||||
token_ttl=timedelta(minutes=15),
|
|
||||||
frontend_reset_url="http://localhost:4200/reset-password",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -180,49 +168,6 @@ class FausseTransaction:
|
|||||||
self.validations += 1
|
self.validations += 1
|
||||||
|
|
||||||
|
|
||||||
class FauxDepotJetonsReset:
|
|
||||||
def __init__(
|
|
||||||
self, revendique: ConsumedResetToken | None = None, *, valide: bool = False
|
|
||||||
) -> None:
|
|
||||||
self.revendique = revendique
|
|
||||||
self.valide = valide
|
|
||||||
self.crees: list[UUID] = []
|
|
||||||
self.invalidations: list[UUID] = []
|
|
||||||
|
|
||||||
async def create(self, *, user_id: UUID, **_: object) -> None:
|
|
||||||
self.crees.append(user_id)
|
|
||||||
|
|
||||||
async def consume(self, token_hash: bytes) -> ConsumedResetToken | None:
|
|
||||||
return self.revendique
|
|
||||||
|
|
||||||
async def exists_valid(self, token_hash: bytes) -> bool:
|
|
||||||
return self.valide
|
|
||||||
|
|
||||||
async def invalidate_all_for_user(self, user_id: UUID) -> int:
|
|
||||||
self.invalidations.append(user_id)
|
|
||||||
return len(self.invalidations)
|
|
||||||
|
|
||||||
|
|
||||||
class FauxDepotTentativesReset:
|
|
||||||
def __init__(self, compteurs: ResetRequestCounts | None = None) -> None:
|
|
||||||
self.compteurs = compteurs or ResetRequestCounts(0, 0)
|
|
||||||
self.enregistrees: list[str] = []
|
|
||||||
|
|
||||||
async def count_recent(self, **_: object) -> ResetRequestCounts:
|
|
||||||
return self.compteurs
|
|
||||||
|
|
||||||
async def record(self, *, email: str, **_: object) -> None:
|
|
||||||
self.enregistrees.append(email)
|
|
||||||
|
|
||||||
|
|
||||||
class FauxMailer:
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.envois: list[tuple[str, str]] = []
|
|
||||||
|
|
||||||
async def send_password_reset_email(self, *, to: str, reset_url: str) -> None:
|
|
||||||
self.envois.append((to, reset_url))
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Attirail:
|
class Attirail:
|
||||||
service: AuthService
|
service: AuthService
|
||||||
@@ -231,9 +176,6 @@ class Attirail:
|
|||||||
jetons: FauxDepotJetons
|
jetons: FauxDepotJetons
|
||||||
audit: FauxDepotAudit
|
audit: FauxDepotAudit
|
||||||
hacheur: FauxHacheur
|
hacheur: FauxHacheur
|
||||||
jetons_reset: FauxDepotJetonsReset
|
|
||||||
tentatives_reset: FauxDepotTentativesReset
|
|
||||||
mailer: FauxMailer
|
|
||||||
|
|
||||||
|
|
||||||
def fabrique_service(
|
def fabrique_service(
|
||||||
@@ -242,17 +184,12 @@ def fabrique_service(
|
|||||||
compteurs: FailureCounts | None = None,
|
compteurs: FailureCounts | None = None,
|
||||||
hacheur: FauxHacheur | None = None,
|
hacheur: FauxHacheur | None = None,
|
||||||
jetons: FauxDepotJetons | None = None,
|
jetons: FauxDepotJetons | None = None,
|
||||||
jetons_reset: FauxDepotJetonsReset | None = None,
|
|
||||||
compteurs_reset: ResetRequestCounts | None = None,
|
|
||||||
) -> Attirail:
|
) -> Attirail:
|
||||||
comptes = FauxDepotComptes(compte)
|
comptes = FauxDepotComptes(compte)
|
||||||
tentatives = FauxDepotTentatives(compteurs)
|
tentatives = FauxDepotTentatives(compteurs)
|
||||||
depot_jetons = jetons or FauxDepotJetons()
|
depot_jetons = jetons or FauxDepotJetons()
|
||||||
audit = FauxDepotAudit()
|
audit = FauxDepotAudit()
|
||||||
hacheur = hacheur or FauxHacheur()
|
hacheur = hacheur or FauxHacheur()
|
||||||
depot_jetons_reset = jetons_reset or FauxDepotJetonsReset()
|
|
||||||
tentatives_reset = FauxDepotTentativesReset(compteurs_reset)
|
|
||||||
mailer = FauxMailer()
|
|
||||||
service = AuthService(
|
service = AuthService(
|
||||||
users=comptes, # type: ignore[arg-type]
|
users=comptes, # type: ignore[arg-type]
|
||||||
attempts=tentatives, # type: ignore[arg-type]
|
attempts=tentatives, # type: ignore[arg-type]
|
||||||
@@ -263,22 +200,8 @@ def fabrique_service(
|
|||||||
token_policy=POLITIQUE_JETON,
|
token_policy=POLITIQUE_JETON,
|
||||||
login_policy=POLITIQUE_CONNEXION,
|
login_policy=POLITIQUE_CONNEXION,
|
||||||
refresh_ttl=timedelta(days=7),
|
refresh_ttl=timedelta(days=7),
|
||||||
reset_tokens=depot_jetons_reset, # type: ignore[arg-type]
|
|
||||||
reset_attempts=tentatives_reset, # type: ignore[arg-type]
|
|
||||||
reset_policy=POLITIQUE_RESET,
|
|
||||||
mailer=mailer, # type: ignore[arg-type]
|
|
||||||
)
|
|
||||||
return Attirail(
|
|
||||||
service,
|
|
||||||
comptes,
|
|
||||||
tentatives,
|
|
||||||
depot_jetons,
|
|
||||||
audit,
|
|
||||||
hacheur,
|
|
||||||
depot_jetons_reset,
|
|
||||||
tentatives_reset,
|
|
||||||
mailer,
|
|
||||||
)
|
)
|
||||||
|
return Attirail(service, comptes, tentatives, depot_jetons, audit, hacheur)
|
||||||
|
|
||||||
|
|
||||||
async def connecte(service: AuthService, mot_de_passe: str = "un-mot-de-passe-valide") -> object:
|
async def connecte(service: AuthService, mot_de_passe: str = "un-mot-de-passe-valide") -> object:
|
||||||
@@ -570,148 +493,3 @@ async def test_change_password_refuses_a_wrong_current_password() -> None:
|
|||||||
|
|
||||||
assert attirail.jetons.revocations_par_compte == []
|
assert attirail.jetons.revocations_par_compte == []
|
||||||
assert attirail.jetons.crees == []
|
assert attirail.jetons.crees == []
|
||||||
|
|
||||||
|
|
||||||
async def test_request_password_reset_emails_a_link_when_the_account_exists() -> None:
|
|
||||||
compte = FauxCompte()
|
|
||||||
attirail = fabrique_service(compte=compte)
|
|
||||||
taches = BackgroundTasks()
|
|
||||||
|
|
||||||
await attirail.service.request_password_reset(
|
|
||||||
email=compte.email, client_ip="203.0.113.10", user_agent="pytest", background_tasks=taches
|
|
||||||
)
|
|
||||||
|
|
||||||
assert attirail.jetons_reset.invalidations == [compte.id]
|
|
||||||
assert attirail.jetons_reset.crees == [compte.id]
|
|
||||||
assert attirail.mailer.envois == [], "l'envoi doit être différé, pas fait dans la réponse"
|
|
||||||
await taches()
|
|
||||||
assert len(attirail.mailer.envois) == 1
|
|
||||||
assert attirail.mailer.envois[0][0] == compte.email
|
|
||||||
assert "auth.password_reset_requested" in attirail.audit.lignes[0][0]
|
|
||||||
|
|
||||||
|
|
||||||
async def test_request_password_reset_stays_silent_when_the_account_is_unknown() -> None:
|
|
||||||
attirail = fabrique_service(compte=None)
|
|
||||||
taches = BackgroundTasks()
|
|
||||||
|
|
||||||
await attirail.service.request_password_reset(
|
|
||||||
email="inconnu@enervision.fr",
|
|
||||||
client_ip="203.0.113.10",
|
|
||||||
user_agent="pytest",
|
|
||||||
background_tasks=taches,
|
|
||||||
)
|
|
||||||
await taches()
|
|
||||||
|
|
||||||
assert attirail.jetons_reset.crees == []
|
|
||||||
assert attirail.mailer.envois == []
|
|
||||||
assert attirail.hacheur.verifications == 1, "le hachage factice doit tout de même tourner"
|
|
||||||
|
|
||||||
|
|
||||||
async def test_request_password_reset_stays_silent_when_the_account_is_inactive() -> None:
|
|
||||||
compte = FauxCompte(is_active=False)
|
|
||||||
attirail = fabrique_service(compte=compte)
|
|
||||||
taches = BackgroundTasks()
|
|
||||||
|
|
||||||
await attirail.service.request_password_reset(
|
|
||||||
email=compte.email, client_ip="203.0.113.10", user_agent="pytest", background_tasks=taches
|
|
||||||
)
|
|
||||||
await taches()
|
|
||||||
|
|
||||||
assert attirail.jetons_reset.crees == []
|
|
||||||
assert attirail.mailer.envois == []
|
|
||||||
|
|
||||||
|
|
||||||
async def test_request_password_reset_raises_when_the_rate_limit_is_reached() -> None:
|
|
||||||
attirail = fabrique_service(compteurs_reset=ResetRequestCounts(per_identifier=3, per_ip=0))
|
|
||||||
taches = BackgroundTasks()
|
|
||||||
|
|
||||||
with pytest.raises(RateLimitedError):
|
|
||||||
await attirail.service.request_password_reset(
|
|
||||||
email="operateur@enervision.fr",
|
|
||||||
client_ip="203.0.113.10",
|
|
||||||
user_agent="pytest",
|
|
||||||
background_tasks=taches,
|
|
||||||
)
|
|
||||||
|
|
||||||
await taches()
|
|
||||||
assert attirail.mailer.envois == []
|
|
||||||
|
|
||||||
|
|
||||||
async def test_request_password_reset_logs_instead_of_raising_when_the_mailer_fails() -> None:
|
|
||||||
compte = FauxCompte()
|
|
||||||
attirail = fabrique_service(compte=compte)
|
|
||||||
taches = BackgroundTasks()
|
|
||||||
|
|
||||||
async def echoue(*, to: str, reset_url: str) -> None:
|
|
||||||
raise RuntimeError("relais SMTP indisponible")
|
|
||||||
|
|
||||||
attirail.mailer.send_password_reset_email = echoue # type: ignore[method-assign]
|
|
||||||
|
|
||||||
await attirail.service.request_password_reset(
|
|
||||||
email=compte.email, client_ip="203.0.113.10", user_agent="pytest", background_tasks=taches
|
|
||||||
)
|
|
||||||
|
|
||||||
await taches()
|
|
||||||
|
|
||||||
|
|
||||||
async def test_confirm_password_reset_revokes_every_session_then_reopens_the_current_one() -> None:
|
|
||||||
compte = FauxCompte()
|
|
||||||
jetons_reset = FauxDepotJetonsReset(
|
|
||||||
revendique=ConsumedResetToken(id=uuid4(), user_id=compte.id)
|
|
||||||
)
|
|
||||||
attirail = fabrique_service(compte=compte, jetons_reset=jetons_reset)
|
|
||||||
|
|
||||||
session = await attirail.service.confirm_password_reset(
|
|
||||||
token="un-secret-opaque",
|
|
||||||
new_password="Un-nouveau-mot-de-passe1!",
|
|
||||||
client_ip="203.0.113.10",
|
|
||||||
user_agent="pytest",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert attirail.jetons.revocations_par_compte == [
|
|
||||||
(compte.id, RevocationReason.CHANGEMENT_MOT_DE_PASSE.value)
|
|
||||||
]
|
|
||||||
assert len(attirail.jetons.crees) == 1
|
|
||||||
assert session.refresh_secret
|
|
||||||
assert "auth.password_reset_self_service" in attirail.audit.lignes[0][0]
|
|
||||||
|
|
||||||
|
|
||||||
async def test_is_reset_token_valid_reflects_the_repository() -> None:
|
|
||||||
attirail_valide = fabrique_service(jetons_reset=FauxDepotJetonsReset(valide=True))
|
|
||||||
attirail_invalide = fabrique_service(jetons_reset=FauxDepotJetonsReset(valide=False))
|
|
||||||
|
|
||||||
assert await attirail_valide.service.is_reset_token_valid("un-secret-opaque") is True
|
|
||||||
assert await attirail_invalide.service.is_reset_token_valid("un-secret-opaque") is False
|
|
||||||
|
|
||||||
|
|
||||||
async def test_confirm_password_reset_rejects_a_token_for_an_account_disabled_since() -> None:
|
|
||||||
compte = FauxCompte(is_active=False)
|
|
||||||
jetons_reset = FauxDepotJetonsReset(
|
|
||||||
revendique=ConsumedResetToken(id=uuid4(), user_id=compte.id)
|
|
||||||
)
|
|
||||||
attirail = fabrique_service(compte=compte, jetons_reset=jetons_reset)
|
|
||||||
|
|
||||||
with pytest.raises(InvalidOrExpiredResetTokenError):
|
|
||||||
await attirail.service.confirm_password_reset(
|
|
||||||
token="un-secret-opaque",
|
|
||||||
new_password="Un-nouveau-mot-de-passe1!",
|
|
||||||
client_ip="203.0.113.10",
|
|
||||||
user_agent="pytest",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert attirail.comptes.mots_de_passe_changes == 0
|
|
||||||
assert attirail.jetons.revocations_par_compte == []
|
|
||||||
|
|
||||||
|
|
||||||
async def test_confirm_password_reset_rejects_an_invalid_or_expired_token() -> None:
|
|
||||||
attirail = fabrique_service(jetons_reset=FauxDepotJetonsReset(revendique=None))
|
|
||||||
|
|
||||||
with pytest.raises(InvalidOrExpiredResetTokenError):
|
|
||||||
await attirail.service.confirm_password_reset(
|
|
||||||
token="un-secret-invalide",
|
|
||||||
new_password="Un-nouveau-mot-de-passe1!",
|
|
||||||
client_ip=None,
|
|
||||||
user_agent=None,
|
|
||||||
)
|
|
||||||
|
|
||||||
assert attirail.jetons.revocations_par_compte == []
|
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
|
from dataclasses import dataclass, field
|
||||||
|
from datetime import UTC, datetime
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from app.models.energy import Site
|
from app.models.energy import Site
|
||||||
from app.services.site import SiteNotFoundError, SiteService
|
from app.services.site import SiteNotFoundError, SiteService
|
||||||
|
|
||||||
|
TIMESTAMP = datetime(2026, 9, 16, 12, 0, tzinfo=UTC)
|
||||||
|
|
||||||
|
|
||||||
def site(site_id: str = "site-1") -> Site:
|
def site(site_id: str = "site-1") -> Site:
|
||||||
return Site(
|
return Site(
|
||||||
@@ -15,6 +20,21 @@ def site(site_id: str = "site-1") -> Site:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class FauxLecture:
|
||||||
|
site_id: str
|
||||||
|
timestamp: datetime = TIMESTAMP
|
||||||
|
consumption_kw: float | None = 87.34
|
||||||
|
consumption_kwh: float | None = 87.34
|
||||||
|
voltage_v: float | None = 401.2
|
||||||
|
current_a: float | None = 132.5
|
||||||
|
power_factor: float | None = 0.923
|
||||||
|
temperature_celsius: float | None = 22.1
|
||||||
|
humidity_percent: float | None = 58.4
|
||||||
|
null_reasons: list[str] | None = field(default_factory=list)
|
||||||
|
data_quality: str | None = "good"
|
||||||
|
|
||||||
|
|
||||||
class FakeRepository:
|
class FakeRepository:
|
||||||
def __init__(self, sites: list[Site]) -> None:
|
def __init__(self, sites: list[Site]) -> None:
|
||||||
self._sites = sites
|
self._sites = sites
|
||||||
@@ -26,24 +46,77 @@ class FakeRepository:
|
|||||||
return next((s for s in self._sites if s.site_id == site_id), None)
|
return next((s for s in self._sites if s.site_id == site_id), None)
|
||||||
|
|
||||||
|
|
||||||
async def test_list_all_returns_the_repository_sites() -> None:
|
class FauxDepotLectures:
|
||||||
service = SiteService(sites=FakeRepository([site("a"), site("b")]))
|
def __init__(self, lectures: dict[str, FauxLecture]) -> None:
|
||||||
|
self._lectures = lectures
|
||||||
|
|
||||||
sites = await service.list_all()
|
async def latest_for_site(self, site_id: str) -> FauxLecture | None:
|
||||||
|
return self._lectures.get(site_id)
|
||||||
|
|
||||||
|
|
||||||
|
def service(sites: list[Site], lectures: dict[str, FauxLecture] | None = None) -> SiteService:
|
||||||
|
return SiteService(
|
||||||
|
sites=FakeRepository(sites), # type: ignore[arg-type]
|
||||||
|
readings=FauxDepotLectures(lectures or {}), # type: ignore[arg-type]
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_list_all_returns_the_repository_sites() -> None:
|
||||||
|
svc = service([site("a"), site("b")])
|
||||||
|
|
||||||
|
sites = await svc.list_all()
|
||||||
|
|
||||||
assert [s.site_id for s in sites] == ["a", "b"]
|
assert [s.site_id for s in sites] == ["a", "b"]
|
||||||
|
|
||||||
|
|
||||||
async def test_get_by_id_returns_the_matching_site() -> None:
|
async def test_get_by_id_returns_the_matching_site() -> None:
|
||||||
service = SiteService(sites=FakeRepository([site("a")]))
|
svc = service([site("a")])
|
||||||
|
|
||||||
trouve = await service.get_by_id("a")
|
trouve = await svc.get_by_id("a")
|
||||||
|
|
||||||
assert trouve.site_id == "a"
|
assert trouve.site_id == "a"
|
||||||
|
|
||||||
|
|
||||||
async def test_get_by_id_raises_when_the_site_is_unknown() -> None:
|
async def test_get_by_id_raises_when_the_site_is_unknown() -> None:
|
||||||
service = SiteService(sites=FakeRepository([]))
|
svc = service([])
|
||||||
|
|
||||||
with pytest.raises(SiteNotFoundError):
|
with pytest.raises(SiteNotFoundError):
|
||||||
await service.get_by_id("inconnu")
|
await svc.get_by_id("inconnu")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_current_raises_when_the_site_is_unknown() -> None:
|
||||||
|
svc = service([])
|
||||||
|
|
||||||
|
with pytest.raises(SiteNotFoundError):
|
||||||
|
await svc.current("inconnu")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_current_returns_every_field_as_null_when_the_site_has_no_reading() -> None:
|
||||||
|
svc = service([site("a")])
|
||||||
|
|
||||||
|
actuel = await svc.current("a")
|
||||||
|
|
||||||
|
assert actuel.timestamp is None
|
||||||
|
assert actuel.consumption_kw is None
|
||||||
|
assert actuel.data_quality == "critical"
|
||||||
|
assert actuel.null_reasons == []
|
||||||
|
|
||||||
|
|
||||||
|
async def test_current_copies_every_field_from_the_latest_reading() -> None:
|
||||||
|
svc = service([site("a")], {"a": FauxLecture(site_id="a")})
|
||||||
|
|
||||||
|
actuel = await svc.current("a")
|
||||||
|
|
||||||
|
assert actuel.timestamp == TIMESTAMP
|
||||||
|
assert actuel.site_type == "industriel"
|
||||||
|
assert actuel.consumption_kw == 87.34
|
||||||
|
assert actuel.voltage_v == 401.2
|
||||||
|
assert actuel.data_quality == "good"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_current_treats_an_unknown_data_quality_as_critical() -> None:
|
||||||
|
svc = service([site("a")], {"a": FauxLecture(site_id="a", data_quality=None)})
|
||||||
|
|
||||||
|
actuel = await svc.current("a")
|
||||||
|
|
||||||
|
assert actuel.data_quality == "critical"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ from pathlib import Path
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from app import cli
|
from app import cli
|
||||||
from app.schemas.auth import valide_complexite
|
|
||||||
|
|
||||||
|
|
||||||
def test_build_parser_reads_the_create_admin_arguments() -> None:
|
def test_build_parser_reads_the_create_admin_arguments() -> None:
|
||||||
@@ -35,36 +34,26 @@ def test_read_password_generates_a_long_secret_when_asked(
|
|||||||
|
|
||||||
assert len(mot_de_passe) >= cli.LONGUEUR_MOT_DE_PASSE_GENERE
|
assert len(mot_de_passe) >= cli.LONGUEUR_MOT_DE_PASSE_GENERE
|
||||||
assert mot_de_passe in capsys.readouterr().out
|
assert mot_de_passe in capsys.readouterr().out
|
||||||
valide_complexite(mot_de_passe)
|
|
||||||
|
|
||||||
|
|
||||||
def test_read_password_accepts_two_matching_entries(monkeypatch: pytest.MonkeyPatch) -> None:
|
def test_read_password_accepts_two_matching_entries(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||||
saisies = iter(["Un-mot-de-passe-valide1", "Un-mot-de-passe-valide1"])
|
saisies = iter(["un-mot-de-passe-valide", "un-mot-de-passe-valide"])
|
||||||
monkeypatch.setattr(cli, "getpass", lambda _: next(saisies))
|
monkeypatch.setattr(cli, "getpass", lambda _: next(saisies))
|
||||||
|
|
||||||
assert cli.read_password(generate=False) == "Un-mot-de-passe-valide1"
|
assert cli.read_password(generate=False) == "un-mot-de-passe-valide"
|
||||||
|
|
||||||
|
|
||||||
def test_read_password_refuses_a_password_below_the_minimum_length(
|
def test_read_password_refuses_a_password_below_the_minimum_length(
|
||||||
monkeypatch: pytest.MonkeyPatch,
|
monkeypatch: pytest.MonkeyPatch,
|
||||||
) -> None:
|
) -> None:
|
||||||
monkeypatch.setattr(cli, "getpass", lambda _: "Court1!")
|
monkeypatch.setattr(cli, "getpass", lambda _: "court")
|
||||||
|
|
||||||
with pytest.raises(SystemExit):
|
|
||||||
cli.read_password(generate=False)
|
|
||||||
|
|
||||||
|
|
||||||
def test_read_password_refuses_a_password_missing_a_character_class(
|
|
||||||
monkeypatch: pytest.MonkeyPatch,
|
|
||||||
) -> None:
|
|
||||||
monkeypatch.setattr(cli, "getpass", lambda _: "un-mot-de-passe-sans-majuscule-ni-chiffre")
|
|
||||||
|
|
||||||
with pytest.raises(SystemExit):
|
with pytest.raises(SystemExit):
|
||||||
cli.read_password(generate=False)
|
cli.read_password(generate=False)
|
||||||
|
|
||||||
|
|
||||||
def test_read_password_refuses_two_different_entries(monkeypatch: pytest.MonkeyPatch) -> None:
|
def test_read_password_refuses_two_different_entries(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||||
saisies = iter(["Un-mot-de-passe-valide1", "Un-autre-mot-de-passe2"])
|
saisies = iter(["un-mot-de-passe-valide", "un-autre-mot-de-passe"])
|
||||||
monkeypatch.setattr(cli, "getpass", lambda _: next(saisies))
|
monkeypatch.setattr(cli, "getpass", lambda _: next(saisies))
|
||||||
|
|
||||||
with pytest.raises(SystemExit):
|
with pytest.raises(SystemExit):
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
# Piège : le logo est committé indépendamment à deux endroits (`app/static/`, servi par
|
|
||||||
# `/docs`/`/redoc`, et `apps/frontend/public/`, servi au front) faute d'étape de build partagée.
|
|
||||||
# Sans ce test, une mise à jour d'un seul des deux fichiers dérive silencieusement : rien en CI
|
|
||||||
# ne le détecte.
|
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
BACKEND_LOGO = Path(__file__).parent.parent / "app" / "static" / "logo-icon.png"
|
|
||||||
FRONTEND_LOGO = Path(__file__).parent.parent.parent / "frontend" / "public" / "logo-icon.png"
|
|
||||||
|
|
||||||
|
|
||||||
def test_the_backend_logo_stays_in_sync_with_the_frontend_one() -> None:
|
|
||||||
assert BACKEND_LOGO.read_bytes() == FRONTEND_LOGO.read_bytes()
|
|
||||||
Generated
-11
@@ -7,15 +7,6 @@ resolution-markers = [
|
|||||||
"sys_platform != 'emscripten' and sys_platform != 'win32'",
|
"sys_platform != 'emscripten' and sys_platform != 'win32'",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "aiosmtplib"
|
|
||||||
version = "5.1.3"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/9b/5c/9cabc5db6d607616e81ba6d8f1f231cd5a75955807a308c1090a59072d6d/aiosmtplib-5.1.3.tar.gz", hash = "sha256:ac2b418d3260ba62d9cfd0fe7359726e9dc009a4e8e8d9909fdfae332f522a7c", size = 77010, upload-time = "2026-09-08T02:11:20.532Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/9c/0a/b56ab8163d54960337fdca475d3dfd56c8badf6172e79cf2ad00d5335dc1/aiosmtplib-5.1.3-py3-none-any.whl", hash = "sha256:f7d76ce3d4995a65a178c1f11e1bd1607706b921d00cb768e7a2c7f7ef5517a8", size = 30116, upload-time = "2026-09-08T02:11:19.352Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "alembic"
|
name = "alembic"
|
||||||
version = "1.20.0"
|
version = "1.20.0"
|
||||||
@@ -320,7 +311,6 @@ name = "enervision-backend"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "aiosmtplib" },
|
|
||||||
{ name = "alembic" },
|
{ name = "alembic" },
|
||||||
{ name = "anyio" },
|
{ name = "anyio" },
|
||||||
{ name = "argon2-cffi" },
|
{ name = "argon2-cffi" },
|
||||||
@@ -349,7 +339,6 @@ dev = [
|
|||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
{ name = "aiosmtplib", specifier = ">=5.1.3" },
|
|
||||||
{ name = "alembic", specifier = ">=1.20.0" },
|
{ name = "alembic", specifier = ">=1.20.0" },
|
||||||
{ name = "anyio", specifier = ">=4.0" },
|
{ name = "anyio", specifier = ">=4.0" },
|
||||||
{ name = "argon2-cffi", specifier = ">=23.1" },
|
{ name = "argon2-cffi", specifier = ">=23.1" },
|
||||||
|
|||||||
@@ -76,13 +76,6 @@ Points à vérifier après toute regénération :
|
|||||||
côté backend. Le `docker-compose.yml` n'a aucun service frontend.
|
côté backend. Le `docker-compose.yml` n'a aucun service frontend.
|
||||||
4. Ajouter le `Dockerfile` multi-stage (build Angular puis service statique nginx).
|
4. Ajouter le `Dockerfile` multi-stage (build Angular puis service statique nginx).
|
||||||
|
|
||||||
## Design système
|
|
||||||
|
|
||||||
Tokens (couleurs, typo, espacements) et composants partagés (`ev-button`, `ev-card`,
|
|
||||||
`ev-alert`, `ev-badge`) sont documentés dans
|
|
||||||
[`docs/architecture/32-design-systeme-frontend.md`](../../docs/architecture/32-design-systeme-frontend.md).
|
|
||||||
Toute nouvelle page doit les réutiliser plutôt que définir ses propres valeurs.
|
|
||||||
|
|
||||||
## Additional Resources
|
## Additional Resources
|
||||||
|
|
||||||
For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
|
For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
@@ -5,8 +5,6 @@ export const routes: Routes = [
|
|||||||
{ path: '', redirectTo: 'dashboard', pathMatch: 'full' },
|
{ path: '', redirectTo: 'dashboard', pathMatch: 'full' },
|
||||||
{ path: 'login', loadComponent: () => import('./features/auth/login/login').then(m => m.Login) },
|
{ path: 'login', loadComponent: () => import('./features/auth/login/login').then(m => m.Login) },
|
||||||
{ path: 'change-password', loadComponent: () => import('./features/auth/change-password/change-password').then(m => m.ChangePassword) },
|
{ path: 'change-password', loadComponent: () => import('./features/auth/change-password/change-password').then(m => m.ChangePassword) },
|
||||||
{ path: 'forgot-password', loadComponent: () => import('./features/auth/forgot-password/forgot-password').then(m => m.ForgotPassword) },
|
|
||||||
{ path: 'reset-password', loadComponent: () => import('./features/auth/reset-password/reset-password').then(m => m.ResetPassword) },
|
|
||||||
{
|
{
|
||||||
path: 'dashboard',
|
path: 'dashboard',
|
||||||
canActivate: [authGuard],
|
canActivate: [authGuard],
|
||||||
|
|||||||
@@ -41,10 +41,7 @@ describe('authInterceptor', () => {
|
|||||||
httpMock = TestBed.inject(HttpTestingController);
|
httpMock = TestBed.inject(HttpTestingController);
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => httpMock.verify());
|
||||||
httpMock.verify();
|
|
||||||
vi.restoreAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ajoute le header Authorization quand un token est disponible', () => {
|
it('ajoute le header Authorization quand un token est disponible', () => {
|
||||||
http.get('/api/v1/stats/summary').subscribe();
|
http.get('/api/v1/stats/summary').subscribe();
|
||||||
@@ -100,19 +97,6 @@ describe('authInterceptor', () => {
|
|||||||
expect(routerMock.navigate).toHaveBeenCalledWith(['/login']);
|
expect(routerMock.navigate).toHaveBeenCalledWith(['/login']);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("ne redirige pas vers /login sur un 401 de /auth/refresh si on est déjà sur /reset-password", () => {
|
|
||||||
vi.spyOn(window, 'location', 'get').mockReturnValue({
|
|
||||||
pathname: '/reset-password',
|
|
||||||
} as Location);
|
|
||||||
|
|
||||||
http.post('/api/v1/auth/refresh', {}).subscribe({ error: () => {} });
|
|
||||||
const req = httpMock.expectOne('/api/v1/auth/refresh');
|
|
||||||
req.flush({}, { status: 401, statusText: 'Unauthorized' });
|
|
||||||
|
|
||||||
expect(authMock.clearSession).toHaveBeenCalled();
|
|
||||||
expect(routerMock.navigate).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('rafraîchit puis rejoue la requête sur un 401 avec error="expired"', () => {
|
it('rafraîchit puis rejoue la requête sur un 401 avec error="expired"', () => {
|
||||||
authMock.refreshShared.mockReturnValue(of({ access_token: 'new-token' }));
|
authMock.refreshShared.mockReturnValue(of({ access_token: 'new-token' }));
|
||||||
authMock.getAccessToken.mockReturnValueOnce('old-token').mockReturnValue('new-token');
|
authMock.getAccessToken.mockReturnValueOnce('old-token').mockReturnValue('new-token');
|
||||||
|
|||||||
@@ -11,16 +11,6 @@ function parseAuthError(response: HttpErrorResponse): string | null {
|
|||||||
return match ? match[1] : null;
|
return match ? match[1] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ROUTES_INVITEES = ['/login', '/forgot-password', '/reset-password'];
|
|
||||||
|
|
||||||
// Piège : le rafraîchissement de session lancé au démarrage de l'app (provideAppInitializer)
|
|
||||||
// échoue silencieusement sans cookie valide. `window.location.pathname` (pas `router.url`,
|
|
||||||
// pas encore fiable à ce stade) évite qu'un 401 de fond écrase la navigation vers le lien de
|
|
||||||
// reset reçu par email.
|
|
||||||
function surRouteInvitee(): boolean {
|
|
||||||
return ROUTES_INVITEES.some((chemin) => window.location.pathname.startsWith(chemin));
|
|
||||||
}
|
|
||||||
|
|
||||||
export const authInterceptor: HttpInterceptorFn = (req, next) => {
|
export const authInterceptor: HttpInterceptorFn = (req, next) => {
|
||||||
const auth = inject(AuthService);
|
const auth = inject(AuthService);
|
||||||
const router = inject(Router);
|
const router = inject(Router);
|
||||||
@@ -53,9 +43,7 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
|
|||||||
|
|
||||||
if (req.url.endsWith('/auth/refresh')) {
|
if (req.url.endsWith('/auth/refresh')) {
|
||||||
auth.clearSession();
|
auth.clearSession();
|
||||||
if (!surRouteInvitee()) {
|
|
||||||
router.navigate(['/login']);
|
router.navigate(['/login']);
|
||||||
}
|
|
||||||
return throwError(() => error);
|
return throwError(() => error);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,9 +51,7 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
|
|||||||
|
|
||||||
if (kind === 'invalid_token') {
|
if (kind === 'invalid_token') {
|
||||||
auth.clearSession();
|
auth.clearSession();
|
||||||
if (!surRouteInvitee()) {
|
|
||||||
router.navigate(['/login']);
|
router.navigate(['/login']);
|
||||||
}
|
|
||||||
return throwError(() => error);
|
return throwError(() => error);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,9 +65,7 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
|
|||||||
}),
|
}),
|
||||||
catchError((refreshError) => {
|
catchError((refreshError) => {
|
||||||
auth.clearSession();
|
auth.clearSession();
|
||||||
if (!surRouteInvitee()) {
|
|
||||||
router.navigate(['/login']);
|
router.navigate(['/login']);
|
||||||
}
|
|
||||||
return throwError(() => refreshError);
|
return throwError(() => refreshError);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -83,17 +83,4 @@ describe('AuthService', () => {
|
|||||||
|
|
||||||
expect(result).toEqual(tokenResponse.principal);
|
expect(result).toEqual(tokenResponse.principal);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('vérifie la validité du jeton de reset via GET /auth/reset-password/validate', () => {
|
|
||||||
let result: { valid: boolean } | undefined;
|
|
||||||
service.validateResetToken('un-secret-opaque').subscribe((r) => (result = r));
|
|
||||||
|
|
||||||
const req = httpMock.expectOne(
|
|
||||||
`${environment.apiUrl}/auth/reset-password/validate?token=un-secret-opaque`
|
|
||||||
);
|
|
||||||
expect(req.request.method).toBe('GET');
|
|
||||||
req.flush({ valid: true });
|
|
||||||
|
|
||||||
expect(result).toEqual({ valid: true });
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
import { Service, signal, computed, inject } from '@angular/core';
|
import { Service, signal, computed, inject } from '@angular/core';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { Observable, tap, finalize, shareReplay } from 'rxjs';
|
import { Observable, tap, finalize, shareReplay } from 'rxjs';
|
||||||
import {
|
import { LoginRequest, PasswordChangeRequest, Principal, TokenResponse } from '../../shared/models/auth.model';
|
||||||
ForgotPasswordRequest,
|
|
||||||
LoginRequest,
|
|
||||||
PasswordChangeRequest,
|
|
||||||
Principal,
|
|
||||||
ResetPasswordRequest,
|
|
||||||
TokenResponse,
|
|
||||||
} from '../../shared/models/auth.model';
|
|
||||||
import { environment } from '../../../environments/environment';
|
import { environment } from '../../../environments/environment';
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
@@ -73,20 +66,4 @@ export class AuthService {
|
|||||||
me(): Observable<Principal> {
|
me(): Observable<Principal> {
|
||||||
return this.http.get<Principal>(`${environment.apiUrl}/auth/me`);
|
return this.http.get<Principal>(`${environment.apiUrl}/auth/me`);
|
||||||
}
|
}
|
||||||
|
|
||||||
forgotPassword(payload: ForgotPasswordRequest): Observable<void> {
|
|
||||||
return this.http.post<void>(`${environment.apiUrl}/auth/forgot-password`, payload);
|
|
||||||
}
|
|
||||||
|
|
||||||
resetPassword(payload: ResetPasswordRequest): Observable<TokenResponse> {
|
|
||||||
return this.http
|
|
||||||
.post<TokenResponse>(`${environment.apiUrl}/auth/reset-password`, payload, { withCredentials: true })
|
|
||||||
.pipe(tap((response) => this.setSession(response)));
|
|
||||||
}
|
|
||||||
|
|
||||||
validateResetToken(token: string): Observable<{ valid: boolean }> {
|
|
||||||
return this.http.get<{ valid: boolean }>(`${environment.apiUrl}/auth/reset-password/validate`, {
|
|
||||||
params: { token },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +1,31 @@
|
|||||||
<div class="auth-page">
|
<div class="auth-page">
|
||||||
<form class="auth-card-wrapper" [formGroup]="form" (ngSubmit)="onSubmit()">
|
<form class="auth-card" [formGroup]="form" (ngSubmit)="onSubmit()">
|
||||||
<ev-card>
|
|
||||||
<ev-brand class="auth-brand" />
|
|
||||||
<h1>Nouveau mot de passe</h1>
|
<h1>Nouveau mot de passe</h1>
|
||||||
<p class="auth-subtitle">
|
<p class="auth-subtitle">Votre mot de passe est provisoire, vous devez le modifier avant de continuer</p>
|
||||||
Votre mot de passe est provisoire, vous devez le modifier avant de continuer
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<label class="form-label" for="current_password">Mot de passe actuel</label>
|
<label for="current_password">Mot de passe actuel</label>
|
||||||
<input
|
<input
|
||||||
id="current_password"
|
id="current_password"
|
||||||
class="form-input"
|
|
||||||
type="password"
|
type="password"
|
||||||
formControlName="current_password"
|
formControlName="current_password"
|
||||||
autocomplete="current-password"
|
autocomplete="current-password"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<label class="form-label" for="new_password">Nouveau mot de passe</label>
|
<label for="new_password">Nouveau mot de passe</label>
|
||||||
<input
|
<input
|
||||||
id="new_password"
|
id="new_password"
|
||||||
class="form-input"
|
|
||||||
type="password"
|
type="password"
|
||||||
formControlName="new_password"
|
formControlName="new_password"
|
||||||
autocomplete="new-password"
|
autocomplete="new-password"
|
||||||
/>
|
/>
|
||||||
<span class="form-hint">{{ passwordHint }}</span>
|
<span class="auth-hint">12 à 128 caractères</span>
|
||||||
|
|
||||||
@if (errorMessage()) {
|
@if (errorMessage()) {
|
||||||
<ev-alert severity="danger">{{ errorMessage() }}</ev-alert>
|
<p class="auth-error">{{ errorMessage() }}</p>
|
||||||
}
|
}
|
||||||
|
|
||||||
<ev-button type="submit" [disabled]="form.invalid || isLoading()">
|
<button type="submit" [disabled]="form.invalid || isLoading()">
|
||||||
{{ isLoading() ? 'Modification...' : 'Valider' }}
|
{{ isLoading() ? 'Modification...' : 'Valider' }}
|
||||||
</ev-button>
|
</button>
|
||||||
</ev-card>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
:host {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 100vh;
|
||||||
|
background: #f3f4f6;
|
||||||
|
font-family: 'Segoe UI', system-ui, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-card {
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid #e5e7eb;
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 2.5rem;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 360px;
|
||||||
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #1f2937;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-subtitle {
|
||||||
|
margin: 0.25rem 0 1.5rem;
|
||||||
|
color: #6b7280;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #374151;
|
||||||
|
margin-bottom: 0.35rem;
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding: 0.6rem 0.75rem;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: #3b82f6;
|
||||||
|
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.15);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
padding: 0.7rem;
|
||||||
|
background: #3b82f6;
|
||||||
|
color: #fff;
|
||||||
|
border: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:disabled {
|
||||||
|
background: #9ca3af;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:not(:disabled):hover {
|
||||||
|
background: #2563eb;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-hint {
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: #9ca3af;
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-error {
|
||||||
|
margin: 0.75rem 0 0;
|
||||||
|
color: #dc2626;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,19 +32,10 @@ describe('ChangePassword', () => {
|
|||||||
expect(authMock.changePassword).not.toHaveBeenCalled();
|
expect(authMock.changePassword).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('ne soumet pas si le mot de passe ne couvre pas les 4 classes de caractères', () => {
|
|
||||||
const fixture = TestBed.createComponent(ChangePassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
component.form.setValue({ current_password: 'old', new_password: 'longueur-suffisante-sans-majuscule-ni-chiffre' });
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
expect(authMock.changePassword).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('redirige vers /dashboard après un changement réussi', () => {
|
it('redirige vers /dashboard après un changement réussi', () => {
|
||||||
const fixture = TestBed.createComponent(ChangePassword);
|
const fixture = TestBed.createComponent(ChangePassword);
|
||||||
const component = fixture.componentInstance;
|
const component = fixture.componentInstance;
|
||||||
component.form.setValue({ current_password: 'ancien-mot-de-passe', new_password: 'Un-nouveau-mot-de-passe1!' });
|
component.form.setValue({ current_password: 'ancien-mot-de-passe', new_password: 'un-nouveau-mot-de-passe-valide' });
|
||||||
|
|
||||||
authMock.changePassword.mockReturnValue(of({ principal: { role: 'admin' } }));
|
authMock.changePassword.mockReturnValue(of({ principal: { role: 'admin' } }));
|
||||||
|
|
||||||
@@ -55,7 +46,7 @@ describe('ChangePassword', () => {
|
|||||||
it("affiche un message d'erreur si le mot de passe actuel est incorrect", () => {
|
it("affiche un message d'erreur si le mot de passe actuel est incorrect", () => {
|
||||||
const fixture = TestBed.createComponent(ChangePassword);
|
const fixture = TestBed.createComponent(ChangePassword);
|
||||||
const component = fixture.componentInstance;
|
const component = fixture.componentInstance;
|
||||||
component.form.setValue({ current_password: 'mauvais-mot-de-passe', new_password: 'Un-nouveau-mot-de-passe1!' });
|
component.form.setValue({ current_password: 'mauvais-mot-de-passe', new_password: 'un-nouveau-mot-de-passe-valide' });
|
||||||
|
|
||||||
authMock.changePassword.mockReturnValue(throwError(() => new Error('401')));
|
authMock.changePassword.mockReturnValue(throwError(() => new Error('401')));
|
||||||
|
|
||||||
@@ -63,7 +54,7 @@ describe('ChangePassword', () => {
|
|||||||
fixture.detectChanges(); // rend le bloc @if (errorMessage())
|
fixture.detectChanges(); // rend le bloc @if (errorMessage())
|
||||||
|
|
||||||
expect(component.errorMessage()).toContain('incorrect');
|
expect(component.errorMessage()).toContain('incorrect');
|
||||||
const errorEl = fixture.nativeElement.querySelector('.ev-alert');
|
const errorEl = fixture.nativeElement.querySelector('.auth-error');
|
||||||
expect(errorEl?.textContent).toContain('incorrect');
|
expect(errorEl?.textContent).toContain('incorrect');
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -73,13 +64,13 @@ describe('ChangePassword', () => {
|
|||||||
|
|
||||||
const button = fixture.nativeElement.querySelector('button[type="submit"]');
|
const button = fixture.nativeElement.querySelector('button[type="submit"]');
|
||||||
expect(button.disabled).toBe(true);
|
expect(button.disabled).toBe(true);
|
||||||
expect(fixture.nativeElement.querySelector('.ev-alert')).toBeNull();
|
expect(fixture.nativeElement.querySelector('.auth-error')).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('déclenche onSubmit via la soumission réelle du formulaire (ngSubmit)', () => {
|
it('déclenche onSubmit via la soumission réelle du formulaire (ngSubmit)', () => {
|
||||||
const fixture = TestBed.createComponent(ChangePassword);
|
const fixture = TestBed.createComponent(ChangePassword);
|
||||||
const component = fixture.componentInstance;
|
const component = fixture.componentInstance;
|
||||||
component.form.setValue({ current_password: 'ancien-mot-de-passe', new_password: 'Un-nouveau-mot-de-passe1!' });
|
component.form.setValue({ current_password: 'ancien-mot-de-passe', new_password: 'un-nouveau-mot-de-passe-valide' });
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
authMock.changePassword.mockReturnValue(of({ principal: { role: 'admin' } }));
|
authMock.changePassword.mockReturnValue(of({ principal: { role: 'admin' } }));
|
||||||
@@ -90,7 +81,7 @@ describe('ChangePassword', () => {
|
|||||||
|
|
||||||
expect(authMock.changePassword).toHaveBeenCalledWith({
|
expect(authMock.changePassword).toHaveBeenCalledWith({
|
||||||
current_password: 'ancien-mot-de-passe',
|
current_password: 'ancien-mot-de-passe',
|
||||||
new_password: 'Un-nouveau-mot-de-passe1!',
|
new_password: 'un-nouveau-mot-de-passe-valide',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -2,16 +2,11 @@ import { Component, inject, signal } from '@angular/core';
|
|||||||
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
|
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
import { AuthService } from '../../../core/services/auth.service';
|
||||||
import { Button } from '../../../shared/components/ui/button/button';
|
|
||||||
import { Card } from '../../../shared/components/ui/card/card';
|
|
||||||
import { Alert } from '../../../shared/components/ui/alert/alert';
|
|
||||||
import { Brand } from '../../../shared/components/ui/brand/brand';
|
|
||||||
import { passwordValidators, PASSWORD_HINT } from '../../../shared/validators/password.validator';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-change-password',
|
selector: 'app-change-password',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [ReactiveFormsModule, Button, Card, Alert, Brand],
|
imports: [ReactiveFormsModule],
|
||||||
templateUrl: './change-password.html',
|
templateUrl: './change-password.html',
|
||||||
styleUrl: './change-password.scss',
|
styleUrl: './change-password.scss',
|
||||||
})
|
})
|
||||||
@@ -22,11 +17,10 @@ export class ChangePassword {
|
|||||||
|
|
||||||
errorMessage = signal<string | null>(null);
|
errorMessage = signal<string | null>(null);
|
||||||
isLoading = signal(false);
|
isLoading = signal(false);
|
||||||
passwordHint = PASSWORD_HINT;
|
|
||||||
|
|
||||||
form = this.fb.nonNullable.group({
|
form = this.fb.nonNullable.group({
|
||||||
current_password: ['', Validators.required],
|
current_password: ['', Validators.required],
|
||||||
new_password: ['', passwordValidators],
|
new_password: ['', [Validators.required, Validators.minLength(12), Validators.maxLength(128)]],
|
||||||
});
|
});
|
||||||
|
|
||||||
onSubmit(): void {
|
onSubmit(): void {
|
||||||
@@ -40,9 +34,7 @@ export class ChangePassword {
|
|||||||
},
|
},
|
||||||
error: () => {
|
error: () => {
|
||||||
this.isLoading.set(false);
|
this.isLoading.set(false);
|
||||||
this.errorMessage.set(
|
this.errorMessage.set('Mot de passe actuel incorrect, ou nouveau mot de passe invalide (12 à 128 caractères).');
|
||||||
`Mot de passe actuel incorrect, ou nouveau mot de passe invalide (${this.passwordHint}).`,
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
<div class="auth-page">
|
|
||||||
<form class="auth-card" [formGroup]="form" (ngSubmit)="onSubmit()">
|
|
||||||
<h1>Mot de passe oublié</h1>
|
|
||||||
<p class="auth-subtitle">Recevez un lien de réinitialisation par email</p>
|
|
||||||
|
|
||||||
@if (submitted()) {
|
|
||||||
<p class="auth-success">
|
|
||||||
Si un compte existe pour cet email, un lien de réinitialisation vient d'être envoyé.
|
|
||||||
Il expire dans 15 minutes.
|
|
||||||
</p>
|
|
||||||
} @else {
|
|
||||||
<label for="email">Email</label>
|
|
||||||
<input
|
|
||||||
id="email"
|
|
||||||
type="email"
|
|
||||||
formControlName="email"
|
|
||||||
autocomplete="username"
|
|
||||||
placeholder="vous@enervision.fr"
|
|
||||||
/>
|
|
||||||
|
|
||||||
@if (errorMessage()) {
|
|
||||||
<p class="auth-error">
|
|
||||||
{{ errorMessage() }}
|
|
||||||
@if (retryAfterSeconds(); as seconds) {
|
|
||||||
(réessayez dans {{ seconds }}s)
|
|
||||||
}
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
|
|
||||||
<button type="submit" [disabled]="form.invalid || isLoading()">
|
|
||||||
{{ isLoading() ? 'Envoi...' : 'Envoyer le lien' }}
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
|
|
||||||
<p class="auth-link"><a routerLink="/login">Retour à la connexion</a></p>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
min-height: 100vh;
|
|
||||||
background: #f3f4f6;
|
|
||||||
font-family: 'Segoe UI', system-ui, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-card {
|
|
||||||
background: #ffffff;
|
|
||||||
border: 1px solid #e5e7eb;
|
|
||||||
border-radius: 12px;
|
|
||||||
padding: 2.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 360px;
|
|
||||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #1f2937;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-subtitle {
|
|
||||||
margin: 0.25rem 0 1.5rem;
|
|
||||||
color: #6b7280;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
line-height: 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-weight: 600;
|
|
||||||
color: #374151;
|
|
||||||
margin-bottom: 0.35rem;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
input {
|
|
||||||
padding: 0.6rem 0.75rem;
|
|
||||||
border: 1px solid #d1d5db;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
|
|
||||||
&:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: #3b82f6;
|
|
||||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.15);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
padding: 0.7rem;
|
|
||||||
background: #3b82f6;
|
|
||||||
color: #fff;
|
|
||||||
border: none;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
&:disabled {
|
|
||||||
background: #9ca3af;
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
|
||||||
background: #2563eb;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-hint {
|
|
||||||
font-size: 0.75rem;
|
|
||||||
color: #9ca3af;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-error {
|
|
||||||
margin: 0.75rem 0 0;
|
|
||||||
color: #dc2626;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-success {
|
|
||||||
margin: 0.75rem 0 0;
|
|
||||||
color: #16a34a;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-link {
|
|
||||||
margin-top: 1rem;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
text-align: center;
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: #3b82f6;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { ReactiveFormsModule } from '@angular/forms';
|
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
|
||||||
import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
|
|
||||||
import { of, throwError } from 'rxjs';
|
|
||||||
import { vi } from 'vitest';
|
|
||||||
import { ForgotPassword } from './forgot-password';
|
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
|
||||||
|
|
||||||
describe('ForgotPassword', () => {
|
|
||||||
let authMock: { forgotPassword: ReturnType<typeof vi.fn> };
|
|
||||||
let routerMock: { navigate: ReturnType<typeof vi.fn> };
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
authMock = { forgotPassword: vi.fn() };
|
|
||||||
routerMock = { navigate: vi.fn() };
|
|
||||||
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
imports: [ForgotPassword, ReactiveFormsModule],
|
|
||||||
providers: [
|
|
||||||
{ provide: AuthService, useValue: authMock },
|
|
||||||
{ provide: Router, useValue: routerMock },
|
|
||||||
{ provide: ActivatedRoute, useValue: {} },
|
|
||||||
],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ne soumet pas si le formulaire est invalide', () => {
|
|
||||||
const fixture = TestBed.createComponent(ForgotPassword);
|
|
||||||
fixture.componentInstance.onSubmit();
|
|
||||||
expect(authMock.forgotPassword).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('affiche le message générique après une soumission réussie', () => {
|
|
||||||
const fixture = TestBed.createComponent(ForgotPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
component.form.setValue({ email: 'operateur@enervision.fr' });
|
|
||||||
authMock.forgotPassword.mockReturnValue(of(undefined));
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(component.submitted()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('affiche le même message générique même quand le serveur répond une erreur autre que 429', () => {
|
|
||||||
const fixture = TestBed.createComponent(ForgotPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
component.form.setValue({ email: 'inconnu@enervision.fr' });
|
|
||||||
authMock.forgotPassword.mockReturnValue(throwError(() => new HttpErrorResponse({ status: 500 })));
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(component.submitted()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('affiche le délai à respecter quand le taux limite est atteint', () => {
|
|
||||||
const fixture = TestBed.createComponent(ForgotPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
component.form.setValue({ email: 'operateur@enervision.fr' });
|
|
||||||
authMock.forgotPassword.mockReturnValue(
|
|
||||||
throwError(
|
|
||||||
() =>
|
|
||||||
new HttpErrorResponse({
|
|
||||||
status: 429,
|
|
||||||
headers: new HttpHeaders({ 'Retry-After': '900' }),
|
|
||||||
})
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(component.submitted()).toBe(false);
|
|
||||||
expect(component.retryAfterSeconds()).toBe(900);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
import { Component, inject, signal } from '@angular/core';
|
|
||||||
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
|
|
||||||
import { RouterLink } from '@angular/router';
|
|
||||||
import { HttpErrorResponse } from '@angular/common/http';
|
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-forgot-password',
|
|
||||||
standalone: true,
|
|
||||||
imports: [ReactiveFormsModule, RouterLink],
|
|
||||||
templateUrl: './forgot-password.html',
|
|
||||||
styleUrl: './forgot-password.scss',
|
|
||||||
})
|
|
||||||
export class ForgotPassword {
|
|
||||||
private fb = inject(FormBuilder);
|
|
||||||
private auth = inject(AuthService);
|
|
||||||
|
|
||||||
errorMessage = signal<string | null>(null);
|
|
||||||
retryAfterSeconds = signal<number | null>(null);
|
|
||||||
submitted = signal(false);
|
|
||||||
isLoading = signal(false);
|
|
||||||
|
|
||||||
form = this.fb.nonNullable.group({
|
|
||||||
email: ['', [Validators.required, Validators.email]],
|
|
||||||
});
|
|
||||||
|
|
||||||
onSubmit(): void {
|
|
||||||
if (this.form.invalid) return;
|
|
||||||
|
|
||||||
this.isLoading.set(true);
|
|
||||||
this.errorMessage.set(null);
|
|
||||||
this.retryAfterSeconds.set(null);
|
|
||||||
|
|
||||||
this.auth.forgotPassword(this.form.getRawValue()).subscribe({
|
|
||||||
// Le message affiché ne dépend jamais du fait que le compte existe ou non : la réponse
|
|
||||||
// du serveur est déjà générique, l'écran doit l'être aussi.
|
|
||||||
next: () => {
|
|
||||||
this.isLoading.set(false);
|
|
||||||
this.submitted.set(true);
|
|
||||||
},
|
|
||||||
error: (error: HttpErrorResponse) => {
|
|
||||||
this.isLoading.set(false);
|
|
||||||
if (error.status === 429) {
|
|
||||||
const retryAfter = error.headers.get('Retry-After');
|
|
||||||
this.retryAfterSeconds.set(retryAfter ? Number(retryAfter) : null);
|
|
||||||
this.errorMessage.set('Trop de demandes, réessayez plus tard.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.submitted.set(true);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +1,36 @@
|
|||||||
<div class="auth-page">
|
<div class="auth-page">
|
||||||
<form class="auth-card-wrapper" [formGroup]="form" (ngSubmit)="onSubmit()">
|
<form class="auth-card" [formGroup]="form" (ngSubmit)="onSubmit()">
|
||||||
<ev-card>
|
|
||||||
<ev-brand class="auth-brand" />
|
|
||||||
<h1>Connexion</h1>
|
<h1>Connexion</h1>
|
||||||
<p class="auth-subtitle">Accédez à votre espace EnerVision</p>
|
<p class="auth-subtitle">Accédez à votre espace EnerVision</p>
|
||||||
|
|
||||||
<label class="form-label" for="email">Email</label>
|
<label for="email">Email</label>
|
||||||
<input
|
<input
|
||||||
id="email"
|
id="email"
|
||||||
class="form-input"
|
|
||||||
type="email"
|
type="email"
|
||||||
formControlName="email"
|
formControlName="email"
|
||||||
autocomplete="username"
|
autocomplete="username"
|
||||||
placeholder="vous@enervision.fr"
|
placeholder="vous@enervision.fr"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<label class="form-label" for="password">Mot de passe</label>
|
<label for="password">Mot de passe</label>
|
||||||
<input
|
<input
|
||||||
id="password"
|
id="password"
|
||||||
class="form-input"
|
|
||||||
type="password"
|
type="password"
|
||||||
formControlName="password"
|
formControlName="password"
|
||||||
autocomplete="current-password"
|
autocomplete="current-password"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@if (errorMessage()) {
|
@if (errorMessage()) {
|
||||||
<ev-alert severity="danger">
|
<p class="auth-error">
|
||||||
{{ errorMessage() }}
|
{{ errorMessage() }}
|
||||||
@if (retryAfterSeconds(); as seconds) {
|
@if (retryAfterSeconds(); as seconds) {
|
||||||
(réessayez dans {{ seconds }}s)
|
(réessayez dans {{ seconds }}s)
|
||||||
}
|
}
|
||||||
</ev-alert>
|
</p>
|
||||||
}
|
}
|
||||||
|
|
||||||
<ev-button type="submit" [disabled]="form.invalid || isLoading()">
|
<button type="submit" [disabled]="form.invalid || isLoading()">
|
||||||
{{ isLoading() ? 'Connexion...' : 'Se connecter' }}
|
{{ isLoading() ? 'Connexion...' : 'Se connecter' }}
|
||||||
</ev-button>
|
</button>
|
||||||
|
|
||||||
<p class="auth-link"><a routerLink="/forgot-password">Mot de passe oublié ?</a></p>
|
|
||||||
</ev-card>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,9 +1,81 @@
|
|||||||
.auth-link {
|
:host {
|
||||||
margin-top: 1rem;
|
display: flex;
|
||||||
font-size: 0.85rem;
|
align-items: center;
|
||||||
text-align: center;
|
justify-content: center;
|
||||||
|
min-height: 100vh;
|
||||||
|
background: #f3f4f6;
|
||||||
|
font-family: 'Segoe UI', system-ui, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
a {
|
.auth-card {
|
||||||
color: #3b82f6;
|
background: #ffffff;
|
||||||
|
border: 1px solid #e5e7eb;
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 2.5rem;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 360px;
|
||||||
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #1f2937;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-subtitle {
|
||||||
|
margin: 0.25rem 0 1.5rem;
|
||||||
|
color: #6b7280;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #374151;
|
||||||
|
margin-bottom: 0.35rem;
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding: 0.6rem 0.75rem;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: #3b82f6;
|
||||||
|
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.15);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
padding: 0.7rem;
|
||||||
|
background: #3b82f6;
|
||||||
|
color: #fff;
|
||||||
|
border: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:disabled {
|
||||||
|
background: #9ca3af;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:not(:disabled):hover {
|
||||||
|
background: #2563eb;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.auth-error {
|
||||||
|
margin: 0.75rem 0 0;
|
||||||
|
color: #dc2626;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,43 +1,27 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
import { TestBed } from '@angular/core/testing';
|
||||||
import { ReactiveFormsModule } from '@angular/forms';
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
|
import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
|
||||||
import { of, throwError } from 'rxjs';
|
import { of, throwError } from 'rxjs';
|
||||||
import { vi } from 'vitest';
|
import { vi } from 'vitest';
|
||||||
import { Login } from './login';
|
import { Login } from './login';
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
import { AuthService } from '../../../core/services/auth.service';
|
||||||
import { MOTIF_LIEN_RESET_INVALIDE } from '../../../shared/models/auth-redirect-reason';
|
|
||||||
|
|
||||||
function configure(queryParams: Record<string, string> = {}) {
|
|
||||||
const authMock = { login: vi.fn() };
|
|
||||||
const routerMock = { navigate: vi.fn() };
|
|
||||||
|
|
||||||
return {
|
|
||||||
authMock,
|
|
||||||
routerMock,
|
|
||||||
testBed: TestBed.configureTestingModule({
|
|
||||||
imports: [Login, ReactiveFormsModule],
|
|
||||||
providers: [
|
|
||||||
{ provide: AuthService, useValue: authMock },
|
|
||||||
{ provide: Router, useValue: routerMock },
|
|
||||||
{
|
|
||||||
provide: ActivatedRoute,
|
|
||||||
useValue: { snapshot: { queryParamMap: convertToParamMap(queryParams) } },
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('Login', () => {
|
describe('Login', () => {
|
||||||
let authMock: { login: ReturnType<typeof vi.fn> };
|
let authMock: { login: ReturnType<typeof vi.fn> };
|
||||||
let routerMock: { navigate: ReturnType<typeof vi.fn> };
|
let routerMock: { navigate: ReturnType<typeof vi.fn> };
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const attirail = configure();
|
authMock = { login: vi.fn() };
|
||||||
authMock = attirail.authMock;
|
routerMock = { navigate: vi.fn() };
|
||||||
routerMock = attirail.routerMock;
|
|
||||||
await attirail.testBed.compileComponents();
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [Login, ReactiveFormsModule],
|
||||||
|
providers: [
|
||||||
|
{ provide: AuthService, useValue: authMock },
|
||||||
|
{ provide: Router, useValue: routerMock },
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('ne soumet pas si le formulaire est invalide', () => {
|
it('ne soumet pas si le formulaire est invalide', () => {
|
||||||
@@ -79,7 +63,7 @@ describe('Login', () => {
|
|||||||
fixture.detectChanges(); // rend le bloc @if (errorMessage()) du template
|
fixture.detectChanges(); // rend le bloc @if (errorMessage()) du template
|
||||||
|
|
||||||
expect(component.errorMessage()).toBe('Email ou mot de passe incorrect.');
|
expect(component.errorMessage()).toBe('Email ou mot de passe incorrect.');
|
||||||
const errorEl = fixture.nativeElement.querySelector('.ev-alert');
|
const errorEl = fixture.nativeElement.querySelector('.auth-error');
|
||||||
expect(errorEl?.textContent).toContain('Email ou mot de passe incorrect.');
|
expect(errorEl?.textContent).toContain('Email ou mot de passe incorrect.');
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -96,25 +80,17 @@ describe('Login', () => {
|
|||||||
fixture.detectChanges(); // rend aussi le sous-bloc @if (retryAfterSeconds(); as seconds)
|
fixture.detectChanges(); // rend aussi le sous-bloc @if (retryAfterSeconds(); as seconds)
|
||||||
|
|
||||||
expect(component.retryAfterSeconds()).toBe(30);
|
expect(component.retryAfterSeconds()).toBe(30);
|
||||||
const errorEl = fixture.nativeElement.querySelector('.ev-alert');
|
const errorEl = fixture.nativeElement.querySelector('.auth-error');
|
||||||
expect(errorEl?.textContent).toContain('30s');
|
expect(errorEl?.textContent).toContain('30s');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('affiche le message standard quand on arrive avec ?motif=lien-expire', async () => {
|
|
||||||
const attirail = configure({ motif: MOTIF_LIEN_RESET_INVALIDE });
|
|
||||||
await attirail.testBed.compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(Login);
|
|
||||||
|
|
||||||
expect(fixture.componentInstance.errorMessage()).toContain('expiré');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('désactive le bouton tant que le formulaire est invalide', () => {
|
it('désactive le bouton tant que le formulaire est invalide', () => {
|
||||||
const fixture = TestBed.createComponent(Login);
|
const fixture = TestBed.createComponent(Login);
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
const button = fixture.nativeElement.querySelector('button[type="submit"]');
|
const button = fixture.nativeElement.querySelector('button[type="submit"]');
|
||||||
expect(button.disabled).toBe(true);
|
expect(button.disabled).toBe(true);
|
||||||
expect(fixture.nativeElement.querySelector('.ev-alert')).toBeNull();
|
expect(fixture.nativeElement.querySelector('.auth-error')).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('déclenche onSubmit via la soumission réelle du formulaire (ngSubmit)', () => {
|
it('déclenche onSubmit via la soumission réelle du formulaire (ngSubmit)', () => {
|
||||||
|
|||||||
@@ -1,21 +1,13 @@
|
|||||||
import { Component, inject, signal } from '@angular/core';
|
import { Component, inject, signal } from '@angular/core';
|
||||||
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
|
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
|
||||||
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { HttpErrorResponse } from '@angular/common/http';
|
import { HttpErrorResponse } from '@angular/common/http';
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
import { AuthService } from '../../../core/services/auth.service';
|
||||||
import { Button } from '../../../shared/components/ui/button/button';
|
|
||||||
import { Card } from '../../../shared/components/ui/card/card';
|
|
||||||
import { Alert } from '../../../shared/components/ui/alert/alert';
|
|
||||||
import { Brand } from '../../../shared/components/ui/brand/brand';
|
|
||||||
import {
|
|
||||||
MESSAGE_LIEN_RESET_INVALIDE,
|
|
||||||
MOTIF_LIEN_RESET_INVALIDE,
|
|
||||||
} from '../../../shared/models/auth-redirect-reason';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-login',
|
selector: 'app-login',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [ReactiveFormsModule, RouterLink, Button, Card, Alert, Brand],
|
imports: [ReactiveFormsModule],
|
||||||
templateUrl: './login.html',
|
templateUrl: './login.html',
|
||||||
styleUrl: './login.scss',
|
styleUrl: './login.scss',
|
||||||
})
|
})
|
||||||
@@ -23,13 +15,8 @@ export class Login {
|
|||||||
private fb = inject(FormBuilder);
|
private fb = inject(FormBuilder);
|
||||||
private auth = inject(AuthService);
|
private auth = inject(AuthService);
|
||||||
private router = inject(Router);
|
private router = inject(Router);
|
||||||
private route = inject(ActivatedRoute);
|
|
||||||
|
|
||||||
errorMessage = signal<string | null>(
|
errorMessage = signal<string | null>(null);
|
||||||
this.route.snapshot.queryParamMap.get('motif') === MOTIF_LIEN_RESET_INVALIDE
|
|
||||||
? MESSAGE_LIEN_RESET_INVALIDE
|
|
||||||
: null,
|
|
||||||
);
|
|
||||||
retryAfterSeconds = signal<number | null>(null);
|
retryAfterSeconds = signal<number | null>(null);
|
||||||
isLoading = signal(false);
|
isLoading = signal(false);
|
||||||
|
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
<div class="auth-page">
|
|
||||||
<form class="auth-card" [formGroup]="form" (ngSubmit)="onSubmit()">
|
|
||||||
<h1>Nouveau mot de passe</h1>
|
|
||||||
|
|
||||||
@if (hasToken && !isCheckingToken()) {
|
|
||||||
<p class="auth-subtitle">Choisissez votre nouveau mot de passe</p>
|
|
||||||
|
|
||||||
<label for="new_password">Nouveau mot de passe</label>
|
|
||||||
<input
|
|
||||||
id="new_password"
|
|
||||||
type="password"
|
|
||||||
formControlName="new_password"
|
|
||||||
autocomplete="new-password"
|
|
||||||
/>
|
|
||||||
<app-password-requirements [password]="password()" />
|
|
||||||
|
|
||||||
@if (errorMessage()) {
|
|
||||||
<p class="auth-error">{{ errorMessage() }}</p>
|
|
||||||
}
|
|
||||||
|
|
||||||
<button type="submit" [disabled]="form.invalid || isLoading()">
|
|
||||||
{{ isLoading() ? 'Modification...' : 'Valider' }}
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
|
|
||||||
@if (hasToken && isCheckingToken()) {
|
|
||||||
<p class="auth-subtitle">Vérification du lien...</p>
|
|
||||||
}
|
|
||||||
|
|
||||||
<p class="auth-link"><a routerLink="/forgot-password">Redemander un lien</a></p>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
min-height: 100vh;
|
|
||||||
background: #f3f4f6;
|
|
||||||
font-family: 'Segoe UI', system-ui, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-card {
|
|
||||||
background: #ffffff;
|
|
||||||
border: 1px solid #e5e7eb;
|
|
||||||
border-radius: 12px;
|
|
||||||
padding: 2.5rem;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 360px;
|
|
||||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #1f2937;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-subtitle {
|
|
||||||
margin: 0.25rem 0 1.5rem;
|
|
||||||
color: #6b7280;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
line-height: 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-weight: 600;
|
|
||||||
color: #374151;
|
|
||||||
margin-bottom: 0.35rem;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
input {
|
|
||||||
padding: 0.6rem 0.75rem;
|
|
||||||
border: 1px solid #d1d5db;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
|
|
||||||
&:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: #3b82f6;
|
|
||||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.15);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
padding: 0.7rem;
|
|
||||||
background: #3b82f6;
|
|
||||||
color: #fff;
|
|
||||||
border: none;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
&:disabled {
|
|
||||||
background: #9ca3af;
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
|
||||||
background: #2563eb;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-hint {
|
|
||||||
font-size: 0.75rem;
|
|
||||||
color: #9ca3af;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-error {
|
|
||||||
margin: 0.75rem 0 0;
|
|
||||||
color: #dc2626;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-success {
|
|
||||||
margin: 0.75rem 0 0;
|
|
||||||
color: #16a34a;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-link {
|
|
||||||
margin-top: 1rem;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
text-align: center;
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: #3b82f6;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { ReactiveFormsModule } from '@angular/forms';
|
|
||||||
import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
|
|
||||||
import { HttpErrorResponse } from '@angular/common/http';
|
|
||||||
import { of, throwError } from 'rxjs';
|
|
||||||
import { vi } from 'vitest';
|
|
||||||
import { ResetPassword } from './reset-password';
|
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
|
||||||
import { MOTIF_LIEN_RESET_INVALIDE } from '../../../shared/models/auth-redirect-reason';
|
|
||||||
|
|
||||||
function configure(token: string | null) {
|
|
||||||
return TestBed.configureTestingModule({
|
|
||||||
imports: [ResetPassword, ReactiveFormsModule],
|
|
||||||
providers: [
|
|
||||||
{
|
|
||||||
provide: AuthService,
|
|
||||||
useValue: {
|
|
||||||
resetPassword: vi.fn(),
|
|
||||||
validateResetToken: vi.fn().mockReturnValue(of({ valid: true })),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ provide: Router, useValue: { navigate: vi.fn() } },
|
|
||||||
{
|
|
||||||
provide: ActivatedRoute,
|
|
||||||
useValue: { snapshot: { queryParamMap: convertToParamMap(token ? { token } : {}) } },
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compileComponents();
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('ResetPassword', () => {
|
|
||||||
it("redirige vers /login avec le motif standard quand le jeton est absent de l'URL", async () => {
|
|
||||||
await configure(null);
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const router = TestBed.inject(Router) as unknown as { navigate: ReturnType<typeof vi.fn> };
|
|
||||||
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.componentInstance.hasToken).toBe(false);
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/login'], {
|
|
||||||
queryParams: { motif: MOTIF_LIEN_RESET_INVALIDE },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('vérifie le jeton sans le consommer dès le chargement de la page', async () => {
|
|
||||||
await configure('un-secret-opaque');
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const auth = TestBed.inject(AuthService) as unknown as { validateResetToken: ReturnType<typeof vi.fn> };
|
|
||||||
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(auth.validateResetToken).toHaveBeenCalledWith('un-secret-opaque');
|
|
||||||
expect(fixture.componentInstance.isCheckingToken()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('redirige immédiatement vers /login si la vérification signale un jeton invalide', async () => {
|
|
||||||
await configure('un-secret-perime');
|
|
||||||
TestBed.overrideProvider(AuthService, {
|
|
||||||
useValue: { resetPassword: vi.fn(), validateResetToken: vi.fn().mockReturnValue(of({ valid: false })) },
|
|
||||||
});
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const router = TestBed.inject(Router) as unknown as { navigate: ReturnType<typeof vi.fn> };
|
|
||||||
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/login'], {
|
|
||||||
queryParams: { motif: MOTIF_LIEN_RESET_INVALIDE },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ne soumet pas si le mot de passe ne respecte pas la politique de complexité', async () => {
|
|
||||||
await configure('un-secret-opaque');
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
const auth = TestBed.inject(AuthService) as unknown as { resetPassword: ReturnType<typeof vi.fn> };
|
|
||||||
component.form.setValue({ new_password: 'trop-simple' });
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(auth.resetPassword).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('redirige vers /dashboard après une réinitialisation réussie', async () => {
|
|
||||||
await configure('un-secret-opaque');
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
const auth = TestBed.inject(AuthService) as unknown as { resetPassword: ReturnType<typeof vi.fn> };
|
|
||||||
const router = TestBed.inject(Router) as unknown as { navigate: ReturnType<typeof vi.fn> };
|
|
||||||
component.form.setValue({ new_password: 'Un-nouveau-mot-de-passe1!' });
|
|
||||||
auth.resetPassword.mockReturnValue(of({ principal: { role: 'operateur' } }));
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(auth.resetPassword).toHaveBeenCalledWith({
|
|
||||||
token: 'un-secret-opaque',
|
|
||||||
new_password: 'Un-nouveau-mot-de-passe1!',
|
|
||||||
});
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/dashboard']);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('redirige vers /login avec le motif standard quand le lien est invalide ou expiré', async () => {
|
|
||||||
await configure('un-secret-perime');
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
const auth = TestBed.inject(AuthService) as unknown as { resetPassword: ReturnType<typeof vi.fn> };
|
|
||||||
const router = TestBed.inject(Router) as unknown as { navigate: ReturnType<typeof vi.fn> };
|
|
||||||
component.form.setValue({ new_password: 'Un-nouveau-mot-de-passe1!' });
|
|
||||||
auth.resetPassword.mockReturnValue(throwError(() => new HttpErrorResponse({ status: 400 })));
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(router.navigate).toHaveBeenCalledWith(['/login'], {
|
|
||||||
queryParams: { motif: MOTIF_LIEN_RESET_INVALIDE },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('affiche un message générique sur une erreur inattendue (pas 400)', async () => {
|
|
||||||
await configure('un-secret-opaque');
|
|
||||||
const fixture = TestBed.createComponent(ResetPassword);
|
|
||||||
const component = fixture.componentInstance;
|
|
||||||
const auth = TestBed.inject(AuthService) as unknown as { resetPassword: ReturnType<typeof vi.fn> };
|
|
||||||
component.form.setValue({ new_password: 'Un-nouveau-mot-de-passe1!' });
|
|
||||||
auth.resetPassword.mockReturnValue(throwError(() => new HttpErrorResponse({ status: 500 })));
|
|
||||||
|
|
||||||
component.onSubmit();
|
|
||||||
|
|
||||||
expect(component.errorMessage()).toContain('invalide');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import { Component, OnInit, inject, signal } from '@angular/core';
|
|
||||||
import { toSignal } from '@angular/core/rxjs-interop';
|
|
||||||
import { ReactiveFormsModule, FormBuilder } from '@angular/forms';
|
|
||||||
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
|
||||||
import { HttpErrorResponse } from '@angular/common/http';
|
|
||||||
import { AuthService } from '../../../core/services/auth.service';
|
|
||||||
import { passwordValidators, PASSWORD_HINT } from '../../../shared/validators/password.validator';
|
|
||||||
import { PasswordRequirementsChecklist } from '../../../shared/components/password-requirements/password-requirements';
|
|
||||||
import { MOTIF_LIEN_RESET_INVALIDE } from '../../../shared/models/auth-redirect-reason';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-reset-password',
|
|
||||||
standalone: true,
|
|
||||||
imports: [ReactiveFormsModule, RouterLink, PasswordRequirementsChecklist],
|
|
||||||
templateUrl: './reset-password.html',
|
|
||||||
styleUrl: './reset-password.scss',
|
|
||||||
})
|
|
||||||
export class ResetPassword implements OnInit {
|
|
||||||
private fb = inject(FormBuilder);
|
|
||||||
private auth = inject(AuthService);
|
|
||||||
private router = inject(Router);
|
|
||||||
private route = inject(ActivatedRoute);
|
|
||||||
|
|
||||||
private token = this.route.snapshot.queryParamMap.get('token') ?? '';
|
|
||||||
|
|
||||||
errorMessage = signal<string | null>(null);
|
|
||||||
isLoading = signal(false);
|
|
||||||
passwordHint = PASSWORD_HINT;
|
|
||||||
hasToken = this.token.length > 0;
|
|
||||||
|
|
||||||
form = this.fb.nonNullable.group({
|
|
||||||
new_password: ['', passwordValidators],
|
|
||||||
});
|
|
||||||
|
|
||||||
password = toSignal(this.form.controls.new_password.valueChanges, { initialValue: '' });
|
|
||||||
isCheckingToken = signal(this.hasToken);
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
if (!this.hasToken) {
|
|
||||||
this.redirigeVersLoginLienInvalide();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.auth.validateResetToken(this.token).subscribe({
|
|
||||||
next: ({ valid }) => {
|
|
||||||
this.isCheckingToken.set(false);
|
|
||||||
if (!valid) {
|
|
||||||
this.redirigeVersLoginLienInvalide();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
error: () => this.isCheckingToken.set(false),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
onSubmit(): void {
|
|
||||||
if (this.form.invalid || !this.hasToken) return;
|
|
||||||
|
|
||||||
this.isLoading.set(true);
|
|
||||||
this.errorMessage.set(null);
|
|
||||||
|
|
||||||
this.auth.resetPassword({ token: this.token, new_password: this.form.getRawValue().new_password }).subscribe({
|
|
||||||
next: () => {
|
|
||||||
this.router.navigate(['/dashboard']);
|
|
||||||
},
|
|
||||||
error: (error: HttpErrorResponse) => {
|
|
||||||
this.isLoading.set(false);
|
|
||||||
if (error.status === 400) {
|
|
||||||
this.redirigeVersLoginLienInvalide();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.errorMessage.set(`Nouveau mot de passe invalide (${this.passwordHint}).`);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private redirigeVersLoginLienInvalide(): void {
|
|
||||||
this.router.navigate(['/login'], { queryParams: { motif: MOTIF_LIEN_RESET_INVALIDE } });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +1,19 @@
|
|||||||
<div class="dashboard">
|
<div class="dashboard">
|
||||||
<header class="dashboard__header">
|
<header class="dashboard__header">
|
||||||
<div class="dashboard__brand">
|
|
||||||
<ev-brand class="dashboard__logo" />
|
|
||||||
<div>
|
<div>
|
||||||
<h1>Vue d'ensemble</h1>
|
<h1>Vue d'ensemble</h1>
|
||||||
<p class="dashboard__subtitle">Consommation instantanée du parc</p>
|
<p class="dashboard__subtitle">Consommation instantanée du parc</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<button type="button" class="logout-button" (click)="onLogout()">Déconnexion</button>
|
||||||
<ev-button class="logout-button" variant="secondary" [fullWidth]="false" (click)="onLogout()"
|
|
||||||
>Déconnexion</ev-button
|
|
||||||
>
|
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@if (error(); as message) {
|
@if (error(); as message) {
|
||||||
<ev-alert severity="danger" class="banner-error">{{ message }}</ev-alert>
|
<p class="banner-error" role="alert">{{ message }}</p>
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (stats(); as s) {
|
@if (stats(); as s) {
|
||||||
<section class="overview">
|
<section class="overview">
|
||||||
<ev-card class="card card--gauge">
|
<div class="card card--gauge">
|
||||||
<span class="card__label">Consommation vs capacité</span>
|
<span class="card__label">Consommation vs capacité</span>
|
||||||
<app-consumption-gauge
|
<app-consumption-gauge
|
||||||
[consumption]="s.total_consumption_kw"
|
[consumption]="s.total_consumption_kw"
|
||||||
@@ -28,20 +23,20 @@
|
|||||||
>{{ s.total_consumption_kw | number: '1.0-1' }} /
|
>{{ s.total_consumption_kw | number: '1.0-1' }} /
|
||||||
{{ s.total_capacity_kw | number }} kW</span
|
{{ s.total_capacity_kw | number }} kW</span
|
||||||
>
|
>
|
||||||
</ev-card>
|
</div>
|
||||||
|
|
||||||
<ev-card class="card">
|
<div class="card">
|
||||||
<span class="card__label">Charge moyenne du parc</span>
|
<span class="card__label">Charge moyenne du parc</span>
|
||||||
<span class="card__value">{{ s.average_load_percent }} %</span>
|
<span class="card__value">{{ s.average_load_percent }} %</span>
|
||||||
<div class="progress-bar">
|
<div class="progress-bar">
|
||||||
<div class="progress-bar__fill" [style.width.%]="s.average_load_percent"></div>
|
<div class="progress-bar__fill" [style.width.%]="s.average_load_percent"></div>
|
||||||
</div>
|
</div>
|
||||||
</ev-card>
|
</div>
|
||||||
|
|
||||||
<ev-card class="card">
|
<div class="card">
|
||||||
<span class="card__label">Sites suivis</span>
|
<span class="card__label">Sites suivis</span>
|
||||||
<span class="card__value">{{ s.total_sites }}</span>
|
<span class="card__value">{{ s.total_sites }}</span>
|
||||||
</ev-card>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="chart-section">
|
<section class="chart-section">
|
||||||
@@ -55,8 +50,8 @@
|
|||||||
<h2>Alertes actives</h2>
|
<h2>Alertes actives</h2>
|
||||||
<ul class="alerts-list">
|
<ul class="alerts-list">
|
||||||
@for (alert of alerts(); track alert.alert_id) {
|
@for (alert of alerts(); track alert.alert_id) {
|
||||||
<li class="alert-item">
|
<li class="alert-item" [class]="'alert-item--' + alert.severity">
|
||||||
<ev-badge [tone]="badgeToneForSeverity(alert.severity)">{{ alert.severity }}</ev-badge>
|
<span class="alert-item__badge">{{ alert.severity }}</span>
|
||||||
<span class="alert-item__message">{{ alert.message }}</span>
|
<span class="alert-item__message">{{ alert.message }}</span>
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,23 @@
|
|||||||
:host {
|
:host {
|
||||||
|
--color-good: #2e7d32;
|
||||||
|
--color-partial: #f9a825;
|
||||||
|
--color-degraded: #ef6c00;
|
||||||
|
--color-critical: #c62828;
|
||||||
|
--color-bg-card: #ffffff;
|
||||||
|
--color-border: #e5e7eb;
|
||||||
|
--color-text-muted: #6b7280;
|
||||||
|
--radius: 10px;
|
||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
color: var(--color-text);
|
font-family: 'Segoe UI', system-ui, sans-serif;
|
||||||
padding: 2.5rem 2rem;
|
color: #1f2937;
|
||||||
|
padding: 2rem;
|
||||||
max-width: 1100px;
|
max-width: 1100px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dashboard__header {
|
.dashboard__header {
|
||||||
display: flex;
|
|
||||||
align-items: flex-start;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 2rem;
|
margin-bottom: 2rem;
|
||||||
}
|
|
||||||
|
|
||||||
.dashboard__brand {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.85rem;
|
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -25,10 +26,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dashboard__logo {
|
|
||||||
font-size: 1.3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dashboard__subtitle {
|
.dashboard__subtitle {
|
||||||
margin: 0.25rem 0 0;
|
margin: 0.25rem 0 0;
|
||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
@@ -41,8 +38,13 @@ h2 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.banner-error {
|
.banner-error {
|
||||||
display: block;
|
|
||||||
margin: 0 0 1.5rem;
|
margin: 0 0 1.5rem;
|
||||||
|
padding: 0.75rem 1rem;
|
||||||
|
border: 1px solid var(--color-critical);
|
||||||
|
border-left-width: 4px;
|
||||||
|
border-radius: var(--radius);
|
||||||
|
background: #fdecea;
|
||||||
|
color: var(--color-critical);
|
||||||
}
|
}
|
||||||
|
|
||||||
.overview {
|
.overview {
|
||||||
@@ -53,8 +55,14 @@ h2 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: var(--radius);
|
||||||
padding: 1.25rem;
|
padding: 1.25rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
gap: 0.35rem;
|
gap: 0.35rem;
|
||||||
|
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
|
||||||
}
|
}
|
||||||
|
|
||||||
.card--gauge {
|
.card--gauge {
|
||||||
@@ -76,16 +84,16 @@ h2 {
|
|||||||
|
|
||||||
.progress-bar {
|
.progress-bar {
|
||||||
height: 6px;
|
height: 6px;
|
||||||
background: var(--color-border-light);
|
background: #e5e7eb;
|
||||||
border-radius: var(--radius-pill);
|
border-radius: 999px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
margin-top: 0.25rem;
|
margin-top: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-bar__fill {
|
.progress-bar__fill {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: var(--color-primary);
|
background: #3b82f6;
|
||||||
border-radius: var(--radius-pill);
|
border-radius: 999px;
|
||||||
transition: width 0.3s ease;
|
transition: width 0.3s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,11 +115,59 @@ h2 {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
padding: 0.7rem 1rem;
|
padding: 0.7rem 1rem;
|
||||||
border-radius: var(--radius-md);
|
border-radius: var(--radius);
|
||||||
background: var(--color-danger-bg);
|
background: #fef2f2;
|
||||||
border: 1px solid var(--color-danger-border);
|
border: 1px solid #fecaca;
|
||||||
|
}
|
||||||
|
|
||||||
|
.alert-item__badge {
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 700;
|
||||||
|
text-transform: uppercase;
|
||||||
|
padding: 0.2rem 0.55rem;
|
||||||
|
border-radius: 999px;
|
||||||
|
color: #fff;
|
||||||
|
background: var(--color-critical);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.alert-item--high .alert-item__badge {
|
||||||
|
background: var(--color-degraded);
|
||||||
|
}
|
||||||
|
.alert-item--medium .alert-item__badge {
|
||||||
|
background: var(--color-partial);
|
||||||
|
}
|
||||||
|
.alert-item--low .alert-item__badge {
|
||||||
|
background: var(--color-good);
|
||||||
}
|
}
|
||||||
|
|
||||||
.alert-item__message {
|
.alert-item__message {
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
}
|
}
|
||||||
|
.dashboard__header {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 1.75rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.logout-button {
|
||||||
|
padding: 0.5rem 1rem;
|
||||||
|
background: #ffffff;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #374151;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: #f3f4f6;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -148,28 +148,4 @@ describe('Dashboard', () => {
|
|||||||
expect(authMock.clearSession).toHaveBeenCalled();
|
expect(authMock.clearSession).toHaveBeenCalled();
|
||||||
expect(routerMock.navigate).toHaveBeenCalledWith(['/login']);
|
expect(routerMock.navigate).toHaveBeenCalledWith(['/login']);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('distingue le ton des sévérités high et critical', () => {
|
|
||||||
const statsMock = { getSummary: vi.fn().mockReturnValue(of({ total_sites: 7, sites: [] })) };
|
|
||||||
const alertsMock = { getAlerts: vi.fn().mockReturnValue(of([])) };
|
|
||||||
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
imports: [Dashboard],
|
|
||||||
providers: [
|
|
||||||
{ provide: StatsService, useValue: statsMock },
|
|
||||||
{ provide: AlertsService, useValue: alertsMock },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const fixture = TestBed.createComponent(Dashboard);
|
|
||||||
const dashboard = fixture.componentInstance;
|
|
||||||
|
|
||||||
expect(dashboard.badgeToneForSeverity('low')).toBe('success');
|
|
||||||
expect(dashboard.badgeToneForSeverity('medium')).toBe('warning');
|
|
||||||
expect(dashboard.badgeToneForSeverity('high')).toBe('danger');
|
|
||||||
expect(dashboard.badgeToneForSeverity('critical')).toBe('critical');
|
|
||||||
expect(dashboard.badgeToneForSeverity('high')).not.toBe(
|
|
||||||
dashboard.badgeToneForSeverity('critical'),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -9,28 +9,16 @@ import { SiteLoadChart } from '../../shared/components/site-load-chart/site-load
|
|||||||
import { AlertsService } from '../../core/services/alerts.service';
|
import { AlertsService } from '../../core/services/alerts.service';
|
||||||
import { AuthService } from '../../core/services/auth.service';
|
import { AuthService } from '../../core/services/auth.service';
|
||||||
import { StatsSummary } from '../../shared/models/stats.model';
|
import { StatsSummary } from '../../shared/models/stats.model';
|
||||||
import { Alert, AlertSeverity } from '../../shared/models/alert.model';
|
import { Alert } from '../../shared/models/alert.model';
|
||||||
import { Card } from '../../shared/components/ui/card/card';
|
|
||||||
import { Alert as EvAlert } from '../../shared/components/ui/alert/alert';
|
|
||||||
import { Badge, BadgeTone } from '../../shared/components/ui/badge/badge';
|
|
||||||
import { Brand } from '../../shared/components/ui/brand/brand';
|
|
||||||
import { Button } from '../../shared/components/ui/button/button';
|
|
||||||
|
|
||||||
const REFRESH_INTERVAL_MS = 10000;
|
const REFRESH_INTERVAL_MS = 10000;
|
||||||
const UNAVAILABLE_MESSAGE =
|
const UNAVAILABLE_MESSAGE =
|
||||||
'Données indisponibles, les valeurs affichées datent du dernier relevé.';
|
'Données indisponibles, les valeurs affichées datent du dernier relevé.';
|
||||||
|
|
||||||
const TON_PAR_SEVERITE: Record<AlertSeverity, BadgeTone> = {
|
|
||||||
low: 'success',
|
|
||||||
medium: 'warning',
|
|
||||||
high: 'danger',
|
|
||||||
critical: 'critical',
|
|
||||||
};
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dashboard',
|
selector: 'app-dashboard',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [DecimalPipe, ConsumptionGauge, SiteLoadChart, Card, EvAlert, Badge, Brand, Button],
|
imports: [DecimalPipe, ConsumptionGauge, SiteLoadChart],
|
||||||
templateUrl: './dashboard.html',
|
templateUrl: './dashboard.html',
|
||||||
styleUrl: './dashboard.scss',
|
styleUrl: './dashboard.scss',
|
||||||
})
|
})
|
||||||
@@ -66,10 +54,6 @@ export class Dashboard implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
badgeToneForSeverity(severity: AlertSeverity): BadgeTone {
|
|
||||||
return TON_PAR_SEVERITE[severity];
|
|
||||||
}
|
|
||||||
|
|
||||||
onLogout(): void {
|
onLogout(): void {
|
||||||
this.auth.logout().subscribe({
|
this.auth.logout().subscribe({
|
||||||
next: () => this.router.navigate(['/login']),
|
next: () => this.router.navigate(['/login']),
|
||||||
|
|||||||
-8
@@ -1,8 +0,0 @@
|
|||||||
<ul class="password-requirements">
|
|
||||||
@for (requirement of requirements(); track requirement.label) {
|
|
||||||
<li [class.met]="requirement.met" [class.unmet]="!requirement.met">
|
|
||||||
<span class="password-requirements-icon">{{ requirement.met ? '✓' : '○' }}</span>
|
|
||||||
{{ requirement.label }}
|
|
||||||
</li>
|
|
||||||
}
|
|
||||||
</ul>
|
|
||||||
-29
@@ -1,29 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.password-requirements {
|
|
||||||
list-style: none;
|
|
||||||
margin: 0.25rem 0 0;
|
|
||||||
padding: 0;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
line-height: 1.5;
|
|
||||||
|
|
||||||
li {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.password-requirements-icon {
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.unmet {
|
|
||||||
color: #9ca3af;
|
|
||||||
}
|
|
||||||
|
|
||||||
.met {
|
|
||||||
color: #16a34a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { PasswordRequirementsChecklist } from './password-requirements';
|
|
||||||
|
|
||||||
describe('PasswordRequirementsChecklist', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
imports: [PasswordRequirementsChecklist],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ne coche aucune règle pour un mot de passe vide', () => {
|
|
||||||
const fixture = TestBed.createComponent(PasswordRequirementsChecklist);
|
|
||||||
fixture.componentRef.setInput('password', '');
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.componentInstance.requirements().every((r) => !r.met)).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ne coche que les règles satisfaites pour un mot de passe partiel', () => {
|
|
||||||
const fixture = TestBed.createComponent(PasswordRequirementsChecklist);
|
|
||||||
fixture.componentRef.setInput('password', 'abcdefgh');
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const parLabel = new Map(fixture.componentInstance.requirements().map((r) => [r.label, r.met]));
|
|
||||||
expect(parLabel.get('8 caractères minimum')).toBe(true);
|
|
||||||
expect(parLabel.get('1 minuscule')).toBe(true);
|
|
||||||
expect(parLabel.get('1 majuscule')).toBe(false);
|
|
||||||
expect(parLabel.get('1 chiffre')).toBe(false);
|
|
||||||
expect(parLabel.get('1 caractère spécial')).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('coche toutes les règles pour un mot de passe conforme', () => {
|
|
||||||
const fixture = TestBed.createComponent(PasswordRequirementsChecklist);
|
|
||||||
fixture.componentRef.setInput('password', 'Un-nouveau-mot-de-passe1!');
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.componentInstance.requirements().every((r) => r.met)).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
-19
@@ -1,19 +0,0 @@
|
|||||||
import { Component, computed, input } from '@angular/core';
|
|
||||||
import { PASSWORD_REQUIREMENTS } from '../../validators/password.validator';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-password-requirements',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './password-requirements.html',
|
|
||||||
styleUrl: './password-requirements.scss',
|
|
||||||
})
|
|
||||||
export class PasswordRequirementsChecklist {
|
|
||||||
password = input('');
|
|
||||||
|
|
||||||
requirements = computed(() =>
|
|
||||||
PASSWORD_REQUIREMENTS.map((requirement) => ({
|
|
||||||
label: requirement.label,
|
|
||||||
met: requirement.test(this.password()),
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<ng-content></ng-content>
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: block;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0.75rem 1rem;
|
|
||||||
border-radius: var(--radius-sm);
|
|
||||||
border: 1px solid transparent;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
line-height: 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
:host.ev-alert--success {
|
|
||||||
background: var(--color-success-bg);
|
|
||||||
border-color: var(--color-success);
|
|
||||||
color: var(--color-success);
|
|
||||||
}
|
|
||||||
|
|
||||||
:host.ev-alert--warning {
|
|
||||||
background: var(--color-warning-bg);
|
|
||||||
border-color: var(--color-warning);
|
|
||||||
color: var(--color-warning-text);
|
|
||||||
}
|
|
||||||
|
|
||||||
:host.ev-alert--danger {
|
|
||||||
background: var(--color-danger-bg);
|
|
||||||
border-color: var(--color-danger-border);
|
|
||||||
color: var(--color-danger);
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Alert } from './alert';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
standalone: true,
|
|
||||||
imports: [Alert],
|
|
||||||
template: `<ev-alert severity="success">C'est fait</ev-alert>`,
|
|
||||||
})
|
|
||||||
class AlertHost {}
|
|
||||||
|
|
||||||
describe('Alert', () => {
|
|
||||||
it('applique la classe danger par défaut', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [Alert] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(Alert);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.nativeElement.classList).toContain('ev-alert--danger');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('applique la sévérité demandée et projette le contenu', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [AlertHost] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(AlertHost);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const el = fixture.nativeElement.querySelector('.ev-alert');
|
|
||||||
expect(el.classList).toContain('ev-alert--success');
|
|
||||||
expect(el.textContent).toContain("C'est fait");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import { Component, HostBinding, input } from '@angular/core';
|
|
||||||
|
|
||||||
export type AlertSeverity = 'success' | 'warning' | 'danger';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'ev-alert',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './alert.html',
|
|
||||||
styleUrl: './alert.scss',
|
|
||||||
})
|
|
||||||
export class Alert {
|
|
||||||
severity = input<AlertSeverity>('danger');
|
|
||||||
|
|
||||||
@HostBinding('class')
|
|
||||||
get hostClass(): string {
|
|
||||||
return `ev-alert ev-alert--${this.severity()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
@HostBinding('attr.role')
|
|
||||||
readonly role = 'alert';
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<span class="ev-badge" [class]="'ev-badge--' + tone()">
|
|
||||||
<ng-content></ng-content>
|
|
||||||
</span>
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: inline-flex;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge {
|
|
||||||
display: inline-block;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
font-weight: 700;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.02em;
|
|
||||||
padding: 0.2rem 0.55rem;
|
|
||||||
border-radius: var(--radius-pill);
|
|
||||||
color: var(--color-text-inverse);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge--success {
|
|
||||||
background: var(--color-success);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge--warning {
|
|
||||||
background: var(--color-warning);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge--danger {
|
|
||||||
background: var(--color-danger);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge--critical {
|
|
||||||
background: var(--color-critical);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-badge--neutral {
|
|
||||||
background: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Badge } from './badge';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
standalone: true,
|
|
||||||
imports: [Badge],
|
|
||||||
template: `<ev-badge tone="danger">critique</ev-badge>`,
|
|
||||||
})
|
|
||||||
class BadgeHost {}
|
|
||||||
|
|
||||||
describe('Badge', () => {
|
|
||||||
it('applique le ton neutral par défaut', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [Badge] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(Badge);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.nativeElement.querySelector('.ev-badge').classList).toContain('ev-badge--neutral');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('applique le ton demandé et projette le contenu', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [BadgeHost] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(BadgeHost);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const el = fixture.nativeElement.querySelector('.ev-badge');
|
|
||||||
expect(el.classList).toContain('ev-badge--danger');
|
|
||||||
expect(el.textContent).toContain('critique');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Component, input } from '@angular/core';
|
|
||||||
|
|
||||||
export type BadgeTone = 'success' | 'warning' | 'danger' | 'critical' | 'neutral';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'ev-badge',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './badge.html',
|
|
||||||
styleUrl: './badge.scss',
|
|
||||||
})
|
|
||||||
export class Badge {
|
|
||||||
tone = input<BadgeTone>('neutral');
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<img src="/logo-icon.png" alt="" class="ev-brand__icon" />
|
|
||||||
<span class="ev-brand__name">EnerVision</span>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
:host {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.45em;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: var(--color-text);
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-brand__icon {
|
|
||||||
height: 1.3em;
|
|
||||||
width: auto;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-brand__name {
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Brand } from './brand';
|
|
||||||
|
|
||||||
describe('Brand', () => {
|
|
||||||
it("affiche l'icône et le nom EnerVision", async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [Brand] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(Brand);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const icon = fixture.nativeElement.querySelector('img.ev-brand__icon');
|
|
||||||
expect(icon).toBeTruthy();
|
|
||||||
expect(fixture.nativeElement.textContent).toContain('EnerVision');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'ev-brand',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './brand.html',
|
|
||||||
styleUrl: './brand.scss',
|
|
||||||
})
|
|
||||||
export class Brand {}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<button
|
|
||||||
[type]="type()"
|
|
||||||
class="ev-button"
|
|
||||||
[class]="'ev-button--' + variant()"
|
|
||||||
[class.ev-button--inline]="!fullWidth()"
|
|
||||||
[disabled]="disabled()"
|
|
||||||
>
|
|
||||||
<ng-content></ng-content>
|
|
||||||
</button>
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
.ev-button {
|
|
||||||
width: 100%;
|
|
||||||
padding: 0.7rem;
|
|
||||||
border: none;
|
|
||||||
border-radius: var(--radius-sm);
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
font-family: var(--font-family);
|
|
||||||
cursor: pointer;
|
|
||||||
|
|
||||||
&:disabled {
|
|
||||||
cursor: not-allowed;
|
|
||||||
opacity: 0.7;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.ev-button--inline {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-button--primary {
|
|
||||||
background: var(--color-primary);
|
|
||||||
color: var(--color-text-inverse);
|
|
||||||
|
|
||||||
&:disabled {
|
|
||||||
background: var(--color-disabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
|
||||||
background: var(--color-primary-hover);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-button--secondary {
|
|
||||||
background: var(--color-surface);
|
|
||||||
border: 1px solid var(--color-border);
|
|
||||||
color: var(--color-label);
|
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
|
||||||
background: var(--color-bg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.ev-button--danger {
|
|
||||||
background: var(--color-danger);
|
|
||||||
color: var(--color-text-inverse);
|
|
||||||
|
|
||||||
&:disabled {
|
|
||||||
background: var(--color-disabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
&:not(:disabled):hover {
|
|
||||||
background: var(--color-danger-hover);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Button } from './button';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
standalone: true,
|
|
||||||
imports: [Button],
|
|
||||||
template: `<ev-button>Valider</ev-button>`,
|
|
||||||
})
|
|
||||||
class ButtonHost {}
|
|
||||||
|
|
||||||
describe('Button', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [Button] }).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('applique la classe de la variante primary par défaut', () => {
|
|
||||||
const fixture = TestBed.createComponent(Button);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const button = fixture.nativeElement.querySelector('button');
|
|
||||||
expect(button.classList).toContain('ev-button--primary');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('applique la classe de la variante demandée', () => {
|
|
||||||
const fixture = TestBed.createComponent(Button);
|
|
||||||
fixture.componentRef.setInput('variant', 'danger');
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const button = fixture.nativeElement.querySelector('button');
|
|
||||||
expect(button.classList).toContain('ev-button--danger');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('désactive le bouton natif quand disabled est vrai', () => {
|
|
||||||
const fixture = TestBed.createComponent(Button);
|
|
||||||
fixture.componentRef.setInput('disabled', true);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const button = fixture.nativeElement.querySelector('button');
|
|
||||||
expect(button.disabled).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('projette le contenu', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [ButtonHost] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(ButtonHost);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
expect(fixture.nativeElement.querySelector('button').textContent).toContain('Valider');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
import { Component, input } from '@angular/core';
|
|
||||||
|
|
||||||
export type ButtonVariant = 'primary' | 'secondary' | 'danger';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'ev-button',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './button.html',
|
|
||||||
styleUrl: './button.scss',
|
|
||||||
})
|
|
||||||
export class Button {
|
|
||||||
variant = input<ButtonVariant>('primary');
|
|
||||||
type = input<'button' | 'submit'>('button');
|
|
||||||
disabled = input(false);
|
|
||||||
fullWidth = input(true);
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<ng-content></ng-content>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
:host {
|
|
||||||
background: var(--color-surface);
|
|
||||||
border: 1px solid var(--color-border-light);
|
|
||||||
border-radius: var(--radius-md);
|
|
||||||
padding: var(--space-5);
|
|
||||||
box-shadow: var(--shadow-card);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
import { TestBed } from '@angular/core/testing';
|
|
||||||
import { Card } from './card';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
standalone: true,
|
|
||||||
imports: [Card],
|
|
||||||
template: `<ev-card><p>Contenu</p></ev-card>`,
|
|
||||||
})
|
|
||||||
class CardHost {}
|
|
||||||
|
|
||||||
describe('Card', () => {
|
|
||||||
it('projette son contenu', async () => {
|
|
||||||
await TestBed.configureTestingModule({ imports: [CardHost] }).compileComponents();
|
|
||||||
const fixture = TestBed.createComponent(CardHost);
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
const card = fixture.nativeElement.querySelector('ev-card');
|
|
||||||
expect(card).toBeTruthy();
|
|
||||||
expect(card.textContent).toContain('Contenu');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { Component } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'ev-card',
|
|
||||||
standalone: true,
|
|
||||||
templateUrl: './card.html',
|
|
||||||
styleUrl: './card.scss',
|
|
||||||
})
|
|
||||||
export class Card {}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export const MOTIF_LIEN_RESET_INVALIDE = 'lien-expire';
|
|
||||||
export const MESSAGE_LIEN_RESET_INVALIDE =
|
|
||||||
'Ce lien de réinitialisation est invalide ou a expiré. Connectez-vous ou redemandez-en un.';
|
|
||||||
@@ -10,15 +10,6 @@ export interface PasswordChangeRequest {
|
|||||||
new_password: string;
|
new_password: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ForgotPasswordRequest {
|
|
||||||
email: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ResetPasswordRequest {
|
|
||||||
token: string;
|
|
||||||
new_password: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Principal {
|
export interface Principal {
|
||||||
id: string;
|
id: string;
|
||||||
email: string;
|
email: string;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user