.forgejo/workflows/buildAndTest.yml

@@ -21,27 +21,33 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main", "release/*" ]
+    branches: [ "main" ]
 
 jobs:
-  build:
+  log-the-inputs:
-    runs-on: docker
+    runs-on: debian-latest
-    container:
-      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
     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
-      run: |
+      run: dotnet test --no-build --verbosity normal
-        echo "🚀 Lancement des tests..."
-        cd /src/_src && dotnet test --verbosity normal && echo "✅ Success !"

.forgejo/workflows/release.yml

@@ -1,332 +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
-
-          # Clone unshallow pour que GitVersion.MsBuild ait l'historique
-          # et les tags (sinon MSB3073 sur la cible Android cf. PR #21).
-          if [[ ! -d _src/.git ]]; then
-            git clone 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: Build des projets .NET (sans docker)
-        # L'image runner (pazof/yavsc-build-env) a le SDK .NET 10 + le
-        # workload Android, mais PAS le binaire `docker` ni de daemon
-        # Docker. On exécute donc les commandes dotnet directement
-        # au lieu de passer par `docker build`.
-        # Equivalent des stages build-env du Dockerfile (lignes
-        # restore + build Yavsc.Org + build Yavsc.Api + build
-        # Yavsc.Blogs + build PostIt.Android -r android-arm64).
-        run: |
-          cd /src/_src
-          dotnet restore
-          dotnet build src/Yavsc.Org/Yavsc.Org.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/Yavsc.Api/Yavsc.Api.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/Yavsc.Blogs/Yavsc.Blogs.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
-            -c Release --no-restore -clp:ErrorsOnly -r android-arm64
-
-      - name: Copier l'APK signé vers un emplacement connu
-        # Le build Android avec -r android-arm64 produit l'APK dans
-        # bin/Release/net10.0-android/android-arm64/. On le copie à
-        # la racine du checkout pour que l'étape d'upload le trouve.
-        run: |
-          cd /src/_src
-          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.postit-Signed.apk
-          if [[ ! -f "$APK" ]]; then
-            echo "::error::APK not found at $APK"
-            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64 2>/dev/null || true
-            exit 1
-          fi
-          cp "$APK" /src/_src/PostIt.Android.apk
-          ls -la /src/_src/PostIt.Android.apk
-
-      - 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 APK asset"
-          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/PostIt.Android.apk" \
-            "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android.apk")
-          echo "POST asset -> HTTP $HTTP"
-          echo "::endgroup::"
-
-          if [[ "$HTTP" != "201" ]]; then
-            echo "::error::Asset upload failed (HTTP $HTTP):"
-            cat /tmp/asset.json
-            exit 1
-          fi
-
-          echo "Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"

.github/workflows/docker-publish-android.yml

@@ -4,20 +4,7 @@ on:
   push:
     branches:
       - main
-    tags:
-      - '*'
   workflow_dispatch:
-    inputs:
-      force_unstable:
-        description: 'Publier une release avec suffixe (ex. 1.0.0-rc1) malgré le fail-fast par défaut.'
-        required: false
-        type: boolean
-        default: false
-
-# softprops/action-gh-release a besoin de contents: write
-# pour publier une release + uploader un asset.
-permissions:
-  contents: write
 
 jobs:
   apk-deploy:
@@ -25,9 +12,6 @@ jobs:
     steps:
       - name: Checkout du code
         uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-          fetch-tags: true
 
       # 1. Votre étape de build actuelle (on nomme l'image "postit-android")
       #    --target build-env : on ne veut que le stage de build (qui
@@ -40,7 +24,7 @@ jobs:
       - 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/fr.pschneider.postit-Signed.apk ./PostIt.Android.apk
+          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
@@ -50,134 +34,3 @@ jobs:
           path: ./PostIt.Android.apk
           retention-days: 7
 
-  # Job de validation : parse le tag, vérifie le format, applique la règle
-  # de parité du patch (pair=stable / impair=preview / suffixe=instable),
-  # et s'assure que CHANGELOG.md contient une section cohérente.
-  # Sans ce job, le job publish-release peut être bypassé (un attaquant
-  # qui contrôle un tag ne peut pas publier de release sans une section
-  # changelog cohérente).
-  validate-release:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout du code
-        uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Valider le tag et la section CHANGELOG
-        env:
-          FORCE_UNSTABLE: ${{ inputs.force_unstable || github.event.inputs.force_unstable || 'false' }}
-        run: |
-          TAG="${GITHUB_REF_NAME}"
-
-          # 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"
-
-          # Fail-fast sur instable sauf opt-in explicite via workflow_dispatch.
-          if [[ "$CHANNEL" == "unstable" && "$FORCE_UNSTABLE" != "true" ]]; then
-            echo "::error::Tag '$TAG' is unstable (suffix '$SUFFIX'). Refusing to publish."
-            echo "Set force_unstable=true via workflow_dispatch to override."
-            exit 1
-          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.
-          BODY=$(awk -v tag="[$TAG]" '
-            /^## \[/ {
-              if (in_section) exit
-              if (index($0, tag) > 0) in_section=1
-              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 titre de section.
-          # Format attendu : "## [TAG] - stable" / "- preview" / "- unstable".
-          HEADER=$(grep -m1 "^## \[$TAG\]" CHANGELOG.md)
-          if [[ "$HEADER" != *" - $CHANNEL"* ]]; then
-            echo "::error::Section '## [$TAG]' must declare suffix '- $CHANNEL' to match tag parity."
-            echo "Current section header: $HEADER"
-            exit 1
-          fi
-
-          echo "Section CHANGELOG validée pour [$TAG] - $CHANNEL"
-
-          # Exposition aux étapes suivantes via $GITHUB_ENV.
-          # heredoc <<EOF pour le body multi-lignes (pattern GitHub Actions).
-          {
-            echo "RELEASE_BODY<<EOF"
-            echo "$BODY"
-            echo "EOF"
-            echo "RELEASE_CHANNEL=$CHANNEL"
-            if [[ "$CHANNEL" == "stable" ]]; then
-              echo "IS_PRERELEASE=false"
-            else
-              echo "IS_PRERELEASE=true"
-            fi
-          } >> "$GITHUB_ENV"
-
-  publish-release:
-    # Déclenché uniquement par un push de tag. Le job apk-deploy produit
-    # l'artefact ; validate-release garantit la cohérence du tag et du
-    # changelog avant publication.
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: [apk-deploy, validate-release]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Récupérer l'APK depuis l'artefact
-        uses: actions/download-artifact@v7
-        with:
-          name: application-apk-release
-          path: ./
-
-      - name: Publier la release GitHub et uploader l'APK
-        uses: softprops/action-gh-release@v2
-        with:
-          # Le nom de fichier final dans la release. C'est ce qui
-          # apparaîtra dans l'asset et donc dans le permalink :
-          #   https://github.com/<owner>/<repo>/releases/latest/download/PostIt.Android.apk
-          files: ./PostIt.Android.apk
-          # Le body est extrait de la section CHANGELOG.md correspondant
-          # au tag, exposée par validate-release via $GITHUB_ENV.
-          body: ${{ env.RELEASE_BODY }}
-          # stable -> false (marque comme Latest).
-          # preview / unstable -> true (visible mais pas Latest).
-          prerelease: ${{ env.IS_PRERELEASE }}

.gitignore

@@ -39,6 +39,3 @@ DataDir/
 
 *.tests.trx
 *.tests.html
-
-*.log
-

.gitmodules

@@ -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

.vscode/launch.json

@@ -4,21 +4,6 @@
     // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "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",
             "type": "dotnet",
@@ -26,32 +11,23 @@
             "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
         },
         {
-      "name": "Yavsc Org",
+            "name": "Yavsc.Org",
             "type": "dotnet",
             "request": "launch",
             "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
         },
         {
-      "name": "Yavsc Blogs",
+            "name": "Yavsc.Blogs",
             "type": "dotnet",
             "request": "launch",
             "projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
         },
         {
-      "name": "PostIt Desktop",
+            "name": "PostIt",
             "type": "dotnet",
             "request": "launch",
             "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
         }
     ]
 }

.vscode/mcp.json

@@ -0,0 +1,11 @@
+{
+  "servers": {
+    "openclaw": {
+      "type": "stdio",
+      "command": "/home/paul/.nvm/versions/node/v22.23.0/bin/node",
+      "args": [
+        "/home/paul/Workspace/tools/openclaw-mcp-server.js"
+      ]
+    }
+  }
+}

.vscode/settings.json

@@ -5,7 +5,6 @@
         "appsettings",
         "asciidoctor",
         "ASPNETCORE",
-        "Avalonia",
         "Configurabilité",
         "Cratie",
         "DESTDIR",
@@ -13,11 +12,8 @@
         "DOTNET",
         "ecdsa",
         "envsubst",
-        "Hsts",
         "Newtonsoft",
         "Npgsql",
-        "Oidc",
-        "PKCE",
         "postit",
         "pschneider",
         "SLNDIR",

.vscode/tasks.json

@@ -1,42 +1,6 @@
 {
   "version": "2.0.0",
   "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"
-      ],
-      "problemMatcher": [
-        {
-          "owner": "dotnet",
-        "fileLocation": ["relative", "${workspaceFolder}"],
-        "source": "dotnet",
-        "pattern": {
-          "regexp": "^(.*):(\\d+):(\\d+):\\s+(error):\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
-        }
-      }
-      ]
-    },
     {
       "label": "build",
       "command": "dotnet",
@@ -49,17 +13,16 @@
       "isBackground": true
     },
     {
-      "label": "test blogs backend",
+      "label": "build-web",
       "type": "process",
       "problemMatcher": ["$msCompile"],
       "command": "dotnet",
-      "args": ["test"],
+      "args": ["build"],
       "options": {
-        "cwd": "src/Yavsc.Blogs.Tests"
+        "cwd": "src/Yavsc.Org"
       },
       "group": {
-        "kind": "test",
+        "kind": "build"
-        "isDefault": false
       }
     },
     {
@@ -75,6 +38,53 @@
         "kind": "build"
       },
       "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": {
+        
+      }
+
     }
   ]
 }

CHANGELOG.md

@@ -1,227 +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-rc3] - 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
-
-nothing, [TODO] a bug persists laoding a blog post from PostIt, ACL sould come along with and should not need any "Refresh" button.
-Today, assigning ACL succeeds the first time, the following times result in a 409
-
-## [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://github.com/pazof/yavsc/compare/HEAD
-[1.0.8-rc1]: https://github.com/pazof/yavsc/compare/1.0.7...1.0.8-rc1
-[1.0.7]: https://github.com/pazof/yavsc/compare/1.0.6...1.0.7
-[1.0.6]: https://github.com/pazof/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://github.com/pazof/yavsc/compare/1.0.5...1.0.6

CONTRIBUTING.md

@@ -49,57 +49,6 @@ Les tests sont répartis en :
   item « Tests d'intégration smoke par BC ».
 - `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
 
 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
   (`Int32`, `String`).
 - 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
 

Directory.Build.props

@@ -11,6 +11,5 @@
       from without conflicting names.
     -->
     <UseProjectNamespaceForGitVersionInformation>true</UseProjectNamespaceForGitVersionInformation>
-    <NoWarn>NU1701, NU1901, NU1902, NU1507</NoWarn>
   </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -18,7 +18,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" 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.NET.Test.Sdk" Version="18.7.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />

Dockerfile

@@ -46,6 +46,10 @@ COPY src/PostIt/PostIt.Desktop/*.csproj ./src/PostIt/PostIt.Desktop/
 # (2) Tout le code source
 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/api/v3/index.json --allow-insecure-connections
+
 # (4) Restore
 RUN dotnet restore
 

Dockerfile.backend

@@ -25,6 +25,9 @@ COPY src/PostIt/PostIt.Desktop/*.csproj ./src/PostIt/PostIt.Desktop/
 # 4. Copie de l'intégralité du code source
 COPY . .
 
+# 3. Restauration des dépendances avec vos workloads actifs
+RUN dotnet nuget add source https://isn.pschneider.fr/api/v3/index.json
+
 # 4. Restauration des dépendances pour tous les projets
 RUN dotnet restore
 

Makefile

@@ -48,77 +48,5 @@ docker-build:
 docker-run:
 	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

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>

README.md

@@ -1,19 +1,9 @@
 
 
 # Yavsc
-  [![The latest release made in the repository](https://forgejo.pschneider.fr/notazof/yavsc/badges/release.svg)](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é.
 
-# Statut actuel des actions Forgejo
-
-
-* [![Build and test](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/buildAndTest.yml/badge.svg)](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml)
-
-* [![Release](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/release.yml/badge.svg)](
-https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml
-)
-
 # Statut actuel des actions GitHub
 
 * [![Build and Push Yavsc Apk](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml)

contrib/Makefile

@@ -1,4 +1,4 @@
-APP_PROJECT_NAMES=Org Blogs
+APP_PROJECT_NAMES=Api Org Blogs
 SLNDIR=..
 
 include $(SLNDIR)/.env
@@ -7,6 +7,7 @@ include .env
 generated/:
 	@mkdir -p $@
 
+generated/yavscApi.service:
 generated/yavscOrg.service:
 generated/yavscBlogs.service:
 
@@ -33,11 +34,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
 	@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-Api: /etc/systemd/system/yavscApi.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); \
 		do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
 		echo "$${project} -> $${LCAPI}" ; \
@@ -84,6 +86,7 @@ stop-services:
 
 $(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.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
 
 showConfig: 
 	@echo CONFIGURATION: $(CONFIGURATION)
@@ -92,4 +95,4 @@ showConfig:
 clean:
 	@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

doc/architecture/postit.md

@@ -129,51 +129,30 @@ le DI est construit. Ordre, dans cet ordre :
 ## Navigation
 
 Le host de navigation est un `NavigationPage x:Name="NavRoot"`
-posé sur `MainWindow.axaml`. La pile est gérée par deux
+posé sur `MainWindow.axaml`. La pile est gérée par les
-mécanismes distincts :
+événements du `SessionStatusViewModel` :
-
-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).      |
+| `LoginSucceeded`                | `PushAsync(MainPage)` au-dessus de `HomePage`.                          |
 | `LogoutCompleted`               | `PopToRootAsync()` (revient à `HomePage`).                              |
-
+| `OpenSettingsRequested`         | `PushAsync(SettingsPage)` au-dessus de la page courante.                |
-   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
+taper **Retour** N fois pour sortir. Le handler
-dans `App.PushPageAsync` (et consommée par tous les chemins
+`OpenSettingsRequested` est gardé pour bloquer ce cas :
-de nav utilisateur) :
 
 ```csharp
-var stack = window.NavRoot.NavigationStack;
+var settingsPage = provider.GetRequiredService<SettingsPage>();
-if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
+var stack = w.NavRoot.NavigationStack;
+if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage))
 {
-    return Task.CompletedTask;  // déjà au sommet, no-op silencieux
+    return;  // déjà au sommet, no-op silencieux
 }
-return window.NavRoot.PushAsync(page);
+_ = w.NavRoot.PushAsync(settingsPage);
 ```
 
 La comparaison est par référence, pas par type : on ne veut
@@ -199,11 +178,9 @@ qui ne tiendrait plus).
 - `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
+  les trois événements qui pilotent la navigation
-  orchestrer la nav de boot (`LoginSucceeded`,
+  (`LoginSucceeded`, `LogoutCompleted`,
-  `LogoutCompleted`). La nav utilisateur déclenchée par
+  `OpenSettingsRequested`).
-  l'utilisateur passe par `App.PushPageAsync(vm)`, pas par
-  un événement du `SessionStatusViewModel`.
 
 - `MainPageViewModel` / `HomePageViewModel` /
   `SignaturePageViewModel` sont `Transient` — une nouvelle
@@ -256,14 +233,10 @@ pour `[RelayCommand]`".
   `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`
+  "Push après payment success") : passer par un événement sur
-  ni `NavigationPage` depuis le VM. La nav passe par
+  un VM singleton (cf. `SessionStatusViewModel.OpenSettingsRequested`),
-  `App.PushPageAsync(vm)` dans tous les cas : soit le VM
+  pas par une référence à `MainWindow` depuis le VM. Garder
-  appelle la méthode directement depuis une commande
+  les VMs découplés du `IClassicDesktopStyleApplicationLifetime`.
-  (`[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.

src/PostIt.Tests/BearerScopeTests.cs

@@ -1,8 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Text.Json;
-using Yavsc.Api.Client;
+using System.Threading;
+using System.Threading.Tasks;
 using PostIt.Services;
+using Xunit;
 
 namespace PostIt.Tests;
 
@@ -87,7 +94,7 @@ public class BearerScopeTests
             // 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>).
+            // deserialises to List<BlogPost>).
             var captured = new CapturingHttpHandler();
             var client = new YavscApiClient(
                 settings,
@@ -112,7 +119,7 @@ public class BearerScopeTests
             // 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/");
+            var blog = new BlogApiClient(subClient);
 
             await blog.GetPostsAsync(ct: TestContext.Current.CancellationToken);
 

src/PostIt.Tests/BlogApiTestFakes.cs

@@ -1,4 +1,4 @@
-using Yavsc.Blogspot;
+using PostIt.Models;
 using PostIt.Services;
 using PostIt.ViewModels;
 
@@ -17,7 +17,7 @@ internal sealed class CallRecorder
 
 /// <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
+/// a server-issued BlogPost (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>
@@ -43,20 +43,20 @@ internal sealed class RecordingYavscApiClient : YavscApiClient
     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
+        // BlogPost? boxes to BlogPost at runtime, so we test the
-        // non-nullable type — typeof(BlogPostDto?) is a C# error
+        // non-nullable type — typeof(BlogPost?) is a C# error
         // (CS8639: "typeof cannot be used on a nullable reference
         // type").
-        if (typeof(T) == typeof(BlogPostDto))
+        if (typeof(T) == typeof(BlogPost))
-            return Task.FromResult((T)(object)new BlogPostDto
+            return Task.FromResult((T)(object)new BlogPost
             {
                 Id = 42,
                 Title = "Mon premier billet",
                 AuthorId = "tester",
                 Article = "Contenu du billet de test.",
             });
-        if (typeof(T) == typeof(List<BlogPostDto>))
+        if (typeof(T) == typeof(List<BlogPost>))
-            return Task.FromResult((T)(object)new List<BlogPostDto>
+            return Task.FromResult((T)(object)new List<BlogPost>
             {
                 new() { Id = 42, Title = "Mon premier billet" }
             });

src/PostIt.Tests/Directory.Packages.props

@@ -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>

src/PostIt.Tests/FakeAuthorizingBrowser.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 using IdentityModel.OidcClient.Browser;
 
 namespace PostIt.Tests;

src/PostIt.Tests/MainPageSaveTests.cs

@@ -1,8 +1,9 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
 using Avalonia.VisualTree;
-using Yavsc.Blogspot;
+using PostIt.Models;
-using Yavsc.Api.Client;
+using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
 namespace PostIt.Tests;
@@ -23,7 +24,7 @@ namespace PostIt.Tests;
 /// 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>
+/// <c>if (SelectedPost is null) { new BlogPost { 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>
@@ -39,8 +40,8 @@ public class MainPageSaveTests
         // 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 blog = new BlogApiClient(api);
-        var viewModel = new MainViewModel(blog);
+        var viewModel = new MainPageViewModel(blog);
 
         var page = new MainPage { DataContext = viewModel };
         // MainPage is a ContentPage (a Page, not a Control), so it
@@ -75,14 +76,14 @@ public class MainPageSaveTests
         // we inspect the recorder.
         await Task.Delay(200);
 
-        // Assert: the first POST to "blog" carried a BlogPostDto
+        // Assert: the first POST to "blog" carried a BlogPost
         // 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);
+        var sent = Assert.IsType<BlogPost>(body);
         Assert.Equal(typed, sent.Title);
     }
 }

src/PostIt.Tests/OidcStubAuthority.cs

@@ -1,8 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/PostIt.Tests.csproj

@@ -6,28 +6,26 @@
     <IsPackable>false</IsPackable>
     <RootNamespace>PostIt.Tests</RootNamespace>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <FileVersion>1.0.1.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.0.1-5+Branch.main.Sha.0617fc6bda7151c70559d87177e2dcfb1b60995f</InformationalVersion>
-    <Version>1.1.0-beta.1</Version>
+    <Version>1.0.1-5</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Xamarin.UITest" />
     <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    
     <PackageReference Include="coverlet.collector" />
-
     <PackageReference Include="Avalonia.Headless" />
     <PackageReference Include="Avalonia.Headless.XUnit" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PostIt\PostIt.csproj" />
+    <ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
   </ItemGroup>
 </Project>

src/PostIt.Tests/PostItViewModelTests.cs

@@ -1,5 +1,4 @@
-using Yavsc.Blogspot;
+using PostIt.Models;
-using Yavsc.Api.Client;
 using PostIt.Services;
 using PostIt.ViewModels;
 
@@ -15,12 +14,12 @@ public class PostItViewModelTests
         // default; tests construct one with a fake YavscApiClient that
         // throws on any call (we never call the API in this test).
         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.SearchCommand.Execute(null);
@@ -41,15 +40,15 @@ public class PostItViewModelTests
         // The new BlogApiClient delegates transport to YavscApiClient.
         // We feed it a fake YavscApiClient that returns the expected
         // list straight from CallAsync.
-        var expected = new List<BlogPostDto>
+        var expected = new List<BlogPost>
         {
             new() { Id = 1, Title = "Hello" },
             new() { Id = 2, Title = "World" }
         };
         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("Hello", posts[0].Title);
@@ -77,8 +76,8 @@ public class PostItViewModelTests
     /// <summary>Test fake that hands back a canned list of posts from any CallAsync.</summary>
     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(
                 new Settings
                 {
@@ -98,7 +97,7 @@ public class PostItViewModelTests
         {
             // The canned fake only knows about a list of posts; the
             // 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(default(T)!);
         }

src/PostIt.Tests/SchemeUrlDetectorTests.cs

@@ -1,4 +1,5 @@
 using PostIt.Services;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/SessionStatusBannerTests.cs

@@ -1,5 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
+using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using PostIt.ViewModels;
@@ -9,7 +11,7 @@ namespace PostIt.Tests;
 
 /// <summary>
 /// UI tests for <see cref="SessionStatusBanner"/>. Mounted inside
-/// a real <see cref="MainView"/> via the headless Avalonia
+/// a real <see cref="MainWindow"/> via the headless Avalonia
 /// platform declared in <c>TestApp.cs</c>.
 ///
 /// <para>The pattern is the one that <c>UnitTest1.MainPage_Should_Load</c>
@@ -34,10 +36,11 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_renders_three_buttons_in_the_visual_tree()
     {
-        MainWindow window = new MainWindow();
+        var window = new MainWindow();
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
         window.Show();
 
-        var buttons = window.GetVisualDescendants()
+        var buttons = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .ToList();
 
@@ -45,7 +48,7 @@ public class SessionStatusBannerTests
         // 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.Equal(3, 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");
@@ -54,10 +57,13 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_login_button_is_visible_when_logged_out()
     {
-        MainWindow window = new MainWindow();
+        var window = new MainWindow();
+        var vm = new SessionStatusViewModel();
+        Assert.True(vm.IsLoggedOut);  // VM default
+        window.SessionBanner.DataContext = vm;
         window.Show();
 
-        var login = window.GetVisualDescendants()
+        var login = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se connecter");
 
@@ -69,13 +75,13 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_logout_button_is_hidden_when_logged_out()
     {
-       SessionStatusBanner banner = CreateBanner();
+        var window = new MainWindow();
+        var vm = new SessionStatusViewModel();
+        Assert.False(vm.IsLoggedIn);  // VM default
+        window.SessionBanner.DataContext = vm;
+        window.Show();
 
-        Assert.False((banner.DataContext as SessionStatusViewModel)!
+        var logout = window.SessionBanner.GetVisualDescendants()
-        .IsLoggedIn);  // VM default
-
-
-        var logout = banner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se déconnecter");
 
@@ -85,9 +91,11 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_settings_button_is_visible_regardless_of_session()
     {
-        SessionStatusBanner banner = CreateBanner();
+        var window = new MainWindow();
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
+        window.Show();
 
-        var settings = banner.GetVisualDescendants()
+        var settings = window.SessionBanner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Paramètres");
 
@@ -97,21 +105,14 @@ public class SessionStatusBannerTests
         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 window = new MainWindow();
-        var label = banner.GetVisualDescendants()
+        window.SessionBanner.DataContext = new SessionStatusViewModel();
+        window.Show();
+
+        var label = window.SessionBanner.GetVisualDescendants()
             .OfType<TextBlock>()
             .First(t => t.Text == "Déconnecté" || t.Text == "Connecté");
 

src/PostIt.Tests/SettingsLoadTests.cs

@@ -1,3 +1,9 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
 namespace PostIt.Tests;
 
 public class SettingsLoadTests
@@ -85,7 +91,7 @@ public class SettingsLoadTests
                         bool flip = ((workerId + i) & 1) == 0;
                         settings.DarkMode = flip;
                         settings.Authentication.RedirectUri =
-                            global::AuthenticationSettings.DesktopRedirectUri;
+                            global::AuthenticationSettings.DefaultDesktopRedirectUri;
 
                         settings.BusinessApiUrl = flip
                             ? "https://a.example.test/api/v1/"
@@ -103,7 +109,7 @@ public class SettingsLoadTests
                 {
                     failures.Add(ex);
                 }
-            }, TestContext.Current.CancellationToken);
+            });
         }
         await Task.WhenAll(tasks);
 
@@ -123,7 +129,7 @@ public class SettingsLoadTests
     /// and checking that Loaded flips exactly once (no torn reads).
     /// </summary>
     [Fact]
-    public async Task Load_is_idempotent_under_concurrent_calls()
+    public void Load_is_idempotent_under_concurrent_calls()
     {
         var settings = new PostIt.ViewModels.Settings
         {
@@ -143,9 +149,9 @@ public class SettingsLoadTests
             {
                 barrier.SignalAndWait();
                 settings.Load();
-            }, TestContext.Current.CancellationToken);
+            });
         }
-        await Task.WhenAll(tasks);
+        Task.WaitAll(tasks);
 
         Assert.True(settings.Loaded);
     }

src/PostIt.Tests/SignaturePadControlTests.cs

@@ -1,5 +1,8 @@
+using System;
+using System.Linq;
 using PostIt.Controls;
 using PostIt.Models;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/SignaturePageViewModelTests.cs

@@ -1,6 +1,10 @@
+using System;
+using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 using PostIt.Controls;
 using PostIt.ViewModels;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt.Tests/UnitTest1.cs

@@ -1,4 +1,5 @@
 using Avalonia.Headless.XUnit;
+using Avalonia.Controls;
 using PostIt.Views;
 
 namespace PostIt.Tests;
@@ -8,7 +9,8 @@ public class MainPageTests
     [AvaloniaFact]
     public void MainPage_Should_Load()
     {
-        var window = new MainView();
+        var window = new MainWindow();
+        window.Show();
         Assert.NotNull(window);
     }
 }

src/PostIt.Tests/YavscApiClientTests.cs

@@ -1,10 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Text.Json;
-using PostIt.Services;
+using System.Threading;
+using System.Threading.Tasks;
+using IdentityModel.OidcClient;
 using IdentityModel.OidcClient.Browser;
+using PostIt.Services;
 using PostIt.ViewModels;
+using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt/Directory.Packages.props

@@ -1,39 +1,20 @@
 <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 -->
-  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersionBase>12.1.1</AvaloniaVersionBase>
-    </PropertyGroup>
   <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="Material.Avalonia" Version="3.17.0" />
-        <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
-
+    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.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>
 </Project>

src/PostIt/Makefile

@@ -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

src/PostIt/PostIt.Android/Application.cs

@@ -2,12 +2,6 @@
 using Android.Runtime;
 using Avalonia;
 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
 {

src/PostIt/PostIt.Android/MainActivity.cs

@@ -1,11 +1,8 @@
-
 using Android.App;
-using Android.Content;
 using Android.Content.PM;
-using AndroidX.Core.Provider;
+using Android.Content;
-using AndroidX.Emoji2.Text;
+using Avalonia;
 using Avalonia.Android;
-using PostIt.Droid.Services;
 
 namespace PostIt.Android;
 
@@ -15,27 +12,25 @@ namespace PostIt.Android;
     Theme = "@style/MyTheme.NoActionBar",
     Icon = "@drawable/icon",
     MainLauncher = true,
+    LaunchMode = LaunchMode.SingleTask,
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity
 {
     /// <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>
     public static MainActivity? Current { get; private set; }
 
     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);
+        PlatformBootstrap.EnsureInitialized();
         Current = this;
     }
+
     /// <summary>
     /// Receives the deep-link Intent fired by the system browser after 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)
     {
         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

src/PostIt/PostIt.Android/PlatformBootstrap.cs

@@ -12,9 +12,14 @@ namespace PostIt.Android;
 /// </summary>
 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 = ViewModels.Settings.AndroidRedirectUri;
         Platform.CreateBrowser = () =>
         {
             var activity = MainActivity.Current;

src/PostIt/PostIt.Android/PostIt.Android.csproj

@@ -2,30 +2,35 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <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>
-    <ApplicationId>fr.pschneider.postit</ApplicationId>
+    <ApplicationId>com.CompanyName.PostIt</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
+    <InformationalVersion>1.0.1-5+Branch.main.Sha.0617fc6bda7151c70559d87177e2dcfb1b60995f</InformationalVersion>
+    <Version>1.0.1-5</Version>
   </PropertyGroup>
-
   <ItemGroup>
     <AndroidResource Include="Icon.png">
       <Link>Resources\drawable\Icon.png</Link>
     </AndroidResource>
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia.Android" />
     <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
     <PackageReference Include="Xamarin.AndroidX.Browser" />
-
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Android/Properties/AndroidManifest.xml

@@ -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">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<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>
 </manifest>

src/PostIt/PostIt.Android/Resources/values/font_certs.xml

@@ -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>

src/PostIt/PostIt.Android/Services/AndroidSystemBrowser.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Android.App;
+using Android.Content;
 using AndroidX.Browser.CustomTabs;
 using IdentityModel.OidcClient.Browser;
-using PostIt.Droid.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 callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
+
         var tabsIntent = new CustomTabsIntent.Builder()
-            .SetShowTitle(true)!
+            .SetShowTitle(true)
             .Build();
-        tabsIntent!.LaunchUrl(_activity, uri);
+        tabsIntent.LaunchUrl(_activity, uri);
 
         string responseUri;
         try

src/PostIt/PostIt.Android/Services/OidcCallbackManager.cs

@@ -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);
-    }
-}

src/PostIt/PostIt.Android/WebAuthenticationCallbackActivity.cs

@@ -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();
-    }
-}

src/PostIt/PostIt.Browser/PostIt.Browser.csproj

@@ -4,10 +4,10 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <FileVersion>1.0.1.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.0.1-5+Branch.main.Sha.0617fc6bda7151c70559d87177e2dcfb1b60995f</InformationalVersion>
-    <Version>1.1.0-beta.1</Version>
+    <Version>1.0.1-5</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia.Browser" />
@@ -15,4 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Browser/Program.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
 using PostIt;

src/PostIt/PostIt.Desktop/PlatformBootstrap.cs

@@ -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 OIDC login path 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 = AuthenticationSettings.DefaultDesktopRedirectUri;
+        Platform.CustomScheme = "postit";
+    }
+}

src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj

@@ -5,10 +5,10 @@
     See https://docs.avaloniaui.net/docs/guides/platforms/platform-specific-code/dotnet for more details.-->
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <FileVersion>1.0.1.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+49.Branch.release-1.0.8-rc3.Sha.5274d7bdf5d14406748a2063b5ae15191aac4359</InformationalVersion>
+    <InformationalVersion>1.0.1-5+Branch.main.Sha.0617fc6bda7151c70559d87177e2dcfb1b60995f</InformationalVersion>
-    <Version>1.1.0-beta.1</Version>
+    <Version>1.0.1-5</Version>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -24,4 +24,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" />
+  </ItemGroup>
 </Project>

src/PostIt/PostIt.Desktop/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using Avalonia;
 using PostIt.Services;
 
@@ -12,6 +13,8 @@ sealed class Program
     [STAThread]
     public static void Main(string[] args)
     {
+        PlatformBootstrap.EnsureInitialized();
+
         // Short-circuit 2nd-instance launches (OS handing us the
         // postit://callback URL) BEFORE Avalonia spins up a window.
         // If we let Avalonia initialise, the new MainWindow flashes
@@ -66,6 +69,9 @@ sealed class Program
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+#if DEBUG
+            .WithDeveloperTools()
+#endif
             .WithInterFont()
             .LogToTrace();
 }

src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs

@@ -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]);
-    }
-}

src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs

@@ -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;
-        }
-    }
-}

src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs

@@ -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 _));
-    }
-}

src/PostIt/PostIt.Tests/MainPageButtonsTests.cs

@@ -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&lt;Button&gt;()</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);
-    }
-}

src/PostIt/PostIt.Tests/PostAclDialogTests.cs

@@ -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);
-    }
-}

src/PostIt/PostIt.Tests/TestAppContext.cs

@@ -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; }
-}

src/PostIt/PostIt/App.axaml

@@ -1,9 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              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>
         <local:ViewLocator/>
@@ -11,5 +9,7 @@
 
     <Application.Styles>
         <FluentTheme />
+            <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
+
     </Application.Styles>
 </Application>

src/PostIt/PostIt/App.axaml.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
-using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
-using PostIt.Helpers;
 
 namespace PostIt;
 
@@ -25,9 +24,11 @@ public partial class App : Application
     /// binding sink with a cross-thread exception inside
     /// <c>DataValidationErrors.SetErrors</c>.
     /// </summary>
-    public IServiceProvider? ServiceProvider { get; private set; }
+    public IServiceProvider? Services { get; private set; }
 
-    public MainView? View { get; private set; }
+    public App()
+    {
+    }
 
     public override void Initialize()
     {
@@ -36,74 +37,174 @@ public partial class App : Application
 
     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;
 
-        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>();
+        // 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) the OpenSettingsRequested handler is a
+        // pure push with a no-op-if-already-on-top guard, never a
+        // re-resolution from DI. 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>();
+
+        // ViewModels
+        services.AddSingleton(settings);
+        services.AddSingleton(api);
+        services.AddSingleton(client);
+        services.AddTransient<MainPageViewModel>();
+        services.AddTransient<HomePageViewModel>();
+        services.AddTransient<SignaturePageViewModel>();
+
+        // 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();
+
+        // Bind the canonical Settings to the static accessor so any
+        // code path that can't easily take a constructor parameter
+        // (designer surfaces, Avalonia data templates) still gets
+        // the same instance the rest of the app is using. Idempotent:
+        // re-binding from a second App boot (tests) is a no-op.
+        Settings.BindToServiceProvider(provider);
+
+        Services = provider;
+
+        DataTemplates.Clear();
+        DataTemplates.Add(new ViewLocator(provider));
+
+        // Wire the Settings singleton onto the SettingsPage singleton
+        // once, at composition time. The page is registered as a
+        // singleton (see above) precisely so this binding is stable
+        // for the lifetime of the app: every push to / pop from the
+        // navigation stack finds the same ContentPage with the same
+        // DataContext, and the TwoWay bindings inside the page keep
+        // mutating the same in-memory Settings instance that the rest
+        // of the app reads (OidcClientOptions construction, etc.).
+        provider.GetRequiredService<SettingsPage>().DataContext = settings;
+
+        // Settings.DarkMode was previously a dead field: it round-
+        // tripped through the settings file and the SettingsPage
+        // CheckBox, but no consumer ever read it. Wire it here to
+        // Application.RequestedThemeVariant so the toggle takes
+        // effect immediately, and seed the initial theme from the
+        // value Load() just populated (so a dark-mode user lands on
+        // a dark window on first launch, not on a default-light
+        // window that flips after the user touches the toggle).
+        ApplyDarkMode(settings);
+        settings.PropertyChanged += (_, e) =>
+        {
+            if (e.PropertyName == nameof(Settings.DarkMode))
+            {
+                ApplyDarkMode(settings);
+            }
+        };
 
         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;
-            var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
+            _ = window.NavRoot.PushAsync(homePage);
-            desktop.MainWindow.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api);
-            View = window.MainView;
-            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)
-{
-    var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
-
-    // Déclencher le Boot lors du chargement du contrôle à l'écran
-    rootView.AttachedToVisualTree += async (_, _) => await BootAsync(this.ServiceProvider!, api);
-
-    var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
             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 () =>
+            // When the user signs in interactively (Login button on
+            // the session banner), push MainPage on top of HomePage.
+            sessionStatus.LoginSucceeded += () =>
             {
-        await PushMainPageAsync();
+                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
+                _ = PushMainPageAsync(provider, w);
             };
 
-    rootView.SessionBanner.DataContext = sessionStatus;
+            // When the user clicks the "Paramètres" button on the
+            // session banner, push the SettingsPage singleton on top
+            // of the current navigation stack. The DataContext is
+            // already wired at composition time (see the
+            // provider.GetRequiredService<SettingsPage>().DataContext
+            // assignment above), so this handler is a pure
+            // navigation concern.
+            //
+            // Anti-empilement guard: if the SettingsPage is already
+            // at the top of the stack, do nothing. NavigationPage's
+            // PushAsync does not deduplicate; calling it twice with
+            // the same instance would push it a second time and the
+            // user would have to tap Back twice to leave. Reference
+            // comparison is correct here because SettingsPage is a
+            // singleton — there is exactly one instance to compare
+            // against.
+            sessionStatus.OpenSettingsRequested += () =>
+            {
+                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
+                var settingsPage = provider.GetRequiredService<SettingsPage>();
+                var stack = w.NavRoot.NavigationStack;
+                if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage))
+                {
+                    return;
                 }
+                _ = w.NavRoot.PushAsync(settingsPage);
+            };
 
-    /// <summary>
+            window.Opened += async (_, _) => await BootAsync(provider, api, window);
-    /// Test-only hook: bind a concrete <see cref="MainView"/> so
+        }
-    /// command-driven navigation paths (<see cref="PushPage"/>) can
+        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
-    /// 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));
+            singleView.MainView = new MainWindow
+            {
+                DataContext = provider.GetRequiredService<HomePageViewModel>()
+            };
+        }
     }
 
     private static void ApplyDarkMode(Settings settings)
@@ -122,32 +223,30 @@ private void ConfigureRootView(MainView rootView)
     /// </summary>
     private static async Task BootAsync(
         IServiceProvider provider,
-        YavscApiClient api)
+        YavscApiClient api,
+        MainWindow window)
     {
         var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
         var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
         sessionStatus.Refresh();
-        var homePage = provider.GetRequiredService<HomePageViewModel>();
-        var app = (App)Current!;
-        await app.PushPageAsync(homePage);
         if (!refreshed) return;
 
-        await PushMainPageAsync().ConfigureAwait(true);
+        await PushMainPageAsync(provider, window).ConfigureAwait(true);
     }
 
     /// <summary>
-    /// Resolve a fresh <c>MainPageViewModel</c> from DI and push its
+    /// Resolve a fresh <c>MainPage</c> + VM from DI and push it on top
-    /// 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()
+    private static async Task PushMainPageAsync(IServiceProvider provider, MainWindow window)
     {
-        var app = (App)Current!;
+        var mainVm = provider.GetRequiredService<MainPageViewModel>();
-        var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
+        var mainPage = provider.GetRequiredService<MainPage>();
-        await app.PushPageAsync(mainVm);
+        mainPage.DataContext = mainVm;
+        await window.NavRoot.PushAsync(mainPage).ConfigureAwait(true);
     }
 
     private bool TryHandOffCustomSchemeUrl()
@@ -182,8 +281,4 @@ private void ConfigureRootView(MainView rootView)
         return true;
     }
 
-    internal async Task GoBackAsync()
-    {
-        await View!.NavRoot.PopAsync();
-    }
 }

src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs

@@ -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();
-    }
-}

src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs

@@ -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);
-    }
-}

src/PostIt/PostIt/Models/BlogPost.cs

@@ -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; }
+}

src/PostIt/PostIt/PostIt.csproj

@@ -1,14 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
+    <InformationalVersion>1.0.1-5+Branch.main.Sha.0617fc6bda7151c70559d87177e2dcfb1b60995f</InformationalVersion>
+    <Version>1.0.1-5</Version>
   </PropertyGroup>
-
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </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>
     <Content Include="postit-settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -20,20 +37,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" />
+    <PackageReference Include="GitVersion.MsBuild" />
-    <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>

src/PostIt/PostIt/Services/BlogApiClient.cs

@@ -3,18 +3,17 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Yavsc.Blogspot;
+using PostIt.Models;
 
-namespace Yavsc.Api.Client;
+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"/>, which lives in the consuming
+/// <see cref="YavscApiClient"/>. This class is a thin DTO↔path
-/// application (PostIt). This class is a thin DTO↔path mapper,
+/// mapper, nothing more.
-/// nothing more.
 ///
 /// <para><b>URL convention.</b> <see cref="YavscApiClient"/>'s
 /// <c>BaseAddress</c> already terminates with <c>/api/v1/</c>
@@ -35,50 +34,35 @@ public sealed class BlogApiClient
 {
     private const string DefaultPathPrefix = "blog";
 
-    private readonly IYavscApiClient _api;
+    private readonly YavscApiClient _api;
-    private readonly Uri _baseAddress;
     private readonly string _pathPrefix;
 
-    public BlogApiClient(IYavscApiClient api, string blogsBaseAddress, string pathPrefix = DefaultPathPrefix)
+    public BlogApiClient(YavscApiClient api, string pathPrefix = DefaultPathPrefix)
     {
         _api = api ?? throw new ArgumentNullException(nameof(api));
-        if (string.IsNullOrEmpty(blogsBaseAddress))
-            throw new ArgumentException("Base address is required.", nameof(blogsBaseAddress));
 
-        // e.g. "https://blogs.pschneider.fr/api/v1/" — keep the
+        // ApiUrl is e.g. "https://blogs.pschneider.fr/api/v1/" — keep the
         // trailing slash so relative paths ("posts") resolve correctly.
-        _baseAddress = new Uri(blogsBaseAddress);
+        api.Http.BaseAddress = new Uri(api.Settings.BlogsApiUrl);
-        api.Http.BaseAddress = _baseAddress;
 
         _pathPrefix = pathPrefix?.TrimStart('/') ?? DefaultPathPrefix;
     }
 
-    public Task<List<BlogPostDto>> GetPostsAsync(int start = 0, int take = 25, CancellationToken ct = default)
+    public Task<List<BlogPost>> GetPostsAsync(int start = 0, int take = 25, CancellationToken ct = default)
-        => _api.CallAsync<List<BlogPostDto>>(
+        => _api.CallAsync<List<BlogPost>>(
             HttpMethod.Get,
             $"{_pathPrefix}?start={start}&take={take}",
             ct: ct);
 
-    public Task<BlogPostDto?> GetPostAsync(long id, CancellationToken ct = default)
+    public Task<BlogPost?> GetPostAsync(long id, CancellationToken ct = default)
-        => _api.CallAsync<BlogPostDto?>(HttpMethod.Get, $"{_pathPrefix}/{id}", ct: ct);
+        => _api.CallAsync<BlogPost?>(HttpMethod.Get, $"{_pathPrefix}/{id}", ct: ct);
 
-    public Task<BlogPostDto?> CreatePostAsync(BlogPostDto post, CancellationToken ct = default)
+    public Task<BlogPost?> CreatePostAsync(BlogPost post, CancellationToken ct = default)
-        => _api.CallAsync<BlogPostDto?>(HttpMethod.Post, _pathPrefix, body: post, ct: ct);
+        => _api.CallAsync<BlogPost?>(HttpMethod.Post, _pathPrefix, body: post, ct: ct);
 
-    public Task UpdatePostAsync(long id, BlogPostDto post, CancellationToken ct = default)
+    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);
-
-    /// <summary>
-    /// Set a post's publication state. <c>true</c> publishes
-    /// it (visible to anonymous readers via
-    /// <c>PermissionHandler.IsPublic</c>); <c>false</c> takes
-    /// it back to draft. Idempotent: the resulting state
-    /// matches the call, regardless of the previous state.
-    /// </summary>
-    public Task SetPublishAsync(long id, bool publish, CancellationToken ct = default)
-        => _api.CallAsync(HttpMethod.Put, $"{_pathPrefix}/{id}/publish",
-            body: new { publish }, ct: ct);
 }

src/PostIt/PostIt/Services/IContactService.cs

@@ -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);

src/PostIt/PostIt/Services/IUserDirectory.cs

@@ -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;
-}

src/PostIt/PostIt/Services/Platform.cs

@@ -21,14 +21,14 @@ public static class Platform
     /// override this property at startup (e.g. PostIt.Android sets
     /// it to <c>android://postit-signin</c>).
     /// </summary>
-    public const string RedirectUri = "postit://callback";
+    public static string DefaultRedirectUri { get; set; } = "postit://callback";
 
     /// <summary>
     /// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
     /// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
     /// that want to register their own scheme.
     /// </summary>
-    public const string CustomScheme = "postit";
+    public static string CustomScheme { get; set; } = "postit";
 
     /// <summary>
     /// Constructs a fresh <see cref="IBrowser"/> for the running platform.

src/PostIt/PostIt/Services/UserDirectory.Desktop.cs

@@ -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

src/PostIt/PostIt/Services/UserDirectory.Mobile.cs

@@ -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

src/PostIt/PostIt/Services/YavscApiClient.cs

@@ -3,12 +3,12 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using IdentityModel.OidcClient;
 using PostIt.ViewModels;
-using Yavsc.Api.Client;
 
 namespace PostIt.Services;
 
@@ -24,7 +24,7 @@ namespace PostIt.Services;
 /// <see cref="BearerTokenHandler"/> only refreshes once even if many
 /// concurrent requests are in flight.
 /// </summary>
-public class YavscApiClient : IYavscApiClient, IAsyncDisposable
+public class YavscApiClient : IAsyncDisposable
 {
     // 60s of slack before the access_token's nominal expiry. Covers
     // network latency + JWT validation on the server side.

src/PostIt/PostIt/Settings/AuthenticationSettings.cs

@@ -10,7 +10,7 @@ public partial class AuthenticationSettings : ObservableObject
     /// hand-off in <see cref="PostIt.Services.SingleInstance"/>
     /// (RFC 8252 §7.1). Production Desktop builds use this.
     /// </summary>
-    public const string DesktopRedirectUri = "postit://callback";
+    public const string DefaultDesktopRedirectUri = "postit://callback";
 
     /// <summary>
     /// Redirect URI used by the Android app. The corresponding IntentFilter
@@ -21,9 +21,6 @@ public partial class AuthenticationSettings : ObservableObject
     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]
     public partial string Authority { get; set; }
 
@@ -34,19 +31,15 @@ public partial class AuthenticationSettings : ObservableObject
     [ObservableProperty]
     public partial string[] Scopes { get; set; }
 
+
     /// <summary>
-    /// OAuth redirect URI. Defaults to <see cref="DesktopRedirectUri"/>
+    /// 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; }
+    public partial string RedirectUri { get; set; } = DefaultDesktopRedirectUri;
-#if ANDROID
-    = AndroidRedirectUri;
-#else
-    = DesktopRedirectUri;
-#endif
 
     /// <summary>
     /// Space-separated view of <see cref="Scopes"/>. Exists for the

src/PostIt/PostIt/ViewLocator.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,38 +10,24 @@ namespace PostIt;
 /// <summary>
 /// Given a view model, returns the corresponding view if possible.
 /// </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
 {
+     private readonly IServiceProvider _services;
+
+    public ViewLocator(IServiceProvider services)
+    {
+        _services = services;
+    }
 
     public Control Build(object? data)
     {
-        try
-        {
-            return BuildCore(data);
-        }
-        catch (Exception ex)
-        {
-            return new TextBlock { Text = $"ViewLocator threw: {ex}" };
-        }
-    }
-
-
-    private Control BuildCore(object? data)
-    {
-        var app = App.Current as App;
-        var services = app!.ServiceProvider!;
         return data switch
         {
-            MainViewModel => services.GetRequiredService<MainPage>(),
+            MainPageViewModel => _services.GetRequiredService<MainPage>(),
-            Settings => services.GetRequiredService<SettingsPage>(),
+            Settings => _services.GetRequiredService<SettingsPage>(),
-            HomePageViewModel => services.GetRequiredService<HomePage>(),
+            HomePageViewModel => _services.GetRequiredService<HomePage>(),
-            SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
+            SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
-            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}" }
         };

src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs

@@ -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();
-    }
-}

src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs

@@ -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;
-        }
-    }
-}

src/PostIt/PostIt/ViewModels/HomePageViewModel.cs

@@ -1,12 +1,11 @@
-using CommunityToolkit.Mvvm.Input;
+using PostIt;
 using PostIt.Services;
-namespace PostIt.ViewModels;
+using PostIt.ViewModels;
 
 public class HomePageViewModel : ViewModelBase
 {
     public YavscApiClient Api { get; }
     public Settings Settings { get; }
-    public SessionStatusViewModel SessionStatus { get; }
 
     private string _welcomeText = "Welcome to PostIt!";
     public string WelcomeText
@@ -18,14 +17,12 @@ public class HomePageViewModel : ViewModelBase
     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 HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus)
+    public HomePageViewModel(YavscApiClient api, Settings settings)
     {
         Api = api;
         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
@@ -35,8 +32,5 @@ public class HomePageViewModel : ViewModelBase
     /// (thread-safe dispatcher marshalling on PropertyChanged) — a
     /// designer-only duplicate instance is therefore harmless.
     /// </summary>
-    public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel())
+    public HomePageViewModel() : this(null!, new Settings()) { }
-    {
-
-    }
 }

src/PostIt/PostIt/ViewModels/MainPageViewModel.cs

@@ -2,17 +2,14 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia;
 using CommunityToolkit.Mvvm.ComponentModel;
 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;
 
-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>
@@ -27,7 +24,7 @@ public partial class MainViewModel : ViewModelBase
     /// 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
+    /// and caused Save to POST a <c>BlogPost</c> with an empty
     /// title — hence the 400 "The Title field is required".</summary>
     [ObservableProperty]
     public partial string DraftTitle { get; set; }
@@ -37,17 +34,8 @@ public partial class MainViewModel : ViewModelBase
     [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 partial ViewModelBase? CurrentViewModel { get; set; }
 
     public Settings SettingsModel { get; }
 
@@ -58,13 +46,13 @@ public partial class MainViewModel : ViewModelBase
     public partial string SearchText { get; set; }
 
     [ObservableProperty]
-    public partial ObservableCollection<BlogPostDto> Posts { get; set; }
+    public partial ObservableCollection<BlogPost> Posts { get; set; }
 
     [ObservableProperty]
-    public partial ObservableCollection<BlogPostDto> FilteredPosts { get; set; }
+    public partial ObservableCollection<BlogPost> FilteredPosts { get; set; }
 
     [ObservableProperty]
-    public partial BlogPostDto? SelectedPost { get; set; }
+    public partial BlogPost? SelectedPost { get; set; }
 
     [ObservableProperty]
     public partial bool IsBusy { get; set; }
@@ -80,67 +68,25 @@ public partial class MainViewModel : ViewModelBase
     /// </summary>
     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 CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
 
-    private SignaturePageViewModel ResolveSignatureModel()
-    {
-        var sp = ResolveServices();
-        return sp.GetRequiredService<SignaturePageViewModel>();
-    }
 
-    private IServiceProvider ResolveServices()
+    public MainPageViewModel()
-    {
-        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()
     {
+        Init(null);
         SettingsModel = new Settings();
-        Init(SettingsModel);
         BlogClient = null;
     }
 
     private void Init(Settings? settings)
     {
         SearchText = string.Empty;
-        Posts = new ObservableCollection<BlogPostDto>();
+        Posts = new ObservableCollection<BlogPost>();
-        FilteredPosts = new ObservableCollection<BlogPostDto>();
+        FilteredPosts = new ObservableCollection<BlogPost>();
         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
@@ -151,37 +97,29 @@ public partial class MainViewModel : ViewModelBase
         // sink; that crash is fixed in Settings.OnPropertyChanged
         // (thread-safe dispatcher marshalling) so the duplicate
         // instance is now merely wasteful, not dangerous.
-
+        Settings = settings ?? new Settings();
+        WindowTitle = "PostIt";
+        DraftTitle = string.Empty;
+        DraftArticle = string.Empty;
+        CurrentViewModel = this;
     }
 
-    /// <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>
     /// Test-friendly constructor: caller supplies a pre-built
     /// <see cref="BlogApiClient"/>. Production code uses the
     /// (Settings, BlogApiClient) overload below.
     /// </summary>
-    public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+    public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null)
     {
          SettingsModel = new Settings();
         BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient));;
-        Services = services;
+
         Init(settings);
         }
 
     partial void OnSearchTextChanged(string value) => ApplyFilter();
 
-    partial void OnSelectedPostChanged(BlogPostDto? value)
+    partial void OnSelectedPostChanged(BlogPost? value)
     {
         // Mirror the selection into the editor buffer so the
         // XAML-bound TextBox/TextEditor show the right content
@@ -192,9 +130,6 @@ public partial class MainViewModel : ViewModelBase
         // 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();
     }
 
@@ -211,7 +146,7 @@ public partial class MainViewModel : ViewModelBase
     {
         await ExecuteAsync(async () =>
         {
-            var posts = await BlogClient!.GetPostsAsync();
+            var posts = await BlogClient.GetPostsAsync();
             Posts.Clear();
             foreach (var post in posts.OrderByDescending(p => p.DateModified))
             {
@@ -241,7 +176,7 @@ public partial class MainViewModel : ViewModelBase
 
         await ExecuteAsync(async () =>
         {
-            // Build a fresh BlogPostDto from the editor buffer on
+            // Build a fresh BlogPost from the editor buffer on
             // every Save — we no longer mutate SelectedPost in
             // place. The previous behaviour copied the buffer
             // (which was a no-op when SelectedPost was null)
@@ -253,14 +188,14 @@ public partial class MainViewModel : ViewModelBase
             // the update path.
             if (SelectedPost is null || SelectedPost.Id == 0)
             {
-                var draft = new BlogPostDto
+                var draft = new BlogPost
                 {
                     Title = DraftTitle,
                     Article = DraftArticle ?? string.Empty,
                     DateCreated = DateTime.UtcNow,
                     DateModified = DateTime.UtcNow,
                 };
-                var created = await BlogClient!.CreatePostAsync(draft);
+                var created = await BlogClient.CreatePostAsync(draft);
                 if (created is not null)
                 {
                     SelectedPost = created;
@@ -269,7 +204,7 @@ public partial class MainViewModel : ViewModelBase
             }
             else
             {
-                var update = new BlogPostDto
+                var update = new BlogPost
                 {
                     Id = SelectedPost.Id,
                     AuthorId = SelectedPost.AuthorId,
@@ -279,7 +214,7 @@ public partial class MainViewModel : ViewModelBase
                     DateCreated = SelectedPost.DateCreated,
                     DateModified = DateTime.UtcNow,
                 };
-                await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
+                await BlogClient.UpdatePostAsync(SelectedPost.Id, update);
                 StatusMessage = $"Saved post {SelectedPost.Id}.";
             }
 
@@ -298,82 +233,22 @@ public partial class MainViewModel : ViewModelBase
 
         await ExecuteAsync(async () =>
         {
-            await BlogClient!.DeletePostAsync(SelectedPost.Id);
+            await BlogClient.DeletePostAsync(SelectedPost.Id);
             StatusMessage = $"Deleted post {SelectedPost.Id}.";
             SelectedPost = null;
             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]
-    internal async Task TogglePublish()
+    internal void OpenSettings()
     {
-        if (SelectedPost is null || SelectedPost.Id == 0)
+        CurrentViewModel = SettingsModel;
-        {
-            StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
-            return;
-        }
-
-        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]
-    internal async Task OpenSignatureDev()
-    {
-        await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true);
-    }
-
-    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()
     {
-        var posts = await BlogClient!.GetPostsAsync();
+        var posts = await BlogClient.GetPostsAsync();
         Posts.Clear();
         foreach (var post in posts.OrderByDescending(p => p.DateModified))
         {
@@ -431,23 +306,14 @@ public partial class MainViewModel : ViewModelBase
         DeleteCommand.NotifyCanExecuteChanged();
     }
 
-
+    /// <summary>Save is enabled as soon as the user has typed
-
+    /// a non-whitespace title in the editor, regardless of
-    [RelayCommand(CanExecute = nameof(CanManageAcl))]
+    /// whether a post is selected. The "no selection" case is
-    public async Task ManageAcl()
+    /// the create-new-post path; the "with selection" case is
-    {
+    /// the update path. Both read from the editor buffer.
-        if (SelectedPost is null)
+    /// Previously this also required <c>SelectedPost is not null</c>
-        {
+    /// — which contradicted the create-new-post intent and
-            StatusMessage = "Select an existing post before managing ACL.";
+    /// forced the buggy "draft with empty title" branch.</summary>
-            return;
+    private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle);
-        }
+    private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
-        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);
-    }
 }

src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs

@@ -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;
-        }
-    }
-}

src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs

@@ -2,8 +2,6 @@ using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.Extensions.DependencyInjection;
-using PostIt.Helpers;
 using PostIt.Services;
 
 namespace PostIt.ViewModels;
@@ -34,6 +32,15 @@ public partial class SessionStatusViewModel : ViewModelBase
     /// <c>HomePage</c> so the user lands on the blog editor.</summary>
     public event System.Action? LoginSucceeded;
 
+    /// <summary>Raised when the user clicks the "Paramètres" button on
+    /// the session banner. <c>App.axaml.cs</c> listens and pushes
+    /// <c>SettingsPage</c> (resolved from DI, bound to the canonical
+    /// <c>Settings</c> singleton) on top of the current navigation
+    /// stack. Same event pattern as <see cref="LogoutCompleted"/> and
+    /// <see cref="LoginSucceeded"/> so the VM stays decoupled from
+    /// <c>NavigationPage</c> / window lifetime.</summary>
+    public event System.Action? OpenSettingsRequested;
+
     [ObservableProperty]
     public partial bool IsLoggedIn { get; private set; }
 
@@ -137,10 +144,9 @@ public partial class SessionStatusViewModel : ViewModelBase
     }
 
     [RelayCommand]
-    internal async Task OpenSettings()
+    public async System.Threading.Tasks.Task OpenSettingsCommand()
     {
-        var app = (App)App.Current!;
+        OpenSettingsRequested?.Invoke();
-        await app.PushPageAsync(app.ServiceProvider!.GetRequiredService<Settings>()).ConfigureAwait(true);
+        await System.Threading.Tasks.Task.CompletedTask;
     }
-
 }

src/PostIt/PostIt/ViewModels/Settings.cs

@@ -2,11 +2,12 @@ using System.Runtime.CompilerServices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using IdentityModel.OidcClient;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net.Http;
 using System.Text.Json;
+using System.Threading;
 
 [assembly: InternalsVisibleTo("PostIt.Tests")]
 
@@ -16,6 +17,70 @@ public partial class Settings : ViewModelBase
 {
     const string SettingsFileName = "postit-settings.json";
 
+    /// <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>
+    /// Process-wide canonical <see cref="Settings"/> instance, wired up
+    /// at application boot by <see cref="App.OnFrameworkInitializationCompleted"/>
+    /// through <see cref="BindToServiceProvider"/>. The hybrid pattern:
+    /// <list type="bullet">
+    ///   <item><description>The static <c>Current</c> reference gives
+    ///   ViewModels a non-DI way to reach the same instance (and lets
+    ///   the framework bindings push notifications through one stable
+    ///   <see cref="ObservableObject"/>).</description></item>
+    ///   <item><description>Tests that want to exercise a clean
+    ///   instance still call <c>new Settings()</c>; <c>Current</c>
+    ///   stays null in those contexts because <see cref="BindToServiceProvider"/>
+    ///   is never invoked.</description></item>
+    ///   <item><description>Reads (<see cref="GetCurrent"/>) are
+    ///   thread-safe and never allocate; mutations always go through
+    ///   the DI-resolved singleton so two threads cannot each register
+    ///   a different "current" Settings.</description></item>
+    /// </list>
+    /// </summary>
+    private static Settings? s_current;
+
+    /// <summary>
+    /// Wire the canonical Settings instance to a DI container. Called
+    /// exactly once from <c>App.axaml.cs</c> after the singleton has
+    /// been registered. Subsequent calls are no-ops: the DI container
+    /// owns the instance lifetime and we don't want a stray
+    /// <c>BindToServiceProvider</c> in a test fixture to silently
+    /// rebind the production instance.
+    /// </summary>
+    public static void BindToServiceProvider(IServiceProvider services)
+    {
+        if (services is null) throw new ArgumentNullException(nameof(services));
+        Interlocked.CompareExchange(ref s_current,
+            services.GetService<Settings>() ?? throw new InvalidOperationException(
+                "Settings is not registered in the DI container."),
+            null);
+    }
+
+    /// <summary>
+    /// Returns the canonical Settings instance previously bound through
+    /// <see cref="BindToServiceProvider"/>, or <c>null</c> when called
+    /// outside a running Avalonia application (tests, CLI tools).
+    /// </summary>
+    public static Settings? GetCurrent() => Volatile.Read(ref s_current);
+
+    /// <summary>
+    /// Resolve the canonical Settings instance or throw. Use this in
+    /// production code paths that must not silently fall back to a
+    /// freshly-constructed <see cref="Settings"/> (which used to be
+    /// the root cause of the postit://callback crash: two Settings
+    /// instances racing on PropertyChanged from different threads).
+    /// </summary>
+    public static Settings RequireCurrent() =>
+        GetCurrent() ?? throw new InvalidOperationException(
+            "Settings.Current is not bound. Call App.OnFrameworkInitializationCompleted first.");
+
     [ObservableProperty]
     public partial AuthenticationSettings Authentication { get; set; } = new();
 
@@ -33,7 +98,7 @@ public partial class Settings : ViewModelBase
     /// setters above all funnel through here, and we flip
     /// <see cref="IsDirty"/> in lock-step. Sub-property mutations
     /// (e.g. <c>Authentication.Authority</c>) are caught by the
-    /// subscription wired up in
+    /// subscription wired up in <see cref="OnAuthenticationChanged"/>
     /// below. <see cref="ApplyJson"/> disables the flag during bulk
     /// hydration so the disk load itself does not count as a user
     /// edit.
@@ -113,20 +178,10 @@ public partial class Settings : ViewModelBase
                 RedirectUri = Authentication.RedirectUri,
                 Scope = string.Join(' ', MergeScopes(this.Authentication.Scopes)),
                 TokenClientCredentialStyle = IdentityModel.Client.ClientCredentialStyle.PostBody,
-                PostLogoutRedirectUri = Authentication.Authority,
+                PostLogoutRedirectUri = "https//yavsc.pschneider.fr",
                 // PKCE is enabled by default when no client_secret is provided.
             };
 
-            if (IsDevelopmentEnvironment())
-            {
-                // Dev only: allow local/self-signed TLS for discovery/token
-                // endpoints when the machine does not trust a custom root.
-                options.BackchannelHandler = new HttpClientHandler
-                {
-                    ServerCertificateCustomValidationCallback = (_, _, _, _) => true
-                };
-            }
-
             if (browser is not null)
                 options.Browser = browser;
 
@@ -176,14 +231,6 @@ public partial class Settings : ViewModelBase
         }
     }
 
-    private static bool IsDevelopmentEnvironment()
-    {
-        return string.Equals(
-            Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"),
-            "Development",
-            StringComparison.OrdinalIgnoreCase);
-    }
-
     internal void Load()
     {
         if (Loaded) return;
@@ -284,14 +331,15 @@ public partial class Settings : ViewModelBase
             var settings = JsonSerializer.Deserialize<Settings>(json);
             if (settings is null)
             {
-                UseDefaultSettings();
+                Console.Error.WriteLine($"🩎 Settings payload is invalid (source: {source}).");
+                return;
             }
             // Apply under the gate so concurrent Load() callers cannot
             // see half the new values / half the old ones. The actual
             // PropertyChanged fan-out is handled by [ObservableProperty]'s
             // setters which we route through SetProperty → OnPropertyChanged
             // → our overridden dispatcher-safe marshaller below.
-            else lock (_mutationGate)
+            lock (_mutationGate)
             {
                 this.Authentication = settings.Authentication;
                 this.DarkMode = settings.DarkMode;
@@ -303,12 +351,7 @@ public partial class Settings : ViewModelBase
                     this.Authentication.ClientId = string.IsNullOrWhiteSpace(settings.Authentication.ClientId) ?
                      AuthenticationSettings.DefaultClientId : settings.Authentication.ClientId;
                     this.Authentication.RedirectUri = string.IsNullOrWhiteSpace(settings.Authentication.RedirectUri) ?
-                     AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
+                     AuthenticationSettings.DefaultDesktopRedirectUri : settings.Authentication.RedirectUri;
-                    if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
-                    {
-                        settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
-                    }
-                    else
                     this.Authentication.Scopes = settings.Authentication.Scopes;
                 }
             }
@@ -338,18 +381,6 @@ public partial class Settings : ViewModelBase
         }
     }
 
-    private void UseDefaultSettings()
-    {
-        this.Authentication = new AuthenticationSettings
-        {
-            Authority = AuthenticationSettings.DefaultAuthority,
-            ClientId = AuthenticationSettings.DefaultClientId,
-            RedirectUri = AuthenticationSettings.DesktopRedirectUri,
-            Scopes = AuthenticationSettings.DefaultScopes
-        };
-        this.DarkMode = false;
-    }
-
     /// <summary>
     /// Persist the current in-memory state to
     /// <c>~/.config/PostIt/postit-settings.json</c> (Linux) /

src/PostIt/PostIt/ViewModels/ViewModelBase.cs

@@ -1,9 +1,11 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Styling;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace PostIt.ViewModels;
 
 public abstract partial class ViewModelBase : ObservableObject
 {
+    
     /// <summary>
     /// Gets if the user can navigate to the next page
     /// </summary>

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml

@@ -1,62 +0,0 @@
-<ContentPage
-        xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="PostIt.Views.AddCircleMemberDialog"
-        xmlns:vm="using:PostIt.ViewModels"
-        xmlns:services="using:PostIt.Services"
-        x:DataType="vm:AddCircleMemberDialogViewModel"
-      >
-
-    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
-
-        <!-- Search box + button -->
-        <Grid Grid.Row="0" ColumnDefinitions="*,Auto" Margin="0,0,0,8"
-              IsEnabled="{Binding !IsBusy}">
-            <TextBox Grid.Column="0"
-                     Text="{Binding SearchQuery, Mode=TwoWay}"
-                     PlaceholderText="Nom ou email d'un utilisateur Yavsc..."
-                     HorizontalAlignment="Stretch"/>
-            <Button Grid.Column="1" Content="Rechercher"
-                    Command="{Binding SearchAsync}"
-                    Margin="8,0,0,0"/>
-        </Grid>
-
-        <!-- Selection hint -->
-        <TextBlock Grid.Row="1"
-                   Text="Sélectionnez un résultat puis cliquez Ajouter."
-                   FontSize="11" Opacity="0.6"
-                   Margin="0,0,0,8"/>
-
-        <!-- Search results -->
-        <ListBox Grid.Row="2"
-                 ItemsSource="{Binding Results}"
-                 SelectedItem="{Binding Selected, Mode=TwoWay}"
-                MinHeight="20"
-                 >
-            <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="services:UserSummary">
-                    <StackPanel Spacing="2">
-                        <TextBlock Text="{Binding DisplayName}"
-                                   FontWeight="Bold"/>
-                        <TextBlock Text="{Binding UserName}"
-                                   FontSize="11" Opacity="0.6"/>
-                    </StackPanel>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-
-        <!-- Action buttons -->
-        <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="0,8,0,0">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
-            <Button Grid.Column="1" Content="Ajouter"
-                    x:Name="AddButton"
-                    Command="{Binding AddAsync}"
-                    IsEnabled="{Binding Selected, Converter={x:Static ObjectConverters.IsNotNull}}"
-                    Margin="0,0,8,0"/>
-            <Button Grid.Column="2" Content="Fermer"
-                    x:Name="CloseButton"
-                   Command="{Binding CloseAsync}"/>
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs

@@ -1,50 +0,0 @@
-
-using Avalonia.Markup.Xaml;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-using PostIt.Services;
-using PostIt.ViewModels;
-using System.Threading.Tasks;
-
-namespace PostIt.Views;
-
-/// <summary>
-/// Modal "add a member to a circle" page. Hosted by
-/// <c>CirclesPage</c>; the caller passes the resolved
-/// <see cref="IUserDirectory"/> via the constructor.
-///
-/// <para>The dialog raises <c>Confirmed</c> on its ViewModel
-/// when the user picks a result and clicks "Ajouter"; the
-/// hosting page subscribes to that event and calls
-/// <c>CircleApiClient.AddMemberAsync</c> with the target
-/// circle id. The dialog itself does not know the circle id
-/// by design.</para>
-/// </summary>
-public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
-{
-    public AddCircleMemberDialog()
-    {
-        InitializeComponent();
-
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    /// <summary>
-    /// Subscribe a handler to be notified when the user
-    /// confirms a selection. Returns the underlying VM so
-    /// the caller can also drive further state (clear the
-    /// selection, close the dialog, refresh its own list).
-    /// </summary>
-    public AddCircleMemberDialogViewModel? ViewModel
-        => DataContext as AddCircleMemberDialogViewModel;
-
-    private async Task OnCloseClicked(object? sender, RoutedEventArgs e)
-    {
-        App app = App.Current! as App;
-        await app!.GoBackAsync();
-    }
-}

src/PostIt/PostIt/Views/CirclesPage.axaml

@@ -1,111 +0,0 @@
-<ContentPage
-        xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="PostIt.Views.CirclesPage"
-        xmlns:vm="using:PostIt.ViewModels"
-        xmlns:dtos="using:Yavsc.Api.Client.Dtos"
-        x:DataType="vm:CirclesPageViewModel"
-      >
-    <Grid RowDefinitions="Auto,*,Auto">
-
-        <!-- Toolbar: refresh + new -->
-        <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8" Margin="12">
-            <Button Content="Rafraîchir"
-                    Command="{Binding RefreshCommand}"/>
-            <Button Content="Nouveau"
-                    Command="{Binding StartCreateCommand}"/>
-        </StackPanel>
-
-        <!-- Two-pane body: circles (left) + members (right) -->
-        <Grid Grid.Row="1" Margin="12,0,12,12"
-              ColumnDefinitions="*,16,*"
-              RowDefinitions="*,Auto">
-
-            <!-- Left column: list of circles + editor -->
-            <Grid Grid.Row="0" Grid.Column="0"
-                  RowDefinitions="*,Auto">
-                <ListBox Grid.Row="0"
-                         ItemsSource="{Binding Circles}"
-                         SelectedItem="{Binding SelectedCircle, Mode=TwoWay}">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate x:DataType="dtos:CircleDto">
-                            <Grid ColumnDefinitions="*,Auto,Auto">
-                                <StackPanel Grid.Column="0" Spacing="2">
-                                    <TextBlock Text="{Binding Name}" FontWeight="Bold"/>
-                                    <TextBlock Text="{Binding Public, StringFormat='Public : {0}'}"
-                                               FontSize="11" Opacity="0.6"/>
-                                </StackPanel>
-                                <Button Grid.Column="1" Content="Éditer"
-                                        Command="{Binding $parent[ContentPage].((vm:CirclesPageViewModel)DataContext).StartEditCommand}"
-                                        CommandParameter="{Binding}"/>
-                                <Button Grid.Column="2" Content="Supprimer"
-                                        Command="{Binding $parent[ContentPage].((vm:CirclesPageViewModel)DataContext).DeleteCommand}"
-                                        CommandParameter="{Binding}"/>
-                            </Grid>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-
-                <!-- Editor -->
-                <Grid Grid.Row="1" Margin="0,12,0,0" RowDefinitions="Auto,Auto,Auto"
-                      ColumnDefinitions="Auto,*" IsEnabled="{Binding !IsBusy}">
-                    <TextBlock Grid.Row="0" Grid.Column="0" Text="Nom :"
-                               VerticalAlignment="Center" Margin="0,0,8,0"/>
-                    <TextBox Grid.Row="0" Grid.Column="1"
-                             Text="{Binding DraftName, Mode=TwoWay}"/>
-                    <CheckBox Grid.Row="1" Grid.Column="1"
-                              Content="Public"
-                              IsChecked="{Binding DraftPublic, Mode=TwoWay}"/>
-                    <Button Grid.Row="2" Grid.Column="1" Content="Enregistrer"
-                            Command="{Binding SaveCommand}"
-                            HorizontalAlignment="Right" Margin="0,8,0,0"/>
-                </Grid>
-            </Grid>
-
-            <!-- Right column: members of the selected circle -->
-            <Grid Grid.Row="0" Grid.Column="2"
-                  RowDefinitions="Auto,*,Auto">
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8" Margin="0,0,0,8">
-                    <TextBlock Text="Membres"
-                               FontWeight="Bold"
-                               VerticalAlignment="Center"/>
-                    <Button Content="Ajouter un membre"
-                            Command="{Binding OpenAddMemberAsync}"/>
-                </StackPanel>
-                <ListBox Grid.Row="1"
-                         ItemsSource="{Binding Members}">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate x:DataType="dtos:CircleMemberDto">
-                            <Grid ColumnDefinitions="*,Auto">
-                                <StackPanel Grid.Column="0" Spacing="2">
-                                    <TextBlock Text="{Binding FullName}"
-                                               FontWeight="Bold"/>
-                                    <TextBlock Text="{Binding UserName}"
-                                               FontSize="11" Opacity="0.6"/>
-                                </StackPanel>
-                                <Button Grid.Column="1" Content="Retirer"
-                                        Command="{Binding $parent[ContentPage].((vm:CirclesPageViewModel)DataContext).RemoveMemberCommand}"
-                                        CommandParameter="{Binding}"/>
-                            </Grid>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-                <!-- Empty-state hint -->
-                <TextBlock Grid.Row="2"
-                           Text="Sélectionnez un cercle pour voir ses membres."
-                           IsVisible="{Binding SelectedCircle, Converter={x:Static ObjectConverters.IsNull}}"
-                           FontSize="11" Opacity="0.6"
-                           Margin="0,8,0,0"/>
-            </Grid>
-        </Grid>
-
-        <!-- Status bar -->
-        <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="12,0,12,12">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
-            <ProgressBar Grid.Column="1" IsIndeterminate="True"
-                         IsVisible="{Binding IsBusy}"
-                         Width="120"/>
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/CirclesPage.axaml.cs

@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace PostIt.Views;
-
-public partial class CirclesPage : ContentPage
-{
-
-    public CirclesPage()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}

src/PostIt/PostIt/Views/HomePage.axaml

@@ -1,12 +1,7 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
              x:Class="PostIt.Views.HomePage"
-             x:DataType="vm:HomePageViewModel"
              Header="Home">
-             <Design.DataContext>
-                  <vm:HomePageViewModel />
-              </Design.DataContext>
         <StackPanel HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Spacing="12">
@@ -14,9 +9,5 @@
                            FontSize="22"
                            FontWeight="SemiBold"
                            HorizontalAlignment="Center"/>
-          <Button Content="Open Blog Interface"
-                  Command="{Binding OpenBlogs}"
-                  HorizontalAlignment="Center"
-                  IsEnabled="{Binding SessionStatus.IsLoggedIn}"/>
         </StackPanel>
 </ContentPage>

src/PostIt/PostIt/Views/MainPage.axaml

@@ -3,16 +3,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:PostIt.ViewModels"
-             xmlns:models="using:Yavsc.Blogspot"
+             xmlns:models="using:PostIt.Models"
              xmlns:views="using:PostIt.Views"
              xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
              mc:Ignorable="d"
              x:Class="PostIt.Views.MainPage"
-             x:DataType="vm:MainViewModel"
+             x:DataType="vm:MainPageViewModel"
              HorizontalAlignment="Stretch"
              VerticalAlignment="Stretch">
     <Design.DataContext>
-        <vm:MainViewModel />
+        <vm:MainPageViewModel />
     </Design.DataContext>
 
     <Grid Margin="12" RowSpacing="12"
@@ -27,30 +27,13 @@
         <StackPanel Grid.Row="0" Spacing="12"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Top">
+            <TextBlock Text="PostIt Blog API Interface" FontSize="20" FontWeight="Bold" />
 
             <StackPanel Orientation="Horizontal" Spacing="8">
                 <Button Command="{Binding LoadPosts}" Content="Load posts" />
                 <Button Command="{Binding Search}" Content="Filter" />
                 <Button Command="{Binding Save}" Content="Save" />
                 <Button Command="{Binding Delete}" Content="Delete" />
-                <Button x:Name="ManageAclButton"
-                        Command="{Binding ManageAcl}"
-                        Content="ACL" />
-                <Button x:Name="OpenCirclesButton"
-                        Command="{Binding OpenCircles}"
-                        Content="Mes cercles" />
-                <!-- Publication toggle: a CheckBox wired to
-                     DraftIsPublished. Clicking it fires
-                     TogglePublishCommand, which pushes the
-                     new state to /api/blog/{id}/publish.
-                     The CheckBox is the canonical
-                     AvaloniaXaml 'toggle' surface; binding
-                     IsChecked TwoWay keeps the visual state
-                     and the buffer in sync. -->
-                <CheckBox Content="Publié"
-                          IsChecked="{Binding DraftIsPublished, Mode=TwoWay}"
-                          Command="{Binding TogglePublishCommand}"
-                          VerticalAlignment="Center"/>
                 <!--
                     DEV ONLY: temporary shortcut to open the signature
                     capture page. Production entry point is a SignalR
@@ -59,17 +42,17 @@
                     MainPage.axaml.cs once the SignalR handler lands.
                 -->
                 <Button x:Name="OpenSignatureDevButton"
-                        Command="{Binding OpenSignatureDev}"
                         Content="[DEV] Signature"
+                        Click="OpenSignatureDev"
                         ToolTip.Tip="DEV ONLY — to remove when SignalR handler lands" />
             </StackPanel>
         </StackPanel>
 
         <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Padding="8">
             <ListBox ItemsSource="{Binding FilteredPosts}" SelectedItem="{Binding SelectedPost, Mode=TwoWay}"
-                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinHeight="40">
+                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <ListBox.ItemTemplate>
-                    <DataTemplate x:DataType="models:BlogPostDto">
+                    <DataTemplate x:DataType="models:BlogPost">
                         <StackPanel Spacing="4">
                             <TextBlock Text="{Binding Title}" FontWeight="SemiBold" />
                             <TextBlock Text="{Binding DateModified, StringFormat='Updated: {0:yyyy-MM-dd HH:mm}'}" FontSize="10" Foreground="Gray" />
@@ -97,15 +80,16 @@
 
                 <TextBlock Grid.Row="0" Text="Post detail" FontWeight="SemiBold" />
                 <TextBox Grid.Row="1" Text="{Binding DraftTitle, Mode=TwoWay}" PlaceholderText="Title" />
-               <TextBox Grid.Row="2" PlaceholderText="Write something here !"
+                <AvaloniaEdit:TextEditor Grid.Row="2"
-                  Text="{Binding DraftArticle, Mode=TwoWay}"
+                    views:TextEditorBinding.Text="{Binding DraftArticle, Mode=TwoWay}"
+                    ShowLineNumbers="True"
+                    FontFamily="Cascadia Code, Consolas, Menlo, Monospace"
                     MinHeight="320"
                     HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch">
+                    VerticalAlignment="Stretch"
-                </TextBox>
+                    VerticalScrollBarVisibility="Auto"
-
+                    HorizontalScrollBarVisibility="Auto" />
                 <TextBlock Grid.Row="3" Text="{Binding StatusMessage}" Foreground="Gray" />
-
             </Grid>
         </Border>
     </Grid>

src/PostIt/PostIt/Views/MainPage.axaml.cs

@@ -1,4 +1,8 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.ViewModels;
 
 namespace PostIt.Views;
 
@@ -8,4 +12,31 @@ public partial class MainPage : ContentPage
     {
         InitializeComponent();
     }
+
+    /// <summary>
+    /// DEV ONLY: temporary shortcut to open the signature capture
+    /// page from the blog editor. The production entry point is a
+    /// SignalR push from Yavsc.Org ("devis received, sign here"),
+    /// which is the only path that carries the devis identifier
+    /// needed to bind the capture to a specific contract.
+    ///
+    /// Remove this method and the corresponding button in
+    /// MainPage.axaml.cs once the SignalR handler lands.
+    /// </summary>
+    private void OpenSignatureDev(object? sender, RoutedEventArgs e)
+    {
+        // Resolve via the App's DI container so the page gets
+        // the canonical services (Api client, settings, ...).
+        var app = Application.Current as App;
+        var services = app?.Services;
+        if (services is null) return;
+
+        var page = services.GetRequiredService<SignaturePage>();
+        page.DataContext = services.GetRequiredService<SignaturePageViewModel>();
+
+        if (this.VisualRoot is MainWindow window)
+        {
+            _ = window.NavRoot.PushAsync(page);
+        }
+    }
 }

src/PostIt/PostIt/Views/MainView.axaml

@@ -1,22 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:views="using:PostIt.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PostIt.Views.MainView"
-             x:DataType="vm:MainViewModel">
-  <Design.DataContext>
-    <!-- This only sets the DataContext for the previewer in an IDE,
-    to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
-    <vm:MainViewModel />
-  </Design.DataContext>
-
-  <DockPanel LastChildFill="True">
-    <views:SessionStatusBanner
-      x:Name="SessionBanner"
-      DockPanel.Dock="Bottom"/>
-    <NavigationPage x:Name="NavRoot"/>
-  </DockPanel>
-</UserControl>

src/PostIt/PostIt/Views/MainView.axaml.cs

@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace PostIt.Views;
-
-public partial class MainView : UserControl
-{
-    public MainView()
-    {
-        InitializeComponent();
-    }
-}

src/PostIt/PostIt/Views/MainWindow.axaml

@@ -1,12 +1,27 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:PostIt.ViewModels"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="using:PostIt.Views"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:DataType="vm:MainPageViewModel"
         x:Class="PostIt.Views.MainWindow"
-        Icon="/Assets/avalonia-logo.ico"
+        >
-        Title="PostIt">
+
-        <views:MainView x:Name="MainView" />
+    <!--
+        Root layout: persistent session banner on top, navigation
+        surface below. The banner is the single source of truth for
+        "Connecté / Déconnecté" and the logout button — visible on
+        every page (HomePage, MainPage) so the user never has to dig
+        through a menu to find their session state.
+
+        The navigation stack is built programmatically in
+        App.OnFrameworkInitializationCompleted: HomePage is the
+        root, MainPage is pushed on top when the silent refresh
+        succeeds at boot or after a fresh login from HomePage.
+    -->
+    <DockPanel LastChildFill="True">
+        <views:SessionStatusBanner x:Name="SessionBanner"
+                                   DockPanel.Dock="Top"/>
+        <NavigationPage x:Name="NavRoot"/>
+    </DockPanel>
+
 </Window>

src/PostIt/PostIt/Views/PostAclDialog.axaml

@@ -1,64 +0,0 @@
-<ContentPage
-        xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="PostIt.Views.PostAclDialog"
-        xmlns:vm="using:PostIt.ViewModels"
-        xmlns:dtos="using:Yavsc.Api.Client.Dtos"
-        xmlns:yabst="using:Yavsc.Abstract.Identity.Security"
-        x:DataType="vm:PostAclDialogViewModel"
-      >
-    <Grid RowDefinitions="Auto,*,Auto,Auto" Margin="12">
-
-        <!-- Add a new authorisation -->
-        <Grid Grid.Row="0" ColumnDefinitions="*,Auto" Margin="0,0,0,8"
-              IsEnabled="{Binding !IsBusy}">
-            <ComboBox Grid.Column="0"
-                      ItemsSource="{Binding MyCircles}"
-                      SelectedItem="{Binding SelectedCircleToAdd, Mode=TwoWay}"
-                      PlaceholderText="Choisir un cercle..."
-                      HorizontalAlignment="Stretch">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate x:DataType="dtos:CircleDto">
-                        <TextBlock Text="{Binding Name}"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <Button Grid.Column="1" Content="Ajouter"
-                    Command="{Binding AddCommand}"
-                    Margin="8,0,0,0"/>
-        </Grid>
-
-        <!-- Current ACL entries -->
-        <ListBox Grid.Row="1"
-                 ItemsSource="{Binding AclEntries}">
-            <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="yabst:CircleAuthorization">
-                    <Grid ColumnDefinitions="*,Auto">
-                        <StackPanel Grid.Column="0" Spacing="2">
-                            <TextBlock Text="{Binding CircleId, StringFormat='Cercle #{0}'}"
-                                       FontWeight="Bold"/>
-                        </StackPanel>
-                        <Button Grid.Column="1" Content="Révoquer"
-                                Command="{Binding $parent[ContentPage].((vm:PostAclDialogViewModel)DataContext).RevokeCommand}"
-                                CommandParameter="{Binding}"/>
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-
-        <!-- Action buttons: close -->
-        <Button Grid.Row="2" Content="Fermer"
-                Click="OnCloseClicked"
-                HorizontalAlignment="Right"
-                Margin="0,8,0,8"/>
-
-        <!-- Status bar -->
-        <Grid Grid.Row="3" ColumnDefinitions="*,Auto">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
-            <ProgressBar Grid.Column="1" IsIndeterminate="True"
-                         IsVisible="{Binding IsBusy}"
-                         Width="120"/>
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/PostAclDialog.axaml.cs

@@ -1,87 +0,0 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using PostIt.ViewModels;
-using Yavsc.Blogspot;
-using Yavsc.Api.Client;
-
-namespace PostIt.Views;
-
-/// <summary>
-/// Modal "manage ACL" page for a single blog post.
-///
-/// <para>The ViewModel is constructed by the caller (the post
-/// list page) and handed to <see cref="App.PushPageAsync"/>,
-/// which routes through <see cref="ViewLocator"/> and lands
-/// here via the parameterless DI constructor. The VM is then
-/// assigned to <see cref="ContentPage.DataContext"/> by
-/// <c>App.PushPageAsync</c> — we listen for that one-shot
-/// assignment and trigger <c>LoadAsync</c> right after, so the
-/// dropdown's <c>MyCircles</c> and the list's <c>AclEntries</c>
-/// are populated when the dialog appears. The VM is idempotent
-/// under repeated loads.</para>
-/// </summary>
-public partial class PostAclDialog : ContentPage
-{
-    public PostAclDialog()
-    {
-        InitializeComponent();
-
-        // App.PushPageAsync wires the VM via DataContext after
-        // building the page. We subscribe once to fire LoadAsync
-        // the moment the VM is attached. Using DataContextChanged
-        // (rather than AttachedToVisualTree) is what makes this
-        // work in the headless test harness too: the load is
-        // tied to the VM being available, not to the visual tree
-        // being realised (which is a separate concern).
-        EventHandler? handler = null;
-        handler = (_, _) =>
-        {
-            if (DataContext is PostAclDialogViewModel vm)
-            {
-                this.DataContextChanged -= handler;
-                _ = vm.LoadAsync();
-            }
-        };
-        this.DataContextChanged += handler;
-    }
-
-    public PostAclDialog(BlogPostDto post, BlogAclApiClient aclClient, CircleApiClient circleClient)
-    {
-        // This overload is not used by the production path —
-        // MainPageViewModel pushes the VM via App.PushPageAsync
-        // and App routes through ViewLocator, which resolves this
-        // page via the parameterless ctor. It is kept so test
-        // scaffolding that wants to bypass the nav pipeline can
-        // still wire a VM directly without losing the load
-        // trigger: the constructor sets DataContext before the
-        // DataContextChanged subscription fires, so the load
-        // is guaranteed to run in either case.
-        InitializeComponent();
-        DataContext = new PostAclDialogViewModel(post, aclClient, circleClient);
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    private void OnCloseClicked(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-    {
-        // Pop this page off the navigation stack. Avalonia's
-        // NavigationPage doesn't have a typed "Close" — the
-        // hosting control (a NavigationPage in MainWindow.axaml)
-        // is the one that owns the back stack, but the
-        // ContentPage itself doesn't know about it. A simpler
-        // contract: fire an event the host listens to, or rely
-        // on the system back gesture. We do the latter — the
-        // dialog is intentionally modal-light.
-        if (this.VisualRoot is NavigationPage nav)
-        {
-            // The actual API varies between Avalonia 11.x
-            // versions; the safest call is the equivalent of
-            // "go back", which lives on the host. For now, hide
-            // the page and let the host decide.
-        }
-    }
-}

src/PostIt/PostIt/Views/SessionStatusBanner.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
 namespace PostIt.Views;
 

src/PostIt/PostIt/Views/TextEditorBinding.cs

@@ -0,0 +1,51 @@
+using Avalonia;
+using Avalonia.Data;
+using AvaloniaEdit;
+
+namespace PostIt.Views;
+
+public sealed class TextEditorBinding
+{
+    public static readonly AttachedProperty<string?> TextProperty =
+        AvaloniaProperty.RegisterAttached<TextEditorBinding, TextEditor, string?>(
+            "Text",
+            defaultBindingMode: BindingMode.TwoWay);
+
+    private static readonly AttachedProperty<bool> IsTextChangeSubscribedProperty =
+        AvaloniaProperty.RegisterAttached<TextEditorBinding, TextEditor, bool>("IsTextChangeSubscribed");
+
+    static TextEditorBinding()
+    {
+        TextProperty.Changed.AddClassHandler<TextEditor>((editor, args) =>
+        {
+            EnsureTextChangeSubscribed(editor);
+
+            var text = args.GetNewValue<string?>() ?? string.Empty;
+            if (editor.Text != text)
+            {
+                editor.Text = text;
+            }
+        });
+    }
+
+    public static string? GetText(TextEditor editor) => editor.GetValue(TextProperty);
+
+    public static void SetText(TextEditor editor, string? value) => editor.SetValue(TextProperty, value);
+
+    private static void EnsureTextChangeSubscribed(TextEditor editor)
+    {
+        if (editor.GetValue(IsTextChangeSubscribedProperty))
+        {
+            return;
+        }
+
+        editor.SetValue(IsTextChangeSubscribedProperty, true);
+        editor.TextChanged += (_, _) =>
+        {
+            if (editor.Text != GetText(editor))
+            {
+                SetText(editor, editor.Text);
+            }
+        };
+    }
+}

src/Yavsc.Abstract/Attributes/ActivityBillingAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes
 {
     public class ActivityBillingAttribute : Attribute

src/Yavsc.Abstract/Attributes/ActivitySettingsAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Yavsc.Attributes
 {
     public class ActivitySettingsAttribute : Attribute

src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs

@@ -1,3 +1,5 @@
+
+using System;
 using System.ComponentModel.DataAnnotations;
 using Yavsc.Server.Helpers;