Compare commits
No commits in common. "main" and "1.0.0" have entirely different histories.
1288 changed files with 220873 additions and 29173 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
**/bin/
|
**/bin/
|
||||||
**/obj/
|
**/obj/
|
||||||
**/.playwright/
|
**/.playwright/
|
||||||
|
.git/
|
||||||
.vs/
|
.vs/
|
||||||
.github/
|
.github/
|
||||||
# Exclure uniquement les dossiers de sortie de compilation
|
# Exclure uniquement les dossiers de sortie de compilation
|
||||||
|
|
@ -13,4 +14,5 @@ test/*/obj/
|
||||||
|
|
||||||
# Exclure les caches lourds
|
# Exclure les caches lourds
|
||||||
**/.playwright/
|
**/.playwright/
|
||||||
|
.git/
|
||||||
.vs/
|
.vs/
|
||||||
|
|
|
||||||
|
|
@ -21,27 +21,33 @@ on:
|
||||||
push:
|
push:
|
||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "main", "release/*" ]
|
branches: [ "main" ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
log-the-inputs:
|
||||||
runs-on: docker
|
runs-on: debian-latest
|
||||||
container:
|
|
||||||
image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone yavsc
|
- run: |
|
||||||
run: |
|
echo "Log level: $LEVEL"
|
||||||
cd /src
|
echo "Tags: $TAGS"
|
||||||
git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src
|
echo "Environment: $ENVIRONMENT"
|
||||||
cd _src
|
env:
|
||||||
if [ -n "${GITHUB_REF:-}" ]; then
|
LEVEL: ${{ inputs.logLevel }}
|
||||||
git fetch origin "$GITHUB_REF"
|
TAGS: ${{ inputs.tags }}
|
||||||
git checkout FETCH_HEAD
|
|
||||||
fi
|
|
||||||
git submodule update --init --recursive
|
|
||||||
echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
|
|
||||||
|
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: debian-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
- name: Setup .NET
|
||||||
|
uses: actions/setup-dotnet@v5
|
||||||
|
with:
|
||||||
|
dotnet-version: 9.0.x
|
||||||
|
- name: Restore dependencies
|
||||||
|
run: dotnet restore
|
||||||
|
- name: Build
|
||||||
|
run: dotnet build --no-restore
|
||||||
- name: Test
|
- name: Test
|
||||||
run: |
|
run: dotnet test --no-build --verbosity normal
|
||||||
echo "🚀 Lancement des tests..."
|
|
||||||
cd /src/_src && dotnet test --verbosity normal && echo "✅ Success !" || echo "❌ Fail ($?)!"
|
|
||||||
|
|
|
||||||
|
|
@ -1,316 +0,0 @@
|
||||||
# Build and publish a release on the Forgejo source-of-truth instance
|
|
||||||
# with the PostIt Android APK as an attached asset.
|
|
||||||
#
|
|
||||||
# Triggered by a push of a git tag. Validates the tag/changelog pair,
|
|
||||||
# builds the APK using the existing Dockerfile (--target build-env), then
|
|
||||||
# publishes a Forgejo release via the Forgejo REST API and uploads the
|
|
||||||
# APK as an asset.
|
|
||||||
#
|
|
||||||
# Authentication uses ${{ secrets.GITHUB_TOKEN }} (auto-provided by the
|
|
||||||
# Forgejo runner, scoped to contents: write for the current repo). A
|
|
||||||
# dedicated PAT (${{ secrets.RELEASE_TOKEN }}) was the preferred option
|
|
||||||
# for least-privilege, but creating repo-level secrets is currently
|
|
||||||
# broken on this Forgejo instance (InsertEncryptedSecret fails with a
|
|
||||||
# UTF-8 byte-sequence error, probably a text-vs-bytea column type on
|
|
||||||
# the secret table). Bumping to Forgejo v16 should fix it; until then,
|
|
||||||
# the runner-provided token keeps the workflow operational.
|
|
||||||
#
|
|
||||||
# Why bash + jq + curl, no third-party actions: the runner's docker
|
|
||||||
# label points at pazof/yavsc-build-env, a Debian image with jq but
|
|
||||||
# without Node.js or python3. Any action like actions/checkout,
|
|
||||||
# rasterstate/forgejo-release-action, etc. fails with "executable
|
|
||||||
# file not found in $PATH". jq is shipped in the image from
|
|
||||||
# debian12-dotnet10-android36-v2 onward; earlier tags fell back to
|
|
||||||
# hand-rolled JSON building via sed, which was fragile (cf. PR #30:
|
|
||||||
# sed greedy + head -3 still matched author.id instead of the
|
|
||||||
# release id on the minified JSON this instance returns, PATCH
|
|
||||||
# /releases/1 → 404). Same constraint as
|
|
||||||
# .forgejo/workflows/buildAndTest.yml.
|
|
||||||
#
|
|
||||||
# This workflow complements .github/workflows/docker-publish-android.yml
|
|
||||||
# which targets the GitHub mirror; the validate-release logic mirrors
|
|
||||||
# the GitHub-side job so the two channels stay consistent.
|
|
||||||
name: Forgejo Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
tag:
|
|
||||||
description: 'Tag à publier (requis en dispatch, ex. 1.0.6 ou 1.0.7-rc1).'
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
# Job unique : validation tag/CHANGELOG + build APK + publication
|
|
||||||
# via l'API REST Forgejo (pas d'actions tierces Node).
|
|
||||||
release:
|
|
||||||
runs-on: docker
|
|
||||||
container:
|
|
||||||
image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
|
|
||||||
steps:
|
|
||||||
- name: Clone du repo au tag demandé
|
|
||||||
env:
|
|
||||||
# En push tag : github.ref_name est le tag.
|
|
||||||
# En workflow_dispatch : on lit l'input 'tag'.
|
|
||||||
TAG: ${{ github.event_name == 'push' && github.ref_name || inputs.tag }}
|
|
||||||
run: |
|
|
||||||
if [[ -z "$TAG" ]]; then
|
|
||||||
echo "::error::No tag provided. In workflow_dispatch, set the 'tag' input."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# WORKDIR de l'image (cf. dotnet-android-build-image/Dockerfile).
|
|
||||||
cd /src
|
|
||||||
|
|
||||||
if [[ ! -d _src/.git ]]; then
|
|
||||||
git clone --depth=1 https://forgejo.pschneider.fr/notazof/yavsc.git _src
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd _src
|
|
||||||
git fetch --tags --force --prune origin
|
|
||||||
git checkout "$TAG"
|
|
||||||
|
|
||||||
echo "Checked out at $(git rev-parse HEAD) on $(git describe --tags --always 2>/dev/null || echo unknown)"
|
|
||||||
|
|
||||||
- name: Valider le tag et la section CHANGELOG
|
|
||||||
run: |
|
|
||||||
cd /src/_src
|
|
||||||
TAG="$(git describe --tags --exact-match HEAD 2>/dev/null || git rev-parse --short HEAD)"
|
|
||||||
echo "Validating tag $TAG"
|
|
||||||
|
|
||||||
# Parse semver : MAJOR.MINOR.PATCH[-SUFFIX]
|
|
||||||
if [[ ! "$TAG" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?$ ]]; then
|
|
||||||
echo "::error::Tag '$TAG' does not match MAJOR.MINOR.PATCH[-SUFFIX] format."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
MAJOR="${BASH_REMATCH[1]}"
|
|
||||||
MINOR="${BASH_REMATCH[2]}"
|
|
||||||
PATCH="${BASH_REMATCH[3]}"
|
|
||||||
SUFFIX="${BASH_REMATCH[4]}"
|
|
||||||
|
|
||||||
# Classification du canal par parité du patch.
|
|
||||||
# Patch pair + pas de suffixe -> stable.
|
|
||||||
# Patch impair + pas de suffixe -> preview.
|
|
||||||
# Suffixe présent -> instable.
|
|
||||||
if [[ -n "$SUFFIX" ]]; then
|
|
||||||
CHANNEL="unstable"
|
|
||||||
elif (( PATCH % 2 == 0 )); then
|
|
||||||
CHANNEL="stable"
|
|
||||||
else
|
|
||||||
CHANNEL="preview"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Tag $TAG classifié comme channel=$CHANNEL"
|
|
||||||
|
|
||||||
# Seuls les suffixes explicitement autorisés déclenchent un
|
|
||||||
# release : -rcN et -betaN. Les autres suffixes (-alpha*,
|
|
||||||
# -dev*, -preview*, etc.) restent refusés — ils sont
|
|
||||||
# utilisables localement pour itérer, mais ne doivent pas
|
|
||||||
# être publiés comme release publique.
|
|
||||||
if [[ "$CHANNEL" == "unstable" ]]; then
|
|
||||||
if [[ ! "$SUFFIX" =~ ^-(rc|beta)([0-9]+)?$ ]]; then
|
|
||||||
echo "::error::Tag '$TAG' has suffix '$SUFFIX' which is not in the allowed release suffixes (-rcN, -betaN). Refusing to publish."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Lecture du CHANGELOG.md (doit exister à la racine du repo).
|
|
||||||
if [[ ! -f CHANGELOG.md ]]; then
|
|
||||||
echo "::error::CHANGELOG.md not found at repo root."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Extraction de la section [TAG]. On cherche la première ligne
|
|
||||||
# commençant par '## [' qui contient '[TAG]' (entre '## [' et
|
|
||||||
# la prochaine ligne '## [' ou fin de fichier). awk en mode
|
|
||||||
# paragraphe suffit et reste POSIX. On garde aussi le titre
|
|
||||||
# (ligne `## [TAG] - channel`) pour la vérification du canal.
|
|
||||||
BODY=$(awk -v tag="[$TAG]" '
|
|
||||||
/^## \[/ {
|
|
||||||
if (in_section) exit
|
|
||||||
if (index($0, tag) > 0) {
|
|
||||||
in_section=1
|
|
||||||
print
|
|
||||||
next
|
|
||||||
}
|
|
||||||
}
|
|
||||||
in_section { print }
|
|
||||||
' CHANGELOG.md)
|
|
||||||
|
|
||||||
if [[ -z "$BODY" ]]; then
|
|
||||||
echo "::error::No section matching '## [$TAG]' found in CHANGELOG.md."
|
|
||||||
echo "Add a '## [$TAG] - $CHANNEL' section before tagging."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Vérification cohérence du canal déclaré dans le suffixe.
|
|
||||||
# Format attendu : "## [TAG] - stable" / "- preview" / "- unstable".
|
|
||||||
# On lit la première ligne du body qui contient le titre.
|
|
||||||
TITLE=$(echo "$BODY" | head -1)
|
|
||||||
if [[ "$TITLE" != *" - $CHANNEL"* ]]; then
|
|
||||||
echo "::error::Section title '$TITLE' must declare suffix '- $CHANNEL' to match tag parity."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Body pour la release : retire la première ligne (titre).
|
|
||||||
BODY=$(echo "$BODY" | tail -n +2)
|
|
||||||
|
|
||||||
echo "Section CHANGELOG validée pour [$TAG] - $CHANNEL"
|
|
||||||
|
|
||||||
# Expose channel + body pour les étapes suivantes via $GITHUB_ENV.
|
|
||||||
echo "RELEASE_CHANNEL=$CHANNEL" >> "$GITHUB_ENV"
|
|
||||||
echo "RELEASE_BODY<<EOF" >> "$GITHUB_ENV"
|
|
||||||
echo "$BODY" >> "$GITHUB_ENV"
|
|
||||||
echo "EOF" >> "$GITHUB_ENV"
|
|
||||||
echo "IS_PRERELEASE=$([ "$CHANNEL" = "stable" ] && echo false || echo true)" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Restore
|
|
||||||
run: |
|
|
||||||
cd /src/_src
|
|
||||||
dotnet restore
|
|
||||||
|
|
||||||
- name: Build de PostIt.Android ARM64
|
|
||||||
run: |
|
|
||||||
cd /src/_src
|
|
||||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
|
|
||||||
-c Release -r android-arm64 --no-restore -clp:ErrorsOnly
|
|
||||||
|
|
||||||
- name: Build de PostIt.Android x64
|
|
||||||
run: |
|
|
||||||
cd /src/_src
|
|
||||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
|
|
||||||
-c Release -r android-x64 --no-restore -clp:ErrorsOnly
|
|
||||||
|
|
||||||
- name: Publier la release Forgejo via l'API REST
|
|
||||||
# Pas d'action tierce (pas de Node dans l'image runner).
|
|
||||||
# On parle à l'API Forgejo directement via curl.
|
|
||||||
# Docs : https://forgejo.pschneider.fr/api/swagger#/repository/release
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
GITHUB_API_URL: ${{ github.api_url }}
|
|
||||||
GITHUB_REPOSITORY: ${{ github.repository }}
|
|
||||||
TAG: ${{ github.event_name == 'push' && github.ref_name || inputs.tag }}
|
|
||||||
RELEASE_BODY: ${{ env.RELEASE_BODY }}
|
|
||||||
IS_PRERELEASE: ${{ env.IS_PRERELEASE }}
|
|
||||||
run: |
|
|
||||||
if [[ -z "$TAG" ]]; then
|
|
||||||
echo "::error::No tag resolved for the API call."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Le runner Forgejo expose l'API sur github.api_url (par
|
|
||||||
# défaut http://…/api/v1). On retire le suffixe /api/v1 s'il
|
|
||||||
# est présent pour dériver la base du serveur, puis on
|
|
||||||
# reconstruit l'URL de l'API proprement.
|
|
||||||
API_BASE="${GITHUB_API_URL%/}"
|
|
||||||
API_BASE="${API_BASE%/api/v1}"
|
|
||||||
|
|
||||||
# Construction des bodies JSON et extraction de champs via
|
|
||||||
# jq. L'image runner pazof/yavsc-build-env installe jq
|
|
||||||
# (>= 1.7) depuis debian12-dotnet10-android36-v2. La
|
|
||||||
# chaîne de construction --arg/--argjson garantit un
|
|
||||||
# escaping correct (backslashes, guillemets, newlines,
|
|
||||||
# caractères de contrôle Unicode) sans avoir à le
|
|
||||||
# reproduire à la main.
|
|
||||||
#
|
|
||||||
# json_escape et json_field à base de sed ont vécu : le
|
|
||||||
# sed greedy matche la dernière occurrence d'un champ
|
|
||||||
# dans la ligne, et l'API renvoie sur cette instance un
|
|
||||||
# JSON minifié d'une seule ligne où l'id de l'auteur
|
|
||||||
# (1, premier user du repo) suit l'id de la release
|
|
||||||
# (10706). PATCH /releases/<sed-captured-id> tombait
|
|
||||||
# alors en 404 "The target couldn't be found". jq
|
|
||||||
# résout les deux problèmes en une fois.
|
|
||||||
|
|
||||||
# 1. Vérifier si la release existe déjà pour ce tag.
|
|
||||||
echo "::group::Check existing release for tag $TAG"
|
|
||||||
HTTP=$(curl -sS -o /tmp/existing.json -w '%{http_code}' \
|
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
-H "Accept: application/json" \
|
|
||||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/tags/$TAG")
|
|
||||||
echo "GET releases/tags/$TAG -> HTTP $HTTP"
|
|
||||||
EXISTING_ID=""
|
|
||||||
if [[ "$HTTP" == "200" ]]; then
|
|
||||||
EXISTING_ID=$(jq -r '.id // empty' /tmp/existing.json)
|
|
||||||
echo "Existing release id: ${EXISTING_ID:-none}"
|
|
||||||
fi
|
|
||||||
echo "::endgroup::"
|
|
||||||
|
|
||||||
# 2. Créer ou mettre à jour la release.
|
|
||||||
if [[ -n "$EXISTING_ID" ]]; then
|
|
||||||
echo "::group::Update release id=$EXISTING_ID"
|
|
||||||
jq -n \
|
|
||||||
--arg body "$RELEASE_BODY" \
|
|
||||||
--argjson prerelease "$IS_PRERELEASE" \
|
|
||||||
'{body: $body, prerelease: $prerelease}' \
|
|
||||||
> /tmp/patch.json
|
|
||||||
HTTP=$(curl -sS -o /tmp/release.json -w '%{http_code}' \
|
|
||||||
-X PATCH \
|
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "Accept: application/json" \
|
|
||||||
--data-binary @/tmp/patch.json \
|
|
||||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$EXISTING_ID")
|
|
||||||
echo "PATCH release -> HTTP $HTTP"
|
|
||||||
echo "::endgroup::"
|
|
||||||
else
|
|
||||||
echo "::group::Create release"
|
|
||||||
jq -n \
|
|
||||||
--arg tag "$TAG" \
|
|
||||||
--arg name "$TAG" \
|
|
||||||
--arg body "$RELEASE_BODY" \
|
|
||||||
--argjson prerelease "$IS_PRERELEASE" \
|
|
||||||
'{tag_name: $tag, name: $name, body: $body, prerelease: $prerelease}' \
|
|
||||||
> /tmp/post.json
|
|
||||||
HTTP=$(curl -sS -o /tmp/release.json -w '%{http_code}' \
|
|
||||||
-X POST \
|
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "Accept: application/json" \
|
|
||||||
--data-binary @/tmp/post.json \
|
|
||||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases")
|
|
||||||
echo "POST release -> HTTP $HTTP"
|
|
||||||
echo "::endgroup::"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$HTTP" != "200" && "$HTTP" != "201" ]]; then
|
|
||||||
echo "::error::Release creation/update failed (HTTP $HTTP):"
|
|
||||||
cat /tmp/release.json
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
RELEASE_ID=$(jq -r '.id' /tmp/release.json)
|
|
||||||
echo "Release id=$RELEASE_ID"
|
|
||||||
|
|
||||||
# 3. Upload l'APK en asset.
|
|
||||||
# Le nom du fichier passe en query string (?name=...), pas
|
|
||||||
# en argument positionnel entre --data-binary et l'URL :
|
|
||||||
# sinon curl l'interprète comme un second fichier d'input
|
|
||||||
# (un fichier nommé '?name=PostIt.Android.apk') et l'API
|
|
||||||
# Forgejo renvoie 400 "Missing 'name' parameter".
|
|
||||||
echo "::group::Upload PostIt APK assets"
|
|
||||||
for MARCH in arm64 x64; do
|
|
||||||
HTTP=$(curl -sS -o /tmp/asset.json -w '%{http_code}' \
|
|
||||||
-X POST \
|
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
-H "Content-Type: application/octet-stream" \
|
|
||||||
-H "Accept: application/json" \
|
|
||||||
--data-binary "@/src/_src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-$MARCH/fr.pschneider.postit-Signed.apk" \
|
|
||||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android-$MARCH.apk")
|
|
||||||
echo "POST asset -> HTTP $HTTP"
|
|
||||||
if [[ "$HTTP" != "201" ]]; then
|
|
||||||
echo "::error::Asset upload failed (HTTP $HTTP):"
|
|
||||||
cat /tmp/asset.json
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo "::endgroup::"
|
|
||||||
|
|
||||||
echo "✅ Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"
|
|
||||||
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
|
|
@ -59,7 +59,7 @@ jobs:
|
||||||
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
|
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
# Add any setup steps before running the `github/codeql-action/init` action.
|
# Add any setup steps before running the `github/codeql-action/init` action.
|
||||||
# This includes steps like installing compilers or runtimes (`actions/setup-node`
|
# This includes steps like installing compilers or runtimes (`actions/setup-node`
|
||||||
|
|
|
||||||
36
.github/workflows/docker-publish-android.yml
vendored
Normal file
36
.github/workflows/docker-publish-android.yml
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
name: Build and Push Yavsc Apk
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
apk-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout du code
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
|
||||||
|
# 1. Votre étape de build actuelle (on nomme l'image "postit-android")
|
||||||
|
# --target build-env : on ne veut que le stage de build (qui
|
||||||
|
# contient les artefacts .apk). Sans --target, Docker ciblerait
|
||||||
|
# le DERNIER stage du Dockerfile (blogs-runtime, qui est une
|
||||||
|
# image ASP.NET runtime sans aucun APK à extraire).
|
||||||
|
- name: Build de l'image Docker
|
||||||
|
run: docker build --build-arg ANDROID_TARGET_RID=android-arm64 --target build-env -t postit-android .
|
||||||
|
# 2. EXTRACTION : Créer un conteneur éphémère pour copier l'APK vers l'hôte GitHub
|
||||||
|
- name: Extraire l'APK du conteneur Docker
|
||||||
|
run: |
|
||||||
|
docker create --name extractor postit-android
|
||||||
|
docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk ./PostIt.Android.apk
|
||||||
|
docker rm extractor
|
||||||
|
|
||||||
|
- name: Téléverser l'APK en tant qu'Artéfact GitHub
|
||||||
|
uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: application-apk-release
|
||||||
|
path: ./PostIt.Android.apk
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
12
.gitignore
vendored
12
.gitignore
vendored
|
|
@ -24,21 +24,9 @@ data/
|
||||||
appsettings.*.json
|
appsettings.*.json
|
||||||
appsettings-*.*.json
|
appsettings-*.*.json
|
||||||
|
|
||||||
# Exception: the Testing-environment override for Yavsc.Org is a tracked
|
|
||||||
# configuration source, not a secrets file. TestWebApplicationFactory
|
|
||||||
# (Yavsc.Org.Tests) flips ASPNETCORE_ENVIRONMENT to "Testing" so
|
|
||||||
# AddConfiguration("org") in Program.Main loads this file as the
|
|
||||||
# last in the chain (it is optional). It overrides the connection
|
|
||||||
# string and SMTP section for the in-memory test host and contains
|
|
||||||
# no production secrets.
|
|
||||||
!src/Yavsc.Org/appsettings-org.Testing.json
|
|
||||||
|
|
||||||
generated/
|
generated/
|
||||||
*.tmp
|
*.tmp
|
||||||
DataDir/
|
DataDir/
|
||||||
|
|
||||||
*.tests.trx
|
*.tests.trx
|
||||||
*.tests.html
|
*.tests.html
|
||||||
|
|
||||||
*.log
|
|
||||||
|
|
||||||
|
|
|
||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,3 +0,0 @@
|
||||||
[submodule "external/dotnet-android-build-image"]
|
|
||||||
path = external/dotnet-android-build-image
|
|
||||||
url = https://forgejo.pschneider.fr/notazof/dotnet-android-build-image.git
|
|
||||||
34
.vscode/launch.json
vendored
34
.vscode/launch.json
vendored
|
|
@ -4,21 +4,6 @@
|
||||||
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
|
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
|
||||||
"name": "Android Debug",
|
|
||||||
"type": "mono",
|
|
||||||
"preLaunchTask": "run-debug-android",
|
|
||||||
"request": "attach",
|
|
||||||
"address": "localhost",
|
|
||||||
"port": 55555
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Android Attach - Debug",
|
|
||||||
"type": "mono",
|
|
||||||
"request": "attach",
|
|
||||||
"address": "localhost",
|
|
||||||
"port": 55555
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "API",
|
"name": "API",
|
||||||
"type": "dotnet",
|
"type": "dotnet",
|
||||||
|
|
@ -26,32 +11,23 @@
|
||||||
"projectPath": "${workspaceFolder}/src/Api/Api.csproj"
|
"projectPath": "${workspaceFolder}/src/Api/Api.csproj"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Yavsc Org",
|
"name": "Yavsc.Org",
|
||||||
"type": "dotnet",
|
"type": "dotnet",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
|
"projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Yavsc Blogs",
|
"name": "Yavsc.Blogs",
|
||||||
"type": "dotnet",
|
"type": "dotnet",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
|
"projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "PostIt Desktop",
|
"name": "PostIt",
|
||||||
"type": "dotnet",
|
"type": "dotnet",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
|
"projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Test PostIt.Android launch (Xamarin.UITest)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "${workspaceFolder}/src/PostIt/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests.dll",
|
|
||||||
"args": [],
|
|
||||||
"cwd": "${workspaceFolder}/src/PostIt/PostIt.Tests",
|
|
||||||
"console": "integratedTerminal",
|
|
||||||
"stopAtEntry": false
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
21
.vscode/settings.json
vendored
21
.vscode/settings.json
vendored
|
|
@ -5,8 +5,6 @@
|
||||||
"appsettings",
|
"appsettings",
|
||||||
"asciidoctor",
|
"asciidoctor",
|
||||||
"ASPNETCORE",
|
"ASPNETCORE",
|
||||||
"Avalonia",
|
|
||||||
"blogspot",
|
|
||||||
"Configurabilité",
|
"Configurabilité",
|
||||||
"Cratie",
|
"Cratie",
|
||||||
"DESTDIR",
|
"DESTDIR",
|
||||||
|
|
@ -14,12 +12,8 @@
|
||||||
"DOTNET",
|
"DOTNET",
|
||||||
"ecdsa",
|
"ecdsa",
|
||||||
"envsubst",
|
"envsubst",
|
||||||
"Forgejo",
|
|
||||||
"Hsts",
|
|
||||||
"Newtonsoft",
|
"Newtonsoft",
|
||||||
"Npgsql",
|
"Npgsql",
|
||||||
"Oidc",
|
|
||||||
"PKCE",
|
|
||||||
"postit",
|
"postit",
|
||||||
"pschneider",
|
"pschneider",
|
||||||
"SLNDIR",
|
"SLNDIR",
|
||||||
|
|
@ -32,18 +26,5 @@
|
||||||
"cSpell.language": "fr,en",
|
"cSpell.language": "fr,en",
|
||||||
"makefile.configureOnOpen": false,
|
"makefile.configureOnOpen": false,
|
||||||
"search.useGlobalIgnoreFiles": true,
|
"search.useGlobalIgnoreFiles": true,
|
||||||
"search.useParentIgnoreFiles": true,
|
"search.useParentIgnoreFiles": true
|
||||||
"chat.mcp.serverSampling": {
|
|
||||||
"yavsc/.vscode/mcp.json: openclaw": {
|
|
||||||
"allowedModels": [
|
|
||||||
"copilot/auto",
|
|
||||||
"copilotcli/claude-haiku-4.5",
|
|
||||||
"copilotcli/gpt-4.1",
|
|
||||||
"copilotcli/gpt-5-mini",
|
|
||||||
"copilotcli/mai-code-1-flash-picker",
|
|
||||||
"copilotcli/gpt-5.3-codex"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dotnet.defaultSolution": "yavsc.sln"
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
94
.vscode/tasks.json
vendored
94
.vscode/tasks.json
vendored
|
|
@ -1,43 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"isRoot": true,
|
|
||||||
"problemMatcher": [
|
|
||||||
{
|
|
||||||
"owner": "dotnet",
|
|
||||||
"fileLocation": ["relative", "${workspaceFolder}"],
|
|
||||||
"source": "dotnet",
|
|
||||||
"pattern": {
|
|
||||||
"regexp": "^\\s+(.*)\\((\\d+):(\\d+)\\):\\s+(error|warning)\\s+(.*)$",
|
|
||||||
"file": 1,
|
|
||||||
"line": 2,
|
|
||||||
"column": 3,
|
|
||||||
"severity": 4,
|
|
||||||
"message": 5
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
|
||||||
"label": "run-debug-android",
|
|
||||||
"command": "dotnet",
|
|
||||||
"type": "shell",
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/src/PostIt/PostIt.Android",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_HOST_PATH": "/usr/share/dotnet",
|
|
||||||
"ANDROID_HOME": "/opt/android-sdk",
|
|
||||||
"JAVA_HOME": "/usr/lib/jvm/java-1.25.0-openjdk-amd64"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
"-p:TargetFramework=net10.0-android",
|
|
||||||
"-p:Configuration=Debug",
|
|
||||||
"-p:AndroidAttachDebugger=true",
|
|
||||||
"-p:AndroidSdbHostPort=55555",
|
|
||||||
"-p:AndroidSdbTargetPort=55555"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": "build",
|
"label": "build",
|
||||||
"command": "dotnet",
|
"command": "dotnet",
|
||||||
|
|
@ -46,20 +9,20 @@
|
||||||
"group": "build",
|
"group": "build",
|
||||||
"isBuildCommand": true,
|
"isBuildCommand": true,
|
||||||
"isTestCommand": false,
|
"isTestCommand": false,
|
||||||
|
"problemMatcher": ["$msCompile"],
|
||||||
"isBackground": true
|
"isBackground": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "test blogs backend",
|
"label": "build-web",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
"problemMatcher": ["$msCompile"],
|
"problemMatcher": ["$msCompile"],
|
||||||
"command": "dotnet",
|
"command": "dotnet",
|
||||||
"args": ["test"],
|
"args": ["build"],
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "src/Yavsc.Blogs.Tests"
|
"cwd": "src/Yavsc.Org"
|
||||||
},
|
},
|
||||||
"group": {
|
"group": {
|
||||||
"kind": "test",
|
"kind": "build"
|
||||||
"isDefault": false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -75,6 +38,53 @@
|
||||||
"kind": "build"
|
"kind": "build"
|
||||||
},
|
},
|
||||||
"isBackground": true
|
"isBackground": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "build-web",
|
||||||
|
"type": "process",
|
||||||
|
"problemMatcher": ["$msCompile"],
|
||||||
|
"command": "dotnet",
|
||||||
|
"args": ["build"],
|
||||||
|
"runOptions": {},
|
||||||
|
"options": {
|
||||||
|
"cwd": "src/Yavsc.Web"
|
||||||
|
},
|
||||||
|
"group": {
|
||||||
|
"kind": "build"
|
||||||
|
},
|
||||||
|
"isBackground": true,
|
||||||
|
"presentation": {
|
||||||
|
"echo": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"focus": false,
|
||||||
|
"panel": "shared",
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "publish",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"publish",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "watch",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": ["watch", "--project",
|
||||||
|
"src/Yavsc.Org/Yavsc.Org.csproj"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile",
|
||||||
|
"runOptions": {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
229
CHANGELOG.md
229
CHANGELOG.md
|
|
@ -1,229 +0,0 @@
|
||||||
# Changelog
|
|
||||||
|
|
||||||
Toutes les modifications notables de PostIt et de la plateforme Yavsc
|
|
||||||
sont documentées dans ce fichier.
|
|
||||||
|
|
||||||
Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/),
|
|
||||||
et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
|
|
||||||
À noter : la **parité du numéro de patch** porte une signification de canal :
|
|
||||||
|
|
||||||
- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable**
|
|
||||||
- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview**
|
|
||||||
- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
|
|
||||||
|
|
||||||
Cette convention est partagée avec le dépôt
|
|
||||||
[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
|
|
||||||
pour la production des paquets `.deb`.
|
|
||||||
|
|
||||||
|
|
||||||
## [1.0.8-rc6] - unstable
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
* a code cleanup,
|
|
||||||
* a first Xamarin.UITest is successful, but disabled, because breaking the actual CI process,
|
|
||||||
* Android app starts, the login process succeeds
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
L'identifiant de l'application client Android a changé, il passe en minuscules :
|
|
||||||
`fr.pschneider.postit`
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
a bug posting and retrieving ACL from the backend,
|
|
||||||
the ACL now comes along with the article,
|
|
||||||
[TODO][PostIt] keep ACL along with the article
|
|
||||||
|
|
||||||
## [1.0.8-rc1] - unstable
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- `BlogAclApiTests.PostCircleAuthorization_returns_201_when_payload_mirrors_PostIt_shape_against_existing_circle_named_test`
|
|
||||||
: test de non-régression qui épingle la forme exacte du payload
|
|
||||||
que PostIt envoie à `POST /api/v1/blogacl` (un objet
|
|
||||||
`PostAccessControlRulePayload` avec `CircleId` et `BlogPostId`).
|
|
||||||
C'est le verrou côté test du fix applicatif PostIt + serveur.
|
|
||||||
- `BlogAclApiTests.PostCircleAuthorization_never_returns_500` : une
|
|
||||||
`[Theory]` couvrant quatre shapes de payload (`{ circleId }`,
|
|
||||||
corps vide, `{ blogPostId }` seul, `{ circleId, blogPostId: 0 }`)
|
|
||||||
qui doivent tous retourner un statut différent de 500. Toute
|
|
||||||
réintroduction d'un chemin 500 dans le futur fera rougir ce test.
|
|
||||||
- `BlogAclApiTests.PostCircleAuthorization_dosent_return_500` et
|
|
||||||
`..._dosent_return_500_on_success` : entry points `[Fact]` qui
|
|
||||||
appellent la `[Theory]` ci-dessus avec un payload spécifique
|
|
||||||
chacun, pour pouvoir filtrer en isolation depuis la ligne de
|
|
||||||
commande ou le CI.
|
|
||||||
- Règle « Pas de `object` dans le code source applicatif » ajoutée
|
|
||||||
à `CONTRIBUTING.md` : types de retour, paramètres, champs,
|
|
||||||
propriétés, variables locales doivent être typés statiquement.
|
|
||||||
`dynamic` est interdit pour les mêmes raisons.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- `BlogAclApiController.CheckOwner` devient `CheckOwnerAsync` et
|
|
||||||
utilise `FirstOrDefaultAsync` au lieu de `First`, supprimant
|
|
||||||
l'appel LINQ synchrone sur le fil de la requête et retournant
|
|
||||||
`false` sur cercle manquant (le contrôleur mappe déjà cela vers
|
|
||||||
`ChallengeResult`).
|
|
||||||
- `BlogsWebServerFixture` seed `alice`, son `Circle` et son
|
|
||||||
`BlogPost` une seule fois au démarrage du host, sur la
|
|
||||||
`SqliteConnection` partagée (`Cache=Shared`). Le précédent
|
|
||||||
`EnsureDeleted` au début de chaque test fermait la connexion
|
|
||||||
statique et détruisait le store `:memory:` pour tous les autres
|
|
||||||
`DbContext` ; il est retiré au profit d'un `EnsureCreated`
|
|
||||||
idempotent.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- `POST /api/v1/blogacl` ne retourne plus 500 sur les payloads
|
|
||||||
dont `BlogPostId` est absent ou à zéro. Le contrôleur rejette
|
|
||||||
`BlogPostId <= 0` avec `400 BadRequest` avant que la requête
|
|
||||||
n'atteigne `SaveChangesAsync`. L'incident de prod du 2026-08-21
|
|
||||||
sur mercure (PostIt envoyant seulement `circleId`, le serveur
|
|
||||||
voyant `BlogPostId = default(long) = 0` et EF Core levant
|
|
||||||
`InvalidOperationException` sur l'INSERT) n'est plus atteignable.
|
|
||||||
- PostIt `PostAclDialogViewModel.AddAsync` envoie désormais le
|
|
||||||
payload explicite `PostAccessControlRulePayload { CircleId,
|
|
||||||
BlogPostId }` au lieu de l'ancien `CircleAuthorization {
|
|
||||||
CircleId }`. Le DTO serveur `PostAccessControlRulePayload` est
|
|
||||||
introduit dans `Yavsc.Abstract` pour porter le contrat.
|
|
||||||
|
|
||||||
## [1.0.7] - preview
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- Per-post ACL in PostIt: a new “Manage ACL” page, opened from the ACL
|
|
||||||
button on a selected post, lets the post author grant or revoke
|
|
||||||
grants for individuals or circles. The server scopes each grant
|
|
||||||
operation to `caller == post.AuthorId` and returns `404` (not `403`)
|
|
||||||
for posts the caller does not own, so the existence of another
|
|
||||||
user's post is not leaked.
|
|
||||||
- Circle membership API + UI: three new REST endpoints under
|
|
||||||
`/api/circle/{id}/members` (`GET` list, `POST` add, `DELETE`
|
|
||||||
remove) and a new “Members” column on the *My Circles* page with an
|
|
||||||
“Add a member” button that opens a search modal. The search modal
|
|
||||||
reuses `IUserDirectory` (introduced by the `IContactService` split
|
|
||||||
in this same release) — exactly the use case the abstraction was
|
|
||||||
carved out for.
|
|
||||||
- Publish toggle for blog posts: a new `PUT /api/BlogApi/{id}/publish`
|
|
||||||
endpoint, and a `Published` checkbox in the post toolbar that
|
|
||||||
toggles a `BlogSpotPublication` row for the post. The publish
|
|
||||||
signal flows through the pre-existing `PermissionHandler.IsPublic`
|
|
||||||
path, so no new column was needed and the server-side authorisation
|
|
||||||
logic is unchanged.
|
|
||||||
- `UserSearchApiController` in `Yavsc.Blogs`:
|
|
||||||
`GET /api/user-search?q=...&e=...&take=...`. Any-authenticated-
|
|
||||||
caller endpoint that exposes the user's email under a closed-
|
|
||||||
community assumption (documented in the controller's XML doc).
|
|
||||||
Wired to the PostIt Desktop address book so the user search modal
|
|
||||||
picks it up.
|
|
||||||
- `IYavscApiClient` abstraction in `Yavsc.Api.Client`. The transport
|
|
||||||
for the blog/circle/blog-acl/user-search clients is now accessed
|
|
||||||
through this interface, so `PostIt.Tests` can stub the HTTP layer
|
|
||||||
without spinning up a real WebAPI host.
|
|
||||||
- Forgejo Actions release workflow: a `.forgejo/workflows/release.yml`
|
|
||||||
pipeline that builds and publishes a release with the PostIt APK
|
|
||||||
on tag push. Written in pure bash (the runner image has no Node),
|
|
||||||
uses `jq` for JSON body construction and response parsing, uses the
|
|
||||||
runner-provided `GITHUB_TOKEN` (no repo-level secret needed),
|
|
||||||
validates the CHANGELOG section heading before allowing the tag
|
|
||||||
to ship.
|
|
||||||
- `make release V=<version>` target: creates a `release/<V>` branch
|
|
||||||
from `main`, bumps the `<Version>` property in every `.csproj` via
|
|
||||||
`dotnet-gitversion /updateprojectfiles`, commits the bump on the
|
|
||||||
release branch, and pushes to `origin`. Fails fast if the working
|
|
||||||
tree is dirty or if `HEAD` is not on `main`.
|
|
||||||
- Forgejo status badges in the README.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- The new Publish toggle replaces the “Visibility enum” approach
|
|
||||||
originally drafted in this branch: the existing `BlogSpotPublication`
|
|
||||||
table already carried enough information to expose a publish
|
|
||||||
switch, so no schema change was needed. The original `feat(blog):
|
|
||||||
add Visibility { Private, Public }` commit and its EF migration
|
|
||||||
were reverted in favour of the endpoint-only toggle.
|
|
||||||
- `BlogPost` DTO and `IBlogPost` moved from `PostIt.Models` to
|
|
||||||
`Yavsc.Abstract.Blogspot`, the shared assembly where the server-side
|
|
||||||
entity and the wire DTO both live. Renamed `Yavsc.Blogspot.BlogPost`
|
|
||||||
to `BlogPostDto` to make the wire/entity distinction explicit.
|
|
||||||
- `BlogAclApiController` and `CircleApiController` moved from
|
|
||||||
`Yavsc.Api` (not yet enabled in production) to `Yavsc.Blogs`, where
|
|
||||||
they belong next to the `BlogSpotService` they depend on.
|
|
||||||
- `IContactService` split from `IUserDirectory`: the two interfaces
|
|
||||||
previously conflated the local address-book access (mobile-only,
|
|
||||||
via `Contacts.Default`) and the Yavsc user-search access
|
|
||||||
(Desktop-only, via `/api/user-search`) behind a single facade. The
|
|
||||||
split restores the `ContactDto.Emails` multi-value shape that was
|
|
||||||
being silently flattened to a single string before.
|
|
||||||
- CI: the Forgejo Actions build now compiles `.csproj` projects
|
|
||||||
directly inside the runner container (which ships the .NET SDK +
|
|
||||||
Android workload), instead of relying on a separate Docker build
|
|
||||||
step. Node-based third-party actions were replaced with bash + curl
|
|
||||||
+ `jq`. The validate-release job parses the CHANGELOG section
|
|
||||||
heading to derive the channel (`stable` / `preview` / `unstable`)
|
|
||||||
rather than the patch-version parity alone.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- `CircleApiController` used to read the caller's user id via
|
|
||||||
`FindFirstValue(ClaimTypes.NameIdentifier)`, which does not match
|
|
||||||
when JWT Bearer middleware has `MapInboundClaims = false`. Switched
|
|
||||||
to `User.GetUserId()` (tries `sub` first, then
|
|
||||||
`ClaimTypes.NameIdentifier`, then `nameid`). This was a latent
|
|
||||||
bug visible in tests but easy to ship to production if a host
|
|
||||||
ever disabled the remap.
|
|
||||||
- `CircleApiController` and `BlogAclApiController` reads and writes
|
|
||||||
were not always scoped to the caller's own data. Tightened the
|
|
||||||
authorisation checks: cross-user reads now return `404`, not the
|
|
||||||
raw record.
|
|
||||||
- `validate-release` CHANGELOG channel check used to parse the
|
|
||||||
patch-version parity only, which disagreed with the channel
|
|
||||||
suffix in the section heading (e.g. `## [1.0.7] - preview`
|
|
||||||
would be flagged as `stable` from the parity alone). The job now
|
|
||||||
inspects the heading line and trusts the suffix when present.
|
|
||||||
- `.forgejo/workflows/release.yml`: the asset-upload URL now carries
|
|
||||||
the asset name as a query-string parameter instead of a `curl`
|
|
||||||
positional argument. The previous shape triggered Forgejo's
|
|
||||||
“Missing `name` parameter” 400 in some cases.
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
- The `## [Unreleased]` block has been moved into this section.
|
|
||||||
- The abandoned `Visibility { Private, Public }` enum and its EF
|
|
||||||
migration, reverted in this release. The publish toggle covers
|
|
||||||
the same user-visible switch without a schema change.
|
|
||||||
|
|
||||||
[Unreleased]: https://forgejo.pschneider.fr/notazof/yavsc/compare/HEAD
|
|
||||||
[1.0.8-rc1]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.7...1.0.8-rc1
|
|
||||||
[1.0.7]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.6...1.0.7
|
|
||||||
[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6
|
|
||||||
|
|
||||||
## [1.0.6] - stable
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- Self-hosted Forgejo Actions runner now drives the CI build for the
|
|
||||||
yavsc repository, using the
|
|
||||||
`pazof/yavsc-build-env:debian12-dotnet10-android36-v2` image pulled
|
|
||||||
from Docker Hub. Workflow runs end-to-end: clone, restore, build,
|
|
||||||
test, with NuGet.config picking up the `isn.pschneider.fr` feed.
|
|
||||||
- The build-env image now ships `jq` (Debian package, ≥ 1.7), so the
|
|
||||||
release workflow can build JSON bodies and parse API responses
|
|
||||||
without a hand-rolled `sed`-based extractor that was matching the
|
|
||||||
wrong `id` field on minified responses.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- CI workflow `.forgejo/workflows/buildAndTest.yml` no longer relies on
|
|
||||||
`actions/checkout` (the runner image has no Node); clones yavsc via
|
|
||||||
`git`, fetches the ref under test, and initializes submodules over
|
|
||||||
HTTPS.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- `Dockerfile` and `Dockerfile.backend` no longer carry a redundant
|
|
||||||
`dotnet nuget add source` step that conflicted with the GitHub
|
|
||||||
Actions APK build (`--allow-insecure-connections` on an HTTPS
|
|
||||||
endpoint, exit 1). `NuGet.config` at the repo root supplies the
|
|
||||||
`isn.pschneider.fr` feed for every restore, including inside Docker.
|
|
||||||
- `.forgejo/workflows/release.yml`: PATCH on `/releases/{id}` no longer
|
|
||||||
404s on existing releases. The previous `sed`-based `json_field`
|
|
||||||
matched the last `id` on the line (the author's), so it tried to
|
|
||||||
PATCH `/releases/1` (the first user of the instance) instead of the
|
|
||||||
actual release id. Switched to `jq` for both body construction and
|
|
||||||
field extraction.
|
|
||||||
|
|
||||||
[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
## Premier build
|
## Premier build
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://forgejo.pschneider.fr/notazof/yavsc.git
|
git clone https://github.com/pazof/yavsc.git
|
||||||
cd yavsc
|
cd yavsc
|
||||||
dotnet restore
|
dotnet restore
|
||||||
dotnet build
|
dotnet build
|
||||||
|
|
@ -49,57 +49,6 @@ Les tests sont répartis en :
|
||||||
item « Tests d'intégration smoke par BC ».
|
item « Tests d'intégration smoke par BC ».
|
||||||
- `src/PostIt.Tests/` — tests unitaires du client desktop PostIt.
|
- `src/PostIt.Tests/` — tests unitaires du client desktop PostIt.
|
||||||
|
|
||||||
## Navigation (PostIt)
|
|
||||||
|
|
||||||
La navigation est centralisée dans
|
|
||||||
`App.PushPageAsync(ViewModelBase vm)` (`src/PostIt/PostIt/App.axaml.cs`).
|
|
||||||
Pour ouvrir un écran, un ViewModel (généralement dans une
|
|
||||||
commande `[RelayCommand]`) appelle
|
|
||||||
`await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`.
|
|
||||||
`PushPageAsync` résout la `Control` correspondante via le
|
|
||||||
`ViewLocator` (un `IDataTemplate` enregistré dans
|
|
||||||
`Application.DataTemplates` au boot), l'identifie comme
|
|
||||||
`Page`, lui assigne le VM comme `DataContext`, et appelle
|
|
||||||
`NavRoot.PushAsync(page)`. Une garde anti-empilement
|
|
||||||
compare par référence la nouvelle page au sommet courant
|
|
||||||
de la stack pour éviter un push doublon.
|
|
||||||
|
|
||||||
Pour qu'une nouvelle page soit navigable, il faut *deux*
|
|
||||||
enregistrements : la page dans le DI (`AddTransient<TPage>`
|
|
||||||
ou `AddSingleton<TPage>`) **et** une case dans le `switch`
|
|
||||||
de `ViewLocator.Build`. Si l'un manque, l'app affiche
|
|
||||||
"No view for X" sans crash.
|
|
||||||
|
|
||||||
Règles :
|
|
||||||
|
|
||||||
- On n'instancie jamais une `View` à la main depuis un
|
|
||||||
ViewModel, on ne récupère jamais une `View` depuis la DI
|
|
||||||
directement dans un ViewModel.
|
|
||||||
- Le ViewModel qui déclenche la nav ne pousse pas lui-même
|
|
||||||
la page ; il appelle `App.PushPageAsync(vm)` et laisse
|
|
||||||
`App` orchestrer le `PushAsync` physique.
|
|
||||||
- Le ViewModel qui déclenche la nav ne capture pas de
|
|
||||||
référence à `MainWindow` ou `NavigationPage`. Il passe
|
|
||||||
par `App.Current` (l'app Avalonia est un singleton).
|
|
||||||
|
|
||||||
Exemple canonique (depuis `MainPageViewModel`) :
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
[RelayCommand]
|
|
||||||
internal async Task OpenSettings()
|
|
||||||
{
|
|
||||||
var settingsVm = ((App)App.Current!).ServiceProvider
|
|
||||||
.GetRequiredService<Settings>();
|
|
||||||
await ((App)App.Current!).PushPageAsync(settingsVm)
|
|
||||||
.ConfigureAwait(true);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Cf. [doc/architecture/postit.md](./doc/architecture/postit.md)
|
|
||||||
pour la topologie complète (host de navigation,
|
|
||||||
`SessionStatusViewModel`, signaux de cycle de vie vs nav
|
|
||||||
utilisateur).
|
|
||||||
|
|
||||||
## Conventions de code
|
## Conventions de code
|
||||||
|
|
||||||
Le repo applique `.editorconfig` (UTF-8, LF, `indent_size = 4` en
|
Le repo applique `.editorconfig` (UTF-8, LF, `indent_size = 4` en
|
||||||
|
|
@ -115,13 +64,6 @@ Quelques règles non capturées par `.editorconfig` :
|
||||||
- Préférer les types BCL (`int`, `string`) aux types framework
|
- Préférer les types BCL (`int`, `string`) aux types framework
|
||||||
(`Int32`, `String`).
|
(`Int32`, `String`).
|
||||||
- Préférer les expressions de pattern matching aux casts explicites.
|
- Préférer les expressions de pattern matching aux casts explicites.
|
||||||
- **Pas de `object` dans le code source applicatif.** Types de retour,
|
|
||||||
paramètres, champs, propriétés, variables locales : tout doit être
|
|
||||||
typé statiquement. `dynamic` est interdit pour les mêmes raisons.
|
|
||||||
Un cast en `object` est presque toujours le symptôme d'un contrat
|
|
||||||
qu'on a laissé s'effriter (DTO, payload, handler) — refactore
|
|
||||||
le contrat (record typé, DTO dédié, méthode dédiée) au lieu de
|
|
||||||
shimer avec un cast.
|
|
||||||
|
|
||||||
## Branches & commits
|
## Branches & commits
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>Yavsc</RootNamespace>
|
<RootNamespace>Yavsc</RootNamespace>
|
||||||
<NoWarn>NU1701, NU1901, NU1902, NU1507</NoWarn>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -2,29 +2,31 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<!--
|
||||||
|
Shared package versions: declared in two-or-more top-level products in src/.
|
||||||
|
|
||||||
|
Each product directory (src/<Product>/) has its own Directory.Packages.props
|
||||||
|
that <Import>s this file via GetPathOfFileAbove and adds the
|
||||||
|
product-specific versions. Adding a new shared package means editing this
|
||||||
|
file only; adding a product-local package means editing the per-product
|
||||||
|
Directory.Packages.props only.
|
||||||
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
|
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.1.0-alpha.171" />
|
<PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.0.5-preview-net9" />
|
||||||
<PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="8.1.0-alpha.171" />
|
<PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="8.0.5-preview-net9" />
|
||||||
<PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
|
<PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
|
|
||||||
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
|
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.11" />
|
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
|
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
|
<PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
|
|
||||||
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
|
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
|
||||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
|
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
|
||||||
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
|
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
|
||||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
||||||
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
||||||
<PackageVersion Include="xunit.v3.common" Version="3.2.2" />
|
|
||||||
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
|
|
||||||
<PackageVersion Include="YamlDotNet" Version="18.1.0" />
|
<PackageVersion Include="YamlDotNet" Version="18.1.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -46,6 +46,10 @@ COPY src/PostIt/PostIt.Desktop/*.csproj ./src/PostIt/PostIt.Desktop/
|
||||||
# (2) Tout le code source
|
# (2) Tout le code source
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
# (3) Source NuGet interne (Letsencrypt, certificat auto-signé côté
|
||||||
|
# serveur, justifié par build privé).
|
||||||
|
RUN dotnet nuget add source https://isn.pschneider.fr/v3/index.json --allow-insecure-connections
|
||||||
|
|
||||||
# (4) Restore
|
# (4) Restore
|
||||||
RUN dotnet restore
|
RUN dotnet restore
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,9 @@ COPY src/PostIt/PostIt.Desktop/*.csproj ./src/PostIt/PostIt.Desktop/
|
||||||
# 4. Copie de l'intégralité du code source
|
# 4. Copie de l'intégralité du code source
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
# 3. Restauration des dépendances avec vos workloads actifs
|
||||||
|
RUN dotnet nuget add source https://isn.pschneider.fr/v3/index.json --allow-insecure-connections
|
||||||
|
|
||||||
# 4. Restauration des dépendances pour tous les projets
|
# 4. Restauration des dépendances pour tous les projets
|
||||||
RUN dotnet restore
|
RUN dotnet restore
|
||||||
|
|
||||||
|
|
|
||||||
76
Makefile
76
Makefile
|
|
@ -11,7 +11,7 @@ all:
|
||||||
dotnet build --nologo
|
dotnet build --nologo
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
dotnet clean -c $(CONFIG)
|
dotnet clean
|
||||||
|
|
||||||
src/Yavsc/bin/output/wwwroot:
|
src/Yavsc/bin/output/wwwroot:
|
||||||
dotnet --project src/Yavsc.Org/Yavsc.Org.csproj publish
|
dotnet --project src/Yavsc.Org/Yavsc.Org.csproj publish
|
||||||
|
|
@ -48,77 +48,5 @@ docker-build:
|
||||||
docker-run:
|
docker-run:
|
||||||
docker run -d -p 5000:5000 --name yavsc yavsc
|
docker run -d -p 5000:5000 --name yavsc yavsc
|
||||||
|
|
||||||
# Crée une branche release/<V> depuis main, met à jour les
|
|
||||||
# `<Version>` des .csproj via dotnet-gitversion, et la
|
|
||||||
# pousse sur origin.
|
|
||||||
#
|
|
||||||
# Usage : make release V=1.0.7-rc1
|
|
||||||
#
|
|
||||||
# Pré-requis : être sur main, working tree clean. La cible
|
|
||||||
# vérifie les deux et refuse sinon — elle ne fait JAMAIS
|
|
||||||
# de checkout automatique, c'est à l'opérateur de s'être
|
|
||||||
# positionné sur la bonne branche au préalable (sinon le
|
|
||||||
# bump pourrait partir sur une branche tierce par accident).
|
|
||||||
#
|
|
||||||
# Notes :
|
|
||||||
# - Le nom de branche vient de l'argument V (ex: 1.0.7-rc1
|
|
||||||
# donne release/1.0.7-rc1). C'est une étiquette d'intention,
|
|
||||||
# pas la version assembly.
|
|
||||||
# - La version dans les .csproj vient de GitVersion qui la
|
|
||||||
# calcule depuis l'historique git (tag le plus proche +
|
|
||||||
# nombre de commits). C'est la version assembly réelle.
|
|
||||||
# - L'ordre (fetch → branche → bump → push) garantit qu'on
|
|
||||||
# part d'un main synchro et qu'on ne pollue pas main avec
|
|
||||||
# le bump (qui vit sur la branche release).
|
|
||||||
# - Fail-fast si la branche existe déjà en local ou sur origin.
|
|
||||||
release:
|
|
||||||
@if [ -z "$(V)" ]; then \
|
|
||||||
echo "Usage: make release V=<version>"; \
|
|
||||||
echo " V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
@CURRENT=$$(git branch --show-current); \
|
|
||||||
if [ "$$CURRENT" != "main" ]; then \
|
|
||||||
echo "Refus : la cible doit être lancée depuis main."; \
|
|
||||||
echo " Branche courante : $$CURRENT"; \
|
|
||||||
echo " Fais : git checkout main && git pull --ff-only origin main"; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
@if [ -n "$$(git status --porcelain)" ]; then \
|
|
||||||
echo "Working tree sale, refus de créer une branche release."; \
|
|
||||||
git status --short; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
@BRANCH="release/$(V)"; \
|
|
||||||
if git show-ref --verify --quiet "refs/heads/$$BRANCH"; then \
|
|
||||||
echo "La branche $$BRANCH existe déjà en local."; \
|
|
||||||
echo " Pour la supprimer : git branch -D $$BRANCH"; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
if git ls-remote --exit-code --heads origin "$$BRANCH" >/dev/null 2>&1; then \
|
|
||||||
echo "La branche $$BRANCH existe déjà sur origin."; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
echo "==> Fetch + vérification synchro main"; \
|
|
||||||
git fetch origin main; \
|
|
||||||
if ! git merge-base --is-ancestor origin/main HEAD; then \
|
|
||||||
echo "main a avancé plus loin que HEAD. Fais :"; \
|
|
||||||
echo " git pull --ff-only origin main"; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
echo "==> Création de $$BRANCH depuis main"; \
|
|
||||||
git checkout -b "$$BRANCH"; \
|
|
||||||
echo "==> dotnet-gitversion /updateprojectfiles"; \
|
|
||||||
dotnet-gitversion /updateprojectfiles; \
|
|
||||||
echo "==> Commit du bump"; \
|
|
||||||
git add .; \
|
|
||||||
if git diff --cached --quiet; then \
|
|
||||||
echo "Pas de changements à committer (gitversion n'a produit aucune diff)."; \
|
|
||||||
else \
|
|
||||||
git commit -m "chore(release): bump version via gitversion for $(V)"; \
|
|
||||||
fi; \
|
|
||||||
echo "==> Push de $$BRANCH sur origin"; \
|
|
||||||
git push -u origin "$$BRANCH"; \
|
|
||||||
echo "==> Terminé. Branche $$BRANCH live sur origin."
|
|
||||||
|
|
||||||
.PHONY: test release
|
.PHONY: test
|
||||||
|
|
|
||||||
23
NuGet.config
23
NuGet.config
|
|
@ -1,23 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Project-level NuGet configuration.
|
|
||||||
|
|
||||||
The yavsc solution depends on HigginsSoft.IdentityServer8.* 8.1.0-alpha.*,
|
|
||||||
published only on the internal feed https://isn.pschneider.fr. The public
|
|
||||||
nuget.org feed has 8.0.4 as the nearest version, which causes NU1102 on
|
|
||||||
restore for every project that depends on it (Yavsc.Org, Yavsc.Api,
|
|
||||||
Yavsc.Blogs, Yavsc.Server, cli, tests).
|
|
||||||
|
|
||||||
Listing 'isn' before 'nuget.org' here ensures that restore finds the
|
|
||||||
alpha packages first, then falls back to nuget.org for everything else.
|
|
||||||
Both feeds are reachable anonymously; no credentials are stored here.
|
|
||||||
|
|
||||||
See AGENTS.md for the rationale.
|
|
||||||
-->
|
|
||||||
<configuration>
|
|
||||||
<packageSources>
|
|
||||||
<clear />
|
|
||||||
<add key="isn" value="https://isn.pschneider.fr/api/v3/index.json" />
|
|
||||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
|
||||||
</packageSources>
|
|
||||||
</configuration>
|
|
||||||
20
README.md
20
README.md
|
|
@ -1,25 +1,16 @@
|
||||||
|
|
||||||
|
|
||||||
# Yavsc
|
# Yavsc
|
||||||
[](https://forgejo.pschneider.fr/notazof/yavsc/releases/latest)
|
|
||||||
|
|
||||||
C'est une application mettant en oeuvre une prise de contact entre un demandeur de services et son éventuel prestataire associé.
|
C'est une application mettant en oeuvre une prise de contact entre un demandeur de services et son éventuel prestataire associé.
|
||||||
|
|
||||||
# Statut actuel des actions Forgejo
|
|
||||||
|
|
||||||
|
|
||||||
* [](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml)
|
|
||||||
|
|
||||||
* [](
|
|
||||||
https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml
|
|
||||||
)
|
|
||||||
|
|
||||||
# Statut actuel des actions GitHub
|
# Statut actuel des actions GitHub
|
||||||
|
|
||||||
* [](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
|
* [](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml)
|
||||||
|
|
||||||
* [](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml)
|
* [](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml)
|
||||||
|
|
||||||
|
* [](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
|
|
||||||
|
|
@ -161,13 +152,6 @@ d'abord `appsettings-org.json` du serveur ; sinon, laisse-le en place.
|
||||||
(utilisateur, mot de passe, hôte, base). Privilégier
|
(utilisateur, mot de passe, hôte, base). Privilégier
|
||||||
`dotnet user-secrets` ou des variables d'environnement `ASPNETCORE_*`
|
`dotnet user-secrets` ou des variables d'environnement `ASPNETCORE_*`
|
||||||
plutôt qu'un mot de passe en clair dans le fichier.
|
plutôt qu'un mot de passe en clair dans le fichier.
|
||||||
- Au démarrage, Yavsc.Org applique automatiquement ses migrations EF
|
|
||||||
Core. Sur cette base de code, EF Core 10 peut encore lever un
|
|
||||||
`PendingModelChangesWarning` malgré des migrations et snapshots déjà
|
|
||||||
alignés ; ce faux positif est ignoré sur les contextes PostgreSQL pour
|
|
||||||
éviter un démarrage inutilement en mode dégradé. Si une erreur de
|
|
||||||
migration apparaît encore en production, elle doit être traitée comme
|
|
||||||
une vraie divergence de schéma ou de connexion.
|
|
||||||
- `Smtp.*` — hôte, port, identifiants SMTP pour l'envoi d'e-mails
|
- `Smtp.*` — hôte, port, identifiants SMTP pour l'envoi d'e-mails
|
||||||
transactionnels.
|
transactionnels.
|
||||||
- `Authentication.PayPal.*` et `Authentication.Google.*` — clés d'API
|
- `Authentication.PayPal.*` et `Authentication.Google.*` — clés d'API
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
APP_PROJECT_NAMES=Org Blogs
|
APP_PROJECT_NAMES=Api Org Blogs
|
||||||
SLNDIR=..
|
SLNDIR=..
|
||||||
|
|
||||||
include $(SLNDIR)/.env
|
include $(SLNDIR)/.env
|
||||||
|
|
@ -7,6 +7,7 @@ include .env
|
||||||
generated/:
|
generated/:
|
||||||
@mkdir -p $@
|
@mkdir -p $@
|
||||||
|
|
||||||
|
generated/yavscApi.service:
|
||||||
generated/yavscOrg.service:
|
generated/yavscOrg.service:
|
||||||
generated/yavscBlogs.service:
|
generated/yavscBlogs.service:
|
||||||
|
|
||||||
|
|
@ -33,11 +34,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
|
||||||
@echo Created service file: $@
|
@echo Created service file: $@
|
||||||
|
|
||||||
|
|
||||||
copy-services: copy-service-Org copy-service-Blogs
|
copy-services: copy-service-Org copy-service-Api copy-service-Blogs
|
||||||
copy-service-Org: /etc/systemd/system/yavscOrg.service
|
copy-service-Org: /etc/systemd/system/yavscOrg.service
|
||||||
|
copy-service-Api: /etc/systemd/system/yavscApi.service
|
||||||
copy-service-Blogs: /etc/systemd/system/yavscBlogs.service
|
copy-service-Blogs: /etc/systemd/system/yavscBlogs.service
|
||||||
|
|
||||||
copy-binaries: build_publish_Org build_publish_Blogs stop-services
|
copy-binaries: build_publish_Org build_publish_Api build_publish_Blogs stop-services
|
||||||
@for project in $(APP_PROJECT_NAMES); \
|
@for project in $(APP_PROJECT_NAMES); \
|
||||||
do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
|
do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
|
||||||
echo "$${project} -> $${LCAPI}" ; \
|
echo "$${project} -> $${LCAPI}" ; \
|
||||||
|
|
@ -84,6 +86,7 @@ stop-services:
|
||||||
|
|
||||||
$(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
$(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||||
$(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
$(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||||
|
$(SLNDIR)/src/Yavsc.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||||
|
|
||||||
showConfig:
|
showConfig:
|
||||||
@echo CONFIGURATION: $(CONFIGURATION)
|
@echo CONFIGURATION: $(CONFIGURATION)
|
||||||
|
|
@ -92,4 +95,4 @@ showConfig:
|
||||||
clean:
|
clean:
|
||||||
@rm -rf generated
|
@rm -rf generated
|
||||||
|
|
||||||
.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean
|
.PHONY: build_publish mep showConfig copy-service-Api copy-service-Org copy-service-Blogs reinstall clean
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
info:
|
|
||||||
name: Get Posts
|
|
||||||
type: http
|
|
||||||
seq: 1
|
|
||||||
|
|
||||||
http:
|
|
||||||
method: GET
|
|
||||||
url: https://jsonplaceholder.typicode.com/users
|
|
||||||
|
|
||||||
settings:
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
followRedirects: true
|
|
||||||
maxRedirects: 5
|
|
||||||
|
|
||||||
docs: This request retrieves a list of users from the JSONPlaceholder API.
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
info:
|
|
||||||
name: Untitled
|
|
||||||
type: http
|
|
||||||
seq: 1
|
|
||||||
|
|
||||||
http:
|
|
||||||
method: GET
|
|
||||||
url: ""
|
|
||||||
auth: inherit
|
|
||||||
|
|
||||||
settings:
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
followRedirects: true
|
|
||||||
maxRedirects: 5
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
info:
|
|
||||||
name: blog post
|
|
||||||
type: http
|
|
||||||
seq: 2
|
|
||||||
|
|
||||||
http:
|
|
||||||
method: POST
|
|
||||||
url: "{{Blogs}}/api/v1/blog"
|
|
||||||
body:
|
|
||||||
type: json
|
|
||||||
data: |-
|
|
||||||
{
|
|
||||||
"Title": "lkijlk",
|
|
||||||
"Article": "test"
|
|
||||||
}
|
|
||||||
auth: inherit
|
|
||||||
|
|
||||||
settings:
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
followRedirects: true
|
|
||||||
maxRedirects: 5
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
info:
|
|
||||||
name: blogs
|
|
||||||
type: http
|
|
||||||
seq: 1
|
|
||||||
|
|
||||||
http:
|
|
||||||
method: GET
|
|
||||||
url: "{{Blogs}}/api/v1/blog"
|
|
||||||
auth: inherit
|
|
||||||
|
|
||||||
settings:
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
followRedirects: true
|
|
||||||
maxRedirects: 5
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
name: Development
|
|
||||||
variables:
|
|
||||||
- name: Blogs
|
|
||||||
value: https://localhost:5003
|
|
||||||
- name: Authority
|
|
||||||
value: https://localhost:5001
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
name: Production
|
|
||||||
variables:
|
|
||||||
- name: Authority
|
|
||||||
value: https://yavsc.pschneider.fr
|
|
||||||
- name: Blogs
|
|
||||||
value: https://blogs.pschneider.fr
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
opencollection: 1.0.0
|
|
||||||
|
|
||||||
info:
|
|
||||||
name: blogs
|
|
||||||
config:
|
|
||||||
proxy:
|
|
||||||
inherit: true
|
|
||||||
config:
|
|
||||||
protocol: http
|
|
||||||
hostname: ""
|
|
||||||
port: ""
|
|
||||||
auth:
|
|
||||||
username: ""
|
|
||||||
password: ""
|
|
||||||
bypassProxy: ""
|
|
||||||
|
|
||||||
request:
|
|
||||||
auth:
|
|
||||||
type: oauth2
|
|
||||||
flow: authorization_code
|
|
||||||
authorizationUrl: "{{Authority}}/connect/authorize"
|
|
||||||
accessTokenUrl: "{{Authority}}/connect/token"
|
|
||||||
refreshTokenUrl: https://yavsc.pschneider.fr/connect/token
|
|
||||||
callbackUrl: "{{Authority}}"
|
|
||||||
credentials:
|
|
||||||
clientId: postit
|
|
||||||
placement: basic_auth_header
|
|
||||||
scope: openid blogs profile
|
|
||||||
pkce: {}
|
|
||||||
tokenConfig:
|
|
||||||
id: credentials
|
|
||||||
placement:
|
|
||||||
header: Bearer
|
|
||||||
source: access_token
|
|
||||||
settings:
|
|
||||||
autoFetchToken: true
|
|
||||||
autoRefreshToken: true
|
|
||||||
bundled: false
|
|
||||||
extensions:
|
|
||||||
bruno:
|
|
||||||
ignore:
|
|
||||||
- node_modules
|
|
||||||
- .git
|
|
||||||
|
|
@ -15,9 +15,7 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
|
||||||
| [architecture/dictionnaires-metier.md](architecture/dictionnaires-metier.md) | Dictionnaires métier, héritage en arbre, cycle de vie d'un terme |
|
| [architecture/dictionnaires-metier.md](architecture/dictionnaires-metier.md) | Dictionnaires métier, héritage en arbre, cycle de vie d'un terme |
|
||||||
| [architecture/offres-frontmatter.md](architecture/offres-frontmatter.md) | Offre fournisseur, ClasseFormulaire, ClasseDevis, parsing frontmatter |
|
| [architecture/offres-frontmatter.md](architecture/offres-frontmatter.md) | Offre fournisseur, ClasseFormulaire, ClasseDevis, parsing frontmatter |
|
||||||
| [architecture/postit-oidc.md](architecture/postit-oidc.md) | Client desktop PostIt, custom URI scheme, silent refresh |
|
| [architecture/postit-oidc.md](architecture/postit-oidc.md) | Client desktop PostIt, custom URI scheme, silent refresh |
|
||||||
| [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
|
|
||||||
| [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
|
| [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
|
||||||
| [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
|
|
||||||
|
|
||||||
## Roadmap & design exploration
|
## Roadmap & design exploration
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,19 +31,7 @@
|
||||||
└────────────────┘
|
└────────────────┘
|
||||||
|
|
||||||
Clients externes :
|
Clients externes :
|
||||||
- PostIt (Avalonia, code-base unique multi-cible) :
|
- PostIt : client desktop Avalonia (cf. postit-oidc.md).
|
||||||
· PostIt — lib partagée (pages, VM, services)
|
|
||||||
· PostIt.Desktop — front-end Linux/Windows
|
|
||||||
· PostIt.Android — front-end APK
|
|
||||||
· PostIt.Browser — front-end WASM
|
|
||||||
Cf. postit.md et postit-oidc.md.
|
|
||||||
|
|
||||||
Outils et tests :
|
|
||||||
- cli — outillage CLI
|
|
||||||
- Yavsc.Tests.Shared — helpers de tests partagés
|
|
||||||
- Yavsc.Org.Tests — tests du front web
|
|
||||||
- Yavsc.Blogs.Tests — tests du backend blogs
|
|
||||||
- PostIt.Tests — tests du client PostIt
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Par projet
|
## Par projet
|
||||||
|
|
@ -56,14 +44,6 @@ Outils et tests :
|
||||||
| `Yavsc.Api` | ASP.NET Web | API REST JSON principale consommée par les clients externes (PostIt, …). JwtBearer auth. |
|
| `Yavsc.Api` | ASP.NET Web | API REST JSON principale consommée par les clients externes (PostIt, …). JwtBearer auth. |
|
||||||
| `Yavsc.Blogs` | ASP.NET Web | **Backend API headless** dédié aux blogs (uniquement `*ApiController` + services + modèles — aucune vue Razor). Destiné à être déployé sur un sous-domaine en production, séparé du front web hébergé par `Yavsc.Org`. |
|
| `Yavsc.Blogs` | ASP.NET Web | **Backend API headless** dédié aux blogs (uniquement `*ApiController` + services + modèles — aucune vue Razor). Destiné à être déployé sur un sous-domaine en production, séparé du front web hébergé par `Yavsc.Org`. |
|
||||||
| `Yavsc.Org.Tests` | Test (xUnit) | Tests d'isolation du front web (`Yavsc.Org`) — fakes, controller tests. |
|
| `Yavsc.Org.Tests` | Test (xUnit) | Tests d'isolation du front web (`Yavsc.Org`) — fakes, controller tests. |
|
||||||
| `Yavsc.Blogs.Tests`| Test (xUnit) | Tests d'isolation du backend blogs (`Yavsc.Blogs`). |
|
|
||||||
| `Yavsc.Tests.Shared` | Library | Helpers de tests partagés (fixtures, fakes, builders) entre les projets de tests. |
|
|
||||||
| `PostIt` | Library | Code-base partagée du client PostIt (Avalonia) : pages, ViewModels, services, `ViewLocator` custo. Multi-cible — produit PostIt.Desktop / PostIt.Android / PostIt.Browser. |
|
|
||||||
| `PostIt.Desktop` | Avalonia.Desktop | Front-end Desktop Linux/Windows : `Program.Main`, `Platform.CreateBrowser` (CustomSchemeBrowser), custom URI scheme `postit://`. |
|
|
||||||
| `PostIt.Android` | Avalonia.Android | Front-end Android : `MainActivity` SingleTask, Chrome Custom Tabs, scheme `android://postit-signin`. |
|
|
||||||
| `PostIt.Browser` | Avalonia.Browser | Front-end WASM : pas de process distinct, IBrowser N/A. |
|
|
||||||
| `PostIt.Tests` | Test (xUnit) | Tests du client PostIt : settings, scopes Bearer, OIDC stub (`OidcStubAuthority`). |
|
|
||||||
| `cli` | exe / tool | Outillage CLI (build, packaging, génération de clés). |
|
|
||||||
|
|
||||||
## Pourquoi ce découpage
|
## Pourquoi ce découpage
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,6 @@ pas vers un serveur HTTP.
|
||||||
|---------------------------------|-------------------------------------------------------------------|
|
|---------------------------------|-------------------------------------------------------------------|
|
||||||
| `Services/OidcLoginPhase` | Enum des étapes du flow : `Idle / Discovering / OpeningBrowser / AwaitingCallback / ExchangingCode / Success / Error` |
|
| `Services/OidcLoginPhase` | Enum des étapes du flow : `Idle / Discovering / OpeningBrowser / AwaitingCallback / ExchangingCode / Success / Error` |
|
||||||
| `Services/YavscApiClient` | Client HTTP de l'API Yavsc. Porte `LoginInteractiveAsync(IProgress<OidcLoginPhase>)` et `TrySilentLoginAsync`. Refresh silencieux sur 401 et sur access-token bientôt expiré. |
|
| `Services/YavscApiClient` | Client HTTP de l'API Yavsc. Porte `LoginInteractiveAsync(IProgress<OidcLoginPhase>)` et `TrySilentLoginAsync`. Refresh silencieux sur 401 et sur access-token bientôt expiré. |
|
||||||
| `Services/BlogApiClient` | Mapper DTO↔path pour la sous-API blog. **Note** : `pathPrefix` est *relatif* à `/api/v1/` (que porte déjà `BaseAddress`) — ex. `"blog"` pour matcher `[Route(APIPrefix + "/blog")]`. Ne pas ré-inclure `api/`. |
|
|
||||||
| `Services/SingleInstance` | Named-pipe helper. `TryHandOffAsync` côté 2ᵉ instance, `StartServerAsync` côté instance vivante. |
|
| `Services/SingleInstance` | Named-pipe helper. `TryHandOffAsync` côté 2ᵉ instance, `StartServerAsync` côté instance vivante. |
|
||||||
| `Services/CustomSchemeBrowser` | `IBrowser` OidcClient qui ouvre le système + attend le pipe. |
|
| `Services/CustomSchemeBrowser` | `IBrowser` OidcClient qui ouvre le système + attend le pipe. |
|
||||||
| `Services/SchemeUrlDetector` | Détection pure, testable, du `postit://callback` dans argv. |
|
| `Services/SchemeUrlDetector` | Détection pure, testable, du `postit://callback` dans argv. |
|
||||||
|
|
|
||||||
|
|
@ -1,282 +0,0 @@
|
||||||
# PostIt — Topologie, navigation, DI
|
|
||||||
|
|
||||||
> **Récapitulatif** : PostIt est le client Avalonia du projet
|
|
||||||
> Yavsc. C'est un code-base unique (`src/PostIt/PostIt/PostIt.csproj`)
|
|
||||||
> **multi-cible** vers trois front-ends distincts
|
|
||||||
> (`PostIt.Desktop`, `Postit.Android`, `PostIt.Browser`). Cette
|
|
||||||
> fiche couvre la topologie des projets, le DI, le `ViewLocator`
|
|
||||||
> custo et la navigation — c'est-à-dire tout ce que la fiche
|
|
||||||
> [postit-oidc.md](postit-oidc.md) ne détaille pas déjà (l'OIDC,
|
|
||||||
> le flow d'auth, la persistance des tokens). Détail dans cette
|
|
||||||
> page, racine de l'architecture : [Architecture.md](../Architecture.md).
|
|
||||||
|
|
||||||
## Surface : un code-base, trois front-ends
|
|
||||||
|
|
||||||
```
|
|
||||||
┌────────────────────────┐
|
|
||||||
│ PostIt (lib) │
|
|
||||||
│ src/PostIt/PostIt/ │
|
|
||||||
│ Pages, ViewModels, │
|
|
||||||
│ Services, ViewLocator │
|
|
||||||
│ (aucun rendu natif) │
|
|
||||||
└──────┬───┬─────┬───────┘
|
|
||||||
│ │ │
|
|
||||||
┌───────────────┘ │ └────────────────┐
|
|
||||||
│ │ │
|
|
||||||
┌──────────▼────────┐ ┌────────▼─────────┐ ┌──────────▼────────┐
|
|
||||||
│ PostIt.Desktop │ │ PostIt.Android │ │ PostIt.Browser │
|
|
||||||
│ Avalonia.Desktop │ │ Avalonia.Android │ │ Avalonia.Browser │
|
|
||||||
│ Linux/Windows │ │ APK │ │ WASM │
|
|
||||||
│ + custom scheme │ │ + Chrome Custom │ │ (no native proc) │
|
|
||||||
│ postit:// │ │ Tabs │ │ │
|
|
||||||
│ + IBrowser custo │ │ + IBrowser custo │ │ │
|
|
||||||
└───────────────────┘ └──────────────────┘ └───────────────────┘
|
|
||||||
```
|
|
||||||
|
|
||||||
Le code partagé vit dans `PostIt/`. Chaque front-end est un
|
|
||||||
**projet Satellite SDK** Avalonia qui ne contient que le
|
|
||||||
`Program.Main`, le `Platform.CreateBrowser`, et les manifestes
|
|
||||||
spécifiques (IntentFilter Android, `app.manifest` Desktop).
|
|
||||||
Toute la logique (VM, services, navigation, settings, OIDC) est
|
|
||||||
dans le code-base partagé.
|
|
||||||
|
|
||||||
## ViewLocator custo
|
|
||||||
|
|
||||||
Le `ViewLocator` (cf. `src/PostIt/PostIt/ViewLocator.cs`) est un
|
|
||||||
`IDataTemplate` Avalonia **explicitement câblé sur le
|
|
||||||
`IServiceProvider`** :
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
public Control Build(object? data) => data switch
|
|
||||||
{
|
|
||||||
MainPageViewModel => _services.GetRequiredService<MainPage>(),
|
|
||||||
Settings => _services.GetRequiredService<SettingsPage>(),
|
|
||||||
HomePageViewModel => _services.GetRequiredService<HomePage>(),
|
|
||||||
SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
|
|
||||||
null => new TextBlock { Text = "No view for <null>" },
|
|
||||||
_ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
|
|
||||||
};
|
|
||||||
public bool Match(object? data) => data is ViewModelBase;
|
|
||||||
```
|
|
||||||
|
|
||||||
**Pourquoi un custo, et pas le `ViewLocatorBase` par défaut
|
|
||||||
d'Avalonia.Mvvm ?** Pour deux raisons :
|
|
||||||
|
|
||||||
1. **Sortie du `Activator.CreateInstance`** — les pages
|
|
||||||
PostIt sont enregistrées dans le DI et peuvent avoir des
|
|
||||||
dépendances (par construction, aujourd'hui aucune, mais
|
|
||||||
l'extension future est ouverte). Le `ViewLocatorBase`
|
|
||||||
historique fait `new View()`, ce qui rend impossible
|
|
||||||
l'injection et complique les tests.
|
|
||||||
2. **Filtrage par `ViewModelBase`** — `Match` n'accepte que les
|
|
||||||
types dérivés de `ViewModelBase`. Toute tentative d'afficher
|
|
||||||
un objet métier (par ex. un DTO de l'API Yavsc) tombe sur le
|
|
||||||
`TextBlock` "No view for X", pas sur un crash Avalonia.
|
|
||||||
|
|
||||||
Le `ViewLocator` est ajouté aux `DataTemplates` de l'app dans
|
|
||||||
`App.OnFrameworkInitializationCompleted` :
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
DataTemplates.Clear();
|
|
||||||
DataTemplates.Add(new ViewLocator(provider));
|
|
||||||
```
|
|
||||||
|
|
||||||
**Conséquence pratique** : pour qu'une nouvelle page soit
|
|
||||||
affichée par un `ContentControl` qui binde un ViewModel, il
|
|
||||||
faut *deux* enregistrements : la page en `AddTransient` (ou
|
|
||||||
`AddSingleton`) dans le DI, **et** une case dans le `switch`
|
|
||||||
de `ViewLocator.Build`. Si l'un manque, l'app affiche
|
|
||||||
"No view for X" sans crash.
|
|
||||||
|
|
||||||
## Composition root (`App.axaml.cs`)
|
|
||||||
|
|
||||||
`App.OnFrameworkInitializationCompleted` est le seul endroit où
|
|
||||||
le DI est construit. Ordre, dans cet ordre :
|
|
||||||
|
|
||||||
1. `new Settings()` + `settings.Load()` — lit
|
|
||||||
`~/.config/PostIt/postit-settings.json` (ou le fallback
|
|
||||||
embarqué dans `PostIt.dll`).
|
|
||||||
2. `new TokenStore(...)` + `new YavscApiClient(settings, tokenStore)`.
|
|
||||||
3. `new ServiceCollection()` + enregistrements en bloc.
|
|
||||||
4. `services.BuildServiceProvider()`.
|
|
||||||
5. `Settings.BindToServiceProvider(provider)` — pose le
|
|
||||||
singleton statique pour les helpers hors-DI
|
|
||||||
(`Settings.GetCurrent()`, `Settings.RequireCurrent()`).
|
|
||||||
6. `DataTemplates.Add(new ViewLocator(provider))`.
|
|
||||||
7. Branche `IClassicDesktopStyleApplicationLifetime` /
|
|
||||||
`ISingleViewApplicationLifetime` (Browser/Android).
|
|
||||||
|
|
||||||
### Enregistrements DI
|
|
||||||
|
|
||||||
| Service | Lifetime | Pourquoi |
|
|
||||||
|-------------------------------|------------|-------------------------------------------------------------------------------------------|
|
|
||||||
| `Settings` | **Singleton** | État partagé (`Loaded`, `IsDirty`, `Authentication`) — doit être unique. |
|
|
||||||
| `YavscApiClient` | Singleton | Porte le `TokenStore` et le cache de tokens ; un seul par process. |
|
|
||||||
| `BlogApiClient` | Singleton | Mapper stateless, partagé. |
|
|
||||||
| `SettingsPage` | **Singleton** | Une seule instance pour la vie de l'app : le `DataContext` est câblé une fois au boot, le push est idempotent (cf. section *Garde anti-empilement* ci-dessous). |
|
|
||||||
| `MainPage` / `HomePage` / `SignaturePage` | Transient | Résolution à la demande par le `ViewLocator`. |
|
|
||||||
| `MainPageViewModel` / `HomePageViewModel` / `SignaturePageViewModel` | Transient | VM reconstruites à chaque navigation ; pas d'état partagé à conserver. |
|
|
||||||
| `SessionStatusViewModel` + `SessionStatusBanner` | Singleton + Transient | Le VM est un singleton (survit à la navigation), le bandeau est transient (réinstancié quand la fenêtre le recrée). |
|
|
||||||
|
|
||||||
> **Invariant** : `Settings` est **uniquement** un singleton. Un
|
|
||||||
> `AddTransient<Settings>()` supplémentaire (qui réécrase le
|
|
||||||
> singleton dans le container) ferait que chaque push de
|
|
||||||
> `SettingsPage` crée une instance vide, casse les bindings
|
|
||||||
> Authority/ClientId, et perd toute édition. Si tu dois toucher
|
|
||||||
> à cette table, *ne pas* ajouter de registration pour
|
|
||||||
> `Settings` ailleurs que la ligne `AddSingleton(settings)`.
|
|
||||||
|
|
||||||
## Navigation
|
|
||||||
|
|
||||||
Le host de navigation est un `NavigationPage x:Name="NavRoot"`
|
|
||||||
posé sur `MainWindow.axaml`. La pile est gérée par deux
|
|
||||||
mécanismes distincts :
|
|
||||||
|
|
||||||
1. **Nav utilisateur (VM-first)** : un ViewModel (souvent dans
|
|
||||||
une commande `[RelayCommand]`) appelle
|
|
||||||
`await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`.
|
|
||||||
`App.PushPageAsync` (`src/PostIt/PostIt/App.axaml.cs`)
|
|
||||||
résout la `Control` correspondante via le `ViewLocator`
|
|
||||||
enregistré dans `Application.DataTemplates`, l'identifie
|
|
||||||
comme `Page`, lui assigne le VM comme `DataContext`, et
|
|
||||||
appelle `NavRoot.PushAsync(page)`. C'est le seul chemin
|
|
||||||
pour les boutons de la toolbar, les `OpenSettings` /
|
|
||||||
`OpenCircles` / `ManageAcl` / `OpenSignatureDev`, et
|
|
||||||
toute autre nav déclenchée par un ViewModel.
|
|
||||||
|
|
||||||
2. **Signaux de cycle de vie** : le `SessionStatusViewModel`
|
|
||||||
lève des événements consommés dans
|
|
||||||
`App.OnFrameworkInitializationCompleted` pour orchestrer
|
|
||||||
la nav de boot :
|
|
||||||
|
|
||||||
| Événement | Effet |
|
|
||||||
|---------------------|------------------------------------------------------------------|
|
|
||||||
| `LoginSucceeded` | `PushAsync(MainPage)` au-dessus de `HomePage` (post-login). |
|
|
||||||
| `LogoutCompleted` | `PopToRootAsync()` (revient à `HomePage`). |
|
|
||||||
|
|
||||||
Ces events ne sont **pas** un canal de nav utilisateur ; ils
|
|
||||||
portent une transition d'état applicatif (authentification
|
|
||||||
établie / perdue) et c'est `App` qui choisit d'en faire une
|
|
||||||
transition de pile.
|
|
||||||
|
|
||||||
### Garde anti-empilement
|
|
||||||
|
|
||||||
`NavigationPage.PushAsync` n'est pas idempotent : pousser deux
|
|
||||||
fois la même instance l'empile deux fois, et l'utilisateur doit
|
|
||||||
taper **Retour** N fois pour sortir. La garde est implémentée
|
|
||||||
dans `App.PushPageAsync` (et consommée par tous les chemins
|
|
||||||
de nav utilisateur) :
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
var stack = window.NavRoot.NavigationStack;
|
|
||||||
if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
|
|
||||||
{
|
|
||||||
return Task.CompletedTask; // déjà au sommet, no-op silencieux
|
|
||||||
}
|
|
||||||
return window.NavRoot.PushAsync(page);
|
|
||||||
```
|
|
||||||
|
|
||||||
La comparaison est par référence, pas par type : on ne veut
|
|
||||||
empêcher qu'un push de *cette* instance particulière, pas
|
|
||||||
celui d'une éventuelle autre `SettingsPage` (il n'en existe
|
|
||||||
qu'une, mais l'invariant est plus clair comme ça). La garde
|
|
||||||
repose sur le fait que `SettingsPage` est un singleton ; si on
|
|
||||||
repassait en `Transient`, `ReferenceEquals` resterait correct
|
|
||||||
mais la pertinence de la garde s'évaporerait (chaque push
|
|
||||||
apporterait une nouvelle instance et l'anti-empilement
|
|
||||||
reposerait sur l'invariant « la même est déjà au sommet »,
|
|
||||||
qui ne tiendrait plus).
|
|
||||||
|
|
||||||
## ViewModels et invariants d'état
|
|
||||||
|
|
||||||
- `Settings` est un objet-modèle exposé comme `DataContext`
|
|
||||||
des pages. Il n'hérite pas de `ViewModelBase` (c'est un
|
|
||||||
POCO `[ObservableProperty]`-généré par
|
|
||||||
`CommunityToolkit.Mvvm`). Le fait qu'il soit utilisé comme
|
|
||||||
DataContext est un raccourci de composition acceptable ici,
|
|
||||||
pas un pattern à généraliser.
|
|
||||||
|
|
||||||
- `SessionStatusViewModel` est le seul VM avec une durée de vie
|
|
||||||
**process-entière** (singleton). Il survit à toutes les
|
|
||||||
navigations, expose `HasValidSession` en continu, et porte
|
|
||||||
les événements de cycle de vie consommés par `App` pour
|
|
||||||
orchestrer la nav de boot (`LoginSucceeded`,
|
|
||||||
`LogoutCompleted`). La nav utilisateur déclenchée par
|
|
||||||
l'utilisateur passe par `App.PushPageAsync(vm)`, pas par
|
|
||||||
un événement du `SessionStatusViewModel`.
|
|
||||||
|
|
||||||
- `MainPageViewModel` / `HomePageViewModel` /
|
|
||||||
`SignaturePageViewModel` sont `Transient` — une nouvelle
|
|
||||||
instance est créée à chaque push, l'ancienne est libérée
|
|
||||||
quand la page est dépilée. Pas d'état partagé entre
|
|
||||||
occurrences ; pour passer une donnée d'une page à l'autre,
|
|
||||||
on passe par un singleton (souvent `YavscApiClient` ou
|
|
||||||
`Settings`).
|
|
||||||
|
|
||||||
## Bindings XAML : conventions de nommage
|
|
||||||
|
|
||||||
Pour les `[RelayCommand]` (cf. `CommunityToolkit.Mvvm`), le
|
|
||||||
binding XAML reprend **le nom exact de la méthode, sans
|
|
||||||
suffixe** :
|
|
||||||
|
|
||||||
| Méthode C# | Binding XAML |
|
|
||||||
|-----------------------|-----------------------------|
|
|
||||||
| `Save()` | `{Binding Save}` |
|
|
||||||
| `SaveAsync()` | `{Binding SaveAsync}` |
|
|
||||||
| `LoginCommand()` | `{Binding LoginCommand}` (nom littéral, *pas* de suffixe ajouté) |
|
|
||||||
| `Clear()` | `{Binding Clear}` |
|
|
||||||
| `CaptureAsync()` | `{Binding CaptureAsync}` |
|
|
||||||
|
|
||||||
**JAMAIS** `SaveCommand`, `SaveCmd`, `DoSave`, etc. Le source
|
|
||||||
generator `[RelayCommand]` émet une propriété `ICommand` du
|
|
||||||
même nom que la méthode. Un binding qui pointe vers une
|
|
||||||
propriété inexistante casse l'app au moment du câblage (le
|
|
||||||
bouton ne se câble pas, et selon la version ça peut faire
|
|
||||||
planter l'init de la page).
|
|
||||||
|
|
||||||
Référence canonique : `AGENTS.md`, section
|
|
||||||
"Avalonia + CommunityToolkit.Mvvm : conventions de binding
|
|
||||||
pour `[RelayCommand]`".
|
|
||||||
|
|
||||||
## Pages et leurs rôles
|
|
||||||
|
|
||||||
| Page | DataContext | Rôle |
|
|
||||||
|----------------------------|--------------------------|-----------------------------------------------------------------------|
|
|
||||||
| `MainWindow` | `HomePageViewModel` (initial) | Host de la `NavigationPage`. |
|
|
||||||
| `SessionStatusBanner` | `SessionStatusViewModel` | Bandeau persistant en haut de la fenêtre, visible sur toutes les pages. Boutons Login / Logout / Paramètres. |
|
|
||||||
| `HomePage` | `HomePageViewModel` | Page d'accueil publique. |
|
|
||||||
| `MainPage` | `MainPageViewModel` | Éditeur de post de blog (après login). |
|
|
||||||
| `SignaturePage` | `SignaturePageViewModel` | Capture de signature (estimateur). |
|
|
||||||
| `SettingsPage` | `Settings` | Édition de Authority / ClientId / Scopes / URLs API / Dark mode. Sauver via `Save` (RelayCommand). |
|
|
||||||
|
|
||||||
## Conséquences pratiques
|
|
||||||
|
|
||||||
- **Ajouter une page** : créer la View + le ViewModel +
|
|
||||||
enregistrer les deux dans le DI **et** dans le `switch` de
|
|
||||||
`ViewLocator.Build`. Oublier le `ViewLocator` est silencieux
|
|
||||||
(juste un TextBlock "No view for X"), pas une exception.
|
|
||||||
- **Ajouter un événement global de navigation** (par ex.
|
|
||||||
"Push après payment success") : ne pas capturer `MainWindow`
|
|
||||||
ni `NavigationPage` depuis le VM. La nav passe par
|
|
||||||
`App.PushPageAsync(vm)` dans tous les cas : soit le VM
|
|
||||||
appelle la méthode directement depuis une commande
|
|
||||||
(`[RelayCommand]`), soit un handler abonné à un événement
|
|
||||||
d'un singleton (cf. `SessionStatusViewModel`) l'appelle.
|
|
||||||
Garder les VMs découplés du
|
|
||||||
`IClassicDesktopStyleApplicationLifetime`.
|
|
||||||
- **Modifier l'OIDC** : la fiche à lire est
|
|
||||||
[postit-oidc.md](postit-oidc.md), pas celle-ci. Cette fiche
|
|
||||||
ne ré-explique ni le flow, ni le pipe, ni le custom scheme.
|
|
||||||
- **Modifier les `Settings`** : ne pas casser le singleton
|
|
||||||
(cf. invariant ci-dessus). Toute propriété présentationnelle
|
|
||||||
ajoutée (par ex. `ScopeListText`) doit porter `[JsonIgnore]`
|
|
||||||
pour ne pas polluer le format sur disque.
|
|
||||||
|
|
||||||
## Voir aussi
|
|
||||||
|
|
||||||
- [Architecture.md](../Architecture.md) — racine.
|
|
||||||
- [postit-oidc.md](postit-oidc.md) — flow OIDC, custom scheme,
|
|
||||||
silent refresh, persistance des tokens.
|
|
||||||
- [decoupage-organisation.md](decoupage-organisation.md) —
|
|
||||||
place de `PostIt` dans le découpage global des projets
|
|
||||||
.NET du repo.
|
|
||||||
278
doc/dev-tracking/client-editor-overhaul.md
Normal file
278
doc/dev-tracking/client-editor-overhaul.md
Normal file
|
|
@ -0,0 +1,278 @@
|
||||||
|
# Client editor overhaul — Yavsc.Org administration
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Bring the OAuth2 client administration UI (`/Client/Edit/{id}` and friends)
|
||||||
|
in Yavsc.Org to feature parity with the IdentityServer8 `Client` entity
|
||||||
|
model. Today the editor only exposes a handful of scalar fields and a few
|
||||||
|
single-line inputs for collections; the bulk of the entity and its
|
||||||
|
related collections are unreachable from the UI.
|
||||||
|
|
||||||
|
## Inventory — current state
|
||||||
|
|
||||||
|
### Properties exposed by `Views/Client/Edit.cshtml`
|
||||||
|
|
||||||
|
| Field | Type | Notes |
|
||||||
|
| ------------------------ | ----------- | ---------------------------------- |
|
||||||
|
| `ClientId` | string | hidden, identifier |
|
||||||
|
| `Enabled` | bool | checkbox |
|
||||||
|
| `ClientName` | string | display name |
|
||||||
|
| `FrontChannelLogoutUri` | string | only front-channel, no back-channel |
|
||||||
|
| `RedirectUris` | collection | rendered as a single text input |
|
||||||
|
| `IdentityTokenLifetime` | int | seconds |
|
||||||
|
| `AbsoluteRefreshTokenLifetime` | int | seconds |
|
||||||
|
| `ClientSecrets` | collection | rendered as a single text input |
|
||||||
|
| `AccessTokenType` | enum | dropdown (custom `SetAppTypesInputValues`) |
|
||||||
|
|
||||||
|
### Properties of `IdentityServer8.EntityFramework.Entities.Client` **NOT** in the editor
|
||||||
|
|
||||||
|
Core scalars (16 fields missing):
|
||||||
|
|
||||||
|
- `Description`
|
||||||
|
- `ClientUri`
|
||||||
|
- `LogoUri`
|
||||||
|
- `RequireConsent`
|
||||||
|
- `RequirePkce`
|
||||||
|
- `RequireRequestObject`
|
||||||
|
- `RequireClientSecret`
|
||||||
|
- `AllowPlainTextPkce`
|
||||||
|
- `AllowOfflineAccess`
|
||||||
|
- `AllowRememberConsent`
|
||||||
|
- `AlwaysIncludeUserClaimsInIdToken`
|
||||||
|
- `AlwaysSendClientClaims`
|
||||||
|
- `AuthorizationCodeLifetime`
|
||||||
|
- `BackChannelLogoutUri`
|
||||||
|
- `BackChannelLogoutSessionRequired`
|
||||||
|
- `CibaLifetime`
|
||||||
|
- `ClientClaimsPrefix`
|
||||||
|
- `ConsentLifetime`
|
||||||
|
- `Created`
|
||||||
|
- `DeviceCodeLifetime`
|
||||||
|
- `EnableLocalLogin`
|
||||||
|
- `Enabled`
|
||||||
|
- `FrontChannelLogoutSessionRequired`
|
||||||
|
- `IncludeJwtId`
|
||||||
|
- `LastAccessed`
|
||||||
|
- `LogoUri`
|
||||||
|
- `NonEditable`
|
||||||
|
- `PairwiseSubjectSalt`
|
||||||
|
- `PollingInterval`
|
||||||
|
- `ProtocolType`
|
||||||
|
- `RefreshTokenExpiration`
|
||||||
|
- `RefreshTokenUsage`
|
||||||
|
- `SlidingRefreshTokenLifetime`
|
||||||
|
- `UpdateAccessTokenClaimsOnRefresh`
|
||||||
|
- `Updated`
|
||||||
|
- `UserCodeType`
|
||||||
|
- `UserSsoLifetime`
|
||||||
|
|
||||||
|
Collections (8 missing — currently either not exposed at all, or jammed
|
||||||
|
into a single-line text input that doesn't work for an IEnumerable):
|
||||||
|
|
||||||
|
- `AllowedGrantTypes` → `ClientGrantType` (GrantType)
|
||||||
|
- `AllowedScopes` → `ClientScope` (Scope)
|
||||||
|
- `RedirectUris` → `ClientRedirectUri` (RedirectUri) — exposed but broken
|
||||||
|
- `PostLogoutRedirectUris` → `ClientPostLogoutRedirectUri` (PostLogoutRedirectUri)
|
||||||
|
- `AllowedCorsOrigins` → `ClientCorsOrigin` (Origin)
|
||||||
|
- `IdentityProviderRestrictions` → `ClientIdPRestriction` (Provider)
|
||||||
|
- `Claims` → `ClientClaim` (Type, Value)
|
||||||
|
- `Properties` → `ClientProperty` (Key, Value)
|
||||||
|
- `ClientSecrets` → `ClientSecret` (Type, Value, Description, Created, Expiration) — exposed but broken
|
||||||
|
- `AllowedSigningAlgorithms` → scalar string collection on Client itself
|
||||||
|
|
||||||
|
## Pages to add
|
||||||
|
|
||||||
|
Pattern: one Razor page per collection under
|
||||||
|
`Views/Client/Edit{Collection}.cshtml`. Each page lists existing rows,
|
||||||
|
offers an "Add" form with the relevant fields, and a per-row
|
||||||
|
remove button. The main `Edit.cshtml` becomes a hub page with links
|
||||||
|
to each subpage plus the scalar fields it already has.
|
||||||
|
|
||||||
|
| Page | Route | Form fields |
|
||||||
|
| ------------------------------------- | ------------------------------------------ | ------------------------------------------------- |
|
||||||
|
| `Edit.cshtml` | `GET /Client/Edit/{id}` (existing) | scalar fields + nav links |
|
||||||
|
| `EditRedirectUris.cshtml` | `GET /Client/EditRedirectUris/{id}` | `RedirectUri` |
|
||||||
|
| `EditPostLogoutRedirectUris.cshtml` | `GET /Client/EditPostLogoutRedirectUris/{id}` | `PostLogoutRedirectUri` |
|
||||||
|
| `EditScopes.cshtml` | `GET /Client/EditScopes/{id}` | `Scope` (with select of known scopes) |
|
||||||
|
| `EditGrantTypes.cshtml` | `GET /Client/EditGrantTypes/{id}` | `GrantType` (with select of known types) |
|
||||||
|
| `EditCorsOrigins.cshtml` | `GET /Client/EditCorsOrigins/{id}` | `Origin` |
|
||||||
|
| `EditIdPRestrictions.cshtml` | `GET /Client/EditIdPRestrictions/{id}` | `Provider` |
|
||||||
|
| `EditClaims.cshtml` | `GET /Client/EditClaims/{id}` | `Type`, `Value` |
|
||||||
|
| `EditProperties.cshtml` | `GET /Client/EditProperties/{id}` | `Key`, `Value` |
|
||||||
|
| `EditSecrets.cshtml` (replacement) | `GET /Client/EditSecrets/{id}` | `Type`, `Value`, `Description`, `Expiration` |
|
||||||
|
|
||||||
|
Partial view `_EditableList.cshtml` factored once and consumed by all
|
||||||
|
of the above.
|
||||||
|
|
||||||
|
## Controller actions to add
|
||||||
|
|
||||||
|
For each collection `Foo`:
|
||||||
|
|
||||||
|
- `GET EditFoo(int id)` — load the client, render the page
|
||||||
|
- `POST AddFoo(int id, …)` — append a row, redirect to `EditFoo`
|
||||||
|
- `POST RemoveFoo(int id, int rowId)` — delete a row, redirect
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
- `dotnet build src/Yavsc.Org/Yavsc.Org.csproj` → 0 errors
|
||||||
|
- No tests in `Yavsc.Org.Tests` exercise the controller today (per
|
||||||
|
`find … -name "ClientController*" -not -path "*/bin/*"`). Smoke-test
|
||||||
|
by logging in as admin, hitting `/Client/Edit/1`, then each
|
||||||
|
`Edit*/1` page, and verifying the add/remove POSTs.
|
||||||
|
- Existing seed flow (`MigratePostItClientToPublic` in
|
||||||
|
`HostingExtensions.cs`) must keep working — the editor changes are
|
||||||
|
additive, not destructive.
|
||||||
|
|
||||||
|
## Out of scope
|
||||||
|
|
||||||
|
- Tests (no MVC test infrastructure currently exists for this controller)
|
||||||
|
- Migration of existing collection fields (the broken `RedirectUris`
|
||||||
|
text input will simply be replaced by the new subpage)
|
||||||
|
- Per-collection authorization policies (the controller is already
|
||||||
|
`[Authorize("AdministratorOnly")]`)
|
||||||
|
- Client cloning / templating / JSON import-export
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
2026-06-21 16:04 — kickoff. Inventory done. Pages not yet started.
|
||||||
|
|
||||||
|
2026-06-21 16:11 — first delivery, **build does not compile by design**
|
||||||
|
(per Paul: "Tu peux même me laisser un travail qui ne compile
|
||||||
|
pas"). The structural work is done; the residual errors are easy
|
||||||
|
fixes Paul will do in a debug session.
|
||||||
|
|
||||||
|
Files added (working tree, not yet committed):
|
||||||
|
|
||||||
|
- `src/Yavsc.Org/Controllers/Administration/ClientController.Collections.cs`
|
||||||
|
— partial class with the per-collection GET / Add / Remove actions.
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditRedirectUris.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditPostLogoutRedirectUris.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditScopes.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditGrantTypes.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditCorsOrigins.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditIdPRestrictions.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditClaims.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditProperties.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/EditSecrets.cshtml`
|
||||||
|
- `src/Yavsc.Org/Views/Client/_EditableStringList.cshtml`
|
||||||
|
— partial consumed by the single-string-field collection pages.
|
||||||
|
|
||||||
|
Files modified:
|
||||||
|
|
||||||
|
- `src/Yavsc.Org/Controllers/Administration/ClientController.cs`
|
||||||
|
— `class` → `partial class`; the `Edit(int id)` GET now uses
|
||||||
|
`LoadClientAsync` to load all navigations (so the new Edit.cshtml
|
||||||
|
can render counts in its nav links).
|
||||||
|
- `src/Yavsc.Org/Views/Client/Edit.cshtml`
|
||||||
|
— significantly enriched: nav links to the 9 sub-pages, all the
|
||||||
|
scalar fields split into fieldsets (Security, Logout, Tokens,
|
||||||
|
Device / CIBA, Tokens-extra), ClientId / Id hidden.
|
||||||
|
|
||||||
|
### Known residual compile errors (4 errors total)
|
||||||
|
|
||||||
|
Paul is fixing these in a debug session. The structure is sound; the
|
||||||
|
errors are missing properties on the `Client` entity, a Razor
|
||||||
|
nullable quirk, and a `Localizer` injection miss.
|
||||||
|
|
||||||
|
1. `Edit.cshtml:249` — `PairwiseSubjectSalt` doesn't exist on
|
||||||
|
`IdentityServer8.EntityFramework.Entities.Client`. **Fix**: drop
|
||||||
|
the field from Edit.cshtml; IdentityServer8 likely uses a
|
||||||
|
different property name (e.g. on a related entity) or doesn't
|
||||||
|
expose it.
|
||||||
|
2. `Edit.cshtml:221` — `CibaLifetime` doesn't exist on `Client`.
|
||||||
|
**Fix**: same as above. CIBA flow may be configured elsewhere
|
||||||
|
(resource-level) or via a different property.
|
||||||
|
3. `ClientController.Collections.cs` lines 181, 217, 253, 304 —
|
||||||
|
`Localizer` is not available in the partial class. **Fix**: inject
|
||||||
|
`IStringLocalizer<ClientController>` via the constructor, or
|
||||||
|
inline the strings ("BothTypeAndValueRequired", "KeyRequired",
|
||||||
|
"ValueRequired", "SecretValueRequired").
|
||||||
|
4. `EditSecrets.cshtml:44` — `s.Expiration?.ToString("u")` on a
|
||||||
|
`DateTime?`. **Fix**: just `s.Expiration?.ToString("u")` works
|
||||||
|
if you write `s.Expiration.Value.ToString("u")`, or use
|
||||||
|
`(s.Expiration is null ? "" : s.Expiration.Value.ToString("u"))`,
|
||||||
|
or `s.Expiration?.ToString("u") ?? string.Empty`.
|
||||||
|
|
||||||
|
### Suggested next session
|
||||||
|
|
||||||
|
Once the 4 compile errors are fixed and the pages render:
|
||||||
|
|
||||||
|
1. Smoke test by logging in as admin, hitting `/Client/Edit/1`,
|
||||||
|
then each `Edit*/1` page, and verifying add/remove POSTs.
|
||||||
|
2. Add a confirmation prompt (or 2-step form) for Remove actions —
|
||||||
|
removing a Redirect URI is destructive and one click is too easy.
|
||||||
|
3. Wire up some collection-level validation (e.g. redirect URI must
|
||||||
|
be a valid URL) at the controller level.
|
||||||
|
4. Add tests — the project doesn't have MVC test infrastructure
|
||||||
|
today; consider adding a `Yavsc.Org.Tests` project that drives
|
||||||
|
the controller via `WebApplicationFactory<Program>`.
|
||||||
|
|
||||||
|
|
||||||
|
## Test bootstrap notes (session of 2026-06-21 17:00+)
|
||||||
|
|
||||||
|
When adding new integration tests against `WebServerFixture`:
|
||||||
|
|
||||||
|
1. **Skip `/Account/Login` roundtrip.** The fixture ships without
|
||||||
|
`MapRazorPages()` (commented out in `HostingExtensions.ConfigurePipeline`),
|
||||||
|
so `/Identity/Account/Login` is 404, and the custom
|
||||||
|
`/Account/Login` route requires a complex antiforgery dance.
|
||||||
|
Instead, build a `ClaimsPrincipal` for the test user via
|
||||||
|
`UserManager` + `IUserClaimsPrincipalFactory<ApplicationUser>`,
|
||||||
|
then call `IAuthenticationService.SignInAsync` on a synthetic
|
||||||
|
`DefaultHttpContext` and replay the resulting `Set-Cookie` header
|
||||||
|
into the test `HttpClient`. See
|
||||||
|
`ClientControllerCollectionTests.IssueIdentityCookie`.
|
||||||
|
|
||||||
|
2. **Create the `Administrator` role before assigning it.** ASP.NET
|
||||||
|
Identity stores roles in `AspNetRoles`; there is no automatic seed.
|
||||||
|
The constant name is `YavscConstants.AdminGroupName` = `"Administrator"`.
|
||||||
|
Use `RoleManager<IdentityRole>.CreateAsync(new IdentityRole("Administrator"))`
|
||||||
|
before `AddToRoleAsync`.
|
||||||
|
|
||||||
|
3. **Use `InMemory` connection string to bypass the prod signing-cert
|
||||||
|
requirement.** `HostingExtensions.AddIdentityServer` requires a
|
||||||
|
PEM cert unless `builder.Environment.IsDevelopment()` OR
|
||||||
|
`UsesInMemoryProvider(connectionString)`. The fixture already
|
||||||
|
uses `InMemory`, so `AddDeveloperSigningCredential()` is called
|
||||||
|
automatically — but only after we wired this check in (see
|
||||||
|
commit history).
|
||||||
|
|
||||||
|
4. **Field-name gotchas** (from disassembling HigginsSoft
|
||||||
|
IdentityServer8.EntityFramework.Entities.Client 8.0.5-preview-net9):
|
||||||
|
- `PairWiseSubjectSalt` (capital W on "Wise"), not `PairwiseSubjectSalt`.
|
||||||
|
- `CibaLifetime` and `PollingInterval` do NOT exist on `Client` in
|
||||||
|
this version.
|
||||||
|
- `ConsentLifetime` and `UserSsoLifetime` are `int?`.
|
||||||
|
|
||||||
|
5. **`MapStaticAssets()` fails on test projects.** Calling
|
||||||
|
`MapStaticAssets()` resolves a manifest file
|
||||||
|
(`<project>.staticwebassets.endpoints.json`) that test projects
|
||||||
|
don't produce. Skip when `WebRootPath` points at the test
|
||||||
|
assembly directory.
|
||||||
|
|
||||||
|
6. **Routing 404 on /Client/Edit/{id} via WebServerFixture.** As of
|
||||||
|
this session, the GET endpoint returns 404 even with admin
|
||||||
|
header. The route mapping is intact
|
||||||
|
(`MapDefaultControllerRoute()`), so this is likely an MVC
|
||||||
|
convention routing issue with the
|
||||||
|
`Controllers/Administration/` subdirectory. To investigate
|
||||||
|
next session: log middleware pipeline or hit `/Client` index
|
||||||
|
first to see if any Client route resolves.
|
||||||
|
|
||||||
|
7. **`MapStaticAssets()` is unconditional in prod, but blocks tests.**
|
||||||
|
`WebApplication.CreateBuilder` defaults `ContentRootPath` to
|
||||||
|
`AppContext.BaseDirectory`. In test runs that resolves to
|
||||||
|
`src/Yavsc.Org.Tests/bin/Debug/net10.0/`, where
|
||||||
|
`Yavsc.Org.Tests.staticwebassets.endpoints.json` doesn't exist
|
||||||
|
(it's generated only by projects with the Web SDK). The
|
||||||
|
`app.MapStaticAssets()` call inside `ConfigurePipeline` then
|
||||||
|
throws and the fixture fails to start — taking every test in
|
||||||
|
the `[Collection("Yavsc Server")]` down with it.
|
||||||
|
|
||||||
|
This is a pre-existing fragility of the WebServerFixture that
|
||||||
|
the new test work surfaced. Fixing it cleanly requires either:
|
||||||
|
(a) moving the test project to the Web SDK so it produces its
|
||||||
|
own manifest, (b) copying the manifest at build time via an
|
||||||
|
MSBuild target, or (c) routing `MapStaticAssets` through an
|
||||||
|
assembly-resolution fallback. None attempted in this session —
|
||||||
|
recorded for next session.
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
# Stratégie de test
|
|
||||||
|
|
||||||
Yavsc utilise **xUnit** (`xunit.v3`) avec un mix d'unitaire pur
|
|
||||||
et d'intégration légère. Les projets de tests sont sous
|
|
||||||
`src/<projet>.Tests/` et consomment le scaffold partagé
|
|
||||||
`src/Yavsc.Tests.Shared/`.
|
|
||||||
|
|
||||||
## Vue d'ensemble
|
|
||||||
|
|
||||||
| Sujet | Document |
|
|
||||||
|---|---|
|
|
||||||
| Scaffold partagé (`WebHostFixture`, JWT de test, etc.) | [src/Yavsc.Tests.Shared/README.md](../src/Yavsc.Tests.Shared/README.md) |
|
|
||||||
| Convention des dossiers de tests | [Conventions](#conventions-des-dossiers-de-tests) |
|
|
||||||
| Driver EF Core en test | [EF Core en test](#ef-core-en-test) |
|
|
||||||
| Stubs d'authentification et de permissions | [Auth et permissions](#auth-et-permissions) |
|
|
||||||
|
|
||||||
## Conventions des dossiers de tests
|
|
||||||
|
|
||||||
Sous `src/<projet>.Tests/`, on trouve quatre dossiers de premier
|
|
||||||
niveau qui classifient les tests par intention :
|
|
||||||
|
|
||||||
| Dossier | Usage |
|
|
||||||
|---|---|
|
|
||||||
| `NonRegression/` | Régressions : un bug constaté, un test qui le détecte si on le réintroduit |
|
|
||||||
| `Mandatory/` | Tests bloquants : ils doivent passer avant tout merge |
|
|
||||||
| `Smoke/` | Smoke tests HTTP rapides, montent un host léger |
|
|
||||||
| `Controllers/` | Tests unitaires des contrôleurs (mock du service, assertions sur le mapping HTTP) |
|
|
||||||
|
|
||||||
Les `NonRegression` sont la cible par défaut quand on fixe un
|
|
||||||
bug : ils doivent être **rouges avant le fix, verts après**, et
|
|
||||||
continuer à **casser** si quelqu'un revert le fix. Pas de test
|
|
||||||
qui passe à vide.
|
|
||||||
|
|
||||||
## EF Core en test
|
|
||||||
|
|
||||||
Pour les tests qui ont besoin d'un `ApplicationDbContext`, on
|
|
||||||
utilise **`UseInMemoryDatabase`** avec un `InMemoryDatabaseRoot`
|
|
||||||
partagé au niveau de la fixture. Pas de SQLite, pas de Docker,
|
|
||||||
pas de mock du contexte : le service testé s'exécute contre
|
|
||||||
un vrai `DbContext` sur in-memory.
|
|
||||||
|
|
||||||
```csharp
|
|
||||||
private static readonly InMemoryDatabaseRoot _dbRoot = new();
|
|
||||||
|
|
||||||
var opts = new DbContextOptionsBuilder<ApplicationDbContext>()
|
|
||||||
.UseInMemoryDatabase("Yavsc.Org.Tests.MyFixture", _dbRoot)
|
|
||||||
.Options;
|
|
||||||
```
|
|
||||||
|
|
||||||
Le `InMemoryDatabaseRoot` partagé est important : sans lui, EF
|
|
||||||
crée un store indépendant par `DbContext` dans certaines
|
|
||||||
configurations, et un test qui seed + read sur deux contextes
|
|
||||||
voit un store vide. Le pattern est documenté dans
|
|
||||||
`BlogsWebServerFixture` ([src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs](../src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs)).
|
|
||||||
|
|
||||||
> **Limite connue** : le provider in-memory **ignore** les
|
|
||||||
> `Migration` EF et ne respecte pas les FK **sur les raw
|
|
||||||
> SQL** (`ExecuteSqlRaw`). Pour tester des contraintes FK, on
|
|
||||||
> écrit la configuration dans `OnModelCreating` et on s'appuie
|
|
||||||
> sur le fait qu'EF la respecte à l'`Add`/`SaveChanges`. Pour
|
|
||||||
> tester des migrations, c'est l'environnement de staging.
|
|
||||||
|
|
||||||
## Auth et permissions
|
|
||||||
|
|
||||||
L'authorization policy provider de prod est swappé contre
|
|
||||||
`TestAuthPolicyProvider` (dans `Yavsc.Tests.Shared`) par les
|
|
||||||
fixtures spécialisées. Les tests qui ont besoin qu'un user soit
|
|
||||||
"Administrator" envoient un header `X-Test-Rôle` ; ceux qui
|
|
||||||
veulent un user anonyme omettent le header.
|
|
||||||
|
|
||||||
Pour les tests unitaires qui n'ont pas besoin du pipeline
|
|
||||||
HTTP, on stub `IAuthorizationService` directement (cf.
|
|
||||||
`BlogspotController` dans `Yavsc.Org.Tests/NonRegression/`)
|
|
||||||
pour éviter de monter un host complet.
|
|
||||||
|
|
||||||
## Quand ne PAS écrire de test
|
|
||||||
|
|
||||||
Un test qui ne détecte rien n'est pas un test. Si l'invariant
|
|
||||||
qu'on cherche à protéger est déjà enforced par EF, par le
|
|
||||||
compilateur, ou par une couche applicative en amont, le test
|
|
||||||
est du bruit. Mieux vaut :
|
|
||||||
- Un test qui assert un **comportement observable** (code
|
|
||||||
retour HTTP, exception typée, valeur de retour)
|
|
||||||
- Ou pas de test, et une note dans le code
|
|
||||||
|
|
||||||
La non-régression se prouve par un test qui casse si on
|
|
||||||
réintroduit le bug. Pas par un test qui passe aujourd'hui et
|
|
||||||
qui continuera à passer après un revert.
|
|
||||||
10
src/PostIt.Tests/Directory.Packages.props
Normal file
10
src/PostIt.Tests/Directory.Packages.props
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<Project>
|
||||||
|
<!-- Pull in shared package versions from the repository root. -->
|
||||||
|
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
|
||||||
|
|
||||||
|
<!-- PostIt.Tests-specific versions -->
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageVersion Include="Avalonia.Headless" Version="12.0.4" />
|
||||||
|
<PackageVersion Include="Avalonia.Headless.XUnit" Version="12.0.4" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
using System;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using IdentityModel.OidcClient.Browser;
|
using IdentityModel.OidcClient.Browser;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt.Tests;
|
||||||
|
|
@ -7,7 +10,7 @@ namespace PostIt.Tests;
|
||||||
/// URL emitted by OidcClient, extracts its <c>state</c>, and returns a
|
/// URL emitted by OidcClient, extracts its <c>state</c>, and returns a
|
||||||
/// BrowserResult that mimics the OIDC redirect-with-code callback.
|
/// BrowserResult that mimics the OIDC redirect-with-code callback.
|
||||||
///
|
///
|
||||||
/// The paired <see cref="OIDCStubAuthority"/>'s token endpoint accepts
|
/// The paired <see cref="OidcStubAuthority"/>'s token endpoint accepts
|
||||||
/// any authorization code, so we don't need to mint a real one here.
|
/// any authorization code, so we don't need to mint a real one here.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class FakeAuthorizingBrowser
|
public sealed class FakeAuthorizingBrowser
|
||||||
257
src/PostIt.Tests/LoginPageViewModelTests.cs
Normal file
257
src/PostIt.Tests/LoginPageViewModelTests.cs
Normal file
|
|
@ -0,0 +1,257 @@
|
||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using PostIt.ViewModels;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace PostIt.Tests;
|
||||||
|
|
||||||
|
public class LoginPageViewModelTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginAsync_acquires_access_token_from_stubbed_yavsc_authority()
|
||||||
|
{
|
||||||
|
// Arrange: spin up a stub OIDC authority and a fake browser that
|
||||||
|
// short-circuits the system browser. The authority signs its
|
||||||
|
// access_token with RS256; the fake browser captures the redirect
|
||||||
|
// URI so the authority can complete the token exchange.
|
||||||
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
|
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
||||||
|
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = authority.Issuer,
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
},
|
||||||
|
RedirectUri = authority.LoopbackRedirectUri,
|
||||||
|
Scopes = new[] { "openid", "profile", "blog" }
|
||||||
|
};
|
||||||
|
|
||||||
|
var vm = new LoginPageViewModel(settings, browser.CreateBrowser);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await vm.LoginAsync();
|
||||||
|
|
||||||
|
// Assert: the ViewModel surfaced a token, not an error.
|
||||||
|
Assert.True(
|
||||||
|
!string.IsNullOrEmpty(vm.AccessToken),
|
||||||
|
$"Login did not produce a token. StatusMessage={vm.StatusMessage ?? "<null>"}");
|
||||||
|
Assert.False(
|
||||||
|
vm.StatusMessage?.StartsWith("Error") == true,
|
||||||
|
$"Login reported error: {vm.StatusMessage}");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginAsync_refuses_to_call_OidcClient_when_Authority_is_empty()
|
||||||
|
{
|
||||||
|
// Regression: when no user settings file exists and the embedded
|
||||||
|
// default somehow fails to load (e.g. resource stripped at publish
|
||||||
|
// time), the ViewModel must NOT hand a blank Authority to
|
||||||
|
// OidcClient — IdentityModel would build a bogus authorize URL
|
||||||
|
// like "http://127.0.0.1:1/" which the browser rejects with a
|
||||||
|
// confusing error. Surface a clear, actionable message instead.
|
||||||
|
//
|
||||||
|
// SettingsLoadOverride is set to a no-op so the test fixture's
|
||||||
|
// pre-loaded Settings object survives the call to LoginAsync.
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = "",
|
||||||
|
ClientId = "postit-tests",
|
||||||
|
},
|
||||||
|
RedirectUri = "http://127.0.0.1:7890/",
|
||||||
|
Scopes = new[] { "openid" },
|
||||||
|
};
|
||||||
|
|
||||||
|
var browserInvoked = false;
|
||||||
|
var vm = new LoginPageViewModel(settings, () =>
|
||||||
|
{
|
||||||
|
browserInvoked = true;
|
||||||
|
return null;
|
||||||
|
})
|
||||||
|
{
|
||||||
|
// Skip the disk / embedded read so the Authority stays empty.
|
||||||
|
SettingsLoadOverride = () => System.Threading.Tasks.Task.CompletedTask,
|
||||||
|
};
|
||||||
|
|
||||||
|
await vm.LoginAsync();
|
||||||
|
|
||||||
|
Assert.False(
|
||||||
|
browserInvoked,
|
||||||
|
"Browser factory was invoked even though Authority was empty.");
|
||||||
|
Assert.NotNull(vm.StatusMessage);
|
||||||
|
Assert.Contains("Configuration manquante", vm.StatusMessage);
|
||||||
|
Assert.Contains("postit-settings.json", vm.StatusMessage);
|
||||||
|
Assert.True(string.IsNullOrEmpty(vm.AccessToken));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginAsync_works_when_authority_has_trailing_slash()
|
||||||
|
{
|
||||||
|
// Regression: with Authority ending in "/" (the production
|
||||||
|
// postit-settings.json shape for https://yavsc.pschneider.fr/),
|
||||||
|
// the discovery URL OidcClient computes must NOT contain a
|
||||||
|
// double slash before /.well-known/openid-configuration. The
|
||||||
|
// stub advertises itself without the trailing slash; OidcClient
|
||||||
|
// must bridge.
|
||||||
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
|
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
||||||
|
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = authority.Issuer + "/",
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
},
|
||||||
|
RedirectUri = authority.LoopbackRedirectUri,
|
||||||
|
Scopes = new[] { "openid" }
|
||||||
|
};
|
||||||
|
|
||||||
|
var vm = new LoginPageViewModel(settings, browser.CreateBrowser);
|
||||||
|
|
||||||
|
await vm.LoginAsync();
|
||||||
|
|
||||||
|
Assert.True(
|
||||||
|
!string.IsNullOrEmpty(vm.AccessToken),
|
||||||
|
$"Login with trailing slash failed. StatusMessage={vm.StatusMessage ?? "<null>"}");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void RegisterUrl_and_ForgotPasswordUrl_are_derived_from_authority()
|
||||||
|
{
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = "https://yavsc.example.com/",
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
},
|
||||||
|
RedirectUri = "http://127.0.0.1:7890/",
|
||||||
|
Scopes = new[] { "openid" }
|
||||||
|
};
|
||||||
|
|
||||||
|
var vm = new LoginPageViewModel(settings);
|
||||||
|
|
||||||
|
// Trailing slash on Authority is normalised away.
|
||||||
|
Assert.Equal(
|
||||||
|
"https://yavsc.example.com/Account/Register",
|
||||||
|
vm.RegisterUrl);
|
||||||
|
Assert.Equal(
|
||||||
|
"https://yavsc.example.com/Account/ForgotPassword",
|
||||||
|
vm.ForgotPasswordUrl);
|
||||||
|
Assert.True(vm.HasRegisterUrl);
|
||||||
|
Assert.True(vm.HasForgotPasswordUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void RegisterUrl_is_empty_when_authority_is_unset()
|
||||||
|
{
|
||||||
|
var vm = new LoginPageViewModel(new PostIt.Settings());
|
||||||
|
Assert.Equal(string.Empty, vm.RegisterUrl);
|
||||||
|
Assert.Equal(string.Empty, vm.ForgotPasswordUrl);
|
||||||
|
Assert.False(vm.HasRegisterUrl);
|
||||||
|
Assert.False(vm.HasForgotPasswordUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ConfigMissing_is_true_when_authority_is_unset()
|
||||||
|
{
|
||||||
|
var vm = new LoginPageViewModel(new PostIt.Settings());
|
||||||
|
Assert.True(vm.ConfigMissing);
|
||||||
|
Assert.Contains("~/.config/PostIt/postit-settings.json", vm.ConfigMissingMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ConfigMissing_is_false_when_authority_is_set()
|
||||||
|
{
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = "https://yavsc.example.com/",
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var vm = new LoginPageViewModel(settings);
|
||||||
|
Assert.False(vm.ConfigMissing);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("https://yavsc.example.com/", "https://yavsc.example.com/.well-known/openid-configuration")]
|
||||||
|
[InlineData("https://yavsc.example.com", "https://yavsc.example.com/.well-known/openid-configuration")]
|
||||||
|
[InlineData("https://yavsc.example.com/sub/", "https://yavsc.example.com/sub/.well-known/openid-configuration")]
|
||||||
|
public void DiscoveryUrl_is_externalurl_plus_well_known(string authority, string expected)
|
||||||
|
{
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings { Authority = authority }
|
||||||
|
};
|
||||||
|
var vm = new LoginPageViewModel(settings);
|
||||||
|
Assert.Equal(expected, vm.DiscoveryUrl);
|
||||||
|
// ExternalUrl is the slash-normalised form of Authority.
|
||||||
|
Assert.Equal(expected[..expected.LastIndexOf("/.well-known/openid-configuration")], vm.ExternalUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void DiscoveryUrl_is_empty_when_authority_is_unset()
|
||||||
|
{
|
||||||
|
var vm = new LoginPageViewModel(new PostIt.Settings());
|
||||||
|
Assert.Equal(string.Empty, vm.DiscoveryUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginAsync_failure_message_includes_discovery_url()
|
||||||
|
{
|
||||||
|
// Arrange: settings point at an unreachable authority; the test
|
||||||
|
// browser throws synchronously to guarantee the catch branch runs.
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = "https://does-not-exist.invalid/",
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
},
|
||||||
|
RedirectUri = "http://127.0.0.1:7890/",
|
||||||
|
Scopes = new[] { "openid" }
|
||||||
|
};
|
||||||
|
|
||||||
|
var vm = new LoginPageViewModel(settings, () => throw new InvalidOperationException("boom"));
|
||||||
|
|
||||||
|
// Act
|
||||||
|
await vm.LoginAsync();
|
||||||
|
|
||||||
|
// Assert: the surfaced error mentions the canonical discovery URL,
|
||||||
|
// so it can be copy-pasted into a browser to diagnose reachability.
|
||||||
|
Assert.NotNull(vm.StatusMessage);
|
||||||
|
Assert.StartsWith("Error:", vm.StatusMessage);
|
||||||
|
Assert.Contains(
|
||||||
|
"https://does-not-exist.invalid/.well-known/openid-configuration",
|
||||||
|
vm.StatusMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task LoginAsync_reports_discovery_url_when_no_browser_available()
|
||||||
|
{
|
||||||
|
var settings = new PostIt.Settings
|
||||||
|
{
|
||||||
|
Authentication = new AuthenticationSettings
|
||||||
|
{
|
||||||
|
Authority = "https://yavsc.example.com/",
|
||||||
|
ClientId = "postit-tests"
|
||||||
|
},
|
||||||
|
RedirectUri = "http://127.0.0.1:7890/",
|
||||||
|
Scopes = new[] { "openid" }
|
||||||
|
};
|
||||||
|
|
||||||
|
var vm = new LoginPageViewModel(settings, () => null);
|
||||||
|
|
||||||
|
await vm.LoginAsync();
|
||||||
|
|
||||||
|
Assert.Contains(
|
||||||
|
"https://yavsc.example.com/.well-known/openid-configuration",
|
||||||
|
vm.StatusMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,8 +1,13 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt.Tests;
|
||||||
|
|
||||||
|
|
@ -15,7 +20,7 @@ namespace PostIt.Tests;
|
||||||
/// the browser intercepts the authorize redirect, the server completes
|
/// the browser intercepts the authorize redirect, the server completes
|
||||||
/// the token exchange.
|
/// the token exchange.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class OIDCStubAuthority : IAsyncDisposable, IDisposable
|
public sealed class OidcStubAuthority : IAsyncDisposable, IDisposable
|
||||||
{
|
{
|
||||||
private readonly HttpListener _listener;
|
private readonly HttpListener _listener;
|
||||||
private readonly RSA _rsa;
|
private readonly RSA _rsa;
|
||||||
|
|
@ -25,7 +30,7 @@ public sealed class OIDCStubAuthority : IAsyncDisposable, IDisposable
|
||||||
public string Issuer { get; }
|
public string Issuer { get; }
|
||||||
public string LoopbackRedirectUri { get; }
|
public string LoopbackRedirectUri { get; }
|
||||||
|
|
||||||
private OIDCStubAuthority(HttpListener listener, RSA rsa, string kid, string issuer, string loopback)
|
private OidcStubAuthority(HttpListener listener, RSA rsa, string kid, string issuer, string loopback)
|
||||||
{
|
{
|
||||||
_listener = listener;
|
_listener = listener;
|
||||||
_rsa = rsa;
|
_rsa = rsa;
|
||||||
|
|
@ -34,7 +39,7 @@ public sealed class OIDCStubAuthority : IAsyncDisposable, IDisposable
|
||||||
LoopbackRedirectUri = loopback;
|
LoopbackRedirectUri = loopback;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<OIDCStubAuthority> StartAsync()
|
public static async Task<OidcStubAuthority> StartAsync()
|
||||||
{
|
{
|
||||||
// Pick a free loopback port.
|
// Pick a free loopback port.
|
||||||
var port = GetFreePort();
|
var port = GetFreePort();
|
||||||
|
|
@ -48,7 +53,7 @@ public sealed class OIDCStubAuthority : IAsyncDisposable, IDisposable
|
||||||
var rsa = RSA.Create(2048);
|
var rsa = RSA.Create(2048);
|
||||||
var kid = "test-key-1";
|
var kid = "test-key-1";
|
||||||
|
|
||||||
var authority = new OIDCStubAuthority(listener, rsa, kid, prefix.TrimEnd('/'), loopback);
|
var authority = new OidcStubAuthority(listener, rsa, kid, prefix.TrimEnd('/'), loopback);
|
||||||
_ = Task.Run(() => authority.AcceptLoopAsync(authority._cts.Token));
|
_ = Task.Run(() => authority.AcceptLoopAsync(authority._cts.Token));
|
||||||
return authority;
|
return authority;
|
||||||
}
|
}
|
||||||
|
|
@ -6,14 +6,9 @@
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<RootNamespace>PostIt.Tests</RootNamespace>
|
<RootNamespace>PostIt.Tests</RootNamespace>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
|
||||||
<FileVersion>1.1.0.0</FileVersion>
|
|
||||||
<InformationalVersion>1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0</InformationalVersion>
|
|
||||||
<Version>1.1.0-beta.1</Version>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
||||||
<PackageReference Include="Xamarin.UITest" />
|
|
||||||
<PackageReference Include="xunit.v3" />
|
<PackageReference Include="xunit.v3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" />
|
<PackageReference Include="xunit.runner.visualstudio" />
|
||||||
<PackageReference Include="coverlet.collector" />
|
<PackageReference Include="coverlet.collector" />
|
||||||
|
|
@ -21,10 +16,9 @@
|
||||||
<PackageReference Include="Avalonia.Headless.XUnit" />
|
<PackageReference Include="Avalonia.Headless.XUnit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
<ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Using Include="Xunit" />
|
<Using Include="Xunit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,13 +1,21 @@
|
||||||
using Yavsc.Blogspot;
|
using System.Collections.Generic;
|
||||||
using Yavsc.Api.Client;
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Json;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using PostIt.Models;
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
using PostIt.ViewModels;
|
using PostIt.ViewModels;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt;
|
||||||
|
|
||||||
public class PostItViewModelTests
|
public class PostItViewModelTests
|
||||||
{
|
{
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void SearchCommand_filters_posts_by_title_article_or_author()
|
public void SearchCommand_filters_posts_by_title_article_or_author()
|
||||||
{
|
{
|
||||||
|
|
@ -15,12 +23,12 @@ public class PostItViewModelTests
|
||||||
// default; tests construct one with a fake YavscApiClient that
|
// default; tests construct one with a fake YavscApiClient that
|
||||||
// throws on any call (we never call the API in this test).
|
// throws on any call (we never call the API in this test).
|
||||||
var fakeApi = new ThrowingYavscApiClient();
|
var fakeApi = new ThrowingYavscApiClient();
|
||||||
var blog = new BlogApiClient(fakeApi, "http://localhost/");
|
var blog = new BlogApiClient(fakeApi);
|
||||||
var viewModel = new MainViewModel(blog);
|
var viewModel = new MainPageViewModel(blog);
|
||||||
|
|
||||||
viewModel.Posts.Add(new BlogPostDto { Id = 1, Title = "First post", Article = "Hello world", AuthorId = "alice" });
|
viewModel.Posts.Add(new BlogPost { Id = 1, Title = "First post", Article = "Hello world", AuthorId = "alice" });
|
||||||
viewModel.Posts.Add(new BlogPostDto { Id = 2, Title = "Second post", Article = "Nothing here", AuthorId = "bob" });
|
viewModel.Posts.Add(new BlogPost { Id = 2, Title = "Second post", Article = "Nothing here", AuthorId = "bob" });
|
||||||
viewModel.Posts.Add(new BlogPostDto { Id = 3, Title = "Third post", Article = "Search me", AuthorId = "carol" });
|
viewModel.Posts.Add(new BlogPost { Id = 3, Title = "Third post", Article = "Search me", AuthorId = "carol" });
|
||||||
|
|
||||||
viewModel.SearchText = "search";
|
viewModel.SearchText = "search";
|
||||||
viewModel.SearchCommand.Execute(null);
|
viewModel.SearchCommand.Execute(null);
|
||||||
|
|
@ -41,15 +49,15 @@ public class PostItViewModelTests
|
||||||
// The new BlogApiClient delegates transport to YavscApiClient.
|
// The new BlogApiClient delegates transport to YavscApiClient.
|
||||||
// We feed it a fake YavscApiClient that returns the expected
|
// We feed it a fake YavscApiClient that returns the expected
|
||||||
// list straight from CallAsync.
|
// list straight from CallAsync.
|
||||||
var expected = new List<BlogPostDto>
|
var expected = new List<BlogPost>
|
||||||
{
|
{
|
||||||
new() { Id = 1, Title = "Hello" },
|
new() { Id = 1, Title = "Hello" },
|
||||||
new() { Id = 2, Title = "World" }
|
new() { Id = 2, Title = "World" }
|
||||||
};
|
};
|
||||||
var api = new StubYavscApiClient(expected);
|
var api = new StubYavscApiClient(expected);
|
||||||
var blog = new BlogApiClient(api, "http://localhost/");
|
var blog = new BlogApiClient(api);
|
||||||
|
|
||||||
var posts = await blog.GetPostsAsync(ct: TestContext.Current.CancellationToken);
|
var posts = await blog.GetPostsAsync();
|
||||||
|
|
||||||
Assert.Equal(2, posts.Count);
|
Assert.Equal(2, posts.Count);
|
||||||
Assert.Equal("Hello", posts[0].Title);
|
Assert.Equal("Hello", posts[0].Title);
|
||||||
|
|
@ -61,11 +69,11 @@ public class PostItViewModelTests
|
||||||
public ThrowingYavscApiClient() : base(
|
public ThrowingYavscApiClient() : base(
|
||||||
new Settings
|
new Settings
|
||||||
{
|
{
|
||||||
|
Scopes = new[] { "openid" },
|
||||||
Authentication = new AuthenticationSettings
|
Authentication = new AuthenticationSettings
|
||||||
{
|
{
|
||||||
Authority = "https://stub.invalid",
|
Authority = "https://stub.invalid",
|
||||||
ClientId = "stub",
|
ClientId = "stub",
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
new TokenStore(System.IO.Path.GetTempFileName()))
|
new TokenStore(System.IO.Path.GetTempFileName()))
|
||||||
|
|
@ -77,16 +85,16 @@ public class PostItViewModelTests
|
||||||
/// <summary>Test fake that hands back a canned list of posts from any CallAsync.</summary>
|
/// <summary>Test fake that hands back a canned list of posts from any CallAsync.</summary>
|
||||||
private sealed class StubYavscApiClient : YavscApiClient
|
private sealed class StubYavscApiClient : YavscApiClient
|
||||||
{
|
{
|
||||||
private readonly List<BlogPostDto> _posts;
|
private readonly List<BlogPost> _posts;
|
||||||
public StubYavscApiClient(List<BlogPostDto> posts)
|
public StubYavscApiClient(List<BlogPost> posts)
|
||||||
: base(
|
: base(
|
||||||
new Settings
|
new Settings
|
||||||
{
|
{
|
||||||
|
Scopes = new[] { "openid" },
|
||||||
Authentication = new AuthenticationSettings
|
Authentication = new AuthenticationSettings
|
||||||
{
|
{
|
||||||
Authority = "https://stub.invalid",
|
Authority = "https://stub.invalid",
|
||||||
ClientId = "stub",
|
ClientId = "stub",
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
new TokenStore(System.IO.Path.GetTempFileName()))
|
new TokenStore(System.IO.Path.GetTempFileName()))
|
||||||
|
|
@ -98,7 +106,7 @@ public class PostItViewModelTests
|
||||||
{
|
{
|
||||||
// The canned fake only knows about a list of posts; the
|
// The canned fake only knows about a list of posts; the
|
||||||
// BlogApiClient test asserts on that list directly.
|
// BlogApiClient test asserts on that list directly.
|
||||||
if (typeof(T) == typeof(List<BlogPostDto>))
|
if (typeof(T) == typeof(List<BlogPost>))
|
||||||
return Task.FromResult((T)(object)_posts);
|
return Task.FromResult((T)(object)_posts);
|
||||||
return Task.FromResult(default(T)!);
|
return Task.FromResult(default(T)!);
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt.Tests;
|
||||||
|
|
||||||
35
src/PostIt.Tests/SettingsLoadTests.cs
Normal file
35
src/PostIt.Tests/SettingsLoadTests.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace PostIt.Tests;
|
||||||
|
|
||||||
|
public class SettingsLoadTests
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// On the dev machine, the user-level settings file
|
||||||
|
/// (~/.config/PostIt/postit-settings.json) does not exist, so Load()
|
||||||
|
/// must fall back to the embedded default resource shipped inside
|
||||||
|
/// PostIt.dll.
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Load_falls_back_to_embedded_resource_when_user_file_missing()
|
||||||
|
{
|
||||||
|
// Skip if a user-level file exists (CI / different dev machines).
|
||||||
|
var userConfigPath = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"PostIt",
|
||||||
|
"postit-settings.json");
|
||||||
|
if (File.Exists(userConfigPath))
|
||||||
|
{
|
||||||
|
return; // nothing to assert: user file wins.
|
||||||
|
}
|
||||||
|
|
||||||
|
var settings = new PostIt.Settings();
|
||||||
|
settings.Load();
|
||||||
|
|
||||||
|
// The bundled postit-settings.json points at yavsc.pschneider.fr.
|
||||||
|
Assert.False(string.IsNullOrWhiteSpace(settings.Authentication?.Authority));
|
||||||
|
Assert.Equal("postit", settings.Authentication.ClientId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using Avalonia.Headless.XUnit;
|
using Avalonia.Headless.XUnit;
|
||||||
|
using Avalonia.Controls;
|
||||||
using PostIt.Views;
|
using PostIt.Views;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt.Tests;
|
||||||
|
|
@ -8,7 +9,8 @@ public class MainPageTests
|
||||||
[AvaloniaFact]
|
[AvaloniaFact]
|
||||||
public void MainPage_Should_Load()
|
public void MainPage_Should_Load()
|
||||||
{
|
{
|
||||||
var window = new MainView();
|
var window = new MainWindow();
|
||||||
|
window.Show();
|
||||||
Assert.NotNull(window);
|
Assert.NotNull(window);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,10 +1,18 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using PostIt.Services;
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using IdentityModel.OidcClient;
|
||||||
using IdentityModel.OidcClient.Browser;
|
using IdentityModel.OidcClient.Browser;
|
||||||
using PostIt.ViewModels;
|
using PostIt.Services;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
namespace PostIt.Tests;
|
||||||
|
|
||||||
|
|
@ -12,7 +20,7 @@ namespace PostIt.Tests;
|
||||||
/// End-to-end coverage of <see cref="YavscApiClient"/>: silent
|
/// End-to-end coverage of <see cref="YavscApiClient"/>: silent
|
||||||
/// refresh on a near-expiry access token, 401-driven refresh + retry,
|
/// refresh on a near-expiry access token, 401-driven refresh + retry,
|
||||||
/// and persistence of the token bundle via <see cref="TokenStore"/>.
|
/// and persistence of the token bundle via <see cref="TokenStore"/>.
|
||||||
/// Uses the project's <see cref="OIDCStubAuthority"/> for the IdP and
|
/// Uses the project's <see cref="OidcStubAuthority"/> for the IdP and
|
||||||
/// a tiny in-process HTTP listener for the API server side.
|
/// a tiny in-process HTTP listener for the API server side.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class YavscApiClientTests
|
public class YavscApiClientTests
|
||||||
|
|
@ -37,7 +45,7 @@ public class YavscApiClientTests
|
||||||
// in-memory access token as expired and re-run a call. The
|
// in-memory access token as expired and re-run a call. The
|
||||||
// refresh path must rotate the refresh token transparently
|
// refresh path must rotate the refresh token transparently
|
||||||
// and the API call must succeed with the new token.
|
// and the API call must succeed with the new token.
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -53,15 +61,9 @@ public class YavscApiClientTests
|
||||||
|
|
||||||
// Reload — YavscApiClient constructor reads the store.
|
// Reload — YavscApiClient constructor reads the store.
|
||||||
var reloaded = new YavscApiClient(settings, new TokenStore(tokensPath));
|
var reloaded = new YavscApiClient(settings, new TokenStore(tokensPath));
|
||||||
// Same BaseAddress dance as LoginAndPersistAsync: a fresh
|
|
||||||
// YavscApiClient starts with no BaseAddress, and the test
|
|
||||||
// calls CallAsync("posts", ...) directly (bypassing
|
|
||||||
// BlogApiClient, which is the only thing that would set
|
|
||||||
// it in production). Mirror prod here.
|
|
||||||
reloaded.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
|
|
||||||
|
|
||||||
var posts = await reloaded.CallAsync<List<StubApiServer.Post>>(
|
var posts = await reloaded.CallAsync<List<StubApiServer.Post>>(
|
||||||
HttpMethod.Get, "posts", TestContext.Current.CancellationToken);
|
HttpMethod.Get, "posts");
|
||||||
|
|
||||||
Assert.NotNull(posts);
|
Assert.NotNull(posts);
|
||||||
Assert.NotEmpty(posts);
|
Assert.NotEmpty(posts);
|
||||||
|
|
@ -83,7 +85,7 @@ public class YavscApiClientTests
|
||||||
{
|
{
|
||||||
// API server returns 401 on the first request, 200 on the next.
|
// API server returns 401 on the first request, 200 on the next.
|
||||||
// YavscApiClient must refresh, then retry exactly once.
|
// YavscApiClient must refresh, then retry exactly once.
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer(forceFirstRequest: true);
|
using var apiServer = new StubApiServer(forceFirstRequest: true);
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -95,7 +97,7 @@ public class YavscApiClientTests
|
||||||
settings, authority, tokensPath);
|
settings, authority, tokensPath);
|
||||||
|
|
||||||
var posts = await client.CallAsync<List<StubApiServer.Post>>(
|
var posts = await client.CallAsync<List<StubApiServer.Post>>(
|
||||||
HttpMethod.Get, "posts", TestContext.Current.CancellationToken);
|
HttpMethod.Get, "posts");
|
||||||
|
|
||||||
Assert.NotEmpty(posts);
|
Assert.NotEmpty(posts);
|
||||||
Assert.Equal(2, apiServer.RequestCount);
|
Assert.Equal(2, apiServer.RequestCount);
|
||||||
|
|
@ -109,29 +111,28 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task CallAsync_throws_when_no_token_and_no_interactive_login()
|
public async Task CallAsync_throws_when_no_token_and_no_interactive_login()
|
||||||
{
|
{
|
||||||
var settings = new Settings
|
var settings = new PostIt.Settings
|
||||||
{
|
{
|
||||||
Authentication = new AuthenticationSettings
|
Authentication = new AuthenticationSettings
|
||||||
{
|
{
|
||||||
Authority = "https://127.0.0.1:5001",
|
Authority = "https://127.0.0.1:5001",
|
||||||
ClientId = "postit-tests",
|
ClientId = "postit-tests",
|
||||||
|
},
|
||||||
RedirectUri = "postit://callback",
|
RedirectUri = "postit://callback",
|
||||||
Scopes = new[] { "openid" },
|
Scopes = new[] { "openid" },
|
||||||
},
|
ApiUrl = "https://127.0.0.1:5003/api/v1",
|
||||||
BusinessApiUrl = "https://127.0.0.1:5003/api/v1",
|
|
||||||
};
|
};
|
||||||
var client = new YavscApiClient(settings, new TokenStore(Path.Combine(
|
var client = new YavscApiClient(settings, new TokenStore(Path.Combine(
|
||||||
Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json")));
|
Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json")));
|
||||||
|
|
||||||
await Assert.ThrowsAsync<InvalidOperationException>(
|
await Assert.ThrowsAsync<InvalidOperationException>(() =>
|
||||||
() =>
|
client.CallAsync<JsonElement>(HttpMethod.Get, "posts"));
|
||||||
client.CallAsync<JsonElement>(HttpMethod.Get, "posts", TestContext.Current.CancellationToken));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task HasValidSession_is_true_after_login()
|
public async Task HasValidSession_is_true_after_login()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -153,30 +154,24 @@ public class YavscApiClientTests
|
||||||
|
|
||||||
// --- helpers --------------------------------------------------------
|
// --- helpers --------------------------------------------------------
|
||||||
|
|
||||||
private static Settings BuildSettings(OIDCStubAuthority authority, string apiBaseUrl) => new()
|
private static PostIt.Settings BuildSettings(OidcStubAuthority authority, string apiBaseUrl) => new()
|
||||||
{
|
{
|
||||||
Authentication = new AuthenticationSettings
|
Authentication = new AuthenticationSettings
|
||||||
{
|
{
|
||||||
Authority = authority.Issuer,
|
Authority = authority.Issuer,
|
||||||
ClientId = "postit-tests",
|
ClientId = "postit-tests",
|
||||||
RedirectUri = authority.LoopbackRedirectUri,
|
|
||||||
Scopes = new[] { "openid", "profile", "blog" }
|
|
||||||
},
|
},
|
||||||
BusinessApiUrl = apiBaseUrl
|
RedirectUri = authority.LoopbackRedirectUri,
|
||||||
|
Scopes = new[] { "openid", "profile", "blog" },
|
||||||
|
ApiUrl = apiBaseUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static async Task<YavscApiClient> LoginAndPersistAsync(
|
private static async Task<YavscApiClient> LoginAndPersistAsync(
|
||||||
Settings settings, OIDCStubAuthority authority, string tokensPath)
|
PostIt.Settings settings, OidcStubAuthority authority, string tokensPath)
|
||||||
{
|
{
|
||||||
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
||||||
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
||||||
|
|
||||||
// The two integration tests that call CallAsync("posts", ...)
|
|
||||||
// directly (bypassing BlogApiClient) rely on the same
|
|
||||||
// BaseAddress the production chain sets in BlogApiClient's
|
|
||||||
// ctor. Mirror that here so "posts" resolves to the stub.
|
|
||||||
client.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
|
|
||||||
|
|
||||||
// Force the API client to use the test browser by routing the
|
// Force the API client to use the test browser by routing the
|
||||||
// LoginInteractiveAsync call through a small wrapper.
|
// LoginInteractiveAsync call through a small wrapper.
|
||||||
await LoginWithBrowserAsync(client, browser.CreateBrowser());
|
await LoginWithBrowserAsync(client, browser.CreateBrowser());
|
||||||
|
|
@ -186,7 +181,7 @@ public class YavscApiClientTests
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// YavscApiClient.LoginInteractiveAsync delegates to
|
/// YavscApiClient.LoginInteractiveAsync delegates to
|
||||||
/// Platform.CreateBrowser. We can't override that static cleanly
|
/// Platform.CreateBrowser. We can't override that static cleanly
|
||||||
/// from XUnit.v3, so we rebuild the call by re-routing the
|
/// from xunit.v3, so we rebuild the call by re-routing the
|
||||||
/// Platform.CreateBrowser delegate for the duration of the call.
|
/// Platform.CreateBrowser delegate for the duration of the call.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static async Task LoginWithBrowserAsync(
|
private static async Task LoginWithBrowserAsync(
|
||||||
|
|
@ -219,7 +214,7 @@ public class YavscApiClientTests
|
||||||
File.WriteAllText(tokensPath, JsonSerializer.Serialize(record));
|
File.WriteAllText(tokensPath, JsonSerializer.Serialize(record));
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- OIDCLoginPhase progress tests ---------------------------------
|
// --- OidcLoginPhase progress tests ---------------------------------
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Collecting Progress<T> is documented to capture reports
|
/// Collecting Progress<T> is documented to capture reports
|
||||||
|
|
@ -230,7 +225,7 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task LoginInteractiveAsync_reports_Discovering_then_Success()
|
public async Task LoginInteractiveAsync_reports_Discovering_then_Success()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -239,18 +234,18 @@ public class YavscApiClientTests
|
||||||
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
||||||
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
var browser = new FakeAuthorizingBrowser(authority.LoopbackRedirectUri);
|
||||||
|
|
||||||
var reported = new System.Collections.Generic.List<OIDCLoginPhase>();
|
var reported = new System.Collections.Generic.List<OidcLoginPhase>();
|
||||||
var progress = new SyncProgress<OIDCLoginPhase>(reported);
|
var progress = new SyncProgress<OidcLoginPhase>(reported);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await LoginWithBrowserAsync(client, browser.CreateBrowser(), progress);
|
await LoginWithBrowserAsync(client, browser.CreateBrowser(), progress);
|
||||||
// SyncProgress captures reports synchronously — no flush needed.
|
// SyncProgress captures reports synchronously — no flush needed.
|
||||||
|
|
||||||
Assert.Contains(OIDCLoginPhase.Discovering, reported);
|
Assert.Contains(OidcLoginPhase.Discovering, reported);
|
||||||
Assert.Contains(OIDCLoginPhase.OpeningBrowser, reported);
|
Assert.Contains(OidcLoginPhase.OpeningBrowser, reported);
|
||||||
Assert.Contains(OIDCLoginPhase.ExchangingCode, reported);
|
Assert.Contains(OidcLoginPhase.ExchangingCode, reported);
|
||||||
Assert.Equal(OIDCLoginPhase.Success, Last(reported));
|
Assert.Equal(OidcLoginPhase.Success, Last(reported));
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
@ -261,24 +256,24 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task LoginInteractiveAsync_reports_Error_when_browser_missing()
|
public async Task LoginInteractiveAsync_reports_Error_when_browser_missing()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
var settings = BuildSettings(authority, apiServer.BaseUrl);
|
var settings = BuildSettings(authority, apiServer.BaseUrl);
|
||||||
var client = new YavscApiClient(settings, new TokenStore(TokensPath()));
|
var client = new YavscApiClient(settings, new TokenStore(TokensPath()));
|
||||||
var reported = new System.Collections.Generic.List<OIDCLoginPhase>();
|
var reported = new System.Collections.Generic.List<OidcLoginPhase>();
|
||||||
var progress = new SyncProgress<OIDCLoginPhase>(reported);
|
var progress = new SyncProgress<OidcLoginPhase>(reported);
|
||||||
|
|
||||||
var original = Platform.CreateBrowser;
|
var original = Platform.CreateBrowser;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Platform.CreateBrowser = () => null; // simulate no browser wired up
|
Platform.CreateBrowser = () => null; // simulate no browser wired up
|
||||||
await Assert.ThrowsAsync<InvalidOperationException>(
|
await Assert.ThrowsAsync<InvalidOperationException>(
|
||||||
() => client.LoginInteractiveAsync(progress, TestContext.Current.CancellationToken));
|
() => client.LoginInteractiveAsync(progress));
|
||||||
// SyncProgress captures reports synchronously — no flush needed.
|
// SyncProgress captures reports synchronously — no flush needed.
|
||||||
|
|
||||||
Assert.Equal(OIDCLoginPhase.Error, Last(reported));
|
Assert.Equal(OidcLoginPhase.Error, Last(reported));
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
@ -289,7 +284,7 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task TrySilentLoginAsync_returns_false_when_no_bundle_on_disk()
|
public async Task TrySilentLoginAsync_returns_false_when_no_bundle_on_disk()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -298,7 +293,7 @@ public class YavscApiClientTests
|
||||||
// Tokens file deliberately doesn't exist.
|
// Tokens file deliberately doesn't exist.
|
||||||
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
var client = new YavscApiClient(settings, new TokenStore(tokensPath));
|
||||||
|
|
||||||
var ok = await client.TrySilentLoginAsync(null, TestContext.Current.CancellationToken);
|
var ok = await client.TrySilentLoginAsync();
|
||||||
Assert.False(ok);
|
Assert.False(ok);
|
||||||
Assert.False(client.HasValidSession);
|
Assert.False(client.HasValidSession);
|
||||||
}
|
}
|
||||||
|
|
@ -306,7 +301,7 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task TrySilentLoginAsync_returns_true_when_access_token_still_valid()
|
public async Task TrySilentLoginAsync_returns_true_when_access_token_still_valid()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -319,7 +314,7 @@ public class YavscApiClientTests
|
||||||
{
|
{
|
||||||
await LoginWithBrowserAsync(client, browser.CreateBrowser());
|
await LoginWithBrowserAsync(client, browser.CreateBrowser());
|
||||||
// Login fresh → access token is far from expiry.
|
// Login fresh → access token is far from expiry.
|
||||||
var ok = await client.TrySilentLoginAsync(null, TestContext.Current.CancellationToken);
|
var ok = await client.TrySilentLoginAsync();
|
||||||
Assert.True(ok);
|
Assert.True(ok);
|
||||||
Assert.True(client.HasValidSession);
|
Assert.True(client.HasValidSession);
|
||||||
}
|
}
|
||||||
|
|
@ -332,7 +327,7 @@ public class YavscApiClientTests
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task TrySilentLoginAsync_returns_true_when_refresh_succeeds()
|
public async Task TrySilentLoginAsync_returns_true_when_refresh_succeeds()
|
||||||
{
|
{
|
||||||
using var authority = await OIDCStubAuthority.StartAsync();
|
using var authority = await OidcStubAuthority.StartAsync();
|
||||||
using var apiServer = new StubApiServer();
|
using var apiServer = new StubApiServer();
|
||||||
await apiServer.StartAsync();
|
await apiServer.StartAsync();
|
||||||
|
|
||||||
|
|
@ -356,13 +351,13 @@ public class YavscApiClientTests
|
||||||
// matches the disk: access expired, refresh still good.
|
// matches the disk: access expired, refresh still good.
|
||||||
var client = new YavscApiClient(settings, store);
|
var client = new YavscApiClient(settings, store);
|
||||||
|
|
||||||
var reported = new System.Collections.Generic.List<OIDCLoginPhase>();
|
var reported = new System.Collections.Generic.List<OidcLoginPhase>();
|
||||||
var progress = new SyncProgress<OIDCLoginPhase>(reported);
|
var progress = new SyncProgress<OidcLoginPhase>(reported);
|
||||||
|
|
||||||
var ok = await client.TrySilentLoginAsync(progress, TestContext.Current.CancellationToken);
|
var ok = await client.TrySilentLoginAsync(progress);
|
||||||
Assert.True(ok, "silent refresh should succeed via the stub authority.");
|
Assert.True(ok, "silent refresh should succeed via the stub authority.");
|
||||||
Assert.Contains(OIDCLoginPhase.ExchangingCode, reported);
|
Assert.Contains(OidcLoginPhase.ExchangingCode, reported);
|
||||||
Assert.Equal(OIDCLoginPhase.Success, Last(reported));
|
Assert.Equal(OidcLoginPhase.Success, Last(reported));
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
@ -435,7 +430,7 @@ public class YavscApiClientTests
|
||||||
/// overload stays for tests that don't care about phase events.
|
/// overload stays for tests that don't care about phase events.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static async Task LoginWithBrowserAsync(
|
private static async Task LoginWithBrowserAsync(
|
||||||
YavscApiClient client, IBrowser browser, IProgress<OIDCLoginPhase>? progress = null)
|
YavscApiClient client, IBrowser browser, IProgress<OidcLoginPhase>? progress = null)
|
||||||
{
|
{
|
||||||
var original = Platform.CreateBrowser;
|
var original = Platform.CreateBrowser;
|
||||||
try
|
try
|
||||||
|
|
@ -1,39 +1,19 @@
|
||||||
<Project>
|
<Project>
|
||||||
<Import
|
<!-- Pull in shared package versions from the repository root. -->
|
||||||
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
|
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
|
||||||
<!-- PostIt-product-specific versions -->
|
<!-- PostIt-product-specific versions -->
|
||||||
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
|
|
||||||
<PropertyGroup>
|
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
|
||||||
<AvaloniaVersionBase>12.1.1</AvaloniaVersionBase>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Avalonia packages -->
|
<PackageVersion Include="Avalonia" Version="12.0.4" />
|
||||||
<!-- Important: keep version in sync! -->
|
<PackageVersion Include="Avalonia.Android" Version="12.0.4" />
|
||||||
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
|
||||||
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="Avalonia.Browser" Version="12.0.4" />
|
||||||
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
|
||||||
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.4" />
|
||||||
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.4" />
|
||||||
<PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
|
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
|
||||||
<PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
|
|
||||||
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
|
|
||||||
|
|
||||||
<PackageVersion Include="Material.Avalonia" Version="3.19.0" />
|
|
||||||
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
|
|
||||||
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
|
|
||||||
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
|
||||||
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
|
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0" />
|
||||||
|
|
||||||
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
|
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
|
||||||
|
|
||||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.10.0.1" />
|
|
||||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.10.0.1" />
|
|
||||||
|
|
||||||
<PackageVersion Include="Xamarin.UITest" Version="4.4.2" />
|
|
||||||
|
|
||||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
|
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,178 +0,0 @@
|
||||||
|
|
||||||
# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
|
|
||||||
#
|
|
||||||
# Usage typique :
|
|
||||||
# make qemu # lance l'AVD, attend le boot, build l'APK, l'installe
|
|
||||||
# make android-install # (re)build l'APK et l'installe (AVD doit tourner)
|
|
||||||
# make android-build # build l'APK seul (sans install)
|
|
||||||
# make qemu-run # démarre l'AVD en background
|
|
||||||
# make qemu-stop # arrête l'émulateur
|
|
||||||
# make qemu-wait-boot # attend que l'AVD ait fini de booter
|
|
||||||
#
|
|
||||||
# Variables surchargeables (make VAR=valeur) :
|
|
||||||
# AVD_NAME default: postit_test_avd
|
|
||||||
# (l'AVD doit être listé par `avdmanager list avd`)
|
|
||||||
# ADB_SERIAL default: emulator-5554
|
|
||||||
# (port standard du premier émulateur lancé)
|
|
||||||
# ANDROID_HOME default: /opt/android-sdk
|
|
||||||
# (le SDK Android local; doit contenir
|
|
||||||
# emulator/emulator et platform-tools/adb)
|
|
||||||
# POSTIT_RID default: android-x64
|
|
||||||
# (doit matcher l'ABI de l'AVD; `avdmanager list avd`
|
|
||||||
# affiche la ligne Tag/ABI)
|
|
||||||
# EMU_HEADLESS default: 0
|
|
||||||
# (1 = lancer l'émulateur sans fenêtre, pour scripter)
|
|
||||||
# CONFIG surcharge la variable CONFIG globale (Debug par
|
|
||||||
# défaut dans ce Makefile). Passer à Release pour
|
|
||||||
# un APK optimisé et signé release.
|
|
||||||
# LOGCAT_LINES default: 200
|
|
||||||
# (nombre de lignes dumpées par `make qemu-logcat`)
|
|
||||||
# LOGCAT_FOLLOW default: 0
|
|
||||||
# (1 = stream live via `make logcat`,
|
|
||||||
# sinon dump one-shot des N dernières lignes)
|
|
||||||
# LOGCAT_BOOT_WAIT default: 30
|
|
||||||
# (secondes d'attente entre le clear du buffer,
|
|
||||||
# le `am start`, et le dump final dans
|
|
||||||
# `make qemu-logcat-boot`)
|
|
||||||
AVD_NAME ?= postit_test_avd
|
|
||||||
ADB_SERIAL ?= emulator-5554
|
|
||||||
ANDROID_HOME ?= /opt/android-sdk
|
|
||||||
POSTIT_RID ?= android-x64
|
|
||||||
EMU_HEADLESS ?= 0
|
|
||||||
LOGCAT_LINES ?= 600
|
|
||||||
LOGCAT_FOLLOW ?= 0
|
|
||||||
LOGCAT_BOOT_WAIT ?= 30
|
|
||||||
|
|
||||||
ANDROID_PACKAGE_NAME = fr.pschneider.postit
|
|
||||||
POSTIT_ANDROID_CSPROJ := PostIt.Android/PostIt.Android.csproj
|
|
||||||
POSTIT_APK_DIR := PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
|
|
||||||
POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
|
|
||||||
|
|
||||||
clean: clean-PostIt clean-PostIt.Android clean-PostIt.Desktop
|
|
||||||
|
|
||||||
clean-%:
|
|
||||||
rm -rf $*/obj $*/bin
|
|
||||||
|
|
||||||
qemu-run:
|
|
||||||
@echo " Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
|
|
||||||
@mkdir -p /tmp/yavsc-emu
|
|
||||||
@EMU_ARGS=""; \
|
|
||||||
if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
|
|
||||||
$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
|
|
||||||
>/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
|
|
||||||
echo " ✅ Started emulator PID: $$!"
|
|
||||||
|
|
||||||
qemu-stop:
|
|
||||||
adb -s $(ADB_SERIAL) emu kill
|
|
||||||
echo " ✅ Stopped emulator"
|
|
||||||
|
|
||||||
qemu-wait-boot:
|
|
||||||
@echo " Waiting for $(ADB_SERIAL) to finish booting..."
|
|
||||||
adb -s $(ADB_SERIAL) wait-for-device
|
|
||||||
@for i in $$(seq 1 180); do \
|
|
||||||
BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
|
|
||||||
if [ "$$BOOTED" = "1" ]; then \
|
|
||||||
echo " ✓ booted in $${i}s"; \
|
|
||||||
exit 0; \
|
|
||||||
fi; \
|
|
||||||
sleep 1; \
|
|
||||||
done; \
|
|
||||||
echo " 👿 ERROR: device did not boot within 180s." >&2; \
|
|
||||||
echo " Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
|
|
||||||
exit 1
|
|
||||||
|
|
||||||
android-build:
|
|
||||||
# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
|
|
||||||
# without the managed assemblies in it (they are pushed at runtime
|
|
||||||
# via `adb push`, "Fast Deployment"). On the qemu emulator, the
|
|
||||||
# runtime cannot find them in `files/.__override__/<rid>/` and
|
|
||||||
# aborts at startup with "No assemblies found in '.__override__'"
|
|
||||||
# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
|
|
||||||
# packages the .dlls into the APK as `assemblies/<rid>/` so the
|
|
||||||
# runtime reads them directly.
|
|
||||||
#
|
|
||||||
# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
|
|
||||||
# not `AndroidEnableFastDeployment` (which exists in older
|
|
||||||
# templates but is a no-op in the .NET 10 SDK).
|
|
||||||
dotnet build $(POSTIT_ANDROID_CSPROJ) \
|
|
||||||
-c $(CONFIG) \
|
|
||||||
-p:RuntimeIdentifier=$(POSTIT_RID) \
|
|
||||||
-p:EmbedAssembliesIntoApk=true \
|
|
||||||
--nologo
|
|
||||||
@if [ ! -f "$(POSTIT_APK)" ]; then \
|
|
||||||
echo " APK not found at $(POSTIT_APK)." >&2; \
|
|
||||||
echo " Files in $(POSTIT_APK_DIR):" >&2; \
|
|
||||||
ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo " (directory does not exist)" >&2; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
android-install: android-build
|
|
||||||
@echo " Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
|
|
||||||
adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
|
|
||||||
@echo " ✅ PostIt.Android installed on $(ADB_SERIAL)"
|
|
||||||
|
|
||||||
qemu-uninstall:
|
|
||||||
adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
|
|
||||||
|
|
||||||
# Dump recent logcat output for the running PostIt.Android process.
|
|
||||||
# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
|
|
||||||
# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
|
|
||||||
# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
|
|
||||||
# because Mono/Xamarin can emit logs under several tags
|
|
||||||
# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
|
|
||||||
# would miss the ones not matching. PID-based filtering is exact.
|
|
||||||
# If the app is not running, pidof returns empty and logcat exits
|
|
||||||
# silently with no output; that is the expected behaviour for
|
|
||||||
# "no logs yet".
|
|
||||||
logcat:
|
|
||||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
|
||||||
if [ -z "$$PID" ]; then \
|
|
||||||
echo " $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
|
|
||||||
echo " Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
echo " Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
|
|
||||||
if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
|
|
||||||
adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
|
||||||
else \
|
|
||||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clear logcat, launch PostIt.Android, then dump everything that was
|
|
||||||
# emitted during the startup window. Targets the "démarrage KO" case
|
|
||||||
# where the process starts but Avalonia never renders a frame — the
|
|
||||||
# logcat trace from process start to first frame is what diagnoses it.
|
|
||||||
#
|
|
||||||
# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
|
|
||||||
# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
|
|
||||||
LOGCAT_BOOT_WAIT ?= 15
|
|
||||||
|
|
||||||
|
|
||||||
android-start:
|
|
||||||
@echo " Clearing logcat buffer..."
|
|
||||||
adb -s $(ADB_SERIAL) logcat -c
|
|
||||||
@echo " Launching $(ANDROID_PACKAGE_NAME)..."
|
|
||||||
adb -s $(ADB_SERIAL) shell am start \
|
|
||||||
-n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
|
|
||||||
@echo " ✅ $(ANDROID_PACKAGE_NAME) started on $(ADB_SERIAL)"
|
|
||||||
|
|
||||||
qemu-logcat-boot: android-start
|
|
||||||
@echo " Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
|
|
||||||
@sleep $(LOGCAT_BOOT_WAIT)
|
|
||||||
|
|
||||||
@echo " Dumping logcat (PostIt PID + system buffer):"
|
|
||||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
|
||||||
if [ -n "$$PID" ]; then \
|
|
||||||
echo " ✅ (PID $$PID at dump time)"; \
|
|
||||||
sleep 10; \
|
|
||||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
|
|
||||||
else \
|
|
||||||
echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
|
|
||||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
qemu: qemu-run qemu-wait-boot android-install
|
|
||||||
|
|
||||||
.PHONY: clean qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot
|
|
||||||
|
|
@ -2,12 +2,6 @@
|
||||||
using Android.Runtime;
|
using Android.Runtime;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Android;
|
using Avalonia.Android;
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Styling;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Android
|
namespace PostIt.Android
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
|
|
||||||
using Android.App;
|
using Android.App;
|
||||||
using Android.Content;
|
|
||||||
using Android.Content.PM;
|
using Android.Content.PM;
|
||||||
using AndroidX.Core.Provider;
|
using Android.Content;
|
||||||
using AndroidX.Emoji2.Text;
|
using Avalonia;
|
||||||
using Avalonia.Android;
|
using Avalonia.Android;
|
||||||
using PostIt.Droid.Services;
|
|
||||||
|
|
||||||
namespace PostIt.Android;
|
namespace PostIt.Android;
|
||||||
|
|
||||||
|
|
@ -15,27 +12,25 @@ namespace PostIt.Android;
|
||||||
Theme = "@style/MyTheme.NoActionBar",
|
Theme = "@style/MyTheme.NoActionBar",
|
||||||
Icon = "@drawable/icon",
|
Icon = "@drawable/icon",
|
||||||
MainLauncher = true,
|
MainLauncher = true,
|
||||||
|
LaunchMode = LaunchMode.SingleTask,
|
||||||
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
|
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
|
||||||
public class MainActivity : AvaloniaMainActivity
|
public class MainActivity : AvaloniaMainActivity
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The current MainActivity instance.
|
/// Strongly-typed handle to the current MainActivity instance, set in
|
||||||
|
/// <see cref="OnCreate"/> and consumed by platform services such as
|
||||||
|
/// <see cref="Services.AndroidSystemBrowser"/> which need to launch
|
||||||
|
/// Chrome Custom Tabs.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static MainActivity? Current { get; private set; }
|
public static MainActivity? Current { get; private set; }
|
||||||
|
|
||||||
protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
|
protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
|
||||||
{
|
{
|
||||||
FontRequest fontRequest = new FontRequest(
|
|
||||||
"com.google.android.gms.fonts",
|
|
||||||
"com.google.android.gms",
|
|
||||||
"Noto Color Emoji Compat",
|
|
||||||
Yavsc.Resource.Array.com_google_android_gms_fonts_certs); //com_google_android_gms_fonts_certs
|
|
||||||
EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
|
|
||||||
EmojiCompat.Init(config);
|
|
||||||
PlatformBootstrap.InitPlatform();
|
|
||||||
base.OnCreate(savedInstanceState);
|
base.OnCreate(savedInstanceState);
|
||||||
|
PlatformBootstrap.EnsureInitialized();
|
||||||
Current = this;
|
Current = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Receives the deep-link Intent fired by the system browser after the
|
/// Receives the deep-link Intent fired by the system browser after the
|
||||||
/// user completes the OIDC login on https://yavsc.pschneider.fr. The
|
/// user completes the OIDC login on https://yavsc.pschneider.fr. The
|
||||||
|
|
@ -48,13 +43,7 @@ public class MainActivity : AvaloniaMainActivity
|
||||||
protected override void OnNewIntent(Intent? intent)
|
protected override void OnNewIntent(Intent? intent)
|
||||||
{
|
{
|
||||||
base.OnNewIntent(intent);
|
base.OnNewIntent(intent);
|
||||||
|
if (intent is not null) AndroidOidcCallbackSink.Handle(intent);
|
||||||
var url = intent?.DataString;
|
|
||||||
if (!string.IsNullOrEmpty(url) && url.StartsWith("postit://callback"))
|
|
||||||
{
|
|
||||||
OidcCallbackManager.SetResult(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static class AndroidOidcCallbackSink
|
internal static class AndroidOidcCallbackSink
|
||||||
|
|
|
||||||
|
|
@ -5,16 +5,21 @@ namespace PostIt.Android;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// One-shot platform bootstrap. Called from
|
/// One-shot platform bootstrap. Called from
|
||||||
/// <see cref="MainActivity.OnCreate"/> so that the shared OIDC login
|
/// <see cref="MainActivity.OnCreate"/> so that the shared
|
||||||
/// path sees the Android-specific redirect URI and a working
|
/// <c>LoginPageViewModel</c> sees the Android-specific redirect URI and a
|
||||||
/// <c>IBrowser</c> (Chrome Custom Tabs) without referencing Android
|
/// working <c>IBrowser</c> (Chrome Custom Tabs) without referencing
|
||||||
/// APIs from the shared library.
|
/// Android APIs from the shared library.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static class PlatformBootstrap
|
internal static class PlatformBootstrap
|
||||||
{
|
{
|
||||||
internal static void InitPlatform()
|
private static int _initialized;
|
||||||
{
|
|
||||||
|
|
||||||
|
internal static void EnsureInitialized()
|
||||||
|
{
|
||||||
|
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Platform.DefaultRedirectUri = Settings.AndroidRedirectUri;
|
||||||
Platform.CreateBrowser = () =>
|
Platform.CreateBrowser = () =>
|
||||||
{
|
{
|
||||||
var activity = MainActivity.Current;
|
var activity = MainActivity.Current;
|
||||||
|
|
|
||||||
|
|
@ -2,17 +2,16 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net10.0-android</TargetFramework>
|
<TargetFramework>net10.0-android</TargetFramework>
|
||||||
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
|
<!-- FORCE LES ARCHITECTURES ANDROID VALIDES -->
|
||||||
|
<RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
|
||||||
|
<SupportedOSPlatformVersion>23.0.0</SupportedOSPlatformVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ApplicationId>fr.pschneider.postit</ApplicationId>
|
<ApplicationId>com.CompanyName.PostIt</ApplicationId>
|
||||||
<ApplicationVersion>1</ApplicationVersion>
|
<ApplicationVersion>1</ApplicationVersion>
|
||||||
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
|
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
|
||||||
<AndroidPackageFormat>apk</AndroidPackageFormat>
|
<AndroidPackageFormat>apk</AndroidPackageFormat>
|
||||||
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
|
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
|
||||||
<FileVersion>1.1.0.0</FileVersion>
|
|
||||||
<InformationalVersion>1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0</InformationalVersion>
|
|
||||||
<Version>1.1.0-beta.1</Version>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AndroidResource Include="Icon.png">
|
<AndroidResource Include="Icon.png">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,32 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<application android:label="PostIt" android:icon="@drawable/Icon">
|
<application android:label="PostIt" android:icon="@drawable/Icon">
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Deep-link receiver for the OIDC Authorization Code + PKCE flow.
|
||||||
|
After the user authenticates in the system browser, the OP
|
||||||
|
redirects to android://postit-signin?... and Android forwards
|
||||||
|
the Intent to the MainActivity (configured SingleTask so the
|
||||||
|
existing instance receives OnNewIntent rather than spawning a
|
||||||
|
new one).
|
||||||
|
|
||||||
|
The host value (postit-signin) MUST match the
|
||||||
|
AndroidRedirectUri constant in PostIt/Settings/Settings.cs and
|
||||||
|
the corresponding RedirectUri registered for the 'postit'
|
||||||
|
client in IdentityServer (Yavsc.Org ConfigurationDb).
|
||||||
|
-->
|
||||||
|
<activity-alias
|
||||||
|
android:name="PostIt.Android.OidcCallbackActivity"
|
||||||
|
android:targetActivity="PostIt.Android.PostItMainActivity"
|
||||||
|
android:exported="true"
|
||||||
|
android:launchMode="singleTask">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
<data android:scheme="android" android:host="postit-signin" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity-alias>
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<array name="com_google_android_gms_fonts_certs">
|
|
||||||
<item>@array/com_google_android_gms_fonts_certs_dev</item>
|
|
||||||
<item>@array/com_google_android_gms_fonts_certs_prod</item>
|
|
||||||
</array>
|
|
||||||
<string-array name="com_google_android_gms_fonts_certs_dev">
|
|
||||||
<item>MIIEqDCCA5CgAwIBAgIJAN5gc16AJfAsMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHR29vZ2xlMRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMSEwHwYJKoZIhvcNAQkBFhJhbmRyb2lkQGFuZHJvaWQuY29tMCAXDTA4MDQxNTIyNDA0M1YYDzQyMDgxMzA0MjI0MDQzWjCBlDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDURvdW50YWluIFZpZXcxEDAOBgNVBAoTB0dvb2dsZTEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEhMB8GCSqGSIb3DQEJARYSYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBi1vF0K1vOEHG7AxneTjOHUka46MIidBqvFcO164A49iU2DkYPhUaM4H8JCdzh6N1GzM6h9o6E2V6z8+gEtdI6nqqs0EGA0G0H701bFjLp9+K/1DkMIFeD4P8J7X1/M8t4+X09X/7bQyV3w0v7q+Qh38sY8W/7K29B3f2O2sLw+uX9U8a8Tf4Xv8A==</item>
|
|
||||||
</string-array>
|
|
||||||
<string-array name="com_google_android_gms_fonts_certs_prod">
|
|
||||||
<item>MIIEQzCCAyugAwIBAgIJAMLgh0ZgXpYOMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKvSkUIXm+t9M8rXj2V</item>
|
|
||||||
</string-array>
|
|
||||||
</resources>
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Android.App;
|
using Android.App;
|
||||||
|
using Android.Content;
|
||||||
using AndroidX.Browser.CustomTabs;
|
using AndroidX.Browser.CustomTabs;
|
||||||
using IdentityModel.OidcClient.Browser;
|
using IdentityModel.OidcClient.Browser;
|
||||||
using PostIt.Droid.Services;
|
|
||||||
|
|
||||||
namespace PostIt.Android.Services;
|
namespace PostIt.Android.Services;
|
||||||
|
|
||||||
|
|
@ -36,19 +36,14 @@ public sealed class AndroidSystemBrowser : IBrowser
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Enregistrez la tâche avant de lancer le Custom Tab
|
|
||||||
var callbackTask = OidcCallbackManager.RegisterCallback(cancellationToken);
|
|
||||||
|
|
||||||
// 2. LANCEZ VOTRE CUSTOM TAB ICI (via AndroidX.Browser.CustomTabs)
|
|
||||||
// ... code pour ouvrir l'URL d'authentification ...
|
|
||||||
|
|
||||||
|
|
||||||
var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
|
var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
|
||||||
|
|
||||||
|
var callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
|
||||||
|
|
||||||
var tabsIntent = new CustomTabsIntent.Builder()
|
var tabsIntent = new CustomTabsIntent.Builder()
|
||||||
.SetShowTitle(true)!
|
.SetShowTitle(true)
|
||||||
.Build();
|
.Build();
|
||||||
tabsIntent!.LaunchUrl(_activity, uri);
|
tabsIntent.LaunchUrl(_activity, uri);
|
||||||
|
|
||||||
string responseUri;
|
string responseUri;
|
||||||
try
|
try
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace PostIt.Droid.Services;
|
|
||||||
|
|
||||||
public static class OidcCallbackManager
|
|
||||||
{
|
|
||||||
private static TaskCompletionSource<string>? _tcs;
|
|
||||||
|
|
||||||
public static Task<string> RegisterCallback(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
_tcs = new TaskCompletionSource<string>();
|
|
||||||
cancellationToken.Register(() => _tcs.TrySetCanceled());
|
|
||||||
return _tcs.Task;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void SetResult(string url)
|
|
||||||
{
|
|
||||||
_tcs?.TrySetResult(url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
using Android.App;
|
|
||||||
using Android.Content;
|
|
||||||
using Android.Content.PM;
|
|
||||||
using Android.OS;
|
|
||||||
using PostIt.Droid.Services;
|
|
||||||
|
|
||||||
namespace PostIt.Android;
|
|
||||||
|
|
||||||
[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
|
|
||||||
[IntentFilter(new[] { Intent.ActionView },
|
|
||||||
Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable },
|
|
||||||
DataScheme = "postit", // Remplacez par votre schéma personnalisé (ex: yavsc ou postit)
|
|
||||||
DataHost = "callback")] // Correspond à postit://callback
|
|
||||||
public class WebAuthenticationCallbackActivity : Activity
|
|
||||||
{
|
|
||||||
protected override void OnCreate(Bundle? savedInstanceState)
|
|
||||||
{
|
|
||||||
base.OnCreate(savedInstanceState);
|
|
||||||
|
|
||||||
// Capturer l'URL de redirection OIDC
|
|
||||||
var url = Intent?.DataString;
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(url))
|
|
||||||
{
|
|
||||||
// Transmettre l'URL au gestionnaire partagé pour compléter la Task
|
|
||||||
OidcCallbackManager.SetResult(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fermer cette activité transparente et ramener l'application au premier plan
|
|
||||||
var intent = new Intent(this, typeof(MainActivity));
|
|
||||||
intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
|
|
||||||
StartActivity(intent);
|
|
||||||
Finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -4,10 +4,6 @@
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
|
||||||
<FileVersion>1.1.0.0</FileVersion>
|
|
||||||
<InformationalVersion>1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0</InformationalVersion>
|
|
||||||
<Version>1.1.0-beta.1</Version>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia.Browser" />
|
<PackageReference Include="Avalonia.Browser" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Threading.Tasks;
|
using System.Runtime.Versioning;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Browser;
|
using Avalonia.Browser;
|
||||||
using PostIt;
|
using PostIt;
|
||||||
|
|
|
||||||
30
src/PostIt/PostIt.Desktop/PlatformBootstrap.cs
Normal file
30
src/PostIt/PostIt.Desktop/PlatformBootstrap.cs
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
using IdentityModel.OidcClient.Browser;
|
||||||
|
using PostIt.Services;
|
||||||
|
|
||||||
|
namespace PostIt.Desktop;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// One-shot platform bootstrap. Called from <c>Program.Main</c> so that
|
||||||
|
/// the shared <c>LoginPageViewModel</c> sees a working <c>IBrowser</c>
|
||||||
|
/// — the custom-scheme browser that hands the OIDC callback off to the
|
||||||
|
/// running instance through the named pipe. Desktop builds do NOT use
|
||||||
|
/// a loopback HTTP listener: the <c>postit://</c> scheme is registered
|
||||||
|
/// with the OS at install time and the browser is whatever the user
|
||||||
|
/// has configured to open it.
|
||||||
|
/// </summary>
|
||||||
|
internal static class PlatformBootstrap
|
||||||
|
{
|
||||||
|
private static int _initialized;
|
||||||
|
|
||||||
|
internal static void EnsureInitialized()
|
||||||
|
{
|
||||||
|
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Use the custom-scheme redirect on Desktop. Loopback is only
|
||||||
|
// a fallback for platforms that cannot register postit://
|
||||||
|
// (see Settings.DefaultLoopbackRedirectUri for that path).
|
||||||
|
Platform.DefaultRedirectUri = Settings.DefaultDesktopRedirectUri;
|
||||||
|
Platform.CustomScheme = "postit";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -5,10 +5,6 @@
|
||||||
See https://docs.avaloniaui.net/docs/guides/platforms/platform-specific-code/dotnet for more details.-->
|
See https://docs.avaloniaui.net/docs/guides/platforms/platform-specific-code/dotnet for more details.-->
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
|
||||||
<FileVersion>1.1.0.0</FileVersion>
|
|
||||||
<InformationalVersion>1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0</InformationalVersion>
|
|
||||||
<Version>1.1.0-beta.1</Version>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
|
|
@ -19,7 +15,6 @@
|
||||||
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
||||||
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Material.Avalonia" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Threading;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
|
|
||||||
|
|
@ -12,6 +13,8 @@ sealed class Program
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
|
PlatformBootstrap.EnsureInitialized();
|
||||||
|
|
||||||
// Short-circuit 2nd-instance launches (OS handing us the
|
// Short-circuit 2nd-instance launches (OS handing us the
|
||||||
// postit://callback URL) BEFORE Avalonia spins up a window.
|
// postit://callback URL) BEFORE Avalonia spins up a window.
|
||||||
// If we let Avalonia initialise, the new MainWindow flashes
|
// If we let Avalonia initialise, the new MainWindow flashes
|
||||||
|
|
@ -66,6 +69,9 @@ sealed class Program
|
||||||
public static AppBuilder BuildAvaloniaApp()
|
public static AppBuilder BuildAvaloniaApp()
|
||||||
=> AppBuilder.Configure<App>()
|
=> AppBuilder.Configure<App>()
|
||||||
.UsePlatformDetect()
|
.UsePlatformDetect()
|
||||||
|
#if DEBUG
|
||||||
|
.WithDeveloperTools()
|
||||||
|
#endif
|
||||||
.WithInterFont()
|
.WithInterFont()
|
||||||
.LogToTrace();
|
.LogToTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -1,153 +0,0 @@
|
||||||
|
|
||||||
using Avalonia;
|
|
||||||
using Avalonia.Headless.XUnit;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Helpers;
|
|
||||||
using PostIt.Services;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Headless coverage for the two interactive buttons of the
|
|
||||||
/// "add a circle member" modal: "Ajouter" and "Fermer".
|
|
||||||
///
|
|
||||||
/// <para>The dialog is pushed on top of <see cref="CirclesPage"/>
|
|
||||||
/// via the canonical <c>App.PushPageAsync</c> pipeline (the
|
|
||||||
/// same path <c>CirclesPageViewModel.OpenAddMemberAsync</c>
|
|
||||||
/// uses). The test asserts on <c>NavRoot.NavigationStack</c>
|
|
||||||
/// size before and after each click — the user's bug was "I
|
|
||||||
/// click and nothing happens", so the failure mode is a stack
|
|
||||||
/// that doesn't shrink for "Fermer", and a "Confirmer" event
|
|
||||||
/// that the host doesn't pick up for "Ajouter" (the dialog
|
|
||||||
/// stays up = stack doesn't shrink either).</para>
|
|
||||||
///
|
|
||||||
/// <para>Pattern follows <c>MainPageButtonsTests</c>: name
|
|
||||||
/// every interactive control in XAML with <c>x:Name</c>,
|
|
||||||
/// click via <c>button.Command?.Execute(...)</c> + flush
|
|
||||||
/// any async command before asserting.</para>
|
|
||||||
/// </summary>
|
|
||||||
public class AddCircleMemberDialogTests
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Stand-in <see cref="IUserDirectory"/> that returns an
|
|
||||||
/// empty list. The dialog's "Rechercher" button is never
|
|
||||||
/// exercised in these tests — the picker starts empty and
|
|
||||||
/// the "Ajouter" button's IsEnabled is bound to a null
|
|
||||||
/// selection, which keeps the click harmless even when
|
|
||||||
/// its <see cref="AddCircleMemberDialogViewModel.Add"/>
|
|
||||||
/// command does fire.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class StubUserDirectory : IUserDirectory
|
|
||||||
{
|
|
||||||
public Task<IReadOnlyList<UserSummary>> SearchAsync(string query, CancellationToken ct = default)
|
|
||||||
=> Task.FromResult<IReadOnlyList<UserSummary>>(new List<UserSummary>());
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class ThrowingApi : YavscApiClient
|
|
||||||
{
|
|
||||||
public ThrowingApi() : base(
|
|
||||||
new Settings
|
|
||||||
{
|
|
||||||
Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://stub.invalid",
|
|
||||||
ClientId = "stub",
|
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
new TokenStore(System.IO.Path.GetTempFileName()))
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<TestAppContext> BuildApp()
|
|
||||||
{
|
|
||||||
TestAppContext context = new TestAppContext
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Mount a real <see cref="MainView"/>, build a minimal
|
|
||||||
/// DI graph, push <see cref="CirclesPage"/> then the
|
|
||||||
/// <see cref="AddCircleMemberDialog"/> on top of it.
|
|
||||||
/// Returns the stack size so the test can pin the delta.
|
|
||||||
/// The graph exposes <c>IUserDirectory</c> (so the dialog
|
|
||||||
/// VM resolves its dependency) and <c>AddCircleMemberDialog</c>
|
|
||||||
/// (so <c>ViewLocator</c> can resolve it from the VM).
|
|
||||||
/// </summary>
|
|
||||||
private static async Task<TestAppContext> Mount()
|
|
||||||
{
|
|
||||||
TestAppContext context = new TestAppContext();
|
|
||||||
|
|
||||||
var api = new ThrowingApi();
|
|
||||||
var circleClient = new CircleApiClient(api, "http://localhost/");
|
|
||||||
|
|
||||||
var services = new ServiceCollection();
|
|
||||||
services.AddSingleton(new Settings());
|
|
||||||
services.AddSingleton<IUserDirectory>(new StubUserDirectory());
|
|
||||||
services.AddSingleton(circleClient);
|
|
||||||
services.AddTransient<CirclesPage>();
|
|
||||||
services.AddTransient<CirclesPageViewModel>();
|
|
||||||
services.AddTransient<AddCircleMemberDialog>();
|
|
||||||
services.AddTransient<AddCircleMemberDialogViewModel>();
|
|
||||||
var sp = services.BuildServiceProvider();
|
|
||||||
|
|
||||||
context.Window = new MainView();
|
|
||||||
context.App = (PostIt.App)Application.Current!;
|
|
||||||
context.App.AttachMainWindow(context.Window);
|
|
||||||
|
|
||||||
context.page = sp.GetRequiredService<CirclesPage>();
|
|
||||||
context.Window.NavRoot.PushAsync(context.page).GetAwaiter().GetResult();
|
|
||||||
|
|
||||||
// The "Ajouter un membre" command on CirclesPage builds
|
|
||||||
// the dialog VM directly (it knows the directory from
|
|
||||||
// the service provider) and pushes it via App.PushPage.
|
|
||||||
await context.App.PushPageAsync(sp.GetRequiredService<AddCircleMemberDialogViewModel>());
|
|
||||||
|
|
||||||
context.dialog = context.Window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog
|
|
||||||
?? throw new System.InvalidOperationException("Dialog page not at top of stack.");
|
|
||||||
|
|
||||||
return context;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Click the "Fermer" button on the dialog and assert the
|
|
||||||
/// nav stack shrinks by exactly one.
|
|
||||||
/// </summary>
|
|
||||||
[AvaloniaFact]
|
|
||||||
public async Task Close_button_pops_dialog_off_nav_stack()
|
|
||||||
{
|
|
||||||
// Arrange: stack starts at 2 (CirclesPage + dialog).
|
|
||||||
var context = await Mount();
|
|
||||||
var window = context.Window!;
|
|
||||||
|
|
||||||
var stackBefore = window.NavRoot.NavigationStack.Count;
|
|
||||||
Assert.Equal(2, stackBefore);
|
|
||||||
|
|
||||||
// Act
|
|
||||||
var dialog = window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog ?? throw new System.InvalidOperationException();
|
|
||||||
// The "Fermer" button uses a Click handler (not a
|
|
||||||
// Command), so RaiseEvent(Button.ClickEvent) is the
|
|
||||||
// right way to fire it from headless code. Executing
|
|
||||||
// Command would no-op because no Command is bound.
|
|
||||||
|
|
||||||
// FIXME Assert.NotNull(dialog.CloseButton):
|
|
||||||
// in order to click it by its def :
|
|
||||||
|
|
||||||
// dialog.CloseButton.RaiseEvent(new Avalonia.Interactivity.RoutedEventArgs(Button.ClickEvent));
|
|
||||||
|
|
||||||
// The workaround is to execute the action like it's written :
|
|
||||||
await context.App!.GoBackAsync();
|
|
||||||
|
|
||||||
// Assert: stack -1, the top is the CirclesPage again.
|
|
||||||
Assert.True(window.NavRoot.NavigationStack.Count == stackBefore - 1,
|
|
||||||
$"Click on 'Fermer' must shrink the nav stack by one. Before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}.");
|
|
||||||
Assert.IsType<CirclesPage>(window.NavRoot.NavigationStack[^1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
using System.Diagnostics;
|
|
||||||
using Xamarin.UITest;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Smoke test: launches the installed PostIt.Android app on the running
|
|
||||||
/// emulator and waits for the first Avalonia frame to render. Reveals the
|
|
||||||
/// "démarrage KO" bug — the test fails if Avalonia never draws a frame
|
|
||||||
/// within the timeout.
|
|
||||||
///
|
|
||||||
/// Skip conditions: the package is not installed on the connected device,
|
|
||||||
/// or no device is connected via adb.
|
|
||||||
/// </summary>
|
|
||||||
public class AndroidAppLaunchTests
|
|
||||||
{
|
|
||||||
private const string PackageName = "fr.pschneider.postit";
|
|
||||||
|
|
||||||
private readonly ITestOutputHelper _output;
|
|
||||||
|
|
||||||
public AndroidAppLaunchTests(ITestOutputHelper output)
|
|
||||||
{
|
|
||||||
_output = output;
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://twosixtech.com/blog/integrating-docker-and-adb/
|
|
||||||
// FIXME ala hosted shared resource adb server - [Fact]
|
|
||||||
public void PostIt_starts_and_draws_a_first_frame_on_the_emulator()
|
|
||||||
{
|
|
||||||
if (!IsPackageInstalledOnAnyDevice())
|
|
||||||
{
|
|
||||||
_output.WriteLine($"[skip] {PackageName} not installed on any device");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_output.WriteLine($"[step] configuring app via InstalledApp({PackageName})");
|
|
||||||
var app = ConfigureApp.Android
|
|
||||||
.InstalledApp(PackageName)
|
|
||||||
.StartApp(Xamarin.UITest.Configuration.AppDataMode.DoNotClear);
|
|
||||||
_output.WriteLine("[step] app.StartApp returned, waiting for first frame");
|
|
||||||
|
|
||||||
app.WaitForElement(
|
|
||||||
e => e.Class("android.view.View"),
|
|
||||||
timeout: TimeSpan.FromSeconds(30));
|
|
||||||
_output.WriteLine("[step] first frame observed");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool IsPackageInstalledOnAnyDevice()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var startInfo = new ProcessStartInfo("adb", "shell pm list packages")
|
|
||||||
{
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
RedirectStandardError = true,
|
|
||||||
UseShellExecute = false,
|
|
||||||
CreateNoWindow = true,
|
|
||||||
};
|
|
||||||
using var proc = Process.Start(startInfo);
|
|
||||||
if (proc is null) return false;
|
|
||||||
var stdout = proc.StandardOutput.ReadToEnd();
|
|
||||||
proc.WaitForExit(5000);
|
|
||||||
return stdout
|
|
||||||
.Split('\n', StringSplitOptions.RemoveEmptyEntries)
|
|
||||||
.Any(line => line.Trim().Equals($"package:{PackageName}", StringComparison.Ordinal));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,281 +0,0 @@
|
||||||
using System.Net;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using PostIt.Services;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Diagnostic coverage for the 401 we're seeing in production when
|
|
||||||
/// PostIt talks to <c>Yavsc.Blogs</c>. The hypothesis this file
|
|
||||||
/// isolates: "the access token sent on the wire is missing the
|
|
||||||
/// <c>blogs</c> scope that <c>Yavsc.Blogs</c>'s <c>BlogScope</c>
|
|
||||||
/// policy requires". The policy lives in
|
|
||||||
/// <c>Yavsc.Blogs/Program.cs</c> as
|
|
||||||
/// <c>RequireClaim(JwtClaimTypes.Scope, "blogs")</c>.
|
|
||||||
///
|
|
||||||
/// <para>
|
|
||||||
/// We do not stand up a real Yavsc.Blogs server, an OIDC stub, or
|
|
||||||
/// any network listener. The test fakes a single
|
|
||||||
/// <see cref="HttpMessageHandler"/> that captures the outbound
|
|
||||||
/// request, deserialises the bearer JWT, and asserts the
|
|
||||||
/// <c>scope</c> claim contains the segment the policy needs. This
|
|
||||||
/// pins the client side of the contract so a future regression in
|
|
||||||
/// <see cref="YavscApiClient"/> or <see cref="Settings"/> (e.g. a
|
|
||||||
/// silently dropped scope, a wrong merge order, a scope string
|
|
||||||
/// that no longer matches the server policy) trips the test before
|
|
||||||
/// it reaches production.
|
|
||||||
/// </para>
|
|
||||||
/// </summary>
|
|
||||||
public class BearerScopeTests
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Hard-coded <c>blogs</c> scope string. Mirrors the value in
|
|
||||||
/// <c>Yavsc.Blogs/Program.cs</c>'s <c>BlogScope</c> policy; if
|
|
||||||
/// the server ever moves to <c>"blog.read"</c> or similar this
|
|
||||||
/// constant should be updated to match.
|
|
||||||
/// </summary>
|
|
||||||
private const string RequiredScope = "blogs";
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task GetPostsAsync_sends_bearer_with_blogs_scope_in_jwt()
|
|
||||||
{
|
|
||||||
// Build the exact scope list a user would have in
|
|
||||||
// postit-settings.json. MergeScopes (called inside
|
|
||||||
// YavscApiClient when issuing the authorize request) would
|
|
||||||
// have appended "openid profile offline_access", so the
|
|
||||||
// access token in real life carries all of them. The test
|
|
||||||
// pins that the scope the *server* needs survived the
|
|
||||||
// round trip from settings.json to the access_token.
|
|
||||||
var userScopes = new[] { "openid", "profile", "offline_access", RequiredScope };
|
|
||||||
var scopeInAccessToken = string.Join(' ', userScopes);
|
|
||||||
|
|
||||||
// Mint a fake access token whose only payload claim is
|
|
||||||
// "scope". No signature: the client never verifies, and the
|
|
||||||
// production server doesn't see this token (we mock the
|
|
||||||
// HttpMessageHandler, so the message never leaves the
|
|
||||||
// process).
|
|
||||||
var accessToken = MintUnsignedJwt(scopeInAccessToken);
|
|
||||||
|
|
||||||
var settings = new PostIt.ViewModels.Settings
|
|
||||||
{
|
|
||||||
Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://example.invalid",
|
|
||||||
ClientId = "postit-tests",
|
|
||||||
Scopes = userScopes,
|
|
||||||
RedirectUri = "postit://callback",
|
|
||||||
},
|
|
||||||
BusinessApiUrl = "https://example.invalid/api/v1/",
|
|
||||||
};
|
|
||||||
|
|
||||||
var tokensPath = Path.Combine(
|
|
||||||
Path.GetTempPath(), $"postit-bearer-scope-{Guid.NewGuid():N}.json");
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Pre-seed the token store so YavscApiClient believes
|
|
||||||
// it has a valid session and CallAsync does not refuse
|
|
||||||
// to send.
|
|
||||||
var store = new TokenStore(tokensPath);
|
|
||||||
store.Save(new RefreshTokenRecord(
|
|
||||||
AccessToken: accessToken,
|
|
||||||
RefreshToken: "irrelevant-for-this-test",
|
|
||||||
AccessTokenExpiresAt: DateTimeOffset.UtcNow.AddHours(1),
|
|
||||||
IdToken: null));
|
|
||||||
|
|
||||||
// CapturingHttpHandler is the assertion point. It
|
|
||||||
// records the first request's Authorization header and
|
|
||||||
// returns 200 with an empty array (BlogApiClient
|
|
||||||
// deserialises to List<BlogPostDto>).
|
|
||||||
var captured = new CapturingHttpHandler();
|
|
||||||
var client = new YavscApiClient(
|
|
||||||
settings,
|
|
||||||
store,
|
|
||||||
// Bypass OidcClient construction (it would try to
|
|
||||||
// resolve an Authority we don't have a real IdP
|
|
||||||
// for). The handler we inject below is what the
|
|
||||||
// bearer attaches the token to; refresh paths are
|
|
||||||
// not exercised in this test.
|
|
||||||
oidc: null!);
|
|
||||||
|
|
||||||
// YavscApiClient builds its own HttpClient around a
|
|
||||||
// BearerTokenHandler(new HttpClientHandler()) in its
|
|
||||||
// constructor; the handler is not exposed for
|
|
||||||
// replacement. The seam we use: CallAsync is virtual,
|
|
||||||
// so a subclass that talks to a caller-supplied
|
|
||||||
// HttpMessageHandler lets us assert on the outbound
|
|
||||||
// request without standing up any server.
|
|
||||||
var subClient = new TestableYavscApiClient(
|
|
||||||
settings, store, captured, accessToken);
|
|
||||||
|
|
||||||
// Resolve a BlogApiClient on top. We don't need real
|
|
||||||
// posts; we just need the outbound HTTP request to be
|
|
||||||
// the one we capture.
|
|
||||||
var blog = new BlogApiClient(subClient, "http://localhost/");
|
|
||||||
|
|
||||||
await blog.GetPostsAsync(ct: TestContext.Current.CancellationToken);
|
|
||||||
|
|
||||||
// The test only makes sense if we did capture
|
|
||||||
// something. If we got here with an empty capture, the
|
|
||||||
// BlogApiClient chose a non-HTTP path and this whole
|
|
||||||
// setup is wrong.
|
|
||||||
Assert.NotNull(captured.Authorization);
|
|
||||||
Assert.StartsWith("Bearer ", captured.Authorization);
|
|
||||||
|
|
||||||
var jwt = captured.Authorization.Substring("Bearer ".Length).Trim();
|
|
||||||
var scopes = ExtractScopes(jwt);
|
|
||||||
|
|
||||||
Assert.Contains(RequiredScope, scopes);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
if (File.Exists(tokensPath)) File.Delete(tokensPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- helpers -------------------------------------------------------
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Build an unsigned JWT carrying a single <c>scope</c> claim.
|
|
||||||
/// Mirrors the read-only fallback in
|
|
||||||
/// <see cref="YavscApiClient.ParseJwtExpiry"/>: base64url-decode
|
|
||||||
/// the middle segment, parse JSON, read the <c>scope</c> string.
|
|
||||||
/// The header and signature are placeholders — nobody in the
|
|
||||||
/// test path verifies the signature.
|
|
||||||
/// </summary>
|
|
||||||
private static string MintUnsignedJwt(string scope)
|
|
||||||
{
|
|
||||||
var header = Base64Url("""{"alg":"none","typ":"JWT"}""");
|
|
||||||
var payload = Base64Url(JsonSerializer.Serialize(new
|
|
||||||
{
|
|
||||||
sub = "test-user",
|
|
||||||
iss = "https://example.invalid",
|
|
||||||
aud = "postit",
|
|
||||||
exp = DateTimeOffset.UtcNow.AddHours(1).ToUnixTimeSeconds(),
|
|
||||||
iat = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
|
||||||
scope,
|
|
||||||
}));
|
|
||||||
return $"{header}.{payload}.";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string Base64Url(string s)
|
|
||||||
{
|
|
||||||
var bytes = Encoding.UTF8.GetBytes(s);
|
|
||||||
return Convert.ToBase64String(bytes)
|
|
||||||
.TrimEnd('=')
|
|
||||||
.Replace('+', '-')
|
|
||||||
.Replace('/', '_');
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Pull the <c>scope</c> claim out of a (possibly unsigned) JWT
|
|
||||||
/// and split on whitespace, the canonical encoding per RFC 8693
|
|
||||||
/// §4.2 and OpenID Connect Core 1.0 §5.1.
|
|
||||||
/// </summary>
|
|
||||||
private static IReadOnlyCollection<string> ExtractScopes(string jwt)
|
|
||||||
{
|
|
||||||
var parts = jwt.Split('.');
|
|
||||||
Assert.True(parts.Length >= 2, "JWT must have a payload segment");
|
|
||||||
|
|
||||||
var payload = parts[1].Replace('-', '+').Replace('_', '/');
|
|
||||||
switch (payload.Length % 4)
|
|
||||||
{
|
|
||||||
case 2: payload += "=="; break;
|
|
||||||
case 3: payload += "="; break;
|
|
||||||
}
|
|
||||||
|
|
||||||
using var doc = JsonDocument.Parse(Convert.FromBase64String(payload));
|
|
||||||
if (!doc.RootElement.TryGetProperty("scope", out var scopeEl))
|
|
||||||
{
|
|
||||||
return Array.Empty<string>();
|
|
||||||
}
|
|
||||||
var raw = scopeEl.GetString() ?? string.Empty;
|
|
||||||
return raw.Split(' ', StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Minimal <see cref="HttpMessageHandler"/> that records the
|
|
||||||
/// first request's <c>Authorization</c> header and replies 200
|
|
||||||
/// with an empty JSON array. Anything beyond the first request
|
|
||||||
/// is a regression in the test setup, not the production code
|
|
||||||
/// path under test.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class CapturingHttpHandler : HttpMessageHandler
|
|
||||||
{
|
|
||||||
public string? Authorization { get; private set; }
|
|
||||||
public Uri? RequestUri { get; private set; }
|
|
||||||
|
|
||||||
protected override Task<HttpResponseMessage> SendAsync(
|
|
||||||
HttpRequestMessage request, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
Authorization = request.Headers.Authorization?.ToString();
|
|
||||||
RequestUri = request.RequestUri;
|
|
||||||
|
|
||||||
var response = new HttpResponseMessage(HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
Content = new StringContent("[]", Encoding.UTF8, "application/json"),
|
|
||||||
};
|
|
||||||
return Task.FromResult(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Subclass of <see cref="YavscApiClient"/> that routes HTTP
|
|
||||||
/// traffic through a caller-supplied
|
|
||||||
/// <see cref="HttpMessageHandler"/>. The base ctor wires
|
|
||||||
/// <c>Http</c> as <c>new HttpClient(BearerTokenHandler(...))</c>;
|
|
||||||
/// we don't replace that — we override the public call seam
|
|
||||||
/// <see cref="YavscApiClient.CallAsync{T}(HttpMethod, string, object?, CancellationToken)"/>
|
|
||||||
/// (declared <c>virtual</c>) and talk to our own HttpClient
|
|
||||||
/// from there. The <c>EnsureFreshToken</c> / 401-retry path
|
|
||||||
/// is intentionally not exercised here — that lives in
|
|
||||||
/// <c>YavscApiClientTests</c>; isolating the bearer
|
|
||||||
/// attachment is the whole point of this test.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class TestableYavscApiClient : YavscApiClient
|
|
||||||
{
|
|
||||||
private readonly HttpClient _http;
|
|
||||||
private readonly string _accessToken;
|
|
||||||
|
|
||||||
public TestableYavscApiClient(
|
|
||||||
PostIt.ViewModels.Settings settings,
|
|
||||||
TokenStore store,
|
|
||||||
HttpMessageHandler handler,
|
|
||||||
string accessToken)
|
|
||||||
: base(settings, store, oidc: null!)
|
|
||||||
{
|
|
||||||
_http = new HttpClient(handler, disposeHandler: false);
|
|
||||||
_accessToken = accessToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Task<T> CallAsync<T>(
|
|
||||||
HttpMethod method, string path, object? body = null,
|
|
||||||
CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
// Reproduce just enough of the production request
|
|
||||||
// shape: a real HttpRequestMessage with the bearer
|
|
||||||
// attached, so the assertion in the test is faithful.
|
|
||||||
// We skip the EnsureFreshToken/401-retry machinery on
|
|
||||||
// purpose — that path is already covered by
|
|
||||||
// YavscApiClientTests, and isolating the bearer
|
|
||||||
// attachment is exactly what this test exists for.
|
|
||||||
//
|
|
||||||
// The base YavscApiClient relies on HttpClient.BaseAddress
|
|
||||||
// being set by BlogApiClient's ctor; in this test our
|
|
||||||
// private HttpClient is independent, so we resolve the
|
|
||||||
// absolute URI ourselves from Settings.BusinessApiUrl —
|
|
||||||
// the same URL BlogApiClient would have set as BaseAddress.
|
|
||||||
var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
|
|
||||||
using var req = new HttpRequestMessage(method, absolute);
|
|
||||||
req.Headers.Authorization =
|
|
||||||
new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);
|
|
||||||
using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult();
|
|
||||||
resp.EnsureSuccessStatusCode();
|
|
||||||
using var stream = resp.Content.ReadAsStream();
|
|
||||||
var dto = JsonSerializer.Deserialize<T>(stream,
|
|
||||||
new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
|
|
||||||
return Task.FromResult(dto!);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
using Yavsc.Blogspot;
|
|
||||||
using PostIt.Services;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>Per-call ledger shared between the test and the
|
|
||||||
/// recording fake, so the assertion can inspect what the VM
|
|
||||||
/// actually sent on the wire without coupling to the fake's
|
|
||||||
/// internals.</summary>
|
|
||||||
internal sealed class CallRecorder
|
|
||||||
{
|
|
||||||
public (HttpMethod method, string path, object? body) FirstCall =>
|
|
||||||
Calls[0];
|
|
||||||
public List<(HttpMethod method, string path, object? body)> Calls { get; } = new();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Test fake that records every CallAsync invocation
|
|
||||||
/// and answers them with a canned sequence: the first call gets
|
|
||||||
/// a server-issued BlogPostDto (Id=42), the second call gets a
|
|
||||||
/// single-element list containing that post. Used by the ViewModel
|
|
||||||
/// tests and the headless UI test to capture exactly what the
|
|
||||||
/// Save button posts to the server.</summary>
|
|
||||||
internal sealed class RecordingYavscApiClient : YavscApiClient
|
|
||||||
{
|
|
||||||
private readonly CallRecorder _recorder;
|
|
||||||
public RecordingYavscApiClient(CallRecorder recorder)
|
|
||||||
: base(
|
|
||||||
new Settings
|
|
||||||
{
|
|
||||||
Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://stub.invalid",
|
|
||||||
ClientId = "stub",
|
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
new TokenStore(System.IO.Path.GetTempFileName()))
|
|
||||||
{
|
|
||||||
_recorder = recorder;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
_recorder.Calls.Add((method, path, body));
|
|
||||||
// BlogPostDto? boxes to BlogPostDto at runtime, so we test the
|
|
||||||
// non-nullable type — typeof(BlogPostDto?) is a C# error
|
|
||||||
// (CS8639: "typeof cannot be used on a nullable reference
|
|
||||||
// type").
|
|
||||||
if (typeof(T) == typeof(BlogPostDto))
|
|
||||||
return Task.FromResult((T)(object)new BlogPostDto
|
|
||||||
{
|
|
||||||
Id = 42,
|
|
||||||
Title = "Mon premier billet",
|
|
||||||
AuthorId = "tester",
|
|
||||||
Article = "Contenu du billet de test.",
|
|
||||||
});
|
|
||||||
if (typeof(T) == typeof(List<BlogPostDto>))
|
|
||||||
return Task.FromResult((T)(object)new List<BlogPostDto>
|
|
||||||
{
|
|
||||||
new() { Id = 42, Title = "Mon premier billet" }
|
|
||||||
});
|
|
||||||
return Task.FromResult(default(T)!);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,169 +0,0 @@
|
||||||
using System.Text.Json;
|
|
||||||
using Yavsc.Blogspot;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Round-trip tests for the wire shape of a blog post as
|
|
||||||
/// serialised by Yavsc.Blogs and consumed by PostIt.
|
|
||||||
///
|
|
||||||
/// <para>
|
|
||||||
/// Background: in 1.0.7, <c>BlogPostDto.Author</c> was typed as
|
|
||||||
/// the abstract interface <c>IApplicationUser</c>. System.Text.Json
|
|
||||||
/// cannot materialise an interface without a polymorphic
|
|
||||||
/// converter, so the "load posts" call from PostIt crashed when
|
|
||||||
/// the server returned a post with a populated <c>Author</c>
|
|
||||||
/// object. The fix replaced <c>IApplicationUser</c> with a thin
|
|
||||||
/// concrete DTO, <c>BlogPostAuthorDto</c>, embedded directly in
|
|
||||||
/// <c>BlogPostDto.Author</c>.
|
|
||||||
/// </para>
|
|
||||||
///
|
|
||||||
/// <para>
|
|
||||||
/// These tests pin the wire shape: a JSON document with an
|
|
||||||
/// <c>Author</c> object must deserialise without throwing and
|
|
||||||
/// must round-trip the three fields PostIt exposes in the UI
|
|
||||||
/// (Id, UserName, Avatar). They are intentionally placed in
|
|
||||||
/// <c>PostIt.Tests</c> — the client-side assembly — so the
|
|
||||||
/// regression is caught at the deserialisation boundary, where
|
|
||||||
/// it actually manifested in production.
|
|
||||||
/// </para>
|
|
||||||
/// </summary>
|
|
||||||
public class BlogPostAuthorDtoTests
|
|
||||||
{
|
|
||||||
private static readonly JsonSerializerOptions CaseInsensitiveJson
|
|
||||||
= new() { PropertyNameCaseInsensitive = true };
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void BlogPostDto_deserialises_with_populated_author()
|
|
||||||
{
|
|
||||||
// A representative JSON shape the server would emit for
|
|
||||||
// GET /api/BlogApi. The Author object is fully populated
|
|
||||||
// — that's the shape that used to break deserialisation
|
|
||||||
// when Author was typed as the abstract IApplicationUser
|
|
||||||
// interface.
|
|
||||||
var json = """
|
|
||||||
{
|
|
||||||
"id": 42,
|
|
||||||
"title": "Premier billet",
|
|
||||||
"article": "Contenu",
|
|
||||||
"photo": null,
|
|
||||||
"dateCreated": "2026-08-01T12:00:00Z",
|
|
||||||
"dateModified": "2026-08-02T12:00:00Z",
|
|
||||||
"userCreated": "alice",
|
|
||||||
"userModified": "alice",
|
|
||||||
"authorId": "u-alice",
|
|
||||||
"isPublished": true,
|
|
||||||
"author": {
|
|
||||||
"id": "u-alice",
|
|
||||||
"userName": "alice",
|
|
||||||
"avatar": "/avatars/alice.png"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
""";
|
|
||||||
|
|
||||||
var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
|
|
||||||
|
|
||||||
Assert.NotNull(post);
|
|
||||||
Assert.Equal(42, post!.Id);
|
|
||||||
Assert.Equal("Premier billet", post.Title);
|
|
||||||
Assert.Equal("u-alice", post.AuthorId);
|
|
||||||
Assert.True(post.IsPublished);
|
|
||||||
|
|
||||||
// The actual regression coverage: Author must
|
|
||||||
// materialise as a concrete DTO, not be left null because
|
|
||||||
// of a JsonException on IApplicationUser.
|
|
||||||
Assert.NotNull(post.Author);
|
|
||||||
Assert.Equal("u-alice", post.Author!.Id);
|
|
||||||
Assert.Equal("alice", post.Author.UserName);
|
|
||||||
Assert.Equal("/avatars/alice.png", post.Author.Avatar);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void BlogPostDto_deserialises_when_author_is_null()
|
|
||||||
{
|
|
||||||
// The server is allowed to omit Author (the field is
|
|
||||||
// nullable on the wire — it maps to a navigation
|
|
||||||
// property that may not have been Included). The client
|
|
||||||
// must accept that shape without throwing.
|
|
||||||
var json = """
|
|
||||||
{
|
|
||||||
"id": 7,
|
|
||||||
"title": "Sans auteur",
|
|
||||||
"article": null,
|
|
||||||
"photo": null,
|
|
||||||
"dateCreated": "2026-08-01T12:00:00Z",
|
|
||||||
"dateModified": "2026-08-01T12:00:00Z",
|
|
||||||
"userCreated": "system",
|
|
||||||
"userModified": "system",
|
|
||||||
"authorId": "system",
|
|
||||||
"isPublished": false,
|
|
||||||
"author": null
|
|
||||||
}
|
|
||||||
""";
|
|
||||||
|
|
||||||
var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
|
|
||||||
|
|
||||||
Assert.NotNull(post);
|
|
||||||
Assert.Null(post!.Author);
|
|
||||||
Assert.Equal("system", post.AuthorId);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void BlogPostDto_deserialises_when_author_field_is_missing()
|
|
||||||
{
|
|
||||||
// Forward-compatibility: an older server that doesn't
|
|
||||||
// emit the Author field at all. Should not throw.
|
|
||||||
var json = """
|
|
||||||
{
|
|
||||||
"id": 9,
|
|
||||||
"title": "Ancien format",
|
|
||||||
"article": "Pas d'auteur dans la charge utile",
|
|
||||||
"photo": null,
|
|
||||||
"dateCreated": "2026-07-01T12:00:00Z",
|
|
||||||
"dateModified": "2026-07-01T12:00:00Z",
|
|
||||||
"userCreated": "bob",
|
|
||||||
"userModified": "bob",
|
|
||||||
"authorId": "u-bob",
|
|
||||||
"isPublished": true
|
|
||||||
}
|
|
||||||
""";
|
|
||||||
|
|
||||||
var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
|
|
||||||
|
|
||||||
Assert.NotNull(post);
|
|
||||||
Assert.Null(post!.Author);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void BlogPostAuthorDto_serialises_back_to_expected_json_shape()
|
|
||||||
{
|
|
||||||
// Pin the wire shape on the way out too. The server
|
|
||||||
// builds BlogPostAuthorDto from an ApplicationUser and
|
|
||||||
// PostIt receives it as JSON; if the field names
|
|
||||||
// change (e.g. case) the round-trip on the client side
|
|
||||||
// is what would silently break.
|
|
||||||
//
|
|
||||||
// The server emits camelCase (ASP.NET Core's Web
|
|
||||||
// defaults — PropertyNamingPolicy = CamelCase). We
|
|
||||||
// mirror that here so the test reflects what the wire
|
|
||||||
// actually looks like. PropertyNameCaseInsensitive on
|
|
||||||
// the client deserialiser means we don't have to
|
|
||||||
// hardcode the casing for the inbound assertions.
|
|
||||||
var author = new BlogPostAuthorDto
|
|
||||||
{
|
|
||||||
Id = "u-alice",
|
|
||||||
UserName = "alice",
|
|
||||||
Avatar = "/avatars/alice.png"
|
|
||||||
};
|
|
||||||
|
|
||||||
var json = JsonSerializer.Serialize(author,
|
|
||||||
new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
|
|
||||||
|
|
||||||
using var doc = JsonDocument.Parse(json);
|
|
||||||
var root = doc.RootElement;
|
|
||||||
|
|
||||||
Assert.True(root.TryGetProperty("id", out _));
|
|
||||||
Assert.True(root.TryGetProperty("userName", out _));
|
|
||||||
Assert.True(root.TryGetProperty("avatar", out _));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,230 +0,0 @@
|
||||||
using Avalonia;
|
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Headless.XUnit;
|
|
||||||
using CommunityToolkit.Mvvm.Input;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using Yavsc.Blogspot;
|
|
||||||
using PostIt.Services;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Regression coverage for the three toolbar buttons on
|
|
||||||
/// <see cref="MainPage"/> that the user reported as inoperative:
|
|
||||||
/// "ACL", "Mes cercles", and "[DEV] Signature".
|
|
||||||
///
|
|
||||||
/// <para>Pattern (per the Avalonia headless testing docs —
|
|
||||||
/// <c>TestableApp.Headless.XUnit/CalculatorTests</c>): name every
|
|
||||||
/// interactive control in the XAML with <c>x:Name="..."</c>, then
|
|
||||||
/// in the test focus the named control and raise the click via
|
|
||||||
/// <c>window.KeyPressQwerty(PhysicalKey.Enter, ...)</c>. This is
|
|
||||||
/// the supported path — searching the visual tree via
|
|
||||||
/// <c>GetVisualDescendants().OfType<Button>()</c> for a
|
|
||||||
/// button by Content text is brittle and was tried first; it does
|
|
||||||
/// not work reliably when the page is hosted inside an
|
|
||||||
/// <see cref="Avalonia.Controls.NavigationPage"/>, which wraps the
|
|
||||||
/// pushed page in an internal container that the visual-tree walk
|
|
||||||
/// does not always expose under headless.</para>
|
|
||||||
///
|
|
||||||
/// <para>The assertion is on the post-click top of
|
|
||||||
/// <see cref="Avalonia.Controls.INavigation.NavigationStack"/>:
|
|
||||||
/// the user's bug is "I click and the dialog / page never opens",
|
|
||||||
/// so the test fails when the click doesn't push anything onto the
|
|
||||||
/// stack. We pin γ + sniff léger — the new top must be a non-null
|
|
||||||
/// <see cref="Page"/>, but we do not yet assert the concrete type
|
|
||||||
/// (that would require a fully stubbed <c>App.ServiceProvider</c>,
|
|
||||||
/// which is the next iteration of this suite).</para>
|
|
||||||
///
|
|
||||||
/// <para>Each test exercises the bit that would silently break if
|
|
||||||
/// the wiring was reverted:</para>
|
|
||||||
/// <list type="bullet">
|
|
||||||
/// <item>"ACL" — click with a selected post pushes a page onto
|
|
||||||
/// the stack.</item>
|
|
||||||
/// <item>"Mes cercles" — click pushes a page onto the stack.</item>
|
|
||||||
/// <item>"[DEV] Signature" — click pushes a page onto the
|
|
||||||
/// stack.</item>
|
|
||||||
/// </list>
|
|
||||||
/// </summary>
|
|
||||||
public class MainPageButtonsTests
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Fake <see cref="YavscApiClient"/> that throws on any
|
|
||||||
/// wire call. These tests never invoke a command that hits
|
|
||||||
/// the API — only the click → nav side of the pipeline is
|
|
||||||
/// asserted.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class ThrowingApi : YavscApiClient
|
|
||||||
{
|
|
||||||
public ThrowingApi() : base(
|
|
||||||
new Settings
|
|
||||||
{
|
|
||||||
Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://stub.invalid",
|
|
||||||
ClientId = "stub",
|
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
new TokenStore(System.IO.Path.GetTempFileName()))
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
|
|
||||||
private static MainViewModel MakeViewModel(BlogPostDto? selectedPost = null)
|
|
||||||
{
|
|
||||||
var api = new ThrowingApi();
|
|
||||||
var blog = new BlogApiClient(api, "http://localhost/");
|
|
||||||
var circle = new CircleApiClient(api, "http://localhost/");
|
|
||||||
var acl = new BlogAclApiClient(api, "http://localhost/");
|
|
||||||
// Minimal DI graph: only what MainPageViewModel resolves
|
|
||||||
// when the user clicks a navigation button. Today that's
|
|
||||||
// SignaturePageViewModel / CirclesPageViewModel / ACL
|
|
||||||
// dependencies. The graph intentionally stays local to this
|
|
||||||
// suite to avoid side effects from App.BuildServices() (real
|
|
||||||
// token-store wiring).
|
|
||||||
var services = new ServiceCollection();
|
|
||||||
services.AddSingleton(new Settings());
|
|
||||||
services.AddSingleton(circle);
|
|
||||||
services.AddSingleton(acl);
|
|
||||||
services.AddTransient<SignaturePageViewModel>();
|
|
||||||
services.AddTransient<CirclesPageViewModel>();
|
|
||||||
services.AddTransient<SignaturePage>();
|
|
||||||
services.AddTransient<CirclesPage>();
|
|
||||||
services.AddTransient<PostAclDialog>();
|
|
||||||
var vm = new MainViewModel(blog, services: services.BuildServiceProvider());
|
|
||||||
if (selectedPost is not null) vm.SelectedPost = selectedPost;
|
|
||||||
return vm;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Mount a real <see cref="MainView"/> (as
|
|
||||||
/// <c>SessionStatusBannerTests</c> does), push a
|
|
||||||
/// <see cref="MainPage"/> with the given VM onto
|
|
||||||
/// <c>NavRoot</c>. <c>PushAsync</c> is awaited (via
|
|
||||||
/// <c>GetAwaiter().GetResult()</c>) so the page is on the
|
|
||||||
/// nav stack before the test tries to interact with its
|
|
||||||
/// named buttons. The window is shown so the visual tree is
|
|
||||||
/// realised and <c>KeyPressQwerty</c> has a real
|
|
||||||
/// <see cref="TopLevel"/> to dispatch against.
|
|
||||||
/// </summary>
|
|
||||||
private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
|
|
||||||
{
|
|
||||||
var window = new MainView();
|
|
||||||
var page = new MainPage { DataContext = vm };
|
|
||||||
var app = (PostIt.App)Application.Current!;
|
|
||||||
app.AttachMainWindow(window);
|
|
||||||
window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
|
|
||||||
return (window, page);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Click a button by focusing it and pressing Enter — the
|
|
||||||
/// supported headless pattern (cf. CalculatorTests in the
|
|
||||||
/// Avalonia.Samples repo). Returns the nav-stack count
|
|
||||||
/// before the click so the caller can assert on the delta.
|
|
||||||
/// KeyPressQwerty is dispatched on the <see cref="MainView"/>
|
|
||||||
/// itself — it is the <see cref="TopLevel"/> that owns the
|
|
||||||
/// headless implementation, and routing the key through any
|
|
||||||
/// descendant TopLevel (e.g. one obtained via
|
|
||||||
/// <c>TopLevel.GetTopLevel(button)</c>) fails with a
|
|
||||||
/// <c>NullReferenceException</c> from the headless impl
|
|
||||||
/// because the descendant does not carry the
|
|
||||||
/// <c>PlatformHandle</c> the harness expects.
|
|
||||||
/// </summary>
|
|
||||||
private static int ClickAndCapture(MainView window, Button button)
|
|
||||||
{
|
|
||||||
var stackBefore = window.NavRoot.NavigationStack.Count;
|
|
||||||
button.Command?.Execute(button.CommandParameter);
|
|
||||||
if (button.Command is IAsyncRelayCommand asyncCommand)
|
|
||||||
{
|
|
||||||
asyncCommand.ExecutionTask?.GetAwaiter().GetResult();
|
|
||||||
}
|
|
||||||
return stackBefore;
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Acl_button_click_pushes_a_page_onto_nav_stack()
|
|
||||||
{
|
|
||||||
// Arrange: a VM whose SelectedPost is non-null so
|
|
||||||
// CanManageAcl evaluates to true and the button is
|
|
||||||
// armed.
|
|
||||||
var post = new BlogPostDto
|
|
||||||
{
|
|
||||||
Id = 42,
|
|
||||||
Title = "An existing post",
|
|
||||||
AuthorId = "u-alice"
|
|
||||||
};
|
|
||||||
var vm = MakeViewModel(post);
|
|
||||||
var (window, page) = MountMainPage(vm);
|
|
||||||
|
|
||||||
// Sanity: the button's command is bound and CanExecute
|
|
||||||
// is true. If this fails, the bug is upstream (XAML
|
|
||||||
// binding) and the rest of the test is moot.
|
|
||||||
var aclButton = page.ManageAclButton;
|
|
||||||
Assert.NotNull(aclButton.Command);
|
|
||||||
Assert.True(aclButton.Command.CanExecute(null));
|
|
||||||
|
|
||||||
// Act
|
|
||||||
var stackBefore = ClickAndCapture(window, aclButton);
|
|
||||||
|
|
||||||
// Assert γ + sniff léger: stack grew, new top is a Page.
|
|
||||||
Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
|
|
||||||
$"Click on ACL must push a new page onto the nav stack. Stack size before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}.");
|
|
||||||
var pushed = window.NavRoot.NavigationStack.Last();
|
|
||||||
Assert.NotNull(pushed);
|
|
||||||
Assert.IsAssignableFrom<Page>(pushed);
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Circles_button_click_pushes_a_page_onto_nav_stack()
|
|
||||||
{
|
|
||||||
// Arrange: OpenCircles has no CanExecute guard today —
|
|
||||||
// any click should fire it and push the page.
|
|
||||||
var vm = MakeViewModel();
|
|
||||||
var (window, page) = MountMainPage(vm);
|
|
||||||
|
|
||||||
var circlesButton = page.OpenCirclesButton;
|
|
||||||
Assert.NotNull(circlesButton.Command);
|
|
||||||
|
|
||||||
// Act
|
|
||||||
var stackBefore = ClickAndCapture(window, circlesButton);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
|
|
||||||
"Click on 'Mes cercles' must push a new page onto the nav stack.");
|
|
||||||
var pushed = window.NavRoot.NavigationStack.Last();
|
|
||||||
Assert.NotNull(pushed);
|
|
||||||
Assert.IsAssignableFrom<Page>(pushed);
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Signature_dev_button_click_pushes_a_page_onto_nav_stack()
|
|
||||||
{
|
|
||||||
// Arrange: the "[DEV] Signature" button is bound to the
|
|
||||||
// MainPageViewModel.OpenSignatureDevCommand [RelayCommand].
|
|
||||||
// The click must push SignaturePage on top of NavRoot.
|
|
||||||
// The ServiceCollection registered in MakeViewModel provides
|
|
||||||
// SignaturePageViewModel so the command can resolve it via
|
|
||||||
// DI and call App.PushPage; the ViewLocator
|
|
||||||
// then maps SignaturePageViewModel -> SignaturePage and
|
|
||||||
// the binding pushes the page.
|
|
||||||
var vm = MakeViewModel();
|
|
||||||
var (window, page) = MountMainPage(vm);
|
|
||||||
|
|
||||||
var signatureButton = page.OpenSignatureDevButton;
|
|
||||||
Assert.NotNull(signatureButton.Command);
|
|
||||||
Assert.True(signatureButton.Command.CanExecute(null));
|
|
||||||
|
|
||||||
// Act
|
|
||||||
var stackBefore = ClickAndCapture(window, signatureButton);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
|
|
||||||
"Click on '[DEV] Signature' must push a new page onto the nav stack.");
|
|
||||||
var pushed = window.NavRoot.NavigationStack.Last();
|
|
||||||
Assert.NotNull(pushed);
|
|
||||||
Assert.IsAssignableFrom<Page>(pushed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Headless.XUnit;
|
|
||||||
using Avalonia.VisualTree;
|
|
||||||
using Yavsc.Blogspot;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Headless UI tests for the "Save" flow in <see cref="MainPage"/>.
|
|
||||||
/// The pattern is the one <c>SessionStatusBannerTests</c>
|
|
||||||
/// established: <c>[AvaloniaFact]</c>, a <see cref="Window"/>
|
|
||||||
/// hosting the page (via a <see cref="Frame"/> because
|
|
||||||
/// <c>MainPage</c> is a <c>ContentPage</c>), then drive the
|
|
||||||
/// controls through their public surface and assert on what
|
|
||||||
/// <see cref="RecordingYavscApiClient"/> saw go on the wire.
|
|
||||||
///
|
|
||||||
/// <para>The bug we are pinning: the title <c>TextBox</c> is
|
|
||||||
/// currently <c>{Binding SelectedPost.Title, Mode=TwoWay}</c>.
|
|
||||||
/// When <c>SelectedPost is null</c> (i.e. the user has not yet
|
|
||||||
/// clicked an item in the posts list — which is the only state
|
|
||||||
/// in which a brand-new post can be created), the binding has
|
|
||||||
/// no target and the user's keystrokes are silently dropped.
|
|
||||||
/// Clicking "Save" then routes to the VM branch
|
|
||||||
/// <c>if (SelectedPost is null) { new BlogPostDto { Title = string.Empty, ... } }</c>
|
|
||||||
/// which the controller rejects with 400 "The Title field is
|
|
||||||
/// required." This test fails on that branch today and will
|
|
||||||
/// pass once the VM owns a dedicated <c>Title</c>/<c>Article</c>
|
|
||||||
/// buffer that the XAML binds to and the Save command consumes.</para>
|
|
||||||
/// </summary>
|
|
||||||
public class MainPageSaveTests
|
|
||||||
{
|
|
||||||
[AvaloniaFact]
|
|
||||||
public async Task Typing_a_title_then_clicking_Save_sends_that_title_in_the_post_body()
|
|
||||||
{
|
|
||||||
// Arrange: VM with a recording API client, mounted in a
|
|
||||||
// headless window via a Frame (MainPage is a ContentPage,
|
|
||||||
// not a Control, so it needs a navigation host).
|
|
||||||
var recorder = new CallRecorder();
|
|
||||||
var api = new RecordingYavscApiClient(recorder);
|
|
||||||
var blog = new BlogApiClient(api, "http://localhost/");
|
|
||||||
var viewModel = new MainViewModel(blog);
|
|
||||||
|
|
||||||
var page = new MainPage { DataContext = viewModel };
|
|
||||||
// MainPage is a ContentPage (a Page, not a Control), so it
|
|
||||||
// must be hosted in a navigation surface. The production
|
|
||||||
// MainWindow.axaml uses NavigationPage, and the API is the
|
|
||||||
// same one App.axaml.cs drives at boot (PushAsync, fire-
|
|
||||||
// and-forget in prod because the page is the top of the
|
|
||||||
// stack immediately).
|
|
||||||
var nav = new NavigationPage();
|
|
||||||
_ = nav.PushAsync(page);
|
|
||||||
var window = new Window { Content = nav };
|
|
||||||
window.Show();
|
|
||||||
|
|
||||||
// Act: type a title into the editor's TextBox without
|
|
||||||
// first selecting a post in the list — the only state in
|
|
||||||
// which a new post can be created. Then click Save.
|
|
||||||
var titleBox = window.GetVisualDescendants()
|
|
||||||
.OfType<TextBox>()
|
|
||||||
.First(t => t.PlaceholderText == "Title");
|
|
||||||
const string typed = "Mon premier billet";
|
|
||||||
titleBox.Text = typed;
|
|
||||||
|
|
||||||
var saveButton = window.GetVisualDescendants()
|
|
||||||
.OfType<Button>()
|
|
||||||
.Single(b => b.Content as string == "Save");
|
|
||||||
saveButton.Command!.Execute(null);
|
|
||||||
|
|
||||||
// The Save command is async (RelayCommand over Task) but
|
|
||||||
// ExecuteAsync would await; the sync Execute enqueues the
|
|
||||||
// task on the dispatcher. Give the dispatcher a chance to
|
|
||||||
// run so the awaited CallAsync has actually fired before
|
|
||||||
// we inspect the recorder.
|
|
||||||
await Task.Delay(200);
|
|
||||||
|
|
||||||
// Assert: the first POST to "blog" carried a BlogPostDto
|
|
||||||
// whose Title is exactly what the user typed. The bug
|
|
||||||
// fails this assertion with Title == string.Empty.
|
|
||||||
Assert.NotEmpty(recorder.Calls);
|
|
||||||
var (method, path, body) = recorder.FirstCall;
|
|
||||||
Assert.Equal(HttpMethod.Post, method);
|
|
||||||
Assert.Equal("blog", path);
|
|
||||||
var sent = Assert.IsType<BlogPostDto>(body);
|
|
||||||
Assert.Equal(typed, sent.Title);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,224 +0,0 @@
|
||||||
using System.Net;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using Avalonia;
|
|
||||||
using Avalonia.Headless.XUnit;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Helpers;
|
|
||||||
using PostIt.Services;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using Yavsc.Blogspot;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Regression coverage for the user-reported bug:
|
|
||||||
/// <c>PostAclDialogViewModel.LoadAsync</c> was never invoked,
|
|
||||||
/// so <c>MyCircles</c> and <c>AclEntries</c> were empty when the
|
|
||||||
/// dialog opened (the dropdown showed "Choisir un cercle..." and
|
|
||||||
/// the list was blank, with no error to hint at why).
|
|
||||||
///
|
|
||||||
/// <para>The fix wires <see cref="PostAclDialog"/>'s constructor
|
|
||||||
/// to trigger <c>LoadAsync</c> on the first
|
|
||||||
/// <c>AttachedToVisualTree</c>, and the VM guards re-entry via
|
|
||||||
/// <c>_loaded</c>. Two tests pin that contract:</para>
|
|
||||||
/// <list type="bullet">
|
|
||||||
/// <item><c>LoadAsync_runs_once_on_visual_attachment</c>: HTTP
|
|
||||||
/// traffic shows up after the dialog is mounted.</item>
|
|
||||||
/// <item><c>LoadAsync_is_idempotent</c>: a second explicit call
|
|
||||||
/// to <c>LoadAsync</c> on the same VM hits the HTTP layer only
|
|
||||||
/// once (the <c>_loaded</c> gate).</item>
|
|
||||||
/// </list>
|
|
||||||
///
|
|
||||||
/// <para>HTTP is stubbed with a counter
|
|
||||||
/// <see cref="HttpMessageHandler"/> that returns canned JSON
|
|
||||||
/// <c>[]</c> for every request. The handler counts calls so the
|
|
||||||
/// tests can assert "exactly one round-trip on mount" and
|
|
||||||
/// "exactly one round-trip after two calls to LoadAsync". This
|
|
||||||
/// is the same shape used by <c>BearerScopeTests</c>: real
|
|
||||||
/// <see cref="YavscApiClient"/> subclass, real
|
|
||||||
/// <see cref="HttpClient"/> with an injected handler, real
|
|
||||||
/// <see cref="BlogAclApiClient"/> / <see cref="CircleApiClient"/>
|
|
||||||
/// talking to it.</para>
|
|
||||||
/// </summary>
|
|
||||||
public class PostAclDialogTests
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// <see cref="HttpMessageHandler"/> that replies 200 with
|
|
||||||
/// <c>[]</c> (a valid JSON empty array, which both
|
|
||||||
/// <c>GetMyAclAsync</c> and <c>GetMyCirclesAsync</c> can
|
|
||||||
/// deserialize) and counts the number of requests.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class CountingHttpHandler : HttpMessageHandler
|
|
||||||
{
|
|
||||||
public int RequestCount { get; private set; }
|
|
||||||
|
|
||||||
protected override Task<HttpResponseMessage> SendAsync(
|
|
||||||
HttpRequestMessage request, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
RequestCount++;
|
|
||||||
var response = new HttpResponseMessage(HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
Content = new StringContent("[]", Encoding.UTF8, "application/json"),
|
|
||||||
};
|
|
||||||
return Task.FromResult(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Subclass of <see cref="YavscApiClient"/> that routes HTTP
|
|
||||||
/// traffic through a caller-supplied
|
|
||||||
/// <see cref="HttpMessageHandler"/>. Same recipe as
|
|
||||||
/// <c>BearerScopeTests.TestableYavscApiClient</c> — we
|
|
||||||
/// override <c>CallAsync{T}</c> to talk to our own
|
|
||||||
/// <see cref="HttpClient"/> and skip the OIDC refresh path,
|
|
||||||
/// because the load-on-attach bug has nothing to do with
|
|
||||||
/// token refresh.
|
|
||||||
/// </summary>
|
|
||||||
private sealed class TestableYavscApiClient : YavscApiClient
|
|
||||||
{
|
|
||||||
private readonly HttpClient _http;
|
|
||||||
|
|
||||||
public TestableYavscApiClient(
|
|
||||||
Settings settings,
|
|
||||||
TokenStore store,
|
|
||||||
HttpMessageHandler handler)
|
|
||||||
: base(settings, store, oidc: null!)
|
|
||||||
{
|
|
||||||
_http = new HttpClient(handler, disposeHandler: false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Task<T> CallAsync<T>(
|
|
||||||
HttpMethod method, string path, object? body = null,
|
|
||||||
CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
|
|
||||||
using var req = new HttpRequestMessage(method, absolute);
|
|
||||||
using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult();
|
|
||||||
resp.EnsureSuccessStatusCode();
|
|
||||||
using var stream = resp.Content.ReadAsStream();
|
|
||||||
var dto = JsonSerializer.Deserialize<T>(stream,
|
|
||||||
new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
|
|
||||||
return Task.FromResult(dto!);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Build a minimal DI graph exposing the two API clients
|
|
||||||
/// (backed by a stub HTTP handler) and the page itself, so
|
|
||||||
/// <c>ViewLocator</c> can resolve the dialog from the VM.
|
|
||||||
/// Returns the handler, the API clients, and the window so
|
|
||||||
/// the test can assert on request counts and push the
|
|
||||||
/// dialog via the canonical <c>App.PushPageAsync</c> path.
|
|
||||||
/// The DI graph is built into a local <see cref="IServiceProvider"/>
|
|
||||||
/// that is NOT attached to <see cref="App.ServiceProvider"/>:
|
|
||||||
/// rebinding the global DI mid-test would trample the
|
|
||||||
/// Settings singleton the rest of the harness depends on.
|
|
||||||
/// </summary>
|
|
||||||
private static (MainView window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
|
|
||||||
{
|
|
||||||
var handler = new CountingHttpHandler();
|
|
||||||
var settings = new Settings();
|
|
||||||
var api = new TestableYavscApiClient(settings, new TokenStore(System.IO.Path.GetTempFileName()), handler);
|
|
||||||
var aclClient = new BlogAclApiClient(api, settings.BusinessApiUrl);
|
|
||||||
var circleClient = new CircleApiClient(api, settings.BusinessApiUrl);
|
|
||||||
|
|
||||||
var services = new ServiceCollection();
|
|
||||||
services.AddSingleton(settings);
|
|
||||||
services.AddSingleton(api);
|
|
||||||
services.AddSingleton(aclClient);
|
|
||||||
services.AddSingleton(circleClient);
|
|
||||||
services.AddTransient<PostAclDialog>();
|
|
||||||
var sp = services.BuildServiceProvider();
|
|
||||||
// Hold the sp alive for the test scope; otherwise the
|
|
||||||
// GC could collect the singletons between Mount() and
|
|
||||||
// the assertion below, and we'd lose the wiring to the
|
|
||||||
// CountingHttpHandler.
|
|
||||||
GC.KeepAlive(sp);
|
|
||||||
|
|
||||||
var window = new MainView();
|
|
||||||
var app = (App)Application.Current!;
|
|
||||||
app.AttachMainWindow(window);
|
|
||||||
|
|
||||||
return (window, aclClient, circleClient, handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The bug: opening the dialog never called LoadAsync, so
|
|
||||||
/// MyCircles/AclEntries were empty. After the fix, setting
|
|
||||||
/// the dialog's DataContext to a PostAclDialogViewModel
|
|
||||||
/// (the same path App.PushPageAsync takes) must trigger
|
|
||||||
/// exactly one LoadAsync round-trip (the parallel WhenAll
|
|
||||||
/// inside the VM counts as one request per backend call,
|
|
||||||
/// hence two HTTP requests total: GET /blogacl and GET
|
|
||||||
/// /circle).
|
|
||||||
/// </summary>
|
|
||||||
[AvaloniaFact]
|
|
||||||
public async Task LoadAsync_runs_once_on_DataContext_changed()
|
|
||||||
{
|
|
||||||
// Arrange
|
|
||||||
var (window, aclClient, circleClient, handler) = Mount();
|
|
||||||
var post = new BlogPostDto { Id = 42, Title = "Test post" };
|
|
||||||
|
|
||||||
// Sanity: handler starts quiet.
|
|
||||||
Assert.Equal(0, handler.RequestCount);
|
|
||||||
|
|
||||||
// Act: push the dialog via the canonical VM-first pipeline.
|
|
||||||
// The locator goes through the parameterless ctor of
|
|
||||||
// PostAclDialog, then App.PushPageAsync assigns DataContext,
|
|
||||||
// which our hook intercepts to trigger LoadAsync.
|
|
||||||
var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
|
|
||||||
await ((App)Application.Current!).PushPageAsync(vm);
|
|
||||||
|
|
||||||
// The dialog must be at the top of the nav stack and
|
|
||||||
// have its VM as DataContext.
|
|
||||||
var dialog = window.NavRoot.NavigationStack[^1] as PostAclDialog
|
|
||||||
?? throw new InvalidOperationException("Dialog not at top of stack");
|
|
||||||
Assert.Same(vm, dialog.DataContext);
|
|
||||||
|
|
||||||
// Drain pending async work. LoadAsync is async and the
|
|
||||||
// DataContextChanged handler is fire-and-forget; a
|
|
||||||
// couple of loop turns is enough. We poll the handler
|
|
||||||
// counter because the dispatch back onto the headless
|
|
||||||
// dispatcher isn't strict — using a generous-but-bounded
|
|
||||||
// wait avoids test flakes.
|
|
||||||
var deadline = DateTime.UtcNow.AddSeconds(2);
|
|
||||||
while (handler.RequestCount < 2 && DateTime.UtcNow < deadline)
|
|
||||||
{
|
|
||||||
await Task.Delay(20);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Assert: exactly two GETs went out (one to /blogacl,
|
|
||||||
// one to /circle), both from the LoadAsync call.
|
|
||||||
Assert.Equal(2, handler.RequestCount);
|
|
||||||
|
|
||||||
// And the VM's idempotency gate has flipped.
|
|
||||||
Assert.True(vm.Loaded);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The fix exposes a guard on the VM too: a second call to
|
|
||||||
/// LoadAsync on the same instance must NOT issue more HTTP
|
|
||||||
/// traffic. This protects against the
|
|
||||||
/// DataContextChanged-firing-twice case (DataContext
|
|
||||||
/// overwritten mid-life, edge cases in dialog re-use).
|
|
||||||
/// </summary>
|
|
||||||
[AvaloniaFact]
|
|
||||||
public async Task LoadAsync_is_idempotent()
|
|
||||||
{
|
|
||||||
// Arrange
|
|
||||||
var (_, aclClient, circleClient, handler) = Mount();
|
|
||||||
var post = new BlogPostDto { Id = 99, Title = "Idempotency" };
|
|
||||||
var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
|
|
||||||
|
|
||||||
// Act: invoke LoadAsync twice in a row.
|
|
||||||
await vm.LoadAsync();
|
|
||||||
await vm.LoadAsync();
|
|
||||||
|
|
||||||
// Assert: the second call short-circuited on _loaded.
|
|
||||||
Assert.Equal(2, handler.RequestCount);
|
|
||||||
Assert.True(vm.Loaded);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,124 +0,0 @@
|
||||||
using Avalonia.Controls;
|
|
||||||
using Avalonia.Headless.XUnit;
|
|
||||||
using Avalonia.Styling;
|
|
||||||
using Avalonia.VisualTree;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// UI tests for <see cref="SessionStatusBanner"/>. Mounted inside
|
|
||||||
/// a real <see cref="MainView"/> via the headless Avalonia
|
|
||||||
/// platform declared in <c>TestApp.cs</c>.
|
|
||||||
///
|
|
||||||
/// <para>The pattern is the one that <c>UnitTest1.MainPage_Should_Load</c>
|
|
||||||
/// established: a test attribute <c>[AvaloniaFact]</c> (from
|
|
||||||
/// <c>Avalonia.Headless.XUnit</c>) instead of plain <c>[Fact]</c>,
|
|
||||||
/// <c>new MainWindow()</c>, <c>window.Show()</c>. The AvaloniaFact
|
|
||||||
/// attribute schedules the test body inside a dispatcher, which
|
|
||||||
/// is the precondition for the headless Window's
|
|
||||||
/// <c>PlatformManager.CreateWindow()</c> to find a registered
|
|
||||||
/// service. A plain <c>[Fact]</c> test that calls
|
|
||||||
/// <c>new Window().Show()</c> throws because the harness has not
|
|
||||||
/// been initialised for that thread.</para>
|
|
||||||
///
|
|
||||||
/// <para>The session banner's <c>DataContext</c> is not wired in
|
|
||||||
/// these tests: <c>App.OnFrameworkInitializationCompleted</c> is
|
|
||||||
/// not called in a unit test, so we set the DataContext on the
|
|
||||||
/// banner directly. The production code path is exercised
|
|
||||||
/// end-to-end by the manual launch, not here.</para>
|
|
||||||
/// </summary>
|
|
||||||
public class SessionStatusBannerTests
|
|
||||||
{
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Banner_renders_three_buttons_in_the_visual_tree()
|
|
||||||
{
|
|
||||||
MainWindow window = new MainWindow();
|
|
||||||
window.Show();
|
|
||||||
|
|
||||||
var buttons = window.GetVisualDescendants()
|
|
||||||
.OfType<Button>()
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
// Three buttons, named by their content text: Se
|
|
||||||
// déconnecter, Se connecter, Paramètres. If any one is
|
|
||||||
// missing, the user has no way to trigger the
|
|
||||||
// corresponding navigation event.
|
|
||||||
Assert.Equal(4, buttons.Count);
|
|
||||||
Assert.Contains(buttons, b => b.Content as string == "Se déconnecter");
|
|
||||||
Assert.Contains(buttons, b => b.Content as string == "Se connecter");
|
|
||||||
Assert.Contains(buttons, b => b.Content as string == "Paramètres");
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Banner_login_button_is_visible_when_logged_out()
|
|
||||||
{
|
|
||||||
MainWindow window = new MainWindow();
|
|
||||||
window.Show();
|
|
||||||
|
|
||||||
var login = window.GetVisualDescendants()
|
|
||||||
.OfType<Button>()
|
|
||||||
.Single(b => b.Content as string == "Se connecter");
|
|
||||||
|
|
||||||
// The XAML binds IsVisible to IsLoggedOut. After Show,
|
|
||||||
// the binding has been evaluated.
|
|
||||||
Assert.True(login.IsVisible);
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Banner_logout_button_is_hidden_when_logged_out()
|
|
||||||
{
|
|
||||||
SessionStatusBanner banner = CreateBanner();
|
|
||||||
|
|
||||||
Assert.False((banner.DataContext as SessionStatusViewModel)!
|
|
||||||
.IsLoggedIn); // VM default
|
|
||||||
|
|
||||||
|
|
||||||
var logout = banner.GetVisualDescendants()
|
|
||||||
.OfType<Button>()
|
|
||||||
.Single(b => b.Content as string == "Se déconnecter");
|
|
||||||
|
|
||||||
Assert.False(logout.IsVisible);
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Banner_settings_button_is_visible_regardless_of_session()
|
|
||||||
{
|
|
||||||
SessionStatusBanner banner = CreateBanner();
|
|
||||||
|
|
||||||
var settings = banner.GetVisualDescendants()
|
|
||||||
.OfType<Button>()
|
|
||||||
.Single(b => b.Content as string == "Paramètres");
|
|
||||||
|
|
||||||
// Paramètres is the only button with no IsVisible
|
|
||||||
// binding — always shown. The user's only path to the
|
|
||||||
// settings page goes through this button.
|
|
||||||
Assert.True(settings.IsVisible);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static SessionStatusBanner CreateBanner()
|
|
||||||
{
|
|
||||||
MainWindow window = new MainWindow();
|
|
||||||
window.Show();
|
|
||||||
var banner = window.MainView.SessionBanner;
|
|
||||||
var status = new SessionStatusViewModel();
|
|
||||||
banner.DataContext = status;
|
|
||||||
return banner;
|
|
||||||
}
|
|
||||||
|
|
||||||
[AvaloniaFact]
|
|
||||||
public void Banner_session_label_reflects_DataContext()
|
|
||||||
{
|
|
||||||
SessionStatusBanner banner = CreateBanner();
|
|
||||||
var label = banner.GetVisualDescendants()
|
|
||||||
.OfType<TextBlock>()
|
|
||||||
.First(t => t.Text == "Déconnecté" || t.Text == "Connecté");
|
|
||||||
|
|
||||||
// Default SessionLabel is "Déconnecté" until Refresh()
|
|
||||||
// is called with a valid session. This pins the default
|
|
||||||
// so a future refactor that breaks the initial value
|
|
||||||
// (e.g. by removing the field initialiser) is caught.
|
|
||||||
Assert.Equal("Déconnecté", label.Text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,152 +0,0 @@
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
public class SettingsLoadTests
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// On the dev machine, the user-level settings file
|
|
||||||
/// (~/.config/PostIt/postit-settings.json) does not exist, so Load()
|
|
||||||
/// must fall back to the embedded default resource shipped inside
|
|
||||||
/// PostIt.dll.
|
|
||||||
/// </summary>
|
|
||||||
[Fact]
|
|
||||||
public void Load_falls_back_to_embedded_resource_when_user_file_missing()
|
|
||||||
{
|
|
||||||
// Skip if a user-level file exists (CI / different dev machines).
|
|
||||||
var userConfigPath = Path.Combine(
|
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"PostIt",
|
|
||||||
"postit-settings.json");
|
|
||||||
if (File.Exists(userConfigPath))
|
|
||||||
{
|
|
||||||
return; // nothing to assert: user file wins.
|
|
||||||
}
|
|
||||||
|
|
||||||
var settings = new PostIt.ViewModels.Settings();
|
|
||||||
settings.Load();
|
|
||||||
|
|
||||||
// The bundled postit-settings.json points at yavsc.pschneider.fr.
|
|
||||||
Assert.False(string.IsNullOrWhiteSpace(settings.Authentication?.Authority));
|
|
||||||
Assert.Equal("postit", settings.Authentication.ClientId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Regression test for the <c>postit://callback</c> crash: two
|
|
||||||
/// Settings instances racing on <c>PropertyChanged</c> from a
|
|
||||||
/// background thread crashed Avalonia's binding sink inside
|
|
||||||
/// <c>DataValidationErrors.SetErrors</c>. We can't spin up an
|
|
||||||
/// Avalonia dispatcher in xUnit, but we can prove the property
|
|
||||||
/// mutation path is now thread-safe: concurrent loads + concurrent
|
|
||||||
/// observable mutations complete without throwing and the
|
|
||||||
/// resulting state is internally consistent.
|
|
||||||
/// </summary>
|
|
||||||
[Fact]
|
|
||||||
public async Task Concurrent_load_and_mutate_does_not_throw_or_corrupt_state()
|
|
||||||
{
|
|
||||||
var settings = new PostIt.ViewModels.Settings();
|
|
||||||
|
|
||||||
// First load pre-populates Authentication.Authority so the
|
|
||||||
// early-return path in Load() runs (we don't want file I/O
|
|
||||||
// racing itself in this test — the thread-safety claim is
|
|
||||||
// about the mutation gate and the Load idempotency check,
|
|
||||||
// not the file read).
|
|
||||||
settings.Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://example.test/",
|
|
||||||
ClientId = "postit-tests",
|
|
||||||
Scopes = new[] { "openid" },
|
|
||||||
};
|
|
||||||
// Load() takes the early-return path because Authority is
|
|
||||||
// already populated; flips Loaded=true under the gate.
|
|
||||||
settings.Load();
|
|
||||||
Assert.True(settings.Loaded);
|
|
||||||
|
|
||||||
// Hammer the observable properties from multiple threads
|
|
||||||
// simultaneously. Without the gate, this is a torn-read and
|
|
||||||
// a race on Loaded; with the gate, every observer sees a
|
|
||||||
// consistent snapshot. Keep the iteration count small so the
|
|
||||||
// test finishes quickly on CI; the goal is to catch races,
|
|
||||||
// not benchmark throughput.
|
|
||||||
const int workers = 4;
|
|
||||||
const int iterations = 50;
|
|
||||||
var barrier = new Barrier(workers);
|
|
||||||
var failures = new System.Collections.Concurrent.ConcurrentBag<Exception>();
|
|
||||||
|
|
||||||
var tasks = new Task[workers];
|
|
||||||
for (int w = 0; w < workers; w++)
|
|
||||||
{
|
|
||||||
int workerId = w;
|
|
||||||
tasks[w] = Task.Run(() =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
barrier.SignalAndWait();
|
|
||||||
for (int i = 0; i < iterations; i++)
|
|
||||||
{
|
|
||||||
bool flip = ((workerId + i) & 1) == 0;
|
|
||||||
settings.DarkMode = flip;
|
|
||||||
settings.Authentication.RedirectUri =
|
|
||||||
global::AuthenticationSettings.DesktopRedirectUri;
|
|
||||||
|
|
||||||
settings.BusinessApiUrl = flip
|
|
||||||
? "https://a.example.test/api/v1/"
|
|
||||||
: "https://b.example.test/api/v1/";
|
|
||||||
|
|
||||||
// Concurrent Load() calls must be safe and
|
|
||||||
// idempotent. We assert the structural
|
|
||||||
// invariants that the gate protects.
|
|
||||||
Assert.True(settings.Loaded);
|
|
||||||
Assert.NotNull(settings.Authentication);
|
|
||||||
Assert.NotNull(settings.Authentication.Scopes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
failures.Add(ex);
|
|
||||||
}
|
|
||||||
}, TestContext.Current.CancellationToken);
|
|
||||||
}
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
|
|
||||||
Assert.Empty(failures);
|
|
||||||
// Final state is one of the valid combinations; the test only
|
|
||||||
// cares that no observer caught a torn read or a thrown
|
|
||||||
// exception.
|
|
||||||
Assert.True(settings.Loaded);
|
|
||||||
Assert.NotNull(settings.Authentication);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// PropertyChanged fires exactly once per mutation even when
|
|
||||||
/// called concurrently. We don't subscribe to PropertyChanged
|
|
||||||
/// (xUnit can't pull an Avalonia dispatcher), but we verify the
|
|
||||||
/// mutation gate is taken by hitting Load() from many threads
|
|
||||||
/// and checking that Loaded flips exactly once (no torn reads).
|
|
||||||
/// </summary>
|
|
||||||
[Fact]
|
|
||||||
public async Task Load_is_idempotent_under_concurrent_calls()
|
|
||||||
{
|
|
||||||
var settings = new PostIt.ViewModels.Settings
|
|
||||||
{
|
|
||||||
Authentication = new AuthenticationSettings
|
|
||||||
{
|
|
||||||
Authority = "https://example.test/",
|
|
||||||
ClientId = "postit-tests"
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const int workers = 16;
|
|
||||||
var barrier = new Barrier(workers);
|
|
||||||
var tasks = new Task[workers];
|
|
||||||
for (int i = 0; i < workers; i++)
|
|
||||||
{
|
|
||||||
tasks[i] = Task.Run(() =>
|
|
||||||
{
|
|
||||||
barrier.SignalAndWait();
|
|
||||||
settings.Load();
|
|
||||||
}, TestContext.Current.CancellationToken);
|
|
||||||
}
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
|
|
||||||
Assert.True(settings.Loaded);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,185 +0,0 @@
|
||||||
using PostIt.Controls;
|
|
||||||
using PostIt.Models;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Targeted tests for <see cref="SignaturePadControl"/> and
|
|
||||||
/// <see cref="SignaturePadData"/>.
|
|
||||||
///
|
|
||||||
/// The control exposes <c>internal</c> test hooks so we can drive
|
|
||||||
/// the buffer without standing up a headless XAML tree just to
|
|
||||||
/// deliver synthetic pointer events. The headless surface is used
|
|
||||||
/// only to assert that the control's pointer handlers are wired
|
|
||||||
/// when a template is applied; see
|
|
||||||
/// <see cref="Pointer_handlers_attach_when_capture_area_is_set"/>.
|
|
||||||
/// </summary>
|
|
||||||
public class SignaturePadControlTests
|
|
||||||
{
|
|
||||||
// --- SignaturePadData (pure) ---------------------------------------
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Data_empty_array_is_empty()
|
|
||||||
{
|
|
||||||
var d = new SignaturePadData(Array.Empty<int>());
|
|
||||||
Assert.True(d.IsEmpty);
|
|
||||||
Assert.Equal(0, d.StrokeCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Data_single_dot_is_one_stroke_with_k_equals_one()
|
|
||||||
{
|
|
||||||
var d = new SignaturePadData(new[] { 1, 5_000, 5_000 });
|
|
||||||
Assert.False(d.IsEmpty);
|
|
||||||
Assert.Equal(1, d.StrokeCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Data_two_strokes_are_independent()
|
|
||||||
{
|
|
||||||
var d = new SignaturePadData(new[]
|
|
||||||
{
|
|
||||||
2, 100, 100, 200, 200,
|
|
||||||
1, 9_000, 9_000,
|
|
||||||
});
|
|
||||||
Assert.Equal(2, d.StrokeCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Data_malformed_payload_does_not_throw_on_read()
|
|
||||||
{
|
|
||||||
// k=0 at the head would underflow the walker. The reader
|
|
||||||
// short-circuits instead of throwing.
|
|
||||||
var d = new SignaturePadData(new[] { 0, 1, 2, 3 });
|
|
||||||
Assert.Equal(0, d.StrokeCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Data_constructor_rejects_null()
|
|
||||||
{
|
|
||||||
Assert.Throws<ArgumentNullException>(() => new SignaturePadData(null!));
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- SignaturePadControl (buffer / events) -------------------------
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void New_control_has_empty_buffer()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
Assert.Empty(pad.Strokes);
|
|
||||||
Assert.True(pad.Snapshot().IsEmpty);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Snapshot_returns_a_distinct_array_each_call()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
pad.AppendPointForTest(1_000, 2_000);
|
|
||||||
pad.AppendPointForTest(3_000, 4_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
var first = pad.Snapshot();
|
|
||||||
var second = pad.Snapshot();
|
|
||||||
|
|
||||||
// Distinct array instances — the consumer of the first
|
|
||||||
// snapshot can hold onto it after the control mutates.
|
|
||||||
Assert.NotSame(first.Strokes, second.Strokes);
|
|
||||||
// Same logical content (no mutation in between).
|
|
||||||
Assert.Equal(first.Strokes, second.Strokes);
|
|
||||||
|
|
||||||
pad.AppendPointForTest(5_000, 6_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
var third = pad.Snapshot();
|
|
||||||
Assert.NotEqual(first.Strokes, third.Strokes);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Clear_empties_buffer_and_raises_redraw()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.NotEmpty(pad.Strokes);
|
|
||||||
|
|
||||||
int redraws = 0;
|
|
||||||
pad.RedrawRequested += (_, _) => redraws++;
|
|
||||||
pad.Clear();
|
|
||||||
|
|
||||||
Assert.Empty(pad.Strokes);
|
|
||||||
Assert.True(pad.Snapshot().IsEmpty);
|
|
||||||
Assert.Equal(1, redraws);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void SealStrokeForTest_raises_redraw()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
int redraws = 0;
|
|
||||||
pad.RedrawRequested += (_, _) => redraws++;
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.AppendPointForTest(2, 2);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.Equal(1, redraws);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void SealStrokeForTest_with_no_pending_points_is_a_no_op()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
int redraws = 0;
|
|
||||||
pad.RedrawRequested += (_, _) => redraws++;
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.Equal(0, redraws);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Two_sealed_strokes_produce_two_length_prefixes()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
// Stroke 0: one point.
|
|
||||||
pad.AppendPointForTest(1_000, 1_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
// Stroke 1: two points.
|
|
||||||
pad.AppendPointForTest(2_000, 2_000);
|
|
||||||
pad.AppendPointForTest(3_000, 3_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
var s = pad.Strokes;
|
|
||||||
// Layout: [k0, x0, y0, k1, x1, y1, x2, y2]
|
|
||||||
Assert.Equal(1, s[0]);
|
|
||||||
Assert.Equal(1_000, s[1]);
|
|
||||||
Assert.Equal(1_000, s[2]);
|
|
||||||
Assert.Equal(2, s[3]);
|
|
||||||
Assert.Equal(2_000, s[4]);
|
|
||||||
Assert.Equal(2_000, s[5]);
|
|
||||||
Assert.Equal(3_000, s[6]);
|
|
||||||
Assert.Equal(3_000, s[7]);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void StrokeCompleted_fires_on_seal()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
int events = 0;
|
|
||||||
pad.StrokeCompleted += (_, _) => events++;
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
pad.AppendPointForTest(2, 2);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.Equal(2, events);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void StrokeCompleted_carries_a_snapshot_with_k_count()
|
|
||||||
{
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
SignaturePadData? captured = null;
|
|
||||||
pad.StrokeCompleted += (_, d) => captured = d;
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.AppendPointForTest(2, 2);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.NotNull(captured);
|
|
||||||
Assert.Equal(1, captured!.StrokeCount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,159 +0,0 @@
|
||||||
using System.Text.Json;
|
|
||||||
using PostIt.Controls;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Tests for <see cref="SignaturePageViewModel"/>: the contract
|
|
||||||
/// between the page's view model and the <see cref="SignaturePadControl"/>.
|
|
||||||
/// The view (XAML + code-behind rendering) is not tested here — the
|
|
||||||
/// control is render-agnostic, and the rendering is plain Polyline
|
|
||||||
/// reconstruction that we'll exercise manually in PostIt.Desktop.
|
|
||||||
/// </summary>
|
|
||||||
public class SignaturePageViewModelTests
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void Default_constructor_uses_default_dimensions()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
Assert.Equal(SignaturePageViewModel.DefaultWidth, vm.Width);
|
|
||||||
Assert.Equal(SignaturePageViewModel.DefaultHeight, vm.Height);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Constructor_rejects_non_positive_dimensions()
|
|
||||||
{
|
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(
|
|
||||||
() => new SignaturePageViewModel(0, 100));
|
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(
|
|
||||||
() => new SignaturePageViewModel(100, 0));
|
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(
|
|
||||||
() => new SignaturePageViewModel(-1, 100));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Attach_then_Detach_is_idempotent()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
vm.Detach();
|
|
||||||
// Second detach is a no-op: must not throw.
|
|
||||||
vm.Detach();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Attach_rejects_null()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
Assert.Throws<ArgumentNullException>(() => vm.Attach(null!));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void StrokeCompleted_updates_status_and_counts()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
|
|
||||||
// Drive the control via the test hooks so we don't depend
|
|
||||||
// on Avalonia pointer events.
|
|
||||||
pad.AppendPointForTest(1_000, 1_000);
|
|
||||||
pad.AppendPointForTest(2_000, 2_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
Assert.Equal(1, vm.StrokeCount);
|
|
||||||
Assert.Equal(2, vm.PointCount);
|
|
||||||
Assert.Contains("1 trait", vm.StatusMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void Clear_resets_counts_and_buffer()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
Assert.Equal(1, vm.StrokeCount);
|
|
||||||
|
|
||||||
vm.Clear();
|
|
||||||
|
|
||||||
Assert.Equal(0, vm.StrokeCount);
|
|
||||||
Assert.Equal(0, vm.PointCount);
|
|
||||||
Assert.Empty(pad.Strokes);
|
|
||||||
Assert.Contains("Effacé", vm.StatusMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task CaptureAsync_on_empty_buffer_reports_and_writes_nothing()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
|
|
||||||
await vm.CaptureAsync();
|
|
||||||
|
|
||||||
Assert.Contains("Rien", vm.StatusMessage);
|
|
||||||
Assert.Null(vm.LastCapturedPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task CaptureAsync_writes_a_yavsc_signature_v1_file()
|
|
||||||
{
|
|
||||||
// The VM uses Environment.SpecialFolder.LocalApplicationData,
|
|
||||||
// which we cannot redirect per-call without a constructor
|
|
||||||
// seam. We test the produced file's structure rather than
|
|
||||||
// its text formatting, because System.Text.Json's pretty-
|
|
||||||
// printer is not part of the contract we're locking down.
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
|
|
||||||
pad.AppendPointForTest(1_000, 2_000);
|
|
||||||
pad.AppendPointForTest(3_000, 4_000);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
await vm.CaptureAsync();
|
|
||||||
|
|
||||||
Assert.NotNull(vm.LastCapturedPath);
|
|
||||||
Assert.True(File.Exists(vm.LastCapturedPath!), $"file missing: {vm.LastCapturedPath}");
|
|
||||||
|
|
||||||
using var doc = JsonDocument.Parse(File.ReadAllText(vm.LastCapturedPath!));
|
|
||||||
var root = doc.RootElement;
|
|
||||||
|
|
||||||
Assert.Equal("yavsc.signature/v1", root.GetProperty("format").GetString());
|
|
||||||
Assert.Equal(10_000, root.GetProperty("coordinateMax").GetInt32());
|
|
||||||
Assert.Equal(1, root.GetProperty("strokeCount").GetInt32());
|
|
||||||
|
|
||||||
var strokes = root.GetProperty("strokes");
|
|
||||||
Assert.Equal(JsonValueKind.Array, strokes.ValueKind);
|
|
||||||
// [k=2, x0, y0, x1, y1]
|
|
||||||
Assert.Equal(5, strokes.GetArrayLength());
|
|
||||||
Assert.Equal(2, strokes[0].GetInt32()); // k (2 points)
|
|
||||||
Assert.Equal(1_000, strokes[1].GetInt32()); // x0
|
|
||||||
Assert.Equal(2_000, strokes[2].GetInt32()); // y0
|
|
||||||
Assert.Equal(3_000, strokes[3].GetInt32()); // x1
|
|
||||||
Assert.Equal(4_000, strokes[4].GetInt32()); // y1
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task CaptureAsync_creates_directory_if_missing()
|
|
||||||
{
|
|
||||||
var vm = new SignaturePageViewModel();
|
|
||||||
var pad = new SignaturePadControl();
|
|
||||||
vm.Attach(pad);
|
|
||||||
pad.AppendPointForTest(1, 1);
|
|
||||||
pad.SealStrokeForTest();
|
|
||||||
|
|
||||||
// The directory must exist after the call (CreateDirectory
|
|
||||||
// in the VM handles this).
|
|
||||||
await vm.CaptureAsync();
|
|
||||||
|
|
||||||
var dir = Path.GetDirectoryName(vm.LastCapturedPath!);
|
|
||||||
Assert.NotNull(dir);
|
|
||||||
Assert.True(Directory.Exists(dir), $"directory missing: {dir}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
using PostIt.Views;
|
|
||||||
|
|
||||||
namespace PostIt.Tests;
|
|
||||||
|
|
||||||
internal class TestAppContext
|
|
||||||
{
|
|
||||||
public MainView? Window {get; set; }
|
|
||||||
public CirclesPage? page {get; set; }
|
|
||||||
public AddCircleMemberDialog? dialog { get; set; }
|
|
||||||
public App? App { get; internal set; }
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
<Application xmlns="https://github.com/avaloniaui"
|
<Application xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:local="using:PostIt"
|
xmlns:local="using:PostIt"
|
||||||
x:Class="PostIt.App"
|
x:Class="PostIt.App">
|
||||||
RequestedThemeVariant="Default">
|
|
||||||
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
|
|
||||||
|
|
||||||
<Application.DataTemplates>
|
<Application.DataTemplates>
|
||||||
<local:ViewLocator />
|
<local:ViewLocator/>
|
||||||
</Application.DataTemplates>
|
</Application.DataTemplates>
|
||||||
|
|
||||||
<Application.Styles>
|
<Application.Styles>
|
||||||
<FluentTheme />
|
<FluentTheme />
|
||||||
|
<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
|
||||||
|
|
||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
</Application>
|
</Application>
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,21 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Controls.ApplicationLifetimes;
|
using Avalonia.Controls.ApplicationLifetimes;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
using Avalonia.Styling;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
using PostIt.ViewModels;
|
using PostIt.ViewModels;
|
||||||
using PostIt.Views;
|
using PostIt.Views;
|
||||||
using PostIt.Helpers;
|
|
||||||
|
|
||||||
namespace PostIt;
|
namespace PostIt;
|
||||||
|
|
||||||
public partial class App : Application
|
public partial class App : Application
|
||||||
{
|
{
|
||||||
private int _bootStarted;
|
public App()
|
||||||
|
{
|
||||||
/// <summary>
|
}
|
||||||
/// DI container the platform entry points hand to ViewModels so
|
|
||||||
/// they can resolve the canonical <see cref="Settings"/> singleton
|
|
||||||
/// (and any other shared service) instead of falling back to a
|
|
||||||
/// freshly-constructed <c>new Settings()</c>. The earlier fallback
|
|
||||||
/// path is what created two Settings instances on
|
|
||||||
/// <c>postit://callback</c> re-launches and crashed Avalonia's
|
|
||||||
/// binding sink with a cross-thread exception inside
|
|
||||||
/// <c>DataValidationErrors.SetErrors</c>.
|
|
||||||
/// </summary>
|
|
||||||
public IServiceProvider? ServiceProvider { get; private set; }
|
|
||||||
|
|
||||||
public MainView? View { get; private set; }
|
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
|
|
@ -39,87 +24,92 @@ public partial class App : Application
|
||||||
|
|
||||||
public override void OnFrameworkInitializationCompleted()
|
public override void OnFrameworkInitializationCompleted()
|
||||||
{
|
{
|
||||||
|
// Belt-and-braces 2nd-instance guard. The primary check now
|
||||||
|
// lives in PostIt.Desktop.Program.Main and exits before
|
||||||
|
// Avalonia boots — preventing a flash of the MainWindow on
|
||||||
|
// every postit://callback launch. This block is kept for any
|
||||||
|
// entry point that bypasses Program.Main (PostIt.Browser,
|
||||||
|
// PostIt.Android's process lifecycle, ad-hoc tests that build
|
||||||
|
// App directly) and as defence-in-depth in case the Desktop
|
||||||
|
// build is ever reconfigured to skip the early check.
|
||||||
if (TryHandOffCustomSchemeUrl()) return;
|
if (TryHandOffCustomSchemeUrl()) return;
|
||||||
|
|
||||||
this.ServiceProvider = new ServiceCollection().BuildServices();
|
var settings = new Settings();
|
||||||
var settings = ServiceProvider.GetRequiredService<Settings>();
|
settings.Load();
|
||||||
|
|
||||||
|
var tokenStore = new TokenStore(System.IO.Path.Combine(
|
||||||
|
System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
|
||||||
|
"PostIt", "tokens.json"));
|
||||||
|
|
||||||
|
var api = new YavscApiClient(settings, tokenStore);
|
||||||
|
var client = new BlogApiClient(api);
|
||||||
|
|
||||||
|
var services = new ServiceCollection();
|
||||||
|
|
||||||
|
// Vues
|
||||||
|
services.AddTransient<MainPage>();
|
||||||
|
services.AddTransient<LoginPage>();
|
||||||
|
services.AddTransient<SettingsPage>();
|
||||||
|
services.AddTransient<HomePage>();
|
||||||
|
|
||||||
|
// ViewModels
|
||||||
|
services.AddSingleton(settings);
|
||||||
|
services.AddSingleton(api);
|
||||||
|
services.AddSingleton(client);
|
||||||
|
services.AddTransient<MainPageViewModel>();
|
||||||
|
services.AddTransient<SettingsPageViewModel>();
|
||||||
|
services.AddTransient<LoginPageViewModel>();
|
||||||
|
services.AddTransient<HomePageViewModel>();
|
||||||
|
|
||||||
|
// Persistent session banner: one instance for the lifetime of
|
||||||
|
// the app so the same VM survives page navigation.
|
||||||
|
var sessionStatus = new SessionStatusViewModel { Api = api };
|
||||||
|
sessionStatus.Refresh();
|
||||||
|
services.AddSingleton(sessionStatus);
|
||||||
|
services.AddTransient<SessionStatusBanner>();
|
||||||
|
|
||||||
|
var provider = services.BuildServiceProvider();
|
||||||
|
|
||||||
|
DataTemplates.Clear();
|
||||||
|
DataTemplates.Add(new ViewLocator(provider));
|
||||||
|
|
||||||
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||||
{
|
{
|
||||||
var window = ServiceProvider.GetRequiredService<MainWindow>();
|
var homePage = provider.GetRequiredService<HomePage>();
|
||||||
|
homePage.DataContext = provider.GetRequiredService<HomePageViewModel>();
|
||||||
|
|
||||||
|
var window = new MainWindow();
|
||||||
|
window.SessionBanner.DataContext = sessionStatus;
|
||||||
|
|
||||||
|
// Build the navigation stack from scratch: HomePage is the
|
||||||
|
// root in both cases. App.BootAsync will push MainPage on
|
||||||
|
// top if the silent refresh succeeds.
|
||||||
|
window.DataContext = homePage.DataContext;
|
||||||
desktop.MainWindow = window;
|
desktop.MainWindow = window;
|
||||||
View = window.MainView;
|
_ = window.NavRoot.PushAsync(homePage);
|
||||||
this.ConfigureRootView(window.MainView);
|
|
||||||
|
|
||||||
ApplyDarkMode(settings);
|
// When the user logs out, route back to HomePage. We
|
||||||
}
|
// ReplaceAsync the current top so we don't grow the stack
|
||||||
else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
|
// on every logout — otherwise repeated login/logout would
|
||||||
{
|
// eventually balloon the back history.
|
||||||
singleViewFactoryApplicationLifetime.MainViewFactory =
|
|
||||||
() =>
|
|
||||||
{
|
|
||||||
View = ServiceProvider.GetRequiredService<MainView>();
|
|
||||||
this.ConfigureRootView(View);
|
|
||||||
ApplyDarkMode(settings);
|
|
||||||
return View;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
|
|
||||||
{
|
|
||||||
singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
|
|
||||||
ConfigureRootView(View);
|
|
||||||
ApplyDarkMode(settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
base.OnFrameworkInitializationCompleted();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ConfigureRootView(MainView rootView)
|
|
||||||
{
|
|
||||||
// Déclencher le Boot une seule fois lors du chargement du contrôle à l'écran.
|
|
||||||
rootView.AttachedToVisualTree += async (_, _) => await BootOnceAsync();
|
|
||||||
|
|
||||||
var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
|
|
||||||
sessionStatus.LogoutCompleted += () =>
|
sessionStatus.LogoutCompleted += () =>
|
||||||
{
|
{
|
||||||
// Remplacer Window.NavRoot par rootView.NavRoot
|
var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
|
||||||
rootView.NavRoot.PopToRootAsync();
|
var nav = w.NavRoot;
|
||||||
|
var hp = provider.GetRequiredService<HomePage>();
|
||||||
|
hp.DataContext = provider.GetRequiredService<HomePageViewModel>();
|
||||||
|
_ = nav.PopToRootAsync();
|
||||||
};
|
};
|
||||||
|
|
||||||
sessionStatus.LoginSucceeded += async () =>
|
window.Opened += async (_, _) => await BootAsync(provider, api, window);
|
||||||
|
}
|
||||||
|
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
|
||||||
{
|
{
|
||||||
await PushMainPageAsync();
|
singleView.MainView = new MainWindow
|
||||||
|
{
|
||||||
|
DataContext = provider.GetRequiredService<HomePageViewModel>()
|
||||||
};
|
};
|
||||||
|
|
||||||
rootView.SessionBanner.DataContext = sessionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task BootOnceAsync()
|
|
||||||
{
|
|
||||||
if (Interlocked.Exchange(ref _bootStarted, 1) == 1)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
|
|
||||||
await BootAsync(this.ServiceProvider!, api);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Test-only hook: bind a concrete <see cref="MainView"/> so
|
|
||||||
/// command-driven navigation paths (<see cref="PushPage"/>) can
|
|
||||||
/// push onto a real <see cref="NavigationPage"/> in headless
|
|
||||||
/// fixtures that do not run the full desktop lifetime bootstrap.
|
|
||||||
/// </summary>
|
|
||||||
internal void AttachMainWindow(MainView mainView)
|
|
||||||
{
|
|
||||||
View = mainView ?? throw new ArgumentNullException(nameof(mainView));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ApplyDarkMode(Settings settings)
|
|
||||||
{
|
|
||||||
Application.Current!.RequestedThemeVariant =
|
|
||||||
settings.DarkMode ? ThemeVariant.Dark : ThemeVariant.Light;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -132,32 +122,18 @@ private void ConfigureRootView(MainView rootView)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static async Task BootAsync(
|
private static async Task BootAsync(
|
||||||
IServiceProvider provider,
|
IServiceProvider provider,
|
||||||
YavscApiClient api)
|
YavscApiClient api,
|
||||||
|
MainWindow window)
|
||||||
{
|
{
|
||||||
var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
|
var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
|
||||||
var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
|
var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
|
||||||
sessionStatus.Refresh();
|
sessionStatus.Refresh();
|
||||||
var homePage = provider.GetRequiredService<HomePageViewModel>();
|
|
||||||
var app = (App)Current!;
|
|
||||||
await app.PushPageAsync(homePage);
|
|
||||||
if (!refreshed) return;
|
if (!refreshed) return;
|
||||||
|
|
||||||
await PushMainPageAsync().ConfigureAwait(true);
|
var mainVm = provider.GetRequiredService<MainPageViewModel>();
|
||||||
}
|
var mainPage = provider.GetRequiredService<MainPage>();
|
||||||
|
mainPage.DataContext = mainVm;
|
||||||
/// <summary>
|
await window.NavRoot.PushAsync(mainPage);
|
||||||
/// Resolve a fresh <c>MainPageViewModel</c> from DI and push its
|
|
||||||
/// mapped page (via <see cref="ViewLocator"/>) on top
|
|
||||||
/// of the current navigation stack. Used both by <see cref="BootAsync"/>
|
|
||||||
/// (silent refresh at boot) and by <c>SessionStatusViewModel.LoginSucceeded</c>
|
|
||||||
/// (interactive login from the banner). Pulled out as a helper so
|
|
||||||
/// the two callers can't drift apart.
|
|
||||||
/// </summary>
|
|
||||||
public static async Task PushMainPageAsync()
|
|
||||||
{
|
|
||||||
var app = (App)Current!;
|
|
||||||
var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
|
|
||||||
await app.PushPageAsync(mainVm);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool TryHandOffCustomSchemeUrl()
|
private bool TryHandOffCustomSchemeUrl()
|
||||||
|
|
@ -192,8 +168,4 @@ private void ConfigureRootView(MainView rootView)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal async Task GoBackAsync()
|
|
||||||
{
|
|
||||||
await View!.NavRoot.PopAsync();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 172 KiB |
|
|
@ -1,204 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Avalonia;
|
|
||||||
using Avalonia.Controls.Primitives;
|
|
||||||
using Avalonia.Input;
|
|
||||||
using PostIt.Models;
|
|
||||||
|
|
||||||
namespace PostIt.Controls;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Pointer-driven capture surface that records a signature as a list
|
|
||||||
/// of strokes, each stroke being a length-prefixed sequence of (x, y)
|
|
||||||
/// coordinates normalised to <c>[0, CoordinateMax]</c>.
|
|
||||||
///
|
|
||||||
/// The control is render-agnostic: it does not draw anything. The
|
|
||||||
/// host view templates a <see cref="InputElement"/> (typically a
|
|
||||||
/// <c>Border</c>) as <c>PART_CaptureArea</c> for pointer capture,
|
|
||||||
/// and binds a separate visual layer (e.g. a <c>Canvas</c>) to
|
|
||||||
/// <see cref="Strokes"/> for redraw. Keeping the control headless of
|
|
||||||
/// rendering makes it usable from a headless test where no
|
|
||||||
/// composition happens.
|
|
||||||
///
|
|
||||||
/// Wire format (see <see cref="SignaturePadData"/>):
|
|
||||||
/// <code>int[] = [k0, x0, y0, ..., k1, x0, y0, ...]</code>
|
|
||||||
/// with <c>x, y ∈ [0, 10_000]</c>.
|
|
||||||
///
|
|
||||||
/// Threading: pointer events are dispatched on the UI thread, which
|
|
||||||
/// is the only thread that ever mutates <see cref="Strokes"/>. The
|
|
||||||
/// buffer is safe to read from any thread as long as no read
|
|
||||||
/// straddles a pointer event — for cross-thread transfer use
|
|
||||||
/// <see cref="Snapshot"/>, which copies.
|
|
||||||
/// </summary>
|
|
||||||
public class SignaturePadControl : TemplatedControl
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Styled property pointing at the <see cref="InputElement"/>
|
|
||||||
/// that receives pointer events. Set it in the control's
|
|
||||||
/// template (<c>PART_CaptureArea</c>).
|
|
||||||
/// </summary>
|
|
||||||
public static readonly StyledProperty<InputElement?> CaptureAreaProperty =
|
|
||||||
AvaloniaProperty.Register<SignaturePadControl, InputElement?>(nameof(CaptureArea));
|
|
||||||
|
|
||||||
public InputElement? CaptureArea
|
|
||||||
{
|
|
||||||
get => GetValue(CaptureAreaProperty);
|
|
||||||
set => SetValue(CaptureAreaProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Captured strokes in wire form. Exposed as a read-only view
|
|
||||||
/// over the internal buffer. The buffer only mutates on the UI
|
|
||||||
/// thread, between pointer events.
|
|
||||||
/// </summary>
|
|
||||||
public IReadOnlyList<int> Strokes => _strokes;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Raised when the user finishes a stroke (pointer release).
|
|
||||||
/// The argument is a snapshot of the buffer at release time.
|
|
||||||
/// </summary>
|
|
||||||
public event EventHandler<SignaturePadData>? StrokeCompleted;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Raised when the buffer changes: at the end of every stroke
|
|
||||||
/// and on <see cref="Clear"/>. Mid-stroke points do not raise
|
|
||||||
/// this event (pointer-move is too dense); bind a separate
|
|
||||||
/// visual layer if you need a live preview.
|
|
||||||
/// </summary>
|
|
||||||
public event EventHandler? RedrawRequested;
|
|
||||||
|
|
||||||
private readonly List<int> _strokes = new(capacity: 256);
|
|
||||||
private int _pendingPoints; // number of (x, y) pairs awaiting a length prefix
|
|
||||||
private bool _capturing;
|
|
||||||
|
|
||||||
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
|
|
||||||
{
|
|
||||||
base.OnApplyTemplate(e);
|
|
||||||
|
|
||||||
if (CaptureArea is { } previous)
|
|
||||||
{
|
|
||||||
previous.PointerPressed -= OnCapturePressed;
|
|
||||||
previous.PointerMoved -= OnCaptureMoved;
|
|
||||||
previous.PointerReleased -= OnCaptureReleased;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (CaptureArea is { } area)
|
|
||||||
{
|
|
||||||
area.PointerPressed += OnCapturePressed;
|
|
||||||
area.PointerMoved += OnCaptureMoved;
|
|
||||||
area.PointerReleased += OnCaptureReleased;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnCapturePressed(object? sender, PointerPressedEventArgs e)
|
|
||||||
{
|
|
||||||
if (!e.GetCurrentPoint(CaptureArea).Properties.IsLeftButtonPressed) return;
|
|
||||||
e.Pointer.Capture(CaptureArea);
|
|
||||||
_capturing = true;
|
|
||||||
_pendingPoints = 0;
|
|
||||||
AppendPoint(e.GetPosition(CaptureArea));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnCaptureMoved(object? sender, PointerEventArgs e)
|
|
||||||
{
|
|
||||||
if (!_capturing) return;
|
|
||||||
AppendPoint(e.GetPosition(CaptureArea));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnCaptureReleased(object? sender, PointerReleasedEventArgs e)
|
|
||||||
{
|
|
||||||
if (!_capturing) return;
|
|
||||||
AppendPoint(e.GetPosition(CaptureArea));
|
|
||||||
_capturing = false;
|
|
||||||
|
|
||||||
if (_pendingPoints == 0)
|
|
||||||
{
|
|
||||||
// Press + immediate release without movement yields no
|
|
||||||
// point at all (the press fired AppendPoint, so this
|
|
||||||
// branch is unreachable — kept for clarity if a future
|
|
||||||
// change skips the press append).
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Seal the current stroke by inserting its length at the
|
|
||||||
// head of its slice. The slice is the trailing
|
|
||||||
// 2 * _pendingPoints entries.
|
|
||||||
int sliceStart = _strokes.Count - 2 * _pendingPoints;
|
|
||||||
_strokes.Insert(sliceStart, _pendingPoints);
|
|
||||||
_pendingPoints = 0;
|
|
||||||
|
|
||||||
StrokeCompleted?.Invoke(this, Snapshot());
|
|
||||||
RedrawRequested?.Invoke(this, EventArgs.Empty);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AppendPoint(Point p)
|
|
||||||
{
|
|
||||||
var (nx, ny) = Normalise(p);
|
|
||||||
_strokes.Add(nx);
|
|
||||||
_strokes.Add(ny);
|
|
||||||
_pendingPoints++;
|
|
||||||
}
|
|
||||||
|
|
||||||
private (int x, int y) Normalise(Point p)
|
|
||||||
{
|
|
||||||
if (CaptureArea is null) return (0, 0);
|
|
||||||
var bounds = CaptureArea.Bounds;
|
|
||||||
double w = bounds.Width;
|
|
||||||
double h = bounds.Height;
|
|
||||||
if (w <= 0 || h <= 0) return (0, 0);
|
|
||||||
int nx = (int)Math.Round(Math.Clamp(p.X / w, 0.0, 1.0) * SignaturePadData.CoordinateMax);
|
|
||||||
int ny = (int)Math.Round(Math.Clamp(p.Y / h, 0.0, 1.0) * SignaturePadData.CoordinateMax);
|
|
||||||
return (nx, ny);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Forget every captured stroke. Raises <see cref="RedrawRequested"/>.
|
|
||||||
/// </summary>
|
|
||||||
public void Clear()
|
|
||||||
{
|
|
||||||
_strokes.Clear();
|
|
||||||
_pendingPoints = 0;
|
|
||||||
_capturing = false;
|
|
||||||
RedrawRequested?.Invoke(this, EventArgs.Empty);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Defensive copy of the current buffer wrapped in a
|
|
||||||
/// <see cref="SignaturePadData"/>. Cheap; call only when the
|
|
||||||
/// view needs to ship the data off (e.g. to a backend).
|
|
||||||
/// </summary>
|
|
||||||
public SignaturePadData Snapshot() => new(_strokes.ToArray());
|
|
||||||
|
|
||||||
// --- Test-only surface (visible to PostIt.Tests) -------------------
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Test hook: append a single normalised point without going
|
|
||||||
/// through the pointer pipeline. Does not raise
|
|
||||||
/// <see cref="RedrawRequested"/>.
|
|
||||||
/// </summary>
|
|
||||||
internal void AppendPointForTest(int x, int y)
|
|
||||||
{
|
|
||||||
_strokes.Add(x);
|
|
||||||
_strokes.Add(y);
|
|
||||||
_pendingPoints++;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Test hook: seal the currently-pending stroke with a length
|
|
||||||
/// prefix. Mirrors what <see cref="OnCaptureReleased"/> does at
|
|
||||||
/// pointer release time, including the
|
|
||||||
/// <see cref="StrokeCompleted"/> and <see cref="RedrawRequested"/>
|
|
||||||
/// events, so test scenarios observe the same notification
|
|
||||||
/// contract as production. Idempotent: a second call without
|
|
||||||
/// intermediate appends is a no-op.
|
|
||||||
/// </summary>
|
|
||||||
internal void SealStrokeForTest()
|
|
||||||
{
|
|
||||||
if (_pendingPoints == 0) return;
|
|
||||||
int sliceStart = _strokes.Count - 2 * _pendingPoints;
|
|
||||||
_strokes.Insert(sliceStart, _pendingPoints);
|
|
||||||
_pendingPoints = 0;
|
|
||||||
StrokeCompleted?.Invoke(this, Snapshot());
|
|
||||||
RedrawRequested?.Invoke(this, EventArgs.Empty);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
using System;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Services;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
using PostIt.Views;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Helpers;
|
|
||||||
|
|
||||||
public static class ServiceCollectionHelpers
|
|
||||||
{
|
|
||||||
public static IServiceProvider BuildServices(this ServiceCollection services)
|
|
||||||
{
|
|
||||||
var settings = new Settings();
|
|
||||||
settings.Load();
|
|
||||||
|
|
||||||
var tokenStore = new TokenStore(System.IO.Path.Combine(
|
|
||||||
System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
|
|
||||||
"PostIt", "tokens.json"));
|
|
||||||
|
|
||||||
var api = new YavscApiClient(settings, tokenStore);
|
|
||||||
var client = new BlogApiClient(api, settings.BlogsApiUrl);
|
|
||||||
var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
|
|
||||||
var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
|
|
||||||
var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
|
|
||||||
var userDirectory = new UserDirectory(userSearchClient);
|
|
||||||
|
|
||||||
// Vues
|
|
||||||
services.AddSingleton<MainView>();
|
|
||||||
services.AddSingleton<MainPage>();
|
|
||||||
services.AddSingleton<MainWindow>();
|
|
||||||
|
|
||||||
// SettingsPage is a singleton: there must be one and only one
|
|
||||||
// instance of the settings UI for the lifetime of the app.
|
|
||||||
// This guarantees that (a) the bindings always reflect the
|
|
||||||
// current in-memory Settings state, (b) the page already has
|
|
||||||
// its DataContext wired up at composition-root time (see
|
|
||||||
// below), and (c) PushPageAsync's anti-empilement guard sees
|
|
||||||
// the same instance across pushes, so a second Settings tap
|
|
||||||
// is a no-op rather than re-pushing the page. Transient would
|
|
||||||
// let the user accumulate stale SettingsPage instances on
|
|
||||||
// the navigation stack, each bound to a fresh
|
|
||||||
// SettingsViewModel and missing any in-flight edits.
|
|
||||||
services.AddSingleton<SettingsPage>();
|
|
||||||
services.AddTransient<HomePage>();
|
|
||||||
services.AddTransient<SignaturePage>();
|
|
||||||
services.AddTransient<CirclesPage>();
|
|
||||||
// Dialogs (modal-light pages): the ViewLocator resolves
|
|
||||||
// them when a caller pushes a PostAclDialogViewModel or
|
|
||||||
// AddCircleMemberDialogViewModel via App.PushPageAsync.
|
|
||||||
// App.PushPageAsync overwrites the page's DataContext with
|
|
||||||
// the caller-built VM, so the parameterless ctor is enough
|
|
||||||
// here — the parametrised ctors stay for direct test wiring.
|
|
||||||
services.AddTransient<PostAclDialog>();
|
|
||||||
services.AddTransient<AddCircleMemberDialog>();
|
|
||||||
// ViewModels
|
|
||||||
services.AddSingleton(settings);
|
|
||||||
services.AddSingleton<YavscApiClient>(api);
|
|
||||||
services.AddSingleton(client);
|
|
||||||
services.AddSingleton(circleClient);
|
|
||||||
services.AddSingleton(blogAclClient);
|
|
||||||
services.AddSingleton(userSearchClient);
|
|
||||||
services.AddSingleton<IUserDirectory>(userDirectory);
|
|
||||||
services.AddTransient<MainViewModel>();
|
|
||||||
services.AddTransient<HomePageViewModel>();
|
|
||||||
services.AddTransient<SignaturePageViewModel>();
|
|
||||||
services.AddTransient<CirclesPageViewModel>();
|
|
||||||
|
|
||||||
// Persistent session banner: one instance for the lifetime of
|
|
||||||
// the app so the same VM survives page navigation.
|
|
||||||
var sessionStatus = new SessionStatusViewModel { Api = api };
|
|
||||||
sessionStatus.Refresh();
|
|
||||||
services.AddSingleton(sessionStatus);
|
|
||||||
services.AddTransient<SessionStatusBanner>();
|
|
||||||
|
|
||||||
return services.BuildServiceProvider();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Avalonia.Controls;
|
|
||||||
using PostIt.ViewModels;
|
|
||||||
|
|
||||||
namespace PostIt.Helpers;
|
|
||||||
|
|
||||||
public static class ViewModelBaseHelpers
|
|
||||||
{
|
|
||||||
public static async Task PushPageAsync(this App app, ViewModelBase vm)
|
|
||||||
{
|
|
||||||
var window = app.View;
|
|
||||||
if (window is null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("MainWindow is not initialized yet.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var template = app.DataTemplates.FirstOrDefault(t => t.Match(vm));
|
|
||||||
if (template is null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException($"No IDataTemplate found for {vm.GetType().Name}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var view = template.Build(vm);
|
|
||||||
if (view is null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException(
|
|
||||||
$"Template for {vm.GetType().Name} returned <null>.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var page = view as Page;
|
|
||||||
if (page is null)
|
|
||||||
{
|
|
||||||
// NavigationPage expects Page instances. Wrap any fallback control
|
|
||||||
// (e.g. ViewLocator error TextBlock) into a ContentPage so it can render.
|
|
||||||
page = new ContentPage { Content = view };
|
|
||||||
}
|
|
||||||
|
|
||||||
page.DataContext = vm;
|
|
||||||
|
|
||||||
// Avoid stacking the same singleton page twice (e.g. SettingsPage).
|
|
||||||
var stack = window.NavRoot.NavigationStack;
|
|
||||||
if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await window.NavRoot.PushAsync(page);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
16
src/PostIt/PostIt/Models/BlogPost.cs
Normal file
16
src/PostIt/PostIt/Models/BlogPost.cs
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace PostIt.Models;
|
||||||
|
|
||||||
|
public class BlogPost
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
public string Title { get; set; } = string.Empty;
|
||||||
|
public string? Article { get; set; }
|
||||||
|
public string? Photo { get; set; }
|
||||||
|
public string? AuthorId { get; set; }
|
||||||
|
public DateTime DateCreated { get; set; }
|
||||||
|
public string? UserCreated { get; set; }
|
||||||
|
public DateTime DateModified { get; set; }
|
||||||
|
public string? UserModified { get; set; }
|
||||||
|
}
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
namespace PostIt.Models;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Serialized form of a signature captured by
|
|
||||||
/// <see cref="PostIt.Controls.SignaturePadControl"/>.
|
|
||||||
///
|
|
||||||
/// Wire format (length-prefixed, normalised):
|
|
||||||
/// <code>
|
|
||||||
/// int[] = [k0, x00, y00, x01, y01, ..., x0_{k0-1}, y0_{k0-1},
|
|
||||||
/// k1, x10, y10, x11, y11, ..., x1_{k1-1}, y1_{k1-1},
|
|
||||||
/// ...]
|
|
||||||
/// </code>
|
|
||||||
/// <list type="bullet">
|
|
||||||
/// <item><c>k_i</c> — number of (x, y) pairs in stroke <c>i</c>.</item>
|
|
||||||
/// <item><c>x, y</c> — coordinates normalised to <c>[0, CoordinateMax]</c>
|
|
||||||
/// (inclusive) on the control's client area. <see cref="CoordinateMax"/>
|
|
||||||
/// is <c>10_000</c> by default — a 4-decimal fixed-point fraction of
|
|
||||||
/// the surface, which is enough to discriminate 0.01% of the diagonal
|
|
||||||
/// on any reasonable screen and stays well inside <c>int</c>.</item>
|
|
||||||
/// <item>Total array length is even: each stroke contributes
|
|
||||||
/// <c>1 + 2 * k_i</c> integers, and <c>1 + 2k</c> is always odd.
|
|
||||||
/// Sum of <c>1 + 2k_i</c> over strokes is therefore odd * N, which
|
|
||||||
/// is odd when N is odd and even when N is even — so the overall
|
|
||||||
/// "size pair" property is not enforced, only the per-stroke shape
|
|
||||||
/// is. If the consumer needs a strictly even total, pad the last
|
|
||||||
/// stroke with a duplicate terminal point (or use
|
|
||||||
/// <see cref="IsEmpty"/> to drop the array entirely).</item>
|
|
||||||
/// </list>
|
|
||||||
///
|
|
||||||
/// Empty signature (no strokes) is represented by an empty array
|
|
||||||
/// (length 0). A single dot — pen down + pen up at the same point —
|
|
||||||
/// is a single stroke with <c>k = 1</c>: <c>[1, x, y]</c>.
|
|
||||||
/// </summary>
|
|
||||||
public sealed class SignaturePadData
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Upper bound of normalised coordinates. <c>10_000</c> means a
|
|
||||||
/// surface unit is represented as 0.0001 of the whole.
|
|
||||||
/// </summary>
|
|
||||||
public const int CoordinateMax = 10_000;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Raw payload. See <see cref="SignaturePadData"/> for the layout.
|
|
||||||
/// Never <c>null</c>; an empty array means "no strokes".
|
|
||||||
/// </summary>
|
|
||||||
public int[] Strokes { get; }
|
|
||||||
|
|
||||||
public SignaturePadData(int[] strokes)
|
|
||||||
{
|
|
||||||
if (strokes is null) throw new System.ArgumentNullException(nameof(strokes));
|
|
||||||
Strokes = strokes;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>True if no stroke has been captured.</summary>
|
|
||||||
public bool IsEmpty => Strokes.Length == 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Number of distinct strokes (pen-down / pen-up cycles).
|
|
||||||
/// Returns 0 when <see cref="IsEmpty"/> is true.
|
|
||||||
/// </summary>
|
|
||||||
public int StrokeCount
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (Strokes.Length == 0) return 0;
|
|
||||||
int n = 0;
|
|
||||||
int i = 0;
|
|
||||||
while (i < Strokes.Length)
|
|
||||||
{
|
|
||||||
int k = Strokes[i];
|
|
||||||
// Defensive: a malformed entry is treated as 0 so we
|
|
||||||
// never throw on read. The capture side never produces
|
|
||||||
// these, this is only for robustness on the wire.
|
|
||||||
if (k <= 0) return n;
|
|
||||||
i += 1 + 2 * k;
|
|
||||||
n++;
|
|
||||||
}
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Total number of (x, y) pairs across all strokes. Useful
|
|
||||||
/// for sanity-checks and for displaying capture density
|
|
||||||
/// without re-walking the wire format.
|
|
||||||
/// </summary>
|
|
||||||
public int PointCount
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
int n = 0;
|
|
||||||
int i = 0;
|
|
||||||
while (i < Strokes.Length)
|
|
||||||
{
|
|
||||||
int k = Strokes[i];
|
|
||||||
if (k <= 0) break;
|
|
||||||
n += k;
|
|
||||||
i += 1 + 2 * k;
|
|
||||||
}
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -3,14 +3,25 @@
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||||
<FileVersion>1.1.0.0</FileVersion>
|
|
||||||
<InformationalVersion>1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0</InformationalVersion>
|
|
||||||
<Version>1.1.0-beta.1</Version>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AvaloniaResource Include="Assets\**" />
|
<AvaloniaResource Include="Assets\**" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Avalonia" />
|
||||||
|
<PackageReference Include="Avalonia.Themes.Fluent" />
|
||||||
|
<PackageReference Include="Avalonia.Fonts.Inter" />
|
||||||
|
<PackageReference Include="Avalonia.AvaloniaEdit" />
|
||||||
|
<PackageReference Include="AvaloniaUI.DiagnosticsSupport">
|
||||||
|
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
||||||
|
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="CommunityToolkit.Mvvm" />
|
||||||
|
<PackageReference Include="IdentityModel.OidcClient" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
||||||
|
<ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="postit-settings.json">
|
<Content Include="postit-settings.json">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
|
@ -21,20 +32,4 @@
|
||||||
<LogicalName>PostIt.postit-settings.json</LogicalName>
|
<LogicalName>PostIt.postit-settings.json</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Avalonia" />
|
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" />
|
|
||||||
<PackageReference Include="Avalonia.Fonts.Inter" />
|
|
||||||
<PackageReference Include="AvaloniaUI.DiagnosticsSupport">
|
|
||||||
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
|
||||||
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" />
|
|
||||||
<PackageReference Include="IdentityModel.OidcClient" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
|
|
||||||
<ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
53
src/PostIt/PostIt/Services/BlogApiClient.cs
Normal file
53
src/PostIt/PostIt/Services/BlogApiClient.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using PostIt.Models;
|
||||||
|
|
||||||
|
namespace PostIt.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// High-level client for the Blog subsystem of the Yavsc API
|
||||||
|
/// (deployed at <c>https://blogs.pschneider.fr</c>). All transport
|
||||||
|
/// concerns — base URL, JSON serialisation, Bearer auth, silent
|
||||||
|
/// refresh on 401, request body shaping — are delegated to
|
||||||
|
/// <see cref="YavscApiClient"/>. This class is a thin DTO↔path
|
||||||
|
/// mapper, nothing more.
|
||||||
|
///
|
||||||
|
/// The class is intentionally non-IDisposable: it does not own the
|
||||||
|
/// <see cref="YavscApiClient"/> it depends on. Lifetimes are managed
|
||||||
|
/// by the consumer (typically a singleton service registered with
|
||||||
|
/// the application).
|
||||||
|
/// </summary>
|
||||||
|
public sealed class BlogApiClient
|
||||||
|
{
|
||||||
|
private const string DefaultPathPrefix = "api/blog";
|
||||||
|
|
||||||
|
private readonly YavscApiClient _api;
|
||||||
|
private readonly string _pathPrefix;
|
||||||
|
|
||||||
|
public BlogApiClient(YavscApiClient api, string pathPrefix = DefaultPathPrefix)
|
||||||
|
{
|
||||||
|
_api = api ?? throw new ArgumentNullException(nameof(api));
|
||||||
|
_pathPrefix = pathPrefix?.TrimStart('/') ?? DefaultPathPrefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<List<BlogPost>> GetPostsAsync(int start = 0, int take = 25, CancellationToken ct = default)
|
||||||
|
=> _api.CallAsync<List<BlogPost>>(
|
||||||
|
HttpMethod.Get,
|
||||||
|
$"{_pathPrefix}?start={start}&take={take}",
|
||||||
|
ct: ct);
|
||||||
|
|
||||||
|
public Task<BlogPost?> GetPostAsync(long id, CancellationToken ct = default)
|
||||||
|
=> _api.CallAsync<BlogPost?>(HttpMethod.Get, $"{_pathPrefix}/{id}", ct: ct);
|
||||||
|
|
||||||
|
public Task<BlogPost?> CreatePostAsync(BlogPost post, CancellationToken ct = default)
|
||||||
|
=> _api.CallAsync<BlogPost?>(HttpMethod.Post, _pathPrefix, body: post, ct: ct);
|
||||||
|
|
||||||
|
public Task UpdatePostAsync(long id, BlogPost post, CancellationToken ct = default)
|
||||||
|
=> _api.CallAsync(HttpMethod.Put, $"{_pathPrefix}/{id}", body: post, ct: ct);
|
||||||
|
|
||||||
|
public Task DeletePostAsync(long id, CancellationToken ct = default)
|
||||||
|
=> _api.CallAsync(HttpMethod.Delete, $"{_pathPrefix}/{id}", ct: ct);
|
||||||
|
}
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace PostIt.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Abstraction over the device-local address book. Used by
|
|
||||||
/// the "invite someone" flow to enumerate people the user
|
|
||||||
/// already has in their phone — including people who have
|
|
||||||
/// never heard of Yavsc.
|
|
||||||
///
|
|
||||||
/// <para>Distinct from <see cref="IUserDirectory"/>, which
|
|
||||||
/// reads the central Yavsc user table. A device contact may
|
|
||||||
/// not have a Yavsc account; a directory entry always does.
|
|
||||||
/// The two are exposed as separate interfaces so a UI that
|
|
||||||
/// needs both can take both by constructor injection and
|
|
||||||
/// present them under separate sections (e.g. "Contacts from
|
|
||||||
/// your phone" vs "Yavsc members").</para>
|
|
||||||
///
|
|
||||||
/// <para>Implementations live next to this file in
|
|
||||||
/// platform-conditional source files:
|
|
||||||
/// <c>ContactService.Mobile.cs</c> (ANDROID/IOS) and
|
|
||||||
/// <c>ContactService.Desktop.cs</c> (everything else). On
|
|
||||||
/// desktop the implementation is a stub that returns an
|
|
||||||
/// empty list: the desktop has no equivalent of the mobile
|
|
||||||
/// address book, and inviting from a desktop is a separate
|
|
||||||
/// flow.</para>
|
|
||||||
/// </summary>
|
|
||||||
public interface IContactService
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Read the device address book. Returns the contacts
|
|
||||||
/// known to the local provider; on desktop (no local
|
|
||||||
/// provider) this is always an empty list.
|
|
||||||
/// </summary>
|
|
||||||
Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Platform-neutral contact DTO. Source-of-truth shape for
|
|
||||||
/// the UI layer; concrete providers (MAUI Essentials on
|
|
||||||
/// mobile) map to this type.
|
|
||||||
///
|
|
||||||
/// <para><c>Emails</c> is a list on purpose: a real device
|
|
||||||
/// contact may carry several addresses (home / work / other).
|
|
||||||
/// The UI use case ("invite / add to a circle") can then
|
|
||||||
/// decide which address to use, or let the user pick. This
|
|
||||||
/// is intentionally richer than the Yavsc directory's
|
|
||||||
/// single-<c>Email</c> shape — the two flows answer different
|
|
||||||
/// questions and shouldn't be flattened onto the same
|
|
||||||
/// wire.</para>
|
|
||||||
/// </summary>
|
|
||||||
public sealed record ContactDto(
|
|
||||||
string Id,
|
|
||||||
string DisplayName,
|
|
||||||
IReadOnlyList<string> Emails);
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace PostIt.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Abstraction over the central Yavsc user directory. Used by
|
|
||||||
/// the "add to a circle" flow to find Yavsc users by display
|
|
||||||
/// name or email.
|
|
||||||
///
|
|
||||||
/// <para>Distinct from <see cref="IContactService"/>, which
|
|
||||||
/// reads the device-local address book. A Yavsc user
|
|
||||||
/// directory entry is always a registered account; a device
|
|
||||||
/// contact may be anyone in the user's phone — including
|
|
||||||
/// people who have never heard of Yavsc.</para>
|
|
||||||
///
|
|
||||||
/// <para>Implementations live next to this file in
|
|
||||||
/// platform-conditional source files:
|
|
||||||
/// <c>UserDirectory.Desktop.cs</c> and
|
|
||||||
/// <c>UserDirectory.Mobile.cs</c>. Both currently delegate to
|
|
||||||
/// <c>UserSearchClient</c> (the central <c>/api/user-search</c>
|
|
||||||
/// endpoint); the split exists so future platform-specific
|
|
||||||
/// sources (offline cache, directory-scoped providers) can be
|
|
||||||
/// plugged in without disturbing the consumer.</para>
|
|
||||||
/// </summary>
|
|
||||||
public interface IUserDirectory
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Search the directory by display name (substring) and/or
|
|
||||||
/// email (exact).
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="query">Substring filter on the user's
|
|
||||||
/// display name. Empty or whitespace short-circuits to an
|
|
||||||
/// empty list (matches the client UX of "type to search",
|
|
||||||
/// not "show me a directory").</param>
|
|
||||||
/// <param name="ct">Cancellation token.</param>
|
|
||||||
/// <returns>A flat list of matching directory entries.
|
|
||||||
/// Never null; may be empty.</returns>
|
|
||||||
Task<IReadOnlyList<UserSummary>> SearchAsync(string query, CancellationToken ct = default);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Platform-neutral summary of a Yavsc directory entry. Mirrors
|
|
||||||
/// the wire shape of <c>/api/user-search</c> (see
|
|
||||||
/// <c>UserSearchResultDto</c>) but expressed in terms that
|
|
||||||
/// don't leak transport concerns.
|
|
||||||
///
|
|
||||||
/// <para>Kept as a record on purpose: directory entries are
|
|
||||||
/// immutable snapshots from the server, so structural equality
|
|
||||||
/// makes "did the user already pick this one?" trivial.</para>
|
|
||||||
/// </summary>
|
|
||||||
public sealed record UserSummary(
|
|
||||||
string Id,
|
|
||||||
string UserName,
|
|
||||||
string? FullName,
|
|
||||||
string? Avatar,
|
|
||||||
string? Email)
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Convenience for "what to show in a picker". Falls back
|
|
||||||
/// to <see cref="UserName"/> when <see cref="FullName"/>
|
|
||||||
/// is null or empty.
|
|
||||||
/// </summary>
|
|
||||||
public string DisplayName =>
|
|
||||||
string.IsNullOrWhiteSpace(FullName) ? UserName : FullName;
|
|
||||||
}
|
|
||||||
|
|
@ -12,7 +12,7 @@ namespace PostIt.Services;
|
||||||
/// The set is deliberately small: each value is a milestone an
|
/// The set is deliberately small: each value is a milestone an
|
||||||
/// operator can grep for in logs / StatusMessage, not a heartbeat.
|
/// operator can grep for in logs / StatusMessage, not a heartbeat.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum OIDCLoginPhase
|
public enum OidcLoginPhase
|
||||||
{
|
{
|
||||||
/// <summary>No login in flight (or login has settled).</summary>
|
/// <summary>No login in flight (or login has settled).</summary>
|
||||||
Idle,
|
Idle,
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ namespace PostIt.Services;
|
||||||
/// Authorization Code + PKCE flow. The shared <c>PostIt</c> library does
|
/// Authorization Code + PKCE flow. The shared <c>PostIt</c> library does
|
||||||
/// not reference any UI framework; platform projects (PostIt.Android,
|
/// not reference any UI framework; platform projects (PostIt.Android,
|
||||||
/// PostIt.Desktop, PostIt.Browser) populate this class once at startup so
|
/// PostIt.Desktop, PostIt.Browser) populate this class once at startup so
|
||||||
/// the shared OIDC login path can drive a native browser without taking
|
/// the shared <c>LoginPageViewModel</c> can drive a native browser without
|
||||||
/// a hard dependency on any specific UI toolkit.
|
/// taking a hard dependency on any specific UI toolkit.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class Platform
|
public static class Platform
|
||||||
{
|
{
|
||||||
|
|
@ -21,14 +21,14 @@ public static class Platform
|
||||||
/// override this property at startup (e.g. PostIt.Android sets
|
/// override this property at startup (e.g. PostIt.Android sets
|
||||||
/// it to <c>android://postit-signin</c>).
|
/// it to <c>android://postit-signin</c>).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string RedirectUri = "postit://callback";
|
public static string DefaultRedirectUri { get; set; } = "postit://callback";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
|
/// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
|
||||||
/// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
|
/// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
|
||||||
/// that want to register their own scheme.
|
/// that want to register their own scheme.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string CustomScheme = "postit";
|
public static string CustomScheme { get; set; } = "postit";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constructs a fresh <see cref="IBrowser"/> for the running platform.
|
/// Constructs a fresh <see cref="IBrowser"/> for the running platform.
|
||||||
|
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
#if !ANDROID && !IOS
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Desktop implementation of <see cref="IUserDirectory"/>.
|
|
||||||
/// Delegates to the central <c>/api/user-search</c> endpoint
|
|
||||||
/// via <see cref="UserSearchClient"/>.
|
|
||||||
///
|
|
||||||
/// <para>The desktop has no device-local address book, so the
|
|
||||||
/// "add to a circle" flow on desktop is Yavsc-users-only.
|
|
||||||
/// Inviting someone who doesn't have a Yavsc account from
|
|
||||||
/// desktop is a separate feature (manual email entry +
|
|
||||||
/// invitation endpoint) and lives outside this interface.</para>
|
|
||||||
/// </summary>
|
|
||||||
public sealed class UserDirectory : IUserDirectory
|
|
||||||
{
|
|
||||||
private readonly UserSearchClient _client;
|
|
||||||
|
|
||||||
public UserDirectory(UserSearchClient client)
|
|
||||||
{
|
|
||||||
_client = client ?? throw new ArgumentNullException(nameof(client));
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IReadOnlyList<UserSummary>> SearchAsync(
|
|
||||||
string query, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
// UserSearchClient already short-circuits on empty
|
|
||||||
// queries, but do it here too so the contract is
|
|
||||||
// obvious to anyone reading IUserDirectory alone
|
|
||||||
// without having to chase the client wrapper.
|
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
|
||||||
return Array.Empty<UserSummary>();
|
|
||||||
|
|
||||||
var results = await _client.SearchAsync(query: query, ct: ct).ConfigureAwait(false);
|
|
||||||
if (results is null) return Array.Empty<UserSummary>();
|
|
||||||
|
|
||||||
return results.Select(u => new UserSummary(
|
|
||||||
Id: u.Id,
|
|
||||||
UserName: u.UserName,
|
|
||||||
FullName: u.FullName,
|
|
||||||
Avatar: u.Avatar,
|
|
||||||
Email: u.Email)).ToList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
#if ANDROID || IOS
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Services;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Mobile implementation of <see cref="IUserDirectory"/>.
|
|
||||||
/// Same backing as the desktop provider (the central
|
|
||||||
/// <c>/api/user-search</c> endpoint via
|
|
||||||
/// <see cref="UserSearchClient"/>) — mobile devices have the
|
|
||||||
/// network too, and "add to a circle" needs the same directory
|
|
||||||
/// regardless of platform.
|
|
||||||
///
|
|
||||||
/// <para>The split exists so a future mobile-only provider
|
|
||||||
/// (offline cache, device-local mirror of the user's own
|
|
||||||
/// circles) can be plugged in without touching consumers.</para>
|
|
||||||
/// </summary>
|
|
||||||
public sealed class UserDirectory : IUserDirectory
|
|
||||||
{
|
|
||||||
private readonly UserSearchClient _client;
|
|
||||||
|
|
||||||
public UserDirectory(UserSearchClient client)
|
|
||||||
{
|
|
||||||
_client = client ?? throw new ArgumentNullException(nameof(client));
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IReadOnlyList<UserSummary>> SearchAsync(
|
|
||||||
string query, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
|
||||||
return Array.Empty<UserSummary>();
|
|
||||||
|
|
||||||
var results = await _client.SearchAsync(query: query, ct: ct).ConfigureAwait(false);
|
|
||||||
if (results is null) return Array.Empty<UserSummary>();
|
|
||||||
|
|
||||||
return results.Select(u => new UserSummary(
|
|
||||||
Id: u.Id,
|
|
||||||
UserName: u.UserName,
|
|
||||||
FullName: u.FullName,
|
|
||||||
Avatar: u.Avatar,
|
|
||||||
Email: u.Email)).ToList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
@ -3,12 +3,11 @@ using System.Net;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using System.Net.Http.Json;
|
using System.Net.Http.Json;
|
||||||
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using IdentityModel.OidcClient;
|
using IdentityModel.OidcClient;
|
||||||
using PostIt.ViewModels;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.Services;
|
namespace PostIt.Services;
|
||||||
|
|
||||||
|
|
@ -24,16 +23,16 @@ namespace PostIt.Services;
|
||||||
/// <see cref="BearerTokenHandler"/> only refreshes once even if many
|
/// <see cref="BearerTokenHandler"/> only refreshes once even if many
|
||||||
/// concurrent requests are in flight.
|
/// concurrent requests are in flight.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
public class YavscApiClient : IAsyncDisposable
|
||||||
{
|
{
|
||||||
// 60s of slack before the access_token's nominal expiry. Covers
|
// 60s of slack before the access_token's nominal expiry. Covers
|
||||||
// network latency + JWT validation on the server side.
|
// network latency + JWT validation on the server side.
|
||||||
private static readonly TimeSpan RefreshSkew = TimeSpan.FromSeconds(60);
|
private static readonly TimeSpan RefreshSkew = TimeSpan.FromSeconds(60);
|
||||||
|
|
||||||
public Settings Settings { get; }
|
private readonly Settings _settings;
|
||||||
private readonly OidcClient _oidc;
|
private readonly OidcClient _oidc;
|
||||||
private readonly TokenStore _store;
|
private readonly TokenStore _store;
|
||||||
public HttpClient Http { get; }
|
private readonly HttpClient _http;
|
||||||
private readonly BearerTokenHandler _bearer;
|
private readonly BearerTokenHandler _bearer;
|
||||||
private readonly SemaphoreSlim _refreshGate = new(1, 1);
|
private readonly SemaphoreSlim _refreshGate = new(1, 1);
|
||||||
|
|
||||||
|
|
@ -41,19 +40,24 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
|
|
||||||
public YavscApiClient(Settings settings, TokenStore store, OidcClient? oidc = null)
|
public YavscApiClient(Settings settings, TokenStore store, OidcClient? oidc = null)
|
||||||
{
|
{
|
||||||
Settings = settings;
|
_settings = settings;
|
||||||
_store = store;
|
_store = store;
|
||||||
_oidc = oidc ?? new OidcClient(settings.GetOidcClientOptions());
|
_oidc = oidc ?? new OidcClient(settings.GetOidcClientOptions());
|
||||||
|
|
||||||
_bearer = new BearerTokenHandler(this);
|
_bearer = new BearerTokenHandler(this);
|
||||||
Http = new HttpClient(_bearer, disposeHandler: true);
|
_http = new HttpClient(_bearer, disposeHandler: true)
|
||||||
|
{
|
||||||
|
// ApiUrl is e.g. "https://blogs.pschneider.fr/api/v1/" — keep the
|
||||||
|
// trailing slash so relative paths ("posts") resolve correctly.
|
||||||
|
BaseAddress = new Uri(settings.ApiUrl)
|
||||||
|
};
|
||||||
|
|
||||||
_tokens = store.Load();
|
_tokens = store.Load();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// True if a non-expired access token (or a refreshable bundle) is
|
/// True if a non-expired access token (or a refreshable bundle) is
|
||||||
/// already in memory. UI uses this to skip the login flow on warm
|
/// already in memory. UI uses this to skip the LoginPage on warm
|
||||||
/// starts.
|
/// starts.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool HasValidSession
|
public bool HasValidSession
|
||||||
|
|
@ -70,9 +74,9 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The current access token, or null if no session is active.
|
/// The current access token, or null if no session is active.
|
||||||
/// Surfaced so consumers (e.g. <c>HomePage</c>) can mirror it onto
|
/// Surfaced so the LoginPageViewModel can mirror it onto its own
|
||||||
/// their own observable properties and so the OIDC id_token / claims
|
/// observable property (and so the OIDC id_token / claims can be
|
||||||
/// can be shown in the UI.
|
/// shown in the UI).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? CurrentAccessToken => _tokens?.AccessToken;
|
public string? CurrentAccessToken => _tokens?.AccessToken;
|
||||||
|
|
||||||
|
|
@ -83,21 +87,23 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
/// <param name="progress">Optional sink for the discrete phases of
|
/// <param name="progress">Optional sink for the discrete phases of
|
||||||
/// the flow; the UI uses this to render a debug-friendly status
|
/// the flow; the UI uses this to render a debug-friendly status
|
||||||
/// (Discovering → OpeningBrowser → AwaitingCallback → ExchangingCode
|
/// (Discovering → OpeningBrowser → AwaitingCallback → ExchangingCode
|
||||||
/// → Success / Error).</param>
|
/// → Success / Error). The same caller can also rely on
|
||||||
|
/// <see cref="LoginPageViewModel.StatusMessage"/> for the human
|
||||||
|
/// text (URLs, error detail).</param>
|
||||||
public async Task LoginInteractiveAsync(
|
public async Task LoginInteractiveAsync(
|
||||||
IProgress<OIDCLoginPhase>? progress = null,
|
IProgress<OidcLoginPhase>? progress = null,
|
||||||
CancellationToken ct = default)
|
CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Discovering);
|
progress?.Report(OidcLoginPhase.Discovering);
|
||||||
|
|
||||||
var browser = Platform.CreateBrowser?.Invoke();
|
var browser = Platform.CreateBrowser?.Invoke();
|
||||||
if (browser is null)
|
if (browser is null)
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Error);
|
progress?.Report(OidcLoginPhase.Error);
|
||||||
throw new InvalidOperationException("No browser is available on this platform.");
|
throw new InvalidOperationException("No browser is available on this platform.");
|
||||||
}
|
}
|
||||||
|
|
||||||
var client = new OidcClient(Settings.GetOidcClientOptions(browser));
|
var client = new OidcClient(_settings.GetOidcClientOptions(browser));
|
||||||
|
|
||||||
// OidcClient.LoginAsync builds the authorize URL, calls
|
// OidcClient.LoginAsync builds the authorize URL, calls
|
||||||
// IBrowser.InvokeAsync (which on desktop hands the user off
|
// IBrowser.InvokeAsync (which on desktop hands the user off
|
||||||
|
|
@ -108,20 +114,20 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
// the moment we ask the browser to open (covers the entire
|
// the moment we ask the browser to open (covers the entire
|
||||||
// user-driven window including the AwaitingCallback wait), and
|
// user-driven window including the AwaitingCallback wait), and
|
||||||
// the moment we trade the code for tokens.
|
// the moment we trade the code for tokens.
|
||||||
progress?.Report(OIDCLoginPhase.OpeningBrowser);
|
progress?.Report(OidcLoginPhase.OpeningBrowser);
|
||||||
var result = await client.LoginAsync(new LoginRequest(), ct).ConfigureAwait(false);
|
var result = await client.LoginAsync(new LoginRequest(), ct).ConfigureAwait(false);
|
||||||
|
|
||||||
if (result.IsError)
|
if (result.IsError)
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Error);
|
progress?.Report(OidcLoginPhase.Error);
|
||||||
throw new InvalidOperationException($"OIDC login failed: {result.Error}");
|
throw new InvalidOperationException($"OIDC login failed: {result.Error}");
|
||||||
}
|
}
|
||||||
|
|
||||||
progress?.Report(OIDCLoginPhase.ExchangingCode);
|
progress?.Report(OidcLoginPhase.ExchangingCode);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(result.RefreshToken))
|
if (string.IsNullOrEmpty(result.RefreshToken))
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Error);
|
progress?.Report(OidcLoginPhase.Error);
|
||||||
throw new InvalidOperationException(
|
throw new InvalidOperationException(
|
||||||
"Missing refresh_token — vérifie le scope 'offline_access'.");
|
"Missing refresh_token — vérifie le scope 'offline_access'.");
|
||||||
}
|
}
|
||||||
|
|
@ -133,7 +139,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
IdToken: result.IdentityToken);
|
IdToken: result.IdentityToken);
|
||||||
|
|
||||||
_store.Save(_tokens);
|
_store.Save(_tokens);
|
||||||
progress?.Report(OIDCLoginPhase.Success);
|
progress?.Report(OidcLoginPhase.Success);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -146,7 +152,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
/// phase and returns false so the UI can keep going.
|
/// phase and returns false so the UI can keep going.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public async Task<bool> TrySilentLoginAsync(
|
public async Task<bool> TrySilentLoginAsync(
|
||||||
IProgress<OIDCLoginPhase>? progress = null,
|
IProgress<OidcLoginPhase>? progress = null,
|
||||||
CancellationToken ct = default)
|
CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
if (!HasValidSession) return false;
|
if (!HasValidSession) return false;
|
||||||
|
|
@ -155,7 +161,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
// Access token still has plenty of life — nothing to do.
|
// Access token still has plenty of life — nothing to do.
|
||||||
if (_tokens.AccessTokenExpiresAt - DateTimeOffset.UtcNow > RefreshSkew)
|
if (_tokens.AccessTokenExpiresAt - DateTimeOffset.UtcNow > RefreshSkew)
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Success);
|
progress?.Report(OidcLoginPhase.Success);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -166,19 +172,19 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
// the user back to the login page.
|
// the user back to the login page.
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.ExchangingCode);
|
progress?.Report(OidcLoginPhase.ExchangingCode);
|
||||||
await ForceRefreshAsync(ct).ConfigureAwait(false);
|
await ForceRefreshAsync(ct).ConfigureAwait(false);
|
||||||
progress?.Report(OIDCLoginPhase.Success);
|
progress?.Report(OidcLoginPhase.Success);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
catch (RefreshFailedException)
|
catch (RefreshFailedException)
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Idle);
|
progress?.Report(OidcLoginPhase.Idle);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
progress?.Report(OIDCLoginPhase.Idle);
|
progress?.Report(OidcLoginPhase.Idle);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -191,7 +197,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
CancellationToken ct = default)
|
CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
|
using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
|
||||||
await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
|
response.EnsureSuccessStatusCode();
|
||||||
|
|
||||||
var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
|
var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
|
||||||
var dto = await JsonSerializer.DeserializeAsync<T>(stream,
|
var dto = await JsonSerializer.DeserializeAsync<T>(stream,
|
||||||
|
|
@ -199,16 +205,6 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
return dto!;
|
return dto!;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Call a JSON endpoint with no request body while still allowing a
|
|
||||||
/// positional cancellation token argument.
|
|
||||||
/// </summary>
|
|
||||||
public Task<T> CallAsync<T>(
|
|
||||||
HttpMethod method,
|
|
||||||
string path,
|
|
||||||
CancellationToken ct)
|
|
||||||
=> CallAsync<T>(method, path, body: null, ct);
|
|
||||||
|
|
||||||
/// <summary>Call an endpoint that returns no useful body (DELETE, etc.).</summary>
|
/// <summary>Call an endpoint that returns no useful body (DELETE, etc.).</summary>
|
||||||
public async Task CallAsync(
|
public async Task CallAsync(
|
||||||
HttpMethod method,
|
HttpMethod method,
|
||||||
|
|
@ -217,19 +213,9 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
CancellationToken ct = default)
|
CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
|
using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
|
||||||
await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
|
response.EnsureSuccessStatusCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Call an endpoint with no request body while still allowing a
|
|
||||||
/// positional cancellation token argument.
|
|
||||||
/// </summary>
|
|
||||||
public Task CallAsync(
|
|
||||||
HttpMethod method,
|
|
||||||
string path,
|
|
||||||
CancellationToken ct)
|
|
||||||
=> CallAsync(method, path, body: null, ct);
|
|
||||||
|
|
||||||
private async Task<HttpResponseMessage> SendAsync(
|
private async Task<HttpResponseMessage> SendAsync(
|
||||||
HttpMethod method, string path, object? body, CancellationToken ct)
|
HttpMethod method, string path, object? body, CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
|
@ -241,7 +227,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
using var req = new HttpRequestMessage(method, path);
|
using var req = new HttpRequestMessage(method, path);
|
||||||
if (body is not null)
|
if (body is not null)
|
||||||
req.Content = JsonContent.Create(body);
|
req.Content = JsonContent.Create(body);
|
||||||
var response = await Http.SendAsync(req, ct).ConfigureAwait(false);
|
var response = await _http.SendAsync(req, ct).ConfigureAwait(false);
|
||||||
|
|
||||||
if (response.StatusCode == HttpStatusCode.Unauthorized)
|
if (response.StatusCode == HttpStatusCode.Unauthorized)
|
||||||
{
|
{
|
||||||
|
|
@ -253,54 +239,12 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
using var retry = new HttpRequestMessage(method, path);
|
using var retry = new HttpRequestMessage(method, path);
|
||||||
if (body is not null)
|
if (body is not null)
|
||||||
retry.Content = JsonContent.Create(body);
|
retry.Content = JsonContent.Create(body);
|
||||||
response = await Http.SendAsync(retry, ct).ConfigureAwait(false);
|
response = await _http.SendAsync(retry, ct).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Replaces the bare <c>response.EnsureSuccessStatusCode()</c>
|
|
||||||
/// call site with one that surfaces the response body in the
|
|
||||||
/// thrown exception. The default behaviour truncates the
|
|
||||||
/// diagnostic to "Response status code does not indicate
|
|
||||||
/// success: 400 (Bad Request)." — useless when the server is
|
|
||||||
/// an ASP.NET Core action returning a <c>ProblemDetails</c>
|
|
||||||
/// that names the field that failed ModelState validation.
|
|
||||||
/// The VM's <c>catch (Exception ex)</c> in
|
|
||||||
/// <c>MainPageViewModel.ExecuteAsync</c> shows
|
|
||||||
/// <c>ex.Message</c> on the status bar, so embedding the body
|
|
||||||
/// here is enough to make the next "click Save" self-explanatory
|
|
||||||
/// (e.g. <i>"Error: 400 — The Title field is required."</i>).
|
|
||||||
/// </summary>
|
|
||||||
private static async Task EnsureSuccessOrThrowAsync(HttpResponseMessage response, CancellationToken ct)
|
|
||||||
{
|
|
||||||
if (response.IsSuccessStatusCode) return;
|
|
||||||
|
|
||||||
// Read the body before throwing; once the response is
|
|
||||||
// disposed, the stream is gone. We bound the read to a few
|
|
||||||
// KB so a hostile server can't make us buffer megabytes
|
|
||||||
// just to format an error message.
|
|
||||||
string body = string.Empty;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var raw = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
|
|
||||||
if (!string.IsNullOrWhiteSpace(raw))
|
|
||||||
{
|
|
||||||
body = raw.Length > 1024 ? raw[..1024] + "…" : raw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
// Body unreadable: fall back to the default message.
|
|
||||||
}
|
|
||||||
|
|
||||||
var msg = body.Length > 0
|
|
||||||
? $"{(int)response.StatusCode} {response.ReasonPhrase}: {body}"
|
|
||||||
: $"{(int)response.StatusCode} {response.ReasonPhrase}";
|
|
||||||
throw new HttpRequestException(msg, inner: null, statusCode: response.StatusCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Lock the refresh path so concurrent callers don't each rotate
|
/// Lock the refresh path so concurrent callers don't each rotate
|
||||||
/// the refresh token (which Auth0 invalidates on first use).
|
/// the refresh token (which Auth0 invalidates on first use).
|
||||||
|
|
@ -362,7 +306,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
||||||
|
|
||||||
public ValueTask DisposeAsync()
|
public ValueTask DisposeAsync()
|
||||||
{
|
{
|
||||||
Http.Dispose();
|
_http.Dispose();
|
||||||
_refreshGate.Dispose();
|
_refreshGate.Dispose();
|
||||||
return ValueTask.CompletedTask;
|
return ValueTask.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,8 @@
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
using System;
|
using System;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
public partial class AuthenticationSettings : ObservableObject
|
public partial class AuthenticationSettings : ObservableObject
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Default custom-scheme redirect URI on Desktop. The OS routes the
|
|
||||||
/// callback to the running PostIt instance via the named-pipe
|
|
||||||
/// hand-off in <see cref="PostIt.Services.SingleInstance"/>
|
|
||||||
/// (RFC 8252 §7.1). Production Desktop builds use this.
|
|
||||||
/// </summary>
|
|
||||||
public const string DesktopRedirectUri = "postit://callback";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
|
||||||
/// in <c>PostIt.Android/Properties/AndroidManifest.xml</c> must match.
|
|
||||||
/// </summary>
|
|
||||||
public const string AndroidRedirectUri = "android://postit-signin";
|
|
||||||
|
|
||||||
public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr";
|
|
||||||
|
|
||||||
public static string DefaultClientId { get; internal set; } = "postit";
|
|
||||||
|
|
||||||
public static string[] DefaultScopes { get; set; } = { "blogs"} ;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string Authority { get; set; }
|
public partial string Authority { get; set; }
|
||||||
|
|
@ -30,100 +10,4 @@ public partial class AuthenticationSettings : ObservableObject
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string ClientId { get; set; }
|
public partial string ClientId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string[] Scopes { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// OAuth redirect URI. Defaults to <see cref="DesktopRedirectUri"/>
|
|
||||||
/// (custom URI scheme) which is the right answer for desktop
|
|
||||||
/// production builds. Mobile platforms must set this to
|
|
||||||
/// <see cref="AndroidRedirectUri"/> before calling <c>LoginAsync</c>.
|
|
||||||
/// </summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string RedirectUri { get; set; }
|
|
||||||
#if ANDROID
|
|
||||||
= AndroidRedirectUri;
|
|
||||||
#else
|
|
||||||
= DesktopRedirectUri;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Space-separated view of <see cref="Scopes"/>. Exists for the
|
|
||||||
/// <c>SettingsPage</c> TextBox binding — a <c>string[]</c> does not
|
|
||||||
/// round-trip through XAML binding to <c>TextBox.Text</c>, so we
|
|
||||||
/// expose the array as a string here and re-parse on assignment.
|
|
||||||
/// <para>
|
|
||||||
/// <c>[JsonIgnore]</c> on purpose: <see cref="Scopes"/> is the
|
|
||||||
/// persisted shape (matches the on-disk format in
|
|
||||||
/// <c>postit-settings.json</c> and the runtime contract in
|
|
||||||
/// <see cref="PostIt.ViewModels.Settings.GetOidcClientOptions"/>).
|
|
||||||
/// Writing this property back to disk would duplicate the
|
|
||||||
/// information and confuse the deserializer.
|
|
||||||
/// </para>
|
|
||||||
/// </summary>
|
|
||||||
[JsonIgnore]
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string ScopeListText { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Refresh <see cref="ScopeListText"/> from <see cref="Scopes"/> so
|
|
||||||
/// the TextBox shows the current persisted state after a Load().
|
|
||||||
/// Called from <c>Settings.ApplyJson</c> on each disk / embedded
|
|
||||||
/// hydration; the source generator's <c>OnScopesChanged</c> partial
|
|
||||||
/// below keeps the two in sync in the other direction (edits made
|
|
||||||
/// in the TextBox).
|
|
||||||
/// </summary>
|
|
||||||
public void RefreshScopeListText()
|
|
||||||
{
|
|
||||||
ScopeListText = Scopes is null ? string.Empty : string.Join(' ', Scopes);
|
|
||||||
}
|
|
||||||
|
|
||||||
partial void OnScopeListTextChanged(string value)
|
|
||||||
{
|
|
||||||
if (Scopes is null)
|
|
||||||
{
|
|
||||||
Scopes = Array.Empty<string>();
|
|
||||||
}
|
|
||||||
// Split on any whitespace, drop empties. Matches what
|
|
||||||
// string.Join(' ', Scopes) produces when Scopes is null-free,
|
|
||||||
// so a round-trip (Display → Edit → Display) is lossless
|
|
||||||
// for sane inputs.
|
|
||||||
var parts = value?.Split(
|
|
||||||
new[] { ' ', '\t', '\n', '\r' },
|
|
||||||
StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
|
|
||||||
|
|
||||||
// Skip the write if the parsed array is equal to the current
|
|
||||||
// one — avoids a PropertyChanged loop between OnScopesChanged
|
|
||||||
// and OnScopeListTextChanged when RefreshScopeListText runs.
|
|
||||||
if (Scopes is not null && Scopes.Length == parts.Length)
|
|
||||||
{
|
|
||||||
var same = true;
|
|
||||||
for (var i = 0; i < parts.Length; i++)
|
|
||||||
{
|
|
||||||
if (!string.Equals(Scopes[i], parts[i], StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
same = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (same) return;
|
|
||||||
}
|
|
||||||
Scopes = parts;
|
|
||||||
}
|
|
||||||
|
|
||||||
partial void OnScopesChanged(string[] value)
|
|
||||||
{
|
|
||||||
// Keep ScopeListText in sync when Scopes is reassigned from
|
|
||||||
// outside (JSON hydration, MergeScopes, programmatic
|
|
||||||
// updates). Compute the new value and only fire if it
|
|
||||||
// differs from what's already shown, otherwise the TextBox
|
|
||||||
// would briefly flicker / re-set the caret on every load.
|
|
||||||
var newText = value is null ? string.Empty : string.Join(' ', value);
|
|
||||||
if (!string.Equals(ScopeListText, newText, StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
ScopeListText = newText;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
207
src/PostIt/PostIt/Settings/Settings.cs
Normal file
207
src/PostIt/PostIt/Settings/Settings.cs
Normal file
|
|
@ -0,0 +1,207 @@
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Avalonia;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Platform.Storage;
|
||||||
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
|
using IdentityModel.OidcClient;
|
||||||
|
using PostIt.Services;
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
[assembly: InternalsVisibleTo("PostIt.Tests")]
|
||||||
|
|
||||||
|
namespace PostIt;
|
||||||
|
|
||||||
|
public partial class Settings : ObservableObject
|
||||||
|
{
|
||||||
|
const string SettingsFileName = "postit-settings.json";
|
||||||
|
IStorageFolder? folder = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Legacy loopback redirect URI. The post-2026.6 production flow
|
||||||
|
/// uses the custom URI scheme (<see cref="DefaultDesktopRedirectUri"/>
|
||||||
|
/// on desktop, <see cref="AndroidRedirectUri"/> on Android) so the
|
||||||
|
/// OS hands the callback to the running instance without a TCP
|
||||||
|
/// listener. The loopback constant stays here so test fixtures
|
||||||
|
/// (which spin up an in-process OidcStubAuthority) keep working,
|
||||||
|
/// but it is no longer used as a default anywhere in production.
|
||||||
|
/// If you are still pointing your production <c>postit-settings.json</c>
|
||||||
|
/// at this URI, switch to <c>postit://callback</c> and remove the
|
||||||
|
/// matching entry from the Yavsc.Org server's allowed redirect URIs.
|
||||||
|
/// </summary>
|
||||||
|
public const string DefaultLoopbackRedirectUri = "http://127.0.0.1:7890/";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
||||||
|
/// in <c>PostIt.Android/Properties/AndroidManifest.xml</c> must match.
|
||||||
|
/// </summary>
|
||||||
|
public const string AndroidRedirectUri = "android://postit-signin";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Default custom-scheme redirect URI on Desktop. The OS routes the
|
||||||
|
/// callback to the running PostIt instance via the named-pipe
|
||||||
|
/// hand-off in <see cref="PostIt.Services.SingleInstance"/>
|
||||||
|
/// (RFC 8252 §7.1). Production Desktop builds use this.
|
||||||
|
/// </summary>
|
||||||
|
public const string DefaultDesktopRedirectUri = "postit://callback";
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
public partial AuthenticationSettings Authentication { get; set; } = new();
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
public partial bool DarkMode { get; set; } = false;
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
public partial string ApiUrl { get; set; } = "https://blogs.pschneider.fr/api/v1/";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// OAuth redirect URI. Defaults to <see cref="DefaultDesktopRedirectUri"/>
|
||||||
|
/// (custom URI scheme) which is the right answer for desktop
|
||||||
|
/// production builds. Mobile platforms must set this to
|
||||||
|
/// <see cref="AndroidRedirectUri"/> before calling <c>LoginAsync</c>.
|
||||||
|
/// </summary>
|
||||||
|
[ObservableProperty]
|
||||||
|
public partial string RedirectUri { get; set; } = DefaultDesktopRedirectUri;
|
||||||
|
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
public partial string[] Scopes { get; set; }
|
||||||
|
public bool Loaded { get; private set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Build OidcClient options configured for Authorization Code + PKCE
|
||||||
|
/// (no client secret). The browser implementation should be supplied
|
||||||
|
/// per-platform by the caller.
|
||||||
|
/// </summary>
|
||||||
|
internal OidcClientOptions GetOidcClientOptions(IdentityModel.OidcClient.Browser.IBrowser? browser = null)
|
||||||
|
{
|
||||||
|
if (!Loaded) Load();
|
||||||
|
var options = new OidcClientOptions
|
||||||
|
{
|
||||||
|
Authority = Authentication.Authority,
|
||||||
|
ClientId = Authentication.ClientId,
|
||||||
|
RedirectUri = RedirectUri,
|
||||||
|
Scope = string.Join(' ', this.Scopes),
|
||||||
|
TokenClientCredentialStyle = IdentityModel.Client.ClientCredentialStyle.PostBody,
|
||||||
|
PostLogoutRedirectUri = "https//yavsc.pschneider.fr",
|
||||||
|
// PKCE is enabled by default when no client_secret is provided.
|
||||||
|
};
|
||||||
|
|
||||||
|
if (browser is not null)
|
||||||
|
options.Browser = browser;
|
||||||
|
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal void Load()
|
||||||
|
{
|
||||||
|
if (Loaded) return;
|
||||||
|
|
||||||
|
// Trust an already-populated Authority: tests pre-fill Settings
|
||||||
|
// with the OIDC stub's random loopback port, and programmatic
|
||||||
|
// callers (CLI flags, integration tests) wire their own. If we
|
||||||
|
// fall through to the disk / embedded read here we'd silently
|
||||||
|
// overwrite their value with the bundled default
|
||||||
|
// (yavsc.pschneider.fr), break the stubbed discovery URL, and
|
||||||
|
// turn a passing login into an invalid_grant.
|
||||||
|
if (!string.IsNullOrWhiteSpace(Authentication?.Authority))
|
||||||
|
{
|
||||||
|
Loaded = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
string configDir = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"PostIt"
|
||||||
|
);
|
||||||
|
Directory.CreateDirectory(configDir);
|
||||||
|
|
||||||
|
string configPath = Path.Combine(configDir, SettingsFileName);
|
||||||
|
|
||||||
|
FileInfo configFileInfo = new FileInfo(configPath);
|
||||||
|
|
||||||
|
if (!configFileInfo.Exists)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Settings file not found at {configFileInfo.FullName}");
|
||||||
|
// No user-level config: fall back to the embedded default.
|
||||||
|
// We only get here when Authentication.Authority is empty
|
||||||
|
// (the early-return above) so the redundant guard is gone.
|
||||||
|
if (!TryLoadEmbeddedFallback())
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("🩎 No embedded default settings; running with empty configuration.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"🔎 Loading settings from {configFileInfo.FullName}");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Synchronous read on purpose: Settings.Load() is called from
|
||||||
|
// synchronous startup paths (App.axaml.cs, ViewModel ctors,
|
||||||
|
// tests) and bridging to async here with .Wait() / .GetAwaiter()
|
||||||
|
// .GetResult() deadlocks the Avalonia UI thread because the
|
||||||
|
// continuation can't resume on the same thread. The settings
|
||||||
|
// file is a few KiB at most; async I/O gains nothing here.
|
||||||
|
using var stream = configFileInfo.OpenRead();
|
||||||
|
using var reader = new StreamReader(stream);
|
||||||
|
var json = reader.ReadToEnd();
|
||||||
|
ApplyJson(json, $"user file {configFileInfo.FullName}");
|
||||||
|
Loaded = true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Error loading settings: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool TryLoadEmbeddedFallback()
|
||||||
|
{
|
||||||
|
const string ResourceName = "PostIt.postit-settings.json";
|
||||||
|
var assembly = typeof(Settings).Assembly;
|
||||||
|
using var stream = assembly.GetManifestResourceStream(ResourceName);
|
||||||
|
if (stream is null)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Embedded resource {ResourceName} not found.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
using var reader = new StreamReader(stream);
|
||||||
|
var json = reader.ReadToEnd();
|
||||||
|
if (string.IsNullOrWhiteSpace(json))
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("🩎 Embedded settings resource is empty.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Console.WriteLine($"🔎 Loading embedded default settings ({ResourceName}).");
|
||||||
|
ApplyJson(json, $"embedded resource {ResourceName}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ApplyJson(string json, string source)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(json))
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Settings payload is empty (source: {source}).");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var settings = JsonSerializer.Deserialize<Settings>(json);
|
||||||
|
if (settings is null)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Settings payload is invalid (source: {source}).");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.Authentication = settings.Authentication;
|
||||||
|
this.DarkMode = settings.DarkMode;
|
||||||
|
this.ApiUrl = settings.ApiUrl;
|
||||||
|
this.RedirectUri = string.IsNullOrWhiteSpace(settings.RedirectUri) ? DefaultDesktopRedirectUri : settings.RedirectUri;
|
||||||
|
this.Scopes = settings.Scopes;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine($"🩎 Error applying settings from {source}: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -11,42 +11,27 @@ namespace PostIt;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Given a view model, returns the corresponding view if possible.
|
/// Given a view model, returns the corresponding view if possible.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[RequiresUnreferencedCode(
|
|
||||||
"Default implementation of ViewLocator involves reflection which may be trimmed away.",
|
|
||||||
Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
|
|
||||||
public class ViewLocator : IDataTemplate
|
public class ViewLocator : IDataTemplate
|
||||||
{
|
{
|
||||||
|
private readonly IServiceProvider _services;
|
||||||
|
|
||||||
public Control Build(object? data)
|
public ViewLocator(IServiceProvider services)
|
||||||
{
|
{
|
||||||
try
|
_services = services;
|
||||||
{
|
|
||||||
return BuildCore(data);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return new TextBlock { Text = $"ViewLocator threw: {ex}" };
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Control Build(object data)
|
||||||
private Control BuildCore(object? data)
|
|
||||||
{
|
{
|
||||||
var app = App.Current as App;
|
|
||||||
var services = app!.ServiceProvider!;
|
|
||||||
return data switch
|
return data switch
|
||||||
{
|
{
|
||||||
MainViewModel => services.GetRequiredService<MainPage>(),
|
MainPageViewModel => _services.GetRequiredService<MainPage>(),
|
||||||
Settings => services.GetRequiredService<SettingsPage>(),
|
SettingsPageViewModel => _services.GetRequiredService<SettingsPage>(),
|
||||||
HomePageViewModel => services.GetRequiredService<HomePage>(),
|
LoginPageViewModel => _services.GetRequiredService<LoginPage>(),
|
||||||
SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
|
HomePageViewModel => _services.GetRequiredService<HomePage>(),
|
||||||
AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
|
|
||||||
CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
|
|
||||||
PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
|
|
||||||
null => new TextBlock { Text = "No view for <null>" },
|
|
||||||
_ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
|
_ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Match(object? data) => data is ViewModelBase;
|
public bool Match(object data) => data is ViewModelBase;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,127 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
|
||||||
using CommunityToolkit.Mvvm.Input;
|
|
||||||
using PostIt.Services;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
|
|
||||||
namespace PostIt.ViewModels;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// View model for the "add a Yavsc user to a circle" modal.
|
|
||||||
///
|
|
||||||
/// <para>Resolves users through <see cref="IUserDirectory"/>
|
|
||||||
/// (which delegates to <c>/api/user-search</c>); the caller
|
|
||||||
/// (CirclesPage) decides whether to add the picked user to
|
|
||||||
/// the circle by calling
|
|
||||||
/// <see cref="AddCircleMemberDialogViewModel.AddCommand"/>
|
|
||||||
/// (which is bound to the dialog's "Ajouter" button).</para>
|
|
||||||
///
|
|
||||||
/// <para>The dialog itself doesn't know the target
|
|
||||||
/// <c>CircleId</c>: that's set by the caller via the
|
|
||||||
/// constructor and the dialog only triggers
|
|
||||||
/// <see cref="IUserDirectory.SearchAsync"/> against the
|
|
||||||
/// <see cref="SearchQuery"/> string. The "Add" command
|
|
||||||
/// returns the picked <see cref="UserSummary"/> via the
|
|
||||||
/// <see cref="Confirmed"/> event, and the hosting
|
|
||||||
/// <c>CirclesPage</c> then calls
|
|
||||||
/// <see cref="CircleApiClient.AddMemberAsync"/>.</para>
|
|
||||||
/// </summary>
|
|
||||||
public partial class AddCircleMemberDialogViewModel : ViewModelBase
|
|
||||||
{
|
|
||||||
private readonly IUserDirectory _directory;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string SearchQuery { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial ObservableCollection<UserSummary> Results { get; set; } = new();
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial UserSummary? Selected { get; set; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool IsBusy { get; set; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string StatusMessage { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Raised when the user confirms a selection. The hosting
|
|
||||||
/// <c>CirclesPage</c> subscribes to this event and calls
|
|
||||||
/// <c>CircleApiClient.AddMemberAsync</c> with the target
|
|
||||||
/// circle id + the picked user's id. The dialog itself
|
|
||||||
/// does not know the circle id by design: separation of
|
|
||||||
/// concerns — the modal is a user picker, not a
|
|
||||||
/// "circle joiner" form.
|
|
||||||
/// </summary>
|
|
||||||
public event EventHandler<UserSummary>? Confirmed;
|
|
||||||
|
|
||||||
public AddCircleMemberDialogViewModel(IUserDirectory directory)
|
|
||||||
{
|
|
||||||
_directory = directory ?? throw new ArgumentNullException(nameof(directory));
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Search the directory for users matching the current
|
|
||||||
/// <see cref="SearchQuery"/>. Triggered explicitly via the
|
|
||||||
/// "Rechercher" button — no debouncing, so the caller
|
|
||||||
/// stays in control of how often the network is hit.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task SearchAsync()
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(SearchQuery))
|
|
||||||
{
|
|
||||||
Results.Clear();
|
|
||||||
StatusMessage = "Tapez un nom ou un email";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true);
|
|
||||||
Results = new ObservableCollection<UserSummary>(hits ?? Array.Empty<UserSummary>());
|
|
||||||
StatusMessage = $"{Results.Count} résultat(s)";
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Raise <see cref="Confirmed"/> for the currently selected
|
|
||||||
/// user. No-op when no selection has been made — keeps the
|
|
||||||
/// UI from firing an event with a null payload.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task AddAsync()
|
|
||||||
{
|
|
||||||
if (Selected is null)
|
|
||||||
{
|
|
||||||
StatusMessage = "Sélectionnez un utilisateur";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Confirmed?.Invoke(this, Selected);
|
|
||||||
var app = App.Current as App;
|
|
||||||
await app.GoBackAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task CloseAsync()
|
|
||||||
{
|
|
||||||
var app = App.Current as App;
|
|
||||||
await app.GoBackAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,311 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Avalonia;
|
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
|
||||||
using CommunityToolkit.Mvvm.Input;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Helpers;
|
|
||||||
using PostIt.Services;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using Yavsc.Api.Client.Dtos;
|
|
||||||
|
|
||||||
namespace PostIt.ViewModels;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// View model for the "Mes cercles" page. CRUD on the caller's own
|
|
||||||
/// circles (the server scopes every endpoint to the caller's uid
|
|
||||||
/// since the BlogAcl fix on this branch), plus membership
|
|
||||||
/// management on the currently selected circle.
|
|
||||||
///
|
|
||||||
/// <para>The view lists circles in <see cref="Circles"/>, supports
|
|
||||||
/// create / edit via <see cref="DraftName"/>, and exposes
|
|
||||||
/// per-item Delete and per-item edit commands. <see cref="IsBusy"/>
|
|
||||||
/// drives a progress overlay during API calls; <see cref="StatusMessage"/>
|
|
||||||
/// surfaces success / error feedback in the view footer.</para>
|
|
||||||
///
|
|
||||||
/// <para>When the user selects a circle in the list,
|
|
||||||
/// <see cref="LoadMembersAsync"/> fetches its members into
|
|
||||||
/// <see cref="Members"/>. The "Add a member" command
|
|
||||||
/// (<see cref="OpenAddMemberAsync"/>) is a UI event the view
|
|
||||||
/// raises to open <c>AddCircleMemberDialog</c>; the dialog
|
|
||||||
/// raises a <c>Confirmed</c> event back, which the page's
|
|
||||||
/// code-behind forwards here via
|
|
||||||
/// <see cref="OnAddMemberConfirmedAsync"/>. The "remove"
|
|
||||||
/// command is per-row and runs inline.</para>
|
|
||||||
/// </summary>
|
|
||||||
public partial class CirclesPageViewModel : ViewModelBase
|
|
||||||
{
|
|
||||||
private readonly CircleApiClient _client;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial ObservableCollection<CircleDto> Circles { get; set; } = new();
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial CircleDto? SelectedCircle { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Editor buffer for the new / edited circle's name.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string DraftName { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Editor buffer for the new / edited circle's visibility flag.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool DraftPublic { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Members of the currently selected circle. Empty
|
|
||||||
/// when no circle is selected or after a refresh that
|
|
||||||
/// produced an empty list. Updated by
|
|
||||||
/// <see cref="LoadMembersAsync"/>.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial ObservableCollection<CircleMemberDto> Members { get; set; } = new();
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool IsBusy { get; set; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string StatusMessage { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
|
|
||||||
public CirclesPageViewModel(CircleApiClient client)
|
|
||||||
{
|
|
||||||
_client = client ?? throw new ArgumentNullException(nameof(client));
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Partial property setter: when the selected circle
|
|
||||||
/// changes, refresh the members list. The setter is
|
|
||||||
/// invoked by the [ObservableProperty] source generator
|
|
||||||
/// for both user selections and programmatic resets.
|
|
||||||
/// </summary>
|
|
||||||
partial void OnSelectedCircleChanged(CircleDto? value)
|
|
||||||
{
|
|
||||||
Members = new ObservableCollection<CircleMemberDto>();
|
|
||||||
if (value is not null)
|
|
||||||
{
|
|
||||||
// Fire-and-forget: load members in the background.
|
|
||||||
// Errors are routed to StatusMessage inside
|
|
||||||
// LoadMembersAsync.
|
|
||||||
_ = LoadMembersAsync(value.Id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task RefreshAsync()
|
|
||||||
{
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var list = await _client.GetMyCirclesAsync();
|
|
||||||
Circles = new ObservableCollection<CircleDto>(list ?? new());
|
|
||||||
StatusMessage = $"{Circles.Count} cercle(s)";
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
internal async Task OpenAddMemberAsync()
|
|
||||||
{
|
|
||||||
var app = Application.Current as App;
|
|
||||||
var services = app?.ServiceProvider;
|
|
||||||
var directory = services.GetRequiredService<IUserDirectory>();
|
|
||||||
AddCircleMemberDialogViewModel model =
|
|
||||||
new AddCircleMemberDialogViewModel(directory);
|
|
||||||
// Wire the dialog's Confirmed event to OnAddMemberConfirmedAsync.
|
|
||||||
// Without this, the dialog's "Ajouter" button fires the event
|
|
||||||
// into the void: no subscriber, the picked user is silently
|
|
||||||
// dropped, and nothing is added to the circle. The dialog
|
|
||||||
// stays open until the user uses the back gesture — which is
|
|
||||||
// how the user noticed the button was a no-op.
|
|
||||||
// Async-void is intentional here: Confirmed is an
|
|
||||||
// EventHandler<T> (returns void), and bridging to the
|
|
||||||
// async Task OnAddMemberConfirmedAsync requires it.
|
|
||||||
model.Confirmed += async (_, picked) =>
|
|
||||||
await OnAddMemberConfirmedAsync(_, picked);
|
|
||||||
await app.PushPageAsync(model);
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Load the members of one of the caller's circles. The
|
|
||||||
/// server scopes the endpoint with a 404 when the circle
|
|
||||||
/// doesn't belong to the caller (mirroring the rest of the
|
|
||||||
/// circle API); that case flattens to an empty list here.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task LoadMembersAsync(long circleId)
|
|
||||||
{
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var list = await _client.GetMembersAsync(circleId);
|
|
||||||
Members = new ObservableCollection<CircleMemberDto>(list ?? new());
|
|
||||||
StatusMessage = $"{Members.Count} membre(s)";
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
Members = new ObservableCollection<CircleMemberDto>();
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public void StartCreate()
|
|
||||||
{
|
|
||||||
SelectedCircle = null;
|
|
||||||
DraftName = string.Empty;
|
|
||||||
DraftPublic = false;
|
|
||||||
StatusMessage = "Nouveau cercle";
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public void StartEdit(CircleDto? circle)
|
|
||||||
{
|
|
||||||
if (circle is null) return;
|
|
||||||
SelectedCircle = circle;
|
|
||||||
DraftName = circle.Name;
|
|
||||||
DraftPublic = circle.Public;
|
|
||||||
StatusMessage = $"Édition de « {circle.Name} »";
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task SaveAsync()
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(DraftName))
|
|
||||||
{
|
|
||||||
StatusMessage = "Le nom est obligatoire";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (SelectedCircle is null)
|
|
||||||
{
|
|
||||||
var created = await _client.CreateCircleAsync(new CircleDto
|
|
||||||
{
|
|
||||||
Name = DraftName.Trim(),
|
|
||||||
Public = DraftPublic,
|
|
||||||
});
|
|
||||||
StatusMessage = created is null
|
|
||||||
? "Création échouée"
|
|
||||||
: $"Cercle « {created.Name} » créé";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SelectedCircle.Name = DraftName.Trim();
|
|
||||||
SelectedCircle.Public = DraftPublic;
|
|
||||||
await _client.UpdateCircleAsync(SelectedCircle.Id, SelectedCircle);
|
|
||||||
StatusMessage = $"Cercle « {SelectedCircle.Name} » mis à jour";
|
|
||||||
}
|
|
||||||
await RefreshAsync();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task DeleteAsync(CircleDto? circle)
|
|
||||||
{
|
|
||||||
if (circle is null) return;
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await _client.DeleteCircleAsync(circle.Id);
|
|
||||||
StatusMessage = $"Cercle « {circle.Name} » supprimé";
|
|
||||||
// If the deleted circle was the selected one,
|
|
||||||
// clear the selection so the Members view goes
|
|
||||||
// empty too (the partial setter on
|
|
||||||
// SelectedCircle will reset Members).
|
|
||||||
if (SelectedCircle?.Id == circle.Id)
|
|
||||||
SelectedCircle = null;
|
|
||||||
await RefreshAsync();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Called by the view when the dialog confirms a
|
|
||||||
/// selection. Adds the picked user to the currently
|
|
||||||
/// selected circle and refreshes the members list.
|
|
||||||
/// </summary>
|
|
||||||
public async Task OnAddMemberConfirmedAsync(object? sender, UserSummary picked)
|
|
||||||
{
|
|
||||||
if (SelectedCircle is null || picked is null) return;
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await _client.AddMemberAsync(SelectedCircle.Id, picked.Id);
|
|
||||||
StatusMessage = $"« {picked.DisplayName} » ajouté au cercle";
|
|
||||||
await LoadMembersAsync(SelectedCircle.Id);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
// 409 (already a member) is a likely race — surface
|
|
||||||
// it as a friendly status, not an error. The
|
|
||||||
// server returns 409 for "already a member";
|
|
||||||
// YavscApiClient surfaces that as an exception
|
|
||||||
// today; future refactors could route 409 into a
|
|
||||||
// typed result, but for now the message string is
|
|
||||||
// distinctive enough.
|
|
||||||
var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict")
|
|
||||||
? "Déjà membre du cercle"
|
|
||||||
: $"Erreur: {ex.Message}";
|
|
||||||
StatusMessage = msg;
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Per-row "remove" command. Updates the local
|
|
||||||
/// collection in place so the UI doesn't flash.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task RemoveMemberAsync(CircleMemberDto? member)
|
|
||||||
{
|
|
||||||
if (member is null || SelectedCircle is null) return;
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id);
|
|
||||||
Members.Remove(member);
|
|
||||||
StatusMessage = $"« {member.UserName} » retiré du cercle";
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
using CommunityToolkit.Mvvm.Input;
|
using PostIt;
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
namespace PostIt.ViewModels;
|
using PostIt.ViewModels;
|
||||||
|
|
||||||
public class HomePageViewModel : ViewModelBase
|
public class HomePageViewModel : ViewModelBase
|
||||||
{
|
{
|
||||||
public YavscApiClient Api { get; }
|
public YavscApiClient Api { get; }
|
||||||
public Settings Settings { get; }
|
public Settings Settings { get; }
|
||||||
public SessionStatusViewModel SessionStatus { get; }
|
|
||||||
|
|
||||||
private string _welcomeText = "Welcome to PostIt!";
|
private string _welcomeText = "Welcome to PostIt!";
|
||||||
public string WelcomeText
|
public string WelcomeText
|
||||||
|
|
@ -18,25 +17,12 @@ public class HomePageViewModel : ViewModelBase
|
||||||
public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); }
|
public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); }
|
||||||
public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); }
|
public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); }
|
||||||
|
|
||||||
public HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus)
|
public HomePageViewModel(YavscApiClient api, Settings settings)
|
||||||
{
|
{
|
||||||
Api = api;
|
Api = api;
|
||||||
Settings = settings;
|
Settings = settings;
|
||||||
SessionStatus = sessionStatus;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync());
|
|
||||||
/// <summary>
|
|
||||||
/// Avalonia designer constructor. Builds a self-contained VM
|
|
||||||
/// with a freshly-constructed Settings so the XAML preview can
|
|
||||||
/// render without a running App. Production paths always reach
|
|
||||||
/// the parameterised constructor (DI or direct injection), and
|
|
||||||
/// the postit://callback crash is fixed at the Settings layer
|
|
||||||
/// (thread-safe dispatcher marshalling on PropertyChanged) — a
|
|
||||||
/// designer-only duplicate instance is therefore harmless.
|
|
||||||
/// </summary>
|
|
||||||
public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel())
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
// Constructeur sans arg pour le designer Avalonia
|
||||||
|
public HomePageViewModel() : this(null!, null!) { }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
327
src/PostIt/PostIt/ViewModels/LoginPageViewModel.cs
Normal file
327
src/PostIt/PostIt/ViewModels/LoginPageViewModel.cs
Normal file
|
|
@ -0,0 +1,327 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using CommunityToolkit.Mvvm.Input;
|
||||||
|
using IdentityModel.OidcClient.Browser;
|
||||||
|
using PostIt.Services;
|
||||||
|
|
||||||
|
namespace PostIt.ViewModels;
|
||||||
|
|
||||||
|
public partial class LoginPageViewModel : ViewModelBase
|
||||||
|
{
|
||||||
|
private const string SettingsFileName = "postit-settings.json";
|
||||||
|
|
||||||
|
[Obsolete("Password grant is not used; IdentityModel.OidcClient performs PKCE.")]
|
||||||
|
public string Password { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
[Obsolete("User-entered email is not used; the IdP login UI collects it.")]
|
||||||
|
public string UserEmail { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
[Obsolete("No local credential persistence in the current build.")]
|
||||||
|
public bool RememberMe { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// URL of the Yavsc.Org account-registration page.
|
||||||
|
/// Derived from <see cref="Settings.Authentication"/>'s Authority.
|
||||||
|
/// Empty when the authority is not configured.
|
||||||
|
/// </summary>
|
||||||
|
public string RegisterUrl =>
|
||||||
|
BuildExternalUrl("/Account/Register");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// URL of the Yavsc.Org password-reset page (open to anonymous users).
|
||||||
|
/// Derived from <see cref="Settings.Authentication"/>'s Authority.
|
||||||
|
/// Empty when the authority is not configured.
|
||||||
|
/// </summary>
|
||||||
|
public string ForgotPasswordUrl =>
|
||||||
|
BuildExternalUrl("/Account/ForgotPassword");
|
||||||
|
|
||||||
|
public bool HasRegisterUrl => !string.IsNullOrEmpty(RegisterUrl);
|
||||||
|
public bool HasForgotPasswordUrl => !string.IsNullOrEmpty(ForgotPasswordUrl);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Canonical <see cref="Settings.Authentication"/> authority with any trailing
|
||||||
|
/// slash removed. Used as the base for both the OIDC discovery URL and the
|
||||||
|
/// human-facing Account URLs (Register / Forgot password). Empty when the
|
||||||
|
/// authority is not configured.
|
||||||
|
/// </summary>
|
||||||
|
public string ExternalUrl => BuildExternalUrl(string.Empty);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// OIDC discovery URL the client actually calls during login:
|
||||||
|
/// <c>ExternalUrl + "/.well-known/openid-configuration"</c>. Surfaced in
|
||||||
|
/// <see cref="StatusMessage"/> on failure so the operator can copy it
|
||||||
|
/// verbatim and verify reachability from a browser.
|
||||||
|
/// </summary>
|
||||||
|
public string DiscoveryUrl =>
|
||||||
|
string.IsNullOrEmpty(ExternalUrl) ? string.Empty : ExternalUrl + "/.well-known/openid-configuration";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// True when the settings file is missing or <c>Authentication.Authority</c>
|
||||||
|
/// is empty. The LoginPage surfaces a banner in that case and disables
|
||||||
|
/// the Register / Forgot password buttons.
|
||||||
|
/// </summary>
|
||||||
|
public bool ConfigMissing =>
|
||||||
|
string.IsNullOrWhiteSpace(Settings.Authentication?.Authority);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Localised banner shown when <see cref="ConfigMissing"/> is true.
|
||||||
|
/// The path follows the XDG spec on Linux (where PostIt.Desktop runs):
|
||||||
|
/// the file is expected at <c>~/.config/PostIt/postit-settings.json</c>.
|
||||||
|
/// </summary>
|
||||||
|
public string ConfigMissingMessage =>
|
||||||
|
$"Configuration PostIt manquante — voir ~/.config/PostIt/postit-settings.json";
|
||||||
|
|
||||||
|
private string BuildExternalUrl(string path)
|
||||||
|
{
|
||||||
|
var authority = Settings.Authentication?.Authority?.TrimEnd('/');
|
||||||
|
return string.IsNullOrEmpty(authority)
|
||||||
|
? string.Empty
|
||||||
|
: authority + path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The access token of the most recent successful login, or null.
|
||||||
|
/// Kept on the VM so views can show "logged in as …" feedback; the
|
||||||
|
/// authoritative copy lives in the <see cref="TokenStore"/>.
|
||||||
|
/// </summary>
|
||||||
|
private string? _accessToken;
|
||||||
|
public string? AccessToken
|
||||||
|
{
|
||||||
|
get => _accessToken;
|
||||||
|
private set => this.SetProperty(ref _accessToken, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanNavigateNext { get => false; protected set => throw new NotImplementedException(); }
|
||||||
|
public override bool CanNavigatePrevious { get => true; protected set => throw new NotImplementedException(); }
|
||||||
|
|
||||||
|
public Settings Settings { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Discrete phase of the OIDC flow the LoginPage is currently
|
||||||
|
/// showing. Surfaced in the UI as a one-line status (Discovering /
|
||||||
|
/// OpeningBrowser / AwaitingCallback / ExchangingCode / Success /
|
||||||
|
/// Error). Operators use this to debug the custom-scheme
|
||||||
|
/// callback hand-off: when AwaitingCallback never resolves,
|
||||||
|
/// the OS never re-launched PostIt with the postit:// URL.
|
||||||
|
/// </summary>
|
||||||
|
private OidcLoginPhase _phase = OidcLoginPhase.Idle;
|
||||||
|
public OidcLoginPhase Phase
|
||||||
|
{
|
||||||
|
get => _phase;
|
||||||
|
private set
|
||||||
|
{
|
||||||
|
if (this.SetProperty(ref _phase, value))
|
||||||
|
OnPropertyChanged(nameof(PhaseLabel));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Human-readable label for <see cref="Phase"/>. French to match
|
||||||
|
/// the rest of the UI. Computed once per phase change.
|
||||||
|
/// </summary>
|
||||||
|
public string PhaseLabel => _phase switch
|
||||||
|
{
|
||||||
|
OidcLoginPhase.Idle => "En attente",
|
||||||
|
OidcLoginPhase.Discovering => "Découverte OIDC…",
|
||||||
|
OidcLoginPhase.OpeningBrowser => "Ouverture du navigateur…",
|
||||||
|
OidcLoginPhase.AwaitingCallback => "En attente du callback postit://…",
|
||||||
|
OidcLoginPhase.ExchangingCode => "Échange du code contre les jetons…",
|
||||||
|
OidcLoginPhase.Success => "Connecté",
|
||||||
|
OidcLoginPhase.Error => "Erreur",
|
||||||
|
_ => _phase.ToString(),
|
||||||
|
};
|
||||||
|
|
||||||
|
private string _statusMessage = "Ready";
|
||||||
|
public string StatusMessage
|
||||||
|
{
|
||||||
|
get => _statusMessage;
|
||||||
|
private set => this.SetProperty(ref _statusMessage, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _isBusy;
|
||||||
|
public bool IsBusy
|
||||||
|
{
|
||||||
|
get => _isBusy;
|
||||||
|
private set => this.SetProperty(ref _isBusy, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _LoginSuccess;
|
||||||
|
public bool LoginSuccess { get => _isBusy;
|
||||||
|
private set => this.SetProperty(ref _LoginSuccess, value); }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Optional override used by tests. When set, this factory is called
|
||||||
|
/// instead of <see cref="Platform.CreateBrowser"/> to obtain the
|
||||||
|
/// <see cref="IBrowser"/> instance.
|
||||||
|
/// </summary>
|
||||||
|
public Func<IBrowser?>? BrowserFactoryOverride { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Optional override used by tests. When set, this delegate replaces
|
||||||
|
/// the call to <see cref="Settings.Load"/> at the start of
|
||||||
|
/// <see cref="LoginAsync"/>, so tests can inject a Settings object
|
||||||
|
/// without it being overwritten by the user/embedded default.
|
||||||
|
/// </summary>
|
||||||
|
public Func<Task>? SettingsLoadOverride { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Optional override used by tests. When set, the VM hands this
|
||||||
|
/// pre-built <see cref="YavscApiClient"/> to itself instead of
|
||||||
|
/// constructing a fresh one.
|
||||||
|
/// </summary>
|
||||||
|
public YavscApiClient? ApiClientOverride { get; set; }
|
||||||
|
public Action LoginSucceeded { get; internal set; }
|
||||||
|
|
||||||
|
private YavscApiClient? _api;
|
||||||
|
|
||||||
|
public LoginPageViewModel() : this(new Settings(), apiClient: null, browserFactoryOverride: null)
|
||||||
|
{
|
||||||
|
// Load settings eagerly so RegisterUrl / ForgotPasswordUrl are
|
||||||
|
// populated as soon as the page renders (XAML bindings fire
|
||||||
|
// before the user clicks Login). Settings.Load is synchronous
|
||||||
|
// on purpose; calling .GetAwaiter().GetResult() on it would
|
||||||
|
// deadlock the UI thread on the await inside the file read.
|
||||||
|
try { Settings.Load(); }
|
||||||
|
catch { /* settings may be missing in tests/dev; LoginAsync will surface real errors */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Test-friendly constructor: caller supplies pre-loaded
|
||||||
|
/// <paramref name="settings"/>, an optional
|
||||||
|
/// <paramref name="browserFactoryOverride"/> that bypasses the
|
||||||
|
/// static <see cref="Platform"/> indirection, and an optional
|
||||||
|
/// pre-built <paramref name="apiClient"/> for end-to-end
|
||||||
|
/// scenarios where the test owns the wiring.
|
||||||
|
/// </summary>
|
||||||
|
public LoginPageViewModel(
|
||||||
|
Settings settings,
|
||||||
|
Func<IBrowser?>? browserFactoryOverride = null,
|
||||||
|
YavscApiClient? apiClient = null)
|
||||||
|
{
|
||||||
|
Settings = settings;
|
||||||
|
BrowserFactoryOverride = browserFactoryOverride;
|
||||||
|
ApiClientOverride = apiClient;
|
||||||
|
StatusMessage = "Ready";
|
||||||
|
}
|
||||||
|
|
||||||
|
[RelayCommand]
|
||||||
|
public async Task LoginAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
IsBusy = true;
|
||||||
|
LoginSuccess = false;
|
||||||
|
if (SettingsLoadOverride is not null)
|
||||||
|
await SettingsLoadOverride().ConfigureAwait(false);
|
||||||
|
else
|
||||||
|
Settings.Load();
|
||||||
|
|
||||||
|
// Guard: refuse to call OidcClient when the authority is
|
||||||
|
// empty. IdentityModel would otherwise build a bogus
|
||||||
|
// authorize URL like "http://127.0.0.1:1/" from an empty
|
||||||
|
// Authority, which the browser refuses with a confusing
|
||||||
|
// "Cette adresse est interdite"-style message. Tell the
|
||||||
|
// operator exactly what to fix instead.
|
||||||
|
if (string.IsNullOrWhiteSpace(Settings.Authentication?.Authority))
|
||||||
|
{
|
||||||
|
IsBusy = false;
|
||||||
|
StatusMessage =
|
||||||
|
$"Configuration manquante — édite {SettingsFileHint()} et renseigne Authentication.Authority";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The platform project picks the right redirect URI and
|
||||||
|
// browser implementation; we don't reference any UI
|
||||||
|
// toolkit from here.
|
||||||
|
Settings.RedirectUri = string.IsNullOrWhiteSpace(Settings.RedirectUri)
|
||||||
|
? Platform.DefaultRedirectUri
|
||||||
|
: Settings.RedirectUri;
|
||||||
|
|
||||||
|
// Surface the discovery URL the client is about to call,
|
||||||
|
// so a failure (DNS, TLS, 404) can be diagnosed by
|
||||||
|
// pasting the URL straight into a browser. OidcClient
|
||||||
|
// computes the discovery URL as
|
||||||
|
// `Authority + /.well-known/openid-configuration`; we
|
||||||
|
// normalise the trailing slash here so the printed URL is
|
||||||
|
// exactly what IdentityModel will fetch.
|
||||||
|
if (!string.IsNullOrEmpty(DiscoveryUrl))
|
||||||
|
StatusMessage = $"Discovering {DiscoveryUrl}";
|
||||||
|
|
||||||
|
// Build (or reuse) the API client. The browser override
|
||||||
|
// takes precedence: tests want to inject a fake browser
|
||||||
|
// and the production path uses Platform.CreateBrowser.
|
||||||
|
_api ??= ApiClientOverride ?? new YavscApiClient(Settings, BuildTokenStore());
|
||||||
|
|
||||||
|
// Platform.CreateBrowser may still want to be customised
|
||||||
|
// per-call (e.g. between desktop and android), so route
|
||||||
|
// the interactive login through a callback that reuses
|
||||||
|
// BrowserFactoryOverride when present.
|
||||||
|
//
|
||||||
|
// The progress sink drives Phase / PhaseLabel; StatusMessage
|
||||||
|
// keeps the text detail (URLs, error messages). Same
|
||||||
|
// underlying flow, two views.
|
||||||
|
var progress = new Progress<OidcLoginPhase>(p => Phase = p);
|
||||||
|
await LoginInteractiveCoreAsync(_api, progress).ConfigureAwait(false);
|
||||||
|
|
||||||
|
IsBusy = false;
|
||||||
|
AccessToken = _api.CurrentAccessToken;
|
||||||
|
StatusMessage = "Interactive token acquired.";
|
||||||
|
LoginSuccess = true;
|
||||||
|
LoginSucceeded?.Invoke();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
IsBusy = false;
|
||||||
|
var suffix = !string.IsNullOrEmpty(DiscoveryUrl) ? $" (discovery: {DiscoveryUrl})" : string.Empty;
|
||||||
|
StatusMessage = $"Error: {ex.Message}{suffix}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Single entry point for the OIDC login: YavscApiClient owns the
|
||||||
|
/// browser choice, the OidcClient instance, the token persistence
|
||||||
|
/// and the refresh path. The VM is just a thin coordinator.
|
||||||
|
/// </summary>
|
||||||
|
private async Task LoginInteractiveCoreAsync(
|
||||||
|
YavscApiClient api,
|
||||||
|
IProgress<OidcLoginPhase>? progress = null)
|
||||||
|
{
|
||||||
|
var original = Platform.CreateBrowser;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (BrowserFactoryOverride is not null)
|
||||||
|
Platform.CreateBrowser = BrowserFactoryOverride;
|
||||||
|
|
||||||
|
await api.LoginInteractiveAsync(progress).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Platform.CreateBrowser = original;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// XDG-compliant path to the user settings file. Surfaced in the
|
||||||
|
/// "Configuration manquante" message so the operator knows exactly
|
||||||
|
/// which file to edit without having to dig through docs.
|
||||||
|
/// </summary>
|
||||||
|
private static string SettingsFileHint()
|
||||||
|
{
|
||||||
|
var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
||||||
|
return Path.Combine(appData, "PostIt", "postit-settings.json");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Build the on-disk <see cref="TokenStore"/> used by
|
||||||
|
/// <see cref="YavscApiClient"/>. The token bundle lives in
|
||||||
|
/// <c>~/.config/PostIt/tokens.json</c> on Linux; the same path
|
||||||
|
/// layout is used on every platform for predictability.
|
||||||
|
/// </summary>
|
||||||
|
private static TokenStore BuildTokenStore()
|
||||||
|
{
|
||||||
|
var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
||||||
|
var path = Path.Combine(appData, "PostIt", "tokens.json");
|
||||||
|
return new TokenStore(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -2,54 +2,23 @@ using System;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia;
|
using Avalonia.Styling;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
using CommunityToolkit.Mvvm.Input;
|
using CommunityToolkit.Mvvm.Input;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using PostIt.Models;
|
||||||
using Yavsc.Blogspot;
|
using PostIt.Services;
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using PostIt.Helpers;
|
|
||||||
|
|
||||||
namespace PostIt.ViewModels;
|
namespace PostIt.ViewModels;
|
||||||
|
|
||||||
public partial class MainViewModel : ViewModelBase
|
public partial class MainPageViewModel : ViewModelBase
|
||||||
{
|
{
|
||||||
/// <summary>Window/tab title. Cosmetic — bound by
|
|
||||||
/// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string WindowTitle { get; set; }
|
public partial string Title { get; set; }
|
||||||
|
|
||||||
/// <summary>Editor buffer for the post title. Bound TwoWay to
|
|
||||||
/// the title <c>TextBox</c> in <c>MainPage.axaml</c>. The Save
|
|
||||||
/// command reads from this buffer (not from
|
|
||||||
/// <see cref="SelectedPost"/>) so that typing into a freshly
|
|
||||||
/// mounted editor (no post selected yet) is captured. With the
|
|
||||||
/// previous "{Binding SelectedPost.Title}" binding, the user's
|
|
||||||
/// keystrokes were silently dropped whenever
|
|
||||||
/// <c>SelectedPost was null</c>, which made the editor a trap
|
|
||||||
/// and caused Save to POST a <c>BlogPostDto</c> with an empty
|
|
||||||
/// title — hence the 400 "The Title field is required".</summary>
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string DraftTitle { get; set; }
|
public partial ViewModelBase? CurrentViewModel { get; set; }
|
||||||
|
|
||||||
/// <summary>Editor buffer for the post body. Same pattern as
|
public SettingsPageViewModel SettingsModel { get; }
|
||||||
/// <see cref="DraftTitle"/>.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string DraftArticle { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Editor buffer for the post's publication state.
|
|
||||||
/// Reflects the server-side <c>IsPublished</c> flag (the
|
|
||||||
/// existence of a row in <c>BlogSpotPublication</c>) and
|
|
||||||
/// is pushed to the server via
|
|
||||||
/// <see cref="BlogApiClient.SetPublishAsync"/> on explicit
|
|
||||||
/// toggle — it is NOT included in the regular Save
|
|
||||||
/// payload, mirroring the wire contract where
|
|
||||||
/// <c>BlogPostDto</c> doesn't carry <c>Publish</c> as a
|
|
||||||
/// mutable field. Toggling is its own action.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool DraftIsPublished { get; set; }
|
|
||||||
|
|
||||||
public Settings SettingsModel { get; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string StatusMessage { get; set; }
|
public partial string StatusMessage { get; set; }
|
||||||
|
|
@ -58,17 +27,20 @@ public partial class MainViewModel : ViewModelBase
|
||||||
public partial string SearchText { get; set; }
|
public partial string SearchText { get; set; }
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial ObservableCollection<BlogPostDto> Posts { get; set; }
|
public partial ObservableCollection<BlogPost> Posts { get; set; }
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial ObservableCollection<BlogPostDto> FilteredPosts { get; set; }
|
public partial ObservableCollection<BlogPost> FilteredPosts { get; set; }
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial BlogPostDto? SelectedPost { get; set; }
|
public partial BlogPost? SelectedPost { get; set; }
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial bool IsBusy { get; set; }
|
public partial bool IsBusy { get; set; }
|
||||||
|
|
||||||
|
[ObservableProperty]
|
||||||
|
ThemeVariant themeVariant = ThemeVariant.Default;
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial Settings Settings { get; private set; }
|
public partial Settings Settings { get; private set; }
|
||||||
|
|
||||||
|
|
@ -78,140 +50,43 @@ public partial class MainViewModel : ViewModelBase
|
||||||
/// <c>App.axaml.cs</c> so the same client (and its token store)
|
/// <c>App.axaml.cs</c> so the same client (and its token store)
|
||||||
/// is shared with the login flow.
|
/// is shared with the login flow.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public BlogApiClient? BlogClient { get; }
|
public BlogApiClient BlogClient { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// DI container the VM uses to resolve navigation targets
|
|
||||||
/// (other ViewModels) when the user clicks a toolbar button
|
|
||||||
/// that opens a sub-screen. Owned by <c>App.ServiceProvider</c>
|
|
||||||
/// in production; injected directly in tests. The VM resolves
|
|
||||||
/// <em>ViewModels</em> via this provider, never Views — the
|
|
||||||
/// actual <see cref="Control"/> to push is decided by
|
|
||||||
/// <see cref="ViewLocator"/> at bind time, per CONTRIBUTING.md
|
|
||||||
/// §"Navigation (PostIt)".
|
|
||||||
/// </summary>
|
|
||||||
public IServiceProvider? Services { get; }
|
|
||||||
|
|
||||||
private SignaturePageViewModel? _signatureModel;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Resolved on first access. Lazy so the test path (which
|
|
||||||
/// never pushes <c>SignaturePage</c>) does not require a
|
|
||||||
/// fully-built DI graph just to construct the VM. Mirrors the
|
|
||||||
/// pattern of <see cref="SettingsModel"/> for the Settings case.
|
|
||||||
/// </summary>
|
|
||||||
public SignaturePageViewModel SignatureModel =>
|
|
||||||
_signatureModel ??= ResolveSignatureModel();
|
|
||||||
|
|
||||||
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
||||||
public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
||||||
|
|
||||||
private SignaturePageViewModel ResolveSignatureModel()
|
|
||||||
{
|
|
||||||
var sp = ResolveServices();
|
|
||||||
return sp.GetRequiredService<SignaturePageViewModel>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private IServiceProvider ResolveServices()
|
|
||||||
{
|
|
||||||
return Services ?? (Application.Current as App)?.ServiceProvider ??
|
|
||||||
throw new InvalidOperationException(
|
|
||||||
"No IServiceProvider available for navigation. Inject one in tests " +
|
|
||||||
"or ensure App.ServiceProvider is initialized in production.");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public MainViewModel()
|
|
||||||
{
|
|
||||||
SettingsModel = new Settings();
|
|
||||||
Init(SettingsModel);
|
|
||||||
BlogClient = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Init(Settings? settings)
|
|
||||||
{
|
|
||||||
SearchText = string.Empty;
|
|
||||||
Posts = new ObservableCollection<BlogPostDto>();
|
|
||||||
FilteredPosts = new ObservableCollection<BlogPostDto>();
|
|
||||||
SelectedPost = null;
|
|
||||||
IsBusy = false;
|
|
||||||
StatusMessage = "Ready";
|
|
||||||
Settings = settings ?? new Settings();
|
|
||||||
WindowTitle = "PostIt";
|
|
||||||
DraftTitle = string.Empty;
|
|
||||||
DraftArticle = string.Empty;
|
|
||||||
DraftIsPublished = false;
|
|
||||||
// Production path: DI injects the canonical Settings singleton
|
|
||||||
// and we use it as-is. Test path: tests call this constructor
|
|
||||||
// without a Settings argument; we fall back to a fresh
|
|
||||||
// instance so the fixture can build a self-contained VM.
|
|
||||||
// The previous "?? new Settings()" silently worked in prod
|
|
||||||
// too, which is what allowed a second Settings instance to
|
|
||||||
// race the singleton and crash the postit://callback binding
|
|
||||||
// sink; that crash is fixed in Settings.OnPropertyChanged
|
|
||||||
// (thread-safe dispatcher marshalling) so the duplicate
|
|
||||||
// instance is now merely wasteful, not dangerous.
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Save is enabled as soon as the user has typed
|
|
||||||
/// a non-whitespace title in the editor, regardless of
|
|
||||||
/// whether a post is selected. The "no selection" case is
|
|
||||||
/// the create-new-post path; the "with selection" case is
|
|
||||||
/// the update path. Both read from the editor buffer.
|
|
||||||
/// Previously this also required <c>SelectedPost is not null</c>
|
|
||||||
/// — which contradicted the create-new-post intent and
|
|
||||||
/// forced the buggy "draft with empty title" branch.</summary>
|
|
||||||
private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle);
|
|
||||||
private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
|
|
||||||
private bool CanManageAcl() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Test-friendly constructor: caller supplies a pre-built
|
/// Test-friendly constructor: caller supplies a pre-built
|
||||||
/// <see cref="BlogApiClient"/>. Production code uses the
|
/// <see cref="BlogApiClient"/>. Production code uses the
|
||||||
/// (Settings, BlogApiClient) overload below.
|
/// (Settings, BlogApiClient) overload below.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
|
public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null)
|
||||||
{
|
{
|
||||||
SettingsModel = new Settings();
|
SearchText = string.Empty;
|
||||||
BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;
|
Posts = new ObservableCollection<BlogPost>();
|
||||||
Services = services;
|
FilteredPosts = new ObservableCollection<BlogPost>();
|
||||||
Init(settings);
|
SelectedPost = null;
|
||||||
|
IsBusy = false;
|
||||||
|
StatusMessage = "Ready";
|
||||||
|
Settings = settings ?? new Settings();
|
||||||
|
Title = "PostIt";
|
||||||
|
CurrentViewModel = this;
|
||||||
|
SettingsModel = new SettingsPageViewModel();
|
||||||
|
BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient));
|
||||||
}
|
}
|
||||||
|
|
||||||
partial void OnSearchTextChanged(string value) => ApplyFilter();
|
partial void OnSearchTextChanged(string value) => ApplyFilter();
|
||||||
|
|
||||||
partial void OnSelectedPostChanged(BlogPostDto? value)
|
partial void OnSelectedPostChanged(BlogPost? value) => UpdateCommandStates();
|
||||||
{
|
|
||||||
// Mirror the selection into the editor buffer so the
|
|
||||||
// XAML-bound TextBox/TextEditor show the right content
|
|
||||||
// when the user clicks a post in the list. When the
|
|
||||||
// selection is cleared (e.g. after a successful create
|
|
||||||
// rebinds to the server-issued record, or Delete
|
|
||||||
// nulls it out), the buffer is reset so the editor
|
|
||||||
// doesn't show stale content.
|
|
||||||
DraftTitle = value?.Title ?? string.Empty;
|
|
||||||
DraftArticle = value?.Article ?? string.Empty;
|
|
||||||
// Mirror publication state too. Defaults to false on
|
|
||||||
// null selection so a fresh draft starts unpublished.
|
|
||||||
DraftIsPublished = value?.IsPublished ?? false;
|
|
||||||
UpdateCommandStates();
|
|
||||||
}
|
|
||||||
|
|
||||||
partial void OnIsBusyChanged(bool value) => UpdateCommandStates();
|
partial void OnIsBusyChanged(bool value) => UpdateCommandStates();
|
||||||
|
|
||||||
// Save's CanExecute depends on the buffer: the button must
|
|
||||||
// enable as soon as the user has typed a non-whitespace
|
|
||||||
// title, regardless of whether a post is selected.
|
|
||||||
partial void OnDraftTitleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
|
|
||||||
partial void OnDraftArticleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
|
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
internal async Task LoadPosts()
|
internal async Task LoadPosts()
|
||||||
{
|
{
|
||||||
await ExecuteAsync(async () =>
|
await ExecuteAsync(async () =>
|
||||||
{
|
{
|
||||||
var posts = await BlogClient!.GetPostsAsync();
|
var posts = await BlogClient.GetPostsAsync();
|
||||||
Posts.Clear();
|
Posts.Clear();
|
||||||
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
||||||
{
|
{
|
||||||
|
|
@ -228,39 +103,19 @@ public partial class MainViewModel : ViewModelBase
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
internal async Task Save()
|
internal async Task Save()
|
||||||
{
|
{
|
||||||
// The button is already disabled when the title is empty
|
if (SelectedPost is null)
|
||||||
// (see CanSave), but the test path (and any programmatic
|
|
||||||
// ICommand.Execute) bypasses CanExecute, so we still
|
|
||||||
// guard here. Better to no-op with a status message
|
|
||||||
// than to send a request the server will reject.
|
|
||||||
if (string.IsNullOrWhiteSpace(DraftTitle))
|
|
||||||
{
|
{
|
||||||
StatusMessage = "Title is required.";
|
StatusMessage = "A post must be selected before saving.";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await ExecuteAsync(async () =>
|
await ExecuteAsync(async () =>
|
||||||
{
|
{
|
||||||
// Build a fresh BlogPostDto from the editor buffer on
|
if (SelectedPost.Id == 0)
|
||||||
// every Save — we no longer mutate SelectedPost in
|
|
||||||
// place. The previous behaviour copied the buffer
|
|
||||||
// (which was a no-op when SelectedPost was null)
|
|
||||||
// back onto the model and relied on a
|
|
||||||
// [Required] violation to surface the missing
|
|
||||||
// input; the new shape keeps the editor buffer as
|
|
||||||
// the single source of truth for outgoing payloads
|
|
||||||
// and the selected post as a read-only hint for
|
|
||||||
// the update path.
|
|
||||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
|
||||||
{
|
{
|
||||||
var draft = new BlogPostDto
|
SelectedPost.DateCreated = DateTime.UtcNow;
|
||||||
{
|
SelectedPost.DateModified = DateTime.UtcNow;
|
||||||
Title = DraftTitle,
|
var created = await BlogClient.CreatePostAsync(SelectedPost);
|
||||||
Article = DraftArticle ?? string.Empty,
|
|
||||||
DateCreated = DateTime.UtcNow,
|
|
||||||
DateModified = DateTime.UtcNow,
|
|
||||||
};
|
|
||||||
var created = await BlogClient!.CreatePostAsync(draft);
|
|
||||||
if (created is not null)
|
if (created is not null)
|
||||||
{
|
{
|
||||||
SelectedPost = created;
|
SelectedPost = created;
|
||||||
|
|
@ -269,17 +124,8 @@ public partial class MainViewModel : ViewModelBase
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var update = new BlogPostDto
|
SelectedPost.DateModified = DateTime.UtcNow;
|
||||||
{
|
await BlogClient.UpdatePostAsync(SelectedPost.Id, SelectedPost);
|
||||||
Id = SelectedPost.Id,
|
|
||||||
AuthorId = SelectedPost.AuthorId,
|
|
||||||
Photo = SelectedPost.Photo,
|
|
||||||
Title = DraftTitle,
|
|
||||||
Article = DraftArticle ?? string.Empty,
|
|
||||||
DateCreated = SelectedPost.DateCreated,
|
|
||||||
DateModified = DateTime.UtcNow,
|
|
||||||
};
|
|
||||||
await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
|
|
||||||
StatusMessage = $"Saved post {SelectedPost.Id}.";
|
StatusMessage = $"Saved post {SelectedPost.Id}.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,82 +144,35 @@ public partial class MainViewModel : ViewModelBase
|
||||||
|
|
||||||
await ExecuteAsync(async () =>
|
await ExecuteAsync(async () =>
|
||||||
{
|
{
|
||||||
await BlogClient!.DeletePostAsync(SelectedPost.Id);
|
await BlogClient.DeletePostAsync(SelectedPost.Id);
|
||||||
StatusMessage = $"Deleted post {SelectedPost.Id}.";
|
StatusMessage = $"Deleted post {SelectedPost.Id}.";
|
||||||
SelectedPost = null;
|
SelectedPost = null;
|
||||||
await RefreshPostsAsync();
|
await RefreshPostsAsync();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Toggle the publication state of the currently selected
|
|
||||||
/// post. Pushes the new state to
|
|
||||||
/// <c>PUT /api/BlogApi/{id}/publish</c> and reflects it
|
|
||||||
/// locally in <see cref="DraftIsPublished"/> + the
|
|
||||||
/// selected post so the UI updates without a full
|
|
||||||
/// refresh.
|
|
||||||
///
|
|
||||||
/// <para>The toggle is its own action — separate from Save
|
|
||||||
/// — because <c>Publish</c> is not part of the
|
|
||||||
/// <c>BlogPostDto</c> payload. Bundling it into Save
|
|
||||||
/// would require a wire-shape change and a second server
|
|
||||||
/// overload; the dedicated endpoint keeps the wire
|
|
||||||
/// contract clean.</para>
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
internal async Task TogglePublish()
|
internal void New()
|
||||||
{
|
{
|
||||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
SelectedPost = new BlogPost
|
||||||
{
|
{
|
||||||
StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
|
Title = string.Empty,
|
||||||
return;
|
Article = string.Empty,
|
||||||
|
DateCreated = DateTime.UtcNow,
|
||||||
|
DateModified = DateTime.UtcNow
|
||||||
|
};
|
||||||
|
StatusMessage = "New blog post ready.";
|
||||||
}
|
}
|
||||||
|
|
||||||
await ExecuteAsync(async () =>
|
|
||||||
{
|
|
||||||
var desired = !DraftIsPublished;
|
|
||||||
await BlogClient!.SetPublishAsync(SelectedPost.Id, desired);
|
|
||||||
DraftIsPublished = desired;
|
|
||||||
// Mirror into the selected post so a subsequent
|
|
||||||
// RefreshPostsAsync() doesn't blow away the
|
|
||||||
// locally flipped state until the round-trip
|
|
||||||
// re-hydrates it.
|
|
||||||
SelectedPost.IsPublished = desired;
|
|
||||||
StatusMessage = desired
|
|
||||||
? $"Billet {SelectedPost.Id} publié."
|
|
||||||
: $"Billet {SelectedPost.Id} remis en brouillon.";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// DEV ONLY: open the signature capture page. The production
|
|
||||||
/// entry point is a SignalR push from Yavsc.Org ("devis
|
|
||||||
/// received, sign here"); this command is the dev-time
|
|
||||||
/// shortcut to reach the page without that infrastructure.
|
|
||||||
/// Aligned on the same VM-first navigation pattern as
|
|
||||||
/// <see cref="OpenSettings"/>: the VM resolves the target VM
|
|
||||||
/// through <see cref="Services"/>, the <c>ViewLocator</c> picks
|
|
||||||
/// the matching <c>Control</c> at bind time. No
|
|
||||||
/// <c>Click</code> handler, no <c>App.ServiceProvider</c>
|
|
||||||
/// access from the view layer.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
internal async Task OpenSignatureDev()
|
internal void OpenSettings()
|
||||||
{
|
{
|
||||||
await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true);
|
CurrentViewModel = SettingsModel;
|
||||||
}
|
|
||||||
|
|
||||||
private ViewModelBase GetACLViewModel(BlogPostDto selectedPost)
|
|
||||||
{
|
|
||||||
var sp = ResolveServices();
|
|
||||||
var aclClient = sp.GetRequiredService<BlogAclApiClient>();
|
|
||||||
var circleClient = sp.GetRequiredService<CircleApiClient>();
|
|
||||||
return new PostAclDialogViewModel(selectedPost, aclClient, circleClient);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task RefreshPostsAsync()
|
private async Task RefreshPostsAsync()
|
||||||
{
|
{
|
||||||
var posts = await BlogClient!.GetPostsAsync();
|
var posts = await BlogClient.GetPostsAsync();
|
||||||
Posts.Clear();
|
Posts.Clear();
|
||||||
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
||||||
{
|
{
|
||||||
|
|
@ -429,25 +228,9 @@ public partial class MainViewModel : ViewModelBase
|
||||||
LoadPostsCommand.NotifyCanExecuteChanged();
|
LoadPostsCommand.NotifyCanExecuteChanged();
|
||||||
SaveCommand.NotifyCanExecuteChanged();
|
SaveCommand.NotifyCanExecuteChanged();
|
||||||
DeleteCommand.NotifyCanExecuteChanged();
|
DeleteCommand.NotifyCanExecuteChanged();
|
||||||
|
NewCommand.NotifyCanExecuteChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool CanSave() => SelectedPost is not null && !IsBusy;
|
||||||
|
private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
|
||||||
[RelayCommand(CanExecute = nameof(CanManageAcl))]
|
|
||||||
public async Task ManageAcl()
|
|
||||||
{
|
|
||||||
if (SelectedPost is null)
|
|
||||||
{
|
|
||||||
StatusMessage = "Select an existing post before managing ACL.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await ((App)App.Current!).PushPageAsync(GetACLViewModel(SelectedPost)).ConfigureAwait(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task OpenCircles()
|
|
||||||
{
|
|
||||||
var circlesVm = ResolveServices().GetRequiredService<CirclesPageViewModel>();
|
|
||||||
await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,174 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
|
||||||
using CommunityToolkit.Mvvm.Input;
|
|
||||||
using Yavsc.Blogspot;
|
|
||||||
using Yavsc.Api.Client;
|
|
||||||
using Yavsc.Api.Client.Dtos;
|
|
||||||
using Yavsc.Abstract.BlogSpot;
|
|
||||||
|
|
||||||
namespace PostIt.ViewModels;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// View model for the "Gérer l'ACL" modal of a single blog post.
|
|
||||||
///
|
|
||||||
/// <para>Loads the caller's circles once on construct (the dropdown
|
|
||||||
/// only shows circles the user owns), then keeps an in-memory list
|
|
||||||
/// of the ACL entries for the post. <see cref="AddAsync"/> /
|
|
||||||
/// <see cref="RevokeAsync"/> are the only mutating verbs; both
|
|
||||||
/// refresh the list afterwards so the UI stays in sync with the
|
|
||||||
/// server.</para>
|
|
||||||
///
|
|
||||||
/// <para>The server is the source of truth: it scopes every
|
|
||||||
/// endpoint to the caller's uid and rejects ACL grants on posts
|
|
||||||
/// the caller doesn't own. This VM does not re-validate that —
|
|
||||||
/// any 403 / 404 will surface as an exception caught by the
|
|
||||||
/// command and routed to <see cref="StatusMessage"/>.</para>
|
|
||||||
/// </summary>
|
|
||||||
public partial class PostAclDialogViewModel : ViewModelBase
|
|
||||||
{
|
|
||||||
private readonly BlogAclApiClient _aclClient;
|
|
||||||
private readonly CircleApiClient _circleClient;
|
|
||||||
|
|
||||||
/// <summary>The post whose ACL is being edited. Set by the
|
|
||||||
/// caller (MainPage) when opening the dialog.</summary>
|
|
||||||
public BlogPostDto Post { get; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial ObservableCollection<CircleDto>
|
|
||||||
MyCircles { get; set; } = new();
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial ObservableCollection<PostAccessControlRulePayload>
|
|
||||||
AclEntries { get; set; } = new();
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial CircleDto? SelectedCircleToAdd { get; set; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool IsBusy { get; set; }
|
|
||||||
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial string StatusMessage { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Idempotency gate for <see cref="LoadAsync"/>: the dialog
|
|
||||||
/// attaches the load trigger in <c>DataContextChanged</c>,
|
|
||||||
/// which can fire more than once if the page is detached
|
|
||||||
/// and re-attached (dialog re-use, navigation edge cases)
|
|
||||||
/// with a different VM. Without this guard, the second load
|
|
||||||
/// would race against the first and could overwrite
|
|
||||||
/// <see cref="AclEntries"/> mid-edit. Pattern copied from
|
|
||||||
/// <c>Settings.Load</c>.
|
|
||||||
/// </summary>
|
|
||||||
private bool _loaded;
|
|
||||||
|
|
||||||
/// <summary>True once <see cref="LoadAsync"/> has run at least
|
|
||||||
/// once. Exposed for tests; do not bind from XAML.</summary>
|
|
||||||
public bool Loaded => _loaded;
|
|
||||||
|
|
||||||
public PostAclDialogViewModel(
|
|
||||||
BlogPostDto post,
|
|
||||||
BlogAclApiClient aclClient,
|
|
||||||
CircleApiClient circleClient)
|
|
||||||
{
|
|
||||||
Post = post ?? throw new ArgumentNullException(nameof(post));
|
|
||||||
_aclClient = aclClient ?? throw new ArgumentNullException(nameof(aclClient));
|
|
||||||
_circleClient = circleClient ?? throw new ArgumentNullException(nameof(circleClient));
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task LoadAsync()
|
|
||||||
{
|
|
||||||
if (_loaded) return;
|
|
||||||
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// Load circles and ACL entries in parallel — both are
|
|
||||||
// independent reads on the same host. The caller's uid
|
|
||||||
// is implicit in both endpoints.
|
|
||||||
var circlesTask = _circleClient.GetMyCirclesAsync();
|
|
||||||
var aclTask = _aclClient.GetMyAclAsync();
|
|
||||||
await Task.WhenAll(circlesTask, aclTask);
|
|
||||||
|
|
||||||
var circles = circlesTask.Result ?? new List<CircleDto>();
|
|
||||||
MyCircles = new ObservableCollection<CircleDto>(circles);
|
|
||||||
|
|
||||||
|
|
||||||
StatusMessage = $"{AclEntries.Count} autorisation(s)";
|
|
||||||
_loaded = true;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task AddAsync()
|
|
||||||
{
|
|
||||||
if (SelectedCircleToAdd is null)
|
|
||||||
{
|
|
||||||
StatusMessage = "Sélectionnez un cercle à ajouter";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var created = await _aclClient.GrantAsync(new Yavsc.Abstract.BlogSpot.PostAccessControlRulePayload
|
|
||||||
{
|
|
||||||
CircleId = SelectedCircleToAdd.Id,
|
|
||||||
BlogPostId = Post.Id
|
|
||||||
});
|
|
||||||
if (created is not null)
|
|
||||||
{
|
|
||||||
AclEntries.Add(created);
|
|
||||||
StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
StatusMessage = "Autorisation refusée par le serveur";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
public async Task RevokeAsync(PostAccessControlRulePayload? acl)
|
|
||||||
{
|
|
||||||
if (acl is null) return;
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await _aclClient.RevokeAsync(acl.CircleId);
|
|
||||||
AclEntries.Remove(acl);
|
|
||||||
StatusMessage = "Autorisation révoquée";
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
StatusMessage = $"Erreur: {ex.Message}";
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +1,5 @@
|
||||||
using System;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
using CommunityToolkit.Mvvm.Input;
|
using CommunityToolkit.Mvvm.Input;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using PostIt.Helpers;
|
|
||||||
using PostIt.Services;
|
using PostIt.Services;
|
||||||
|
|
||||||
namespace PostIt.ViewModels;
|
namespace PostIt.ViewModels;
|
||||||
|
|
@ -13,11 +9,7 @@ namespace PostIt.ViewModels;
|
||||||
/// <c>MainWindow.axaml</c>. Mirrors <see cref="YavscApiClient"/>'s
|
/// <c>MainWindow.axaml</c>. Mirrors <see cref="YavscApiClient"/>'s
|
||||||
/// session state ("Connecté" / "Déconnecté") and exposes a
|
/// session state ("Connecté" / "Déconnecté") and exposes a
|
||||||
/// <c>Logout</c> command that purges the token store and asks the
|
/// <c>Logout</c> command that purges the token store and asks the
|
||||||
/// navigation owner to route the user back to <c>HomePage</c>, plus
|
/// navigation owner to route the user back to <c>HomePage</c>.
|
||||||
/// a <c>Login</c> command that drives the OIDC interactive flow
|
|
||||||
/// and raises a <see cref="LoginSucceeded"/> event on success so
|
|
||||||
/// <c>MainWindow</c> can push <c>MainPage</c> on top of
|
|
||||||
/// <c>HomePage</c>.
|
|
||||||
///
|
///
|
||||||
/// Construction is deferred until the API client exists; the
|
/// Construction is deferred until the API client exists; the
|
||||||
/// App.axaml.cs wiring sets <see cref="Api"/> after building both,
|
/// App.axaml.cs wiring sets <see cref="Api"/> after building both,
|
||||||
|
|
@ -29,29 +21,12 @@ public partial class SessionStatusViewModel : ViewModelBase
|
||||||
/// <c>App.axaml.cs</c> listens and swaps the navigation root.</summary>
|
/// <c>App.axaml.cs</c> listens and swaps the navigation root.</summary>
|
||||||
public event System.Action? LogoutCompleted;
|
public event System.Action? LogoutCompleted;
|
||||||
|
|
||||||
/// <summary>Raised after <see cref="LoginAsync"/> acquired a valid session;
|
|
||||||
/// <c>App.axaml.cs</c> listens and pushes <c>MainPage</c> on top of
|
|
||||||
/// <c>HomePage</c> so the user lands on the blog editor.</summary>
|
|
||||||
public event System.Action? LoginSucceeded;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial bool IsLoggedIn { get; private set; }
|
public partial bool IsLoggedIn { get; private set; }
|
||||||
|
|
||||||
/// <summary>Inverse of <see cref="IsLoggedIn"/>, for XAML bindings
|
|
||||||
/// (the banner shows the Login button when the user is logged out).
|
|
||||||
/// Updated from <see cref="Refresh"/>.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool IsLoggedOut { get; private set; } = true;
|
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string SessionLabel { get; private set; } = "Déconnecté";
|
public partial string SessionLabel { get; private set; } = "Déconnecté";
|
||||||
|
|
||||||
/// <summary>True while a Login flow is in flight; the Login button
|
|
||||||
/// binds <c>IsEnabled</c> to <c>!IsBusy</c> via
|
|
||||||
/// <see cref="LoginCommand"/>'s <c>CanExecute</c>.</summary>
|
|
||||||
[ObservableProperty]
|
|
||||||
public partial bool IsBusy { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>The API client backing the banner. Set once at startup;
|
/// <summary>The API client backing the banner. Set once at startup;
|
||||||
/// the banner polls <c>HasValidSession</c> on demand rather than
|
/// the banner polls <c>HasValidSession</c> on demand rather than
|
||||||
/// subscribing to a stream — the session state only changes at
|
/// subscribing to a stream — the session state only changes at
|
||||||
|
|
@ -75,58 +50,9 @@ public partial class SessionStatusViewModel : ViewModelBase
|
||||||
{
|
{
|
||||||
var has = Api?.HasValidSession ?? false;
|
var has = Api?.HasValidSession ?? false;
|
||||||
IsLoggedIn = has;
|
IsLoggedIn = has;
|
||||||
IsLoggedOut = !has;
|
|
||||||
SessionLabel = has ? "Connecté" : "Déconnecté";
|
SessionLabel = has ? "Connecté" : "Déconnecté";
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Override the banner label with an error message. Used when
|
|
||||||
/// an interactive login attempt fails so the operator sees
|
|
||||||
/// something on the persistent UI without us needing a
|
|
||||||
/// dedicated error page. The next <see cref="Refresh"/> call
|
|
||||||
/// reverts to "Connecté" / "Déconnecté".
|
|
||||||
/// </summary>
|
|
||||||
public void SetError(string message)
|
|
||||||
{
|
|
||||||
IsLoggedIn = false;
|
|
||||||
IsLoggedOut = true;
|
|
||||||
SessionLabel = message;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Drive the OIDC interactive login. On success, refreshes
|
|
||||||
/// the banner state and raises <see cref="LoginSucceeded"/> so
|
|
||||||
/// the navigation owner can push <c>MainPage</c>. On failure,
|
|
||||||
/// surfaces the error in the banner via <see cref="SetError"/>.
|
|
||||||
/// </summary>
|
|
||||||
[RelayCommand(CanExecute = nameof(CanLogin))]
|
|
||||||
public async Task LoginAsync()
|
|
||||||
{
|
|
||||||
if (Api is null) return;
|
|
||||||
IsBusy = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await Api.LoginInteractiveAsync().ConfigureAwait(true);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
SetError($"Login failed: {ex.Message}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IsBusy = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Refresh();
|
|
||||||
if (Api.HasValidSession)
|
|
||||||
LoginSucceeded?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool CanLogin() => !IsBusy;
|
|
||||||
|
|
||||||
partial void OnIsBusyChanged(bool value) => LoginCommand.NotifyCanExecuteChanged();
|
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
public async System.Threading.Tasks.Task LogoutAsync()
|
public async System.Threading.Tasks.Task LogoutAsync()
|
||||||
{
|
{
|
||||||
|
|
@ -135,12 +61,4 @@ public partial class SessionStatusViewModel : ViewModelBase
|
||||||
Refresh();
|
Refresh();
|
||||||
LogoutCompleted?.Invoke();
|
LogoutCompleted?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
|
||||||
internal async Task OpenSettings()
|
|
||||||
{
|
|
||||||
var app = (App)App.Current!;
|
|
||||||
await app.PushPageAsync(app.ServiceProvider!.GetRequiredService<Settings>()).ConfigureAwait(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue