RedWizardsLab/EchoHub
1
0
Fork 0
mirror of https://github.com/RedWizardsLab/EchoHub.git synced 2026-09-04 08:36:11 +02:00
Code Issues 2 Packages Projects Releases 10 Wiki Activity

feat: add password protection for channels

Browse Source 
- Updated IChatService to include password parameter in JoinChannelAsync method.
- Modified ChannelDto and related models to support password functionality.
- Implemented password handling in ChannelService for channel creation and membership validation.
- Enhanced IrcCommandHandler to manage channel join requests with passwords.
- Added ChannelPasswordDialog for user input when joining protected channels.
- Created database migration to add PasswordHash column to Channels table.
- Updated tests to cover new password functionality in channel joining and management.
This commit is contained in:
HueByte
2026-07-16 03:13:03 +02:00
parent 15187c4665
commit 3ca9dbfd91
31 changed files with 1056 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EchoHub.Client/AppOrchestrator.cs
+42 -6
View File
@@ -216,13 +216,15 @@ public sealed class AppOrchestrator : IDisposable
return Task.CompletedTask;
}
private async Task HandleCmdJoinChannel(string channelName)
private async Task HandleCmdJoinChannel(string channelName, string? password)
{
if (!_conn.IsConnected) return;
try
{
var history = await _conn.JoinChannelAsync(channelName);
var history = await JoinChannelWithPasswordPromptAsync(channelName, password);
if (history is null) return; // user cancelled the password prompt
InvokeUI(() =>
{
_mainWindow.EnsureChannelInList(channelName);
@@ -237,6 +239,31 @@ public sealed class AppOrchestrator : IDisposable
}
}
/// <summary>
/// Joins a channel, prompting for a password when the server requires one and
/// re-prompting on a wrong password. Returns the channel history, or null if
/// the user cancelled the prompt.
/// </summary>
private async Task<List<MessageDto>?> JoinChannelWithPasswordPromptAsync(string channelName, string? password)
{
while (true)
{
try
{
return await _conn.JoinChannelAsync(channelName, password);
}
catch (ChannelPasswordRequiredException ex)
{
var prompt = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
var message = password is not null ? ex.Message : null;
InvokeUI(() => prompt.SetResult(ChannelPasswordDialog.Show(_app, channelName, message)));
password = await prompt.Task;
if (password is null) return null;
}
}
}
private async Task HandleCmdLeaveChannel()
{
if (!_conn.IsConnected) return;
@@ -554,7 +581,7 @@ public sealed class AppOrchestrator : IDisposable
InvokeUI(() =>
{
if (channel.IsPublic)
_mainWindow.EnsureChannelInList(channel.Name, channel.IsPublic);
_mainWindow.EnsureChannelInList(channel.Name, channel.IsPublic, channel.IsProtected);
_mainWindow.SetChannelTopic(channel.Name, channel.Topic);
});
};
@@ -707,7 +734,16 @@ public sealed class AppOrchestrator : IDisposable
RunAsync(async () =>
{
if (_conn.TrackChannel(channelName))
await _conn.JoinChannelAsync(channelName);
{
var joined = await JoinChannelWithPasswordPromptAsync(channelName, null);
if (joined is null)
{
// User cancelled the password prompt — back to the default channel
_conn.UntrackChannel(channelName);
InvokeUI(() => _mainWindow.SwitchToChannel(HubConstants.DefaultChannel));
return;
}
}
try
{
@@ -983,14 +1019,14 @@ public sealed class AppOrchestrator : IDisposable
RunAsync(async () =>
{
var channel = await _conn.Api!.CreateChannelAsync(result.Name, result.Topic, result.IsPublic);
var channel = await _conn.Api!.CreateChannelAsync(result.Name, result.Topic, result.IsPublic, result.Password);
if (channel is null) return;
var history = await _conn.JoinChannelAsync(channel.Name);
InvokeUI(() =>
{
_mainWindow.EnsureChannelInList(channel.Name);
_mainWindow.EnsureChannelInList(channel.Name, channel.IsPublic, channel.IsProtected);
_mainWindow.SetChannelTopic(channel.Name, channel.Topic);
_mainWindow.SwitchToChannel(channel.Name);
if (history.Count > 0)