From c36b7e02c61e37efb4b8e95a7f077cda828c1d35 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 12 Nov 2026 16:36:14 +0000 Subject: [PATCH] feat(postit): restore direct calls and list contacts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 4 + doc/architecture/audio-video-calls.md | 21 ++-- .../PostIt.Tests/CallTransportRoutingTests.cs | 115 ++++++++++++++++++ .../ContactsPageViewModelTests.cs | 61 ++++++++++ .../Helpers/ServiceCollectionHelpers.cs | 2 + src/PostIt/PostIt/ViewLocator.cs | 1 + .../ViewModels/ACL/ContactsPageViewModel.cs | 66 ++++++++++ .../PostIt/ViewModels/Chat/ChatViewModel.cs | 55 ++++++--- .../ViewModels/Chat/LanCallViewModel.cs | 26 ++-- .../ViewModels/Chat/WebRtcCallViewModel.cs | 32 ++--- .../ViewModels/Layout/HomePageViewModel.cs | 11 ++ .../PostIt/Views/ACL/ContactsPage.axaml | 23 ++++ .../PostIt/Views/ACL/ContactsPage.axaml.cs | 8 ++ src/PostIt/PostIt/Views/Chat/ChatPage.axaml | 57 ++++++++- .../PostIt/Views/Chat/ChatPage.axaml.cs | 7 +- src/PostIt/PostIt/Views/Layout/HomePage.axaml | 4 + 16 files changed, 438 insertions(+), 55 deletions(-) create mode 100644 src/PostIt/PostIt.Tests/CallTransportRoutingTests.cs create mode 100644 src/PostIt/PostIt.Tests/ContactsPageViewModelTests.cs create mode 100644 src/PostIt/PostIt/ViewModels/ACL/ContactsPageViewModel.cs create mode 100644 src/PostIt/PostIt/Views/ACL/ContactsPage.axaml create mode 100644 src/PostIt/PostIt/Views/ACL/ContactsPage.axaml.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 04d0e3902..84641b65d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ ### Added +* [PostIt/Contacts] Add a Contacts page listing circle members and their associated circles, with duplicate members merged. Presence and calling contacts outside a shared chat room are not yet implemented. + +* [PostIt/Calls] Restore the direct IPv4/IPv6 VLC/SRTP call panel alongside WebRTC on supported platforms, route invitations to the matching transport, and retain explicit IP disclosure consent and server privacy policy. Add transport routing and lifecycle regressions. + * [PostIt/Administration] Add an administrator-only consumption relief page reachable from Administration: select a user at their limit, preview and confirm an arbitrary point erasure up to current consumption. Protect the quota-exempt API with the Administrator policy, serialize adjustments with accounting, reject stale confirmations, preserve technical counters and disk quotas, and audit the actor. Add API, service, client and responsive-page regressions. * [PostIt] Upgrade Avalonia to 12.1.6 and align the headless and native Skia test rendering packages. diff --git a/doc/architecture/audio-video-calls.md b/doc/architecture/audio-video-calls.md index 7b9affd29..38936102d 100644 --- a/doc/architecture/audio-video-calls.md +++ b/doc/architecture/audio-video-calls.md @@ -6,10 +6,11 @@ Ce document décrit l'architecture cible, l'implementation native actuelle et l'historique du transport direct. La préférence de confidentialité est persistée et éditable dans le profil. La signalisation est intégrée au chat, désactivée par défaut. La page du chat -utilise maintenant **WebRTC natif sur Android et Desktop Linux**, avec -ICE/STUN/TURN et masquage IP impose par la politique serveur. L'ancien -transport VLC/SRTP n'est plus raccorde a cette page. Les groupes et les -clients navigateur ne sont pas implementes. +propose **WebRTC natif** et le transport direct VLC/SRTP sur Android et +Desktop Linux. WebRTC utilise ICE/STUN/TURN et le masquage IP impose par la +politique serveur. Le mode SRTP direct ne masque pas les adresses IP et exige +que cette preference soit desactivee pour les deux participants. Les groupes +et les clients navigateur ne sont pas implementes. Il complète la [topologie de PostIt](postit.md) et les [mécanismes de notification existants](notifications.md). La cible couvre : @@ -52,7 +53,11 @@ La cible couvre : terminent l'appel explicitement. Il n'y a pas d'ICE restart/renegociation automatique ni de migration transparente d'un appel existant. -Le panneau ne demande plus d'adresse ni de port RTP manuel. Sans masquage, +Le panneau WebRTC ne demande pas d'adresse ni de port RTP manuel. Le panneau +SRTP direct demande une adresse locale, un port UDP pair et le consentement au +partage d'adresse ; il requiert HTTPS pour proteger les cles de signalisation. +Les invitations sont dirigees vers le panneau correspondant, sans bascule +automatique entre transports. Sans masquage, un consentement explicite au partage IP reste requis. Activer le masquage dans le profil pendant un appel fait terminer cet appel par le serveur : il faut rappeler pour appliquer la nouvelle politique. @@ -115,10 +120,10 @@ la camera avant et le microphone Android reels, des sources Linux synthetiques et un coturn TCP local via USB ; la camera et la sortie audio Linux materielles, TURN/TLS et les reseaux Internet distincts restent a verifier. -## Historique : premiere implementation SRTP direct IPv4/IPv6 +## Implementation SRTP direct IPv4/IPv6 -Les paragraphes suivants decrivent le transport precedent, conserve dans le -code et ses tests mais non propose par le panneau d'appel actuel. +Les paragraphes suivants decrivent le transport direct historique, de nouveau +propose a cote de WebRTC dans la page du chat. Les adresses IPv4 publiques directement assignees a une interface locale active sont egalement disponibles, avec la meme validation unicast cote client, diff --git a/src/PostIt/PostIt.Tests/CallTransportRoutingTests.cs b/src/PostIt/PostIt.Tests/CallTransportRoutingTests.cs new file mode 100644 index 000000000..370ddc2c1 --- /dev/null +++ b/src/PostIt/PostIt.Tests/CallTransportRoutingTests.cs @@ -0,0 +1,115 @@ +using Avalonia.Headless.XUnit; +using PostIt.Services; +using PostIt.ViewModels; +using PostIt.ViewModels.Chat; +using Yavsc.Abstract.Chat.Calls; + +namespace PostIt.Tests; + +[Trait("Category", "non-reg")] +public sealed class CallTransportRoutingTests +{ + [AvaloniaTheory] + [InlineData(CallTransports.LanSrtp)] + [InlineData(CallTransports.WebRtc)] + public async Task Incoming_calls_are_handled_only_by_the_matching_transport(string transport) + { + var signaling = new Signaling(); + await using var lan = new LanCallViewModel(signaling); + await using var webRtc = new WebRtcCallViewModel(signaling); + var call = new CallSession(Guid.NewGuid(), "General", "alice", "bob", false, + DateTimeOffset.UtcNow.AddMinutes(1), transport); + + signaling.Invite(call); + await WaitAsync(() => lan.Incoming || webRtc.Incoming); + + Assert.Equal(transport == CallTransports.LanSrtp, lan.Incoming); + Assert.Equal(transport == CallTransports.WebRtc, webRtc.Incoming); + Assert.Empty(signaling.EndedCalls); + + if (lan.Incoming) await lan.HangupAsync(); + else await webRtc.HangupAsync(); + Assert.Equal([call.Id], signaling.EndedCalls); + Assert.False(lan.Busy); + Assert.False(webRtc.Busy); + } + + [AvaloniaFact] + public async Task Unknown_transport_is_rejected_once_without_starting_either_call() + { + var signaling = new Signaling(); + await using var lan = new LanCallViewModel(signaling); + await using var webRtc = new WebRtcCallViewModel(signaling); + var call = new CallSession(Guid.NewGuid(), "General", "alice", "bob", false, + DateTimeOffset.UtcNow.AddMinutes(1), "unknown"); + + signaling.Invite(call); + await WaitAsync(() => signaling.EndedCalls.Count != 0); + + Assert.Equal([call.Id], signaling.EndedCalls); + Assert.False(lan.Busy); + Assert.False(webRtc.Busy); + } + + [AvaloniaTheory] + [InlineData(CallTransports.LanSrtp)] + [InlineData(CallTransports.WebRtc)] + public async Task Chat_updates_both_rooms_and_disconnects_the_active_transport(string transport) + { + var signaling = new Signaling(); + var chat = new ChatViewModel(settings: new Settings()); + var lan = new LanCallViewModel(signaling); + var webRtc = new WebRtcCallViewModel(signaling); + chat.LanCall = lan; + chat.VideoCall = webRtc; + chat.SelectedRoom = "General"; + Assert.Equal("General", lan.Room); + Assert.Equal("General", webRtc.Room); + + var call = new CallSession(Guid.NewGuid(), "General", "alice", "bob", false, + DateTimeOffset.UtcNow.AddMinutes(1), transport); + signaling.Invite(call); + await WaitAsync(() => lan.Incoming || webRtc.Incoming); + await chat.DisconnectAsync(); + + Assert.Equal([call.Id], signaling.EndedCalls); + Assert.Null(chat.LanCall); + Assert.Null(chat.VideoCall); + Assert.False(lan.Busy); + Assert.False(webRtc.Busy); + signaling.Invite(call); + Assert.False(lan.Incoming); + Assert.False(webRtc.Incoming); + } + + private static async Task WaitAsync(Func condition) + { + using var timeout = CancellationTokenSource.CreateLinkedTokenSource(TestContext.Current.CancellationToken); + timeout.CancelAfter(TimeSpan.FromSeconds(5)); + while (!condition()) await Task.Delay(10, timeout.Token); + } + + private sealed class Signaling : IWebRtcCallSignaling + { + public event Action? Invitation; + public event Action? Accepted; + public event Action? Ended; + public event Action? Signal; + public event Action? Interrupted; + public List EndedCalls { get; } = []; + + public void Invite(CallSession call) => Invitation?.Invoke(call); + public Task InviteAsync(string room, string user, CancellationToken ct = default) => + throw new NotSupportedException(); + public Task InviteLanAsync(string room, string user, CancellationToken ct = default) => + throw new NotSupportedException(); + public Task AcceptAsync(Guid callId, CancellationToken ct = default) => throw new NotSupportedException(); + public Task EndAsync(Guid callId, CancellationToken ct = default) + { + EndedCalls.Add(callId); + return Task.CompletedTask; + } + public Task SendAsync(Guid callId, CallSignal signal, CancellationToken ct = default) => + throw new NotSupportedException(); + } +} diff --git a/src/PostIt/PostIt.Tests/ContactsPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ContactsPageViewModelTests.cs new file mode 100644 index 000000000..9b8bae890 --- /dev/null +++ b/src/PostIt/PostIt.Tests/ContactsPageViewModelTests.cs @@ -0,0 +1,61 @@ +using System.Net; +using System.Text.Json; +using PostIt.ViewModels; +using Yavsc.Api.Client; + +namespace PostIt.Tests; + +[Trait("Category", "non-reg")] +public sealed class ContactsPageViewModelTests +{ + [Fact] + public async Task Contacts_are_deduplicated_and_show_all_their_circles() + { + await using var api = new FakeApi(); + var vm = new ContactsPageViewModel(new CircleApiClient(api, "https://example.test/")); + await vm.RefreshAsync(); + var contact = Assert.Single(vm.Contacts); + Assert.Equal("bob-id", contact.Id); + Assert.Equal("Bob", contact.DisplayName); + Assert.Equal("Amis, Travail", contact.Circles); + } + + [Fact] + public async Task Missing_circle_is_reported_instead_of_showing_incomplete_contacts() + { + await using var api = new FakeApi { MissingCircle = true }; + var vm = new ContactsPageViewModel(new CircleApiClient(api, "https://example.test/")); + await vm.RefreshAsync(); + Assert.Empty(vm.Contacts); + Assert.Contains("n'est plus disponible", vm.Status); + Assert.False(vm.IsBusy); + } + + private sealed class FakeApi : IYavscApiClient + { + public HttpClient Http { get; } = new(); + public bool MissingCircle { get; init; } + + public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) + { + string json = path switch + { + "circle" => """[{"id":1,"name":"Travail"},{"id":2,"name":"Amis"}]""", + "circle/1/members" => """[{"id":"bob-id","userName":"bob","fullName":"Bob"}]""", + "circle/2/members" when MissingCircle => "null", + "circle/2/members" => """[{"id":"bob-id","userName":"bob","fullName":"Bob"}]""", + _ => throw new HttpRequestException("Unexpected path", null, HttpStatusCode.NotFound) + }; + return Task.FromResult(JsonSerializer.Deserialize(json, + new JsonSerializerOptions { PropertyNameCaseInsensitive = true })!); + } + + public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) => + throw new NotSupportedException(); + public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) => + throw new NotSupportedException(); + public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) => + throw new NotSupportedException(); + public ValueTask DisposeAsync() { Http.Dispose(); return ValueTask.CompletedTask; } + } +} diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs index e041dd074..2c2323d44 100644 --- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs +++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs @@ -81,6 +81,7 @@ public static class ServiceCollectionHelpers AddReusablePage(); AddReusablePage(); AddReusablePage(); + services.AddTransient(); AddReusablePage(); services.AddTransient(); services.AddTransient(); @@ -129,6 +130,7 @@ public static class ServiceCollectionHelpers services.AddTransient(); services.AddSingleton(); services.AddSingleton(); + services.AddTransient(); services.AddSingleton(); services.AddTransient(); diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs index 93e890759..a4e026cb4 100644 --- a/src/PostIt/PostIt/ViewLocator.cs +++ b/src/PostIt/PostIt/ViewLocator.cs @@ -55,6 +55,7 @@ public class ViewLocator : IDataTemplate AddCircleMemberDialogViewModel => services.GetRequiredService(), ConfirmationDialogViewModel => services.GetRequiredService(), CirclesPageViewModel => services.GetRequiredService(), + ContactsPageViewModel => services.GetRequiredService(), PostAclDialogViewModel => services.GetRequiredService(), BillingQueriesPageViewModel => services.GetRequiredService(), BillingQueryDetailsPageViewModel => services.GetRequiredService(), diff --git a/src/PostIt/PostIt/ViewModels/ACL/ContactsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/ContactsPageViewModel.cs new file mode 100644 index 000000000..080c9ba12 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/ACL/ContactsPageViewModel.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Threading.Tasks; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using Yavsc.Api.Client; +using Yavsc.Api.Client.Dtos; + +namespace PostIt.ViewModels; + +public sealed record ContactEntry(string Id, string UserName, string DisplayName, string Circles); + +public partial class ContactsPageViewModel(CircleApiClient client) : ViewModelBase +{ + public ObservableCollection Contacts { get; } = []; + + [ObservableProperty] + public partial bool IsBusy { get; set; } + + [ObservableProperty] + public partial string Status { get; set; } = "Pret."; + + public override bool CanNavigateNext { get; protected set; } = false; + public override bool CanNavigatePrevious { get; protected set; } = true; + + [RelayCommand] + public async Task RefreshAsync() + { + IsBusy = true; + try + { + var circles = await client.GetMyCirclesAsync() + ?? throw new InvalidOperationException("Le serveur n'a pas renvoye les cercles."); + var members = new List<(CircleDto Circle, CircleMemberDto Member)>(); + foreach (var circle in circles) + { + var list = await client.GetMembersAsync(circle.Id) + ?? throw new InvalidOperationException($"Le cercle {circle.Name} n'est plus disponible."); + members.AddRange(list.Select(member => (circle, member))); + } + var contacts = members.GroupBy(item => item.Member.Id, StringComparer.Ordinal) + .Select(group => + { + var member = group.First().Member; + if (string.IsNullOrWhiteSpace(member.Id) || string.IsNullOrWhiteSpace(member.UserName)) + throw new InvalidOperationException("Un membre de cercle n'a pas d'identifiant ou de pseudo."); + return new ContactEntry(member.Id, member.UserName, + string.IsNullOrWhiteSpace(member.FullName) ? member.UserName : member.FullName, + string.Join(", ", group.Select(item => item.Circle.Name).Distinct().OrderBy(name => name))); + }) + .OrderBy(contact => contact.DisplayName, StringComparer.CurrentCultureIgnoreCase) + .ToArray(); + Contacts.Clear(); + foreach (var contact in contacts) Contacts.Add(contact); + Status = $"{Contacts.Count} contact(s)."; + } + catch (Exception error) + { + Contacts.Clear(); + Status = $"Impossible de charger les contacts : {error.Message}"; + } + finally { IsBusy = false; } + } +} diff --git a/src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs b/src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs index bd4d6d8c6..7553c16a4 100644 --- a/src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Chat/ChatViewModel.cs @@ -59,9 +59,15 @@ namespace PostIt.ViewModels.Chat public bool SupportsVideoCalls => Platform.CreateWebRtcMedia != null || (OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()); + public bool SupportsLanCalls => Platform.CreateLanCallMedia != null || + (OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()); + [ObservableProperty] public partial WebRtcCallViewModel? VideoCall { get; set; } + [ObservableProperty] + public partial LanCallViewModel? LanCall { get; set; } + [ObservableProperty] public partial string CurrentRoom { get; set; } = "General"; @@ -107,6 +113,7 @@ namespace PostIt.ViewModels.Chat partial void OnSelectedRoomChanged(string? value) { if (VideoCall != null) VideoCall.Room = value ?? ""; + if (LanCall != null) LanCall.Room = value ?? ""; FocusedMessages = value != null && _messagesByRoom.TryGetValue(value, out var msgs) ? msgs : _systemMessages; FocusedUsers = value != null && _usersByRoom.TryGetValue(value, out var users) @@ -161,6 +168,7 @@ namespace PostIt.ViewModels.Chat try { if (VideoCall != null) await VideoCall.HangupAsync(); + if (LanCall != null) await LanCall.HangupAsync(); await _transport.LeaveAsync(room); JoinedRooms.Remove(room); _messagesByRoom.Remove(room); @@ -210,12 +218,8 @@ namespace PostIt.ViewModels.Chat private async Task DisconnectCoreAsync() { Exception? callError = null; - if (VideoCall != null) - { - try { await VideoCall.DisposeAsync(); } - catch (Exception error) { callError = error; } - finally { VideoCall = null; } - } + try { await DisposeCallViewModelsAsync(); } + catch (Exception error) { callError = error; } Calls?.Dispose(); Calls = null; try @@ -239,6 +243,24 @@ namespace PostIt.ViewModels.Chat } } + private async Task DisposeCallViewModelsAsync() + { + Exception? callError = null; + if (VideoCall != null) + { + try { await VideoCall.DisposeAsync(); } + catch (Exception error) { callError = error; } + finally { VideoCall = null; } + } + if (LanCall != null) + { + try { await LanCall.DisposeAsync(); } + catch (Exception error) { callError = callError == null ? error : new AggregateException(callError, error); } + finally { LanCall = null; } + } + if (callError != null) throw callError; + } + public async Task ConnectAsync() { if (_api?.IsSigningOut == true) @@ -269,13 +291,12 @@ namespace PostIt.ViewModels.Chat return; if (_connection != null) { - if (VideoCall != null) + try { await DisposeCallViewModelsAsync(); } + finally { - await VideoCall.DisposeAsync(); - VideoCall = null; + Calls?.Dispose(); + Calls = null; } - Calls?.Dispose(); - Calls = null; } Status = new StatusNotice("Connexion en cours...", StatusSeverity.Info, new RelayCheckCommand("Vérifier la connexion", async () => await CheckConnectionAsync())); @@ -298,9 +319,15 @@ namespace PostIt.ViewModels.Chat Calls = new CallSignalingClient(_connection); if (SupportsVideoCalls) VideoCall = new WebRtcCallViewModel(Calls, settings: _settings) { Room = SelectedRoom ?? "" }; - else - Calls.Invitation += call => PostForCurrentSession(() => - Log($"Invitation audio-vidéo de {call.Caller} dans {call.RoomName} ; transport non disponible sur cette plateforme.")); + if (SupportsLanCalls) + LanCall = new LanCallViewModel(Calls, settings: _settings) { Room = SelectedRoom ?? "" }; + Calls.Invitation += call => + { + if ((call.Transport == Yavsc.Abstract.Chat.Calls.CallTransports.LanSrtp && !SupportsLanCalls) || + (call.Transport != Yavsc.Abstract.Chat.Calls.CallTransports.LanSrtp && !SupportsVideoCalls)) + PostForCurrentSession(() => + Log($"Invitation audio-vidéo de {call.Caller} dans {call.RoomName} ; transport non disponible sur cette plateforme.")); + }; Calls.Ended += call => PostForCurrentSession(() => Log($"Appel terminé : {call.Reason}.")); diff --git a/src/PostIt/PostIt/ViewModels/Chat/LanCallViewModel.cs b/src/PostIt/PostIt/ViewModels/Chat/LanCallViewModel.cs index b1a182e09..545faa0b6 100644 --- a/src/PostIt/PostIt/ViewModels/Chat/LanCallViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Chat/LanCallViewModel.cs @@ -243,22 +243,20 @@ public partial class LanCallViewModel : ObservableObject, IAsyncDisposable return RunAsync(() => StopAsync("Appel termine.", true)); } - private void OnInvitation(CallSession call) => Queue(async () => + private void OnInvitation(CallSession call) { - if (call.Transport != CallTransports.LanSrtp) + if (call.Transport != CallTransports.LanSrtp) return; + Queue(async () => { - await _signaling.EndAsync(call.Id, _lifetime.Token); - Status = "Invitation WebRTC non prise en charge par le mode LAN."; - return; - } - if (_call != null) throw new InvalidOperationException("Invitation concurrente inattendue."); - if (call.RelayOnly) throw new InvalidOperationException("Le mode LAN ne peut pas masquer les adresses IP."); - _call = call; - Busy = true; - Incoming = true; - Status = $"{call.Caller} propose un appel SRTP dans {call.RoomName}. Acceptez ou refusez."; - await Task.CompletedTask; - }); + if (_call != null) throw new InvalidOperationException("Invitation concurrente inattendue."); + if (call.RelayOnly) throw new InvalidOperationException("Le mode LAN ne peut pas masquer les adresses IP."); + _call = call; + Busy = true; + Incoming = true; + Status = $"{call.Caller} propose un appel SRTP dans {call.RoomName}. Acceptez ou refusez."; + await Task.CompletedTask; + }); + } private void OnAccepted(CallAccepted accepted) => Queue(async () => { diff --git a/src/PostIt/PostIt/ViewModels/Chat/WebRtcCallViewModel.cs b/src/PostIt/PostIt/ViewModels/Chat/WebRtcCallViewModel.cs index 76ff80f50..72dbf8ab8 100644 --- a/src/PostIt/PostIt/ViewModels/Chat/WebRtcCallViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Chat/WebRtcCallViewModel.cs @@ -156,22 +156,26 @@ public partial class WebRtcCallViewModel : ObservableObject, IAsyncDisposable return RunAsync(() => StopAsync("Appel termine.", true)); } - private void OnInvitation(CallSession call) => Queue(async () => + private void OnInvitation(CallSession call) { - if (call.Transport != CallTransports.WebRtc || _call is not null) + if (call.Transport == CallTransports.LanSrtp) return; + Queue(async () => { - await _signaling.EndAsync(call.Id, _lifetime.Token); - Status = "Invitation refusee : transport incompatible ou appel deja en cours."; - return; - } - _call = call; - _caller = false; - _callLifetime = CancellationTokenSource.CreateLinkedTokenSource(_lifetime.Token); - Busy = Incoming = true; - Status = $"{call.Caller} propose un appel dans {call.RoomName}. " - + (call.RelayOnly ? "Masquage IP : relais TURN obligatoire. " : "Mode direct : consentement au partage IP requis. ") - + "Acceptez ou refusez."; - }); + if (call.Transport != CallTransports.WebRtc || _call is not null) + { + await _signaling.EndAsync(call.Id, _lifetime.Token); + Status = "Invitation refusee : transport incompatible ou appel deja en cours."; + return; + } + _call = call; + _caller = false; + _callLifetime = CancellationTokenSource.CreateLinkedTokenSource(_lifetime.Token); + Busy = Incoming = true; + Status = $"{call.Caller} propose un appel dans {call.RoomName}. " + + (call.RelayOnly ? "Masquage IP : relais TURN obligatoire. " : "Mode direct : consentement au partage IP requis. ") + + "Acceptez ou refusez."; + }); + } private void OnAccepted(CallAccepted accepted) => Queue(async () => { diff --git a/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs index 5600854f0..8e1457237 100644 --- a/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs @@ -78,6 +78,7 @@ public class HomePageViewModel : ViewModelBase OpenPerformerConfiguration = new AsyncRelayCommand(OpenPerformerConfigurationAsync); OpenAdministration = new AsyncRelayCommand(OpenAdministrationAsync, () => SessionStatus.IsAdministrator); OpenChat = new AsyncRelayCommand(OpenChatAsync); + OpenContacts = new AsyncRelayCommand(OpenContactsAsync); OpenPodcasts = new AsyncRelayCommand(async () => { var app = Application.Current as App ?? throw new InvalidOperationException("Application indisponible."); @@ -89,6 +90,7 @@ public class HomePageViewModel : ViewModelBase public IAsyncRelayCommand OpenChat { get; } + public IAsyncRelayCommand OpenContacts { get; } public IAsyncRelayCommand OpenPodcasts { get; } public bool SupportsPodcasts => Platform.IsPodcastSupported; public IAsyncRelayCommand OpenBlogs { get; } @@ -264,6 +266,15 @@ public class HomePageViewModel : ViewModelBase } + private async Task OpenContactsAsync() + { + var app = Application.Current as App ?? throw new InvalidOperationException("Application indisponible."); + var vm = app.ServiceProvider?.GetRequiredService() + ?? throw new InvalidOperationException("Page contacts indisponible."); + await app.PushPageAsync(vm); + await vm.RefreshAsync(); + } + /// /// Ouvre la page « Mes fichiers » (espace de stockage personnel), /// servie par le host Blogs via api/v1/fs. diff --git a/src/PostIt/PostIt/Views/ACL/ContactsPage.axaml b/src/PostIt/PostIt/Views/ACL/ContactsPage.axaml new file mode 100644 index 000000000..3917714ed --- /dev/null +++ b/src/PostIt/PostIt/Views/ACL/ContactsPage.axaml @@ -0,0 +1,23 @@ + + +