SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

OnTicketReceivedContext

Browse source
This commit is contained in:
Haiping Chen 2025-05-29 05:39:07 -05:00
parent 365c1db383
commit 854e6bf11d
3 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Users.Models;
using Microsoft.AspNetCore.Authentication;
using System.Security.Claims;
namespace BotSharp.Abstraction.Users;
@ -11,7 +12,8 @@ public interface IAuthenticationHook
/// <param name="id"></param>
/// <param name="password"></param>
/// <returns></returns>
Task<User> Authenticate(string id, string password);
Task<User> Authenticate(string id, string password)
=> Task.FromResult(new User());
/// <summary>
/// Add extra claims to user
@ -30,31 +32,38 @@ public interface IAuthenticationHook
bool UserAuthenticated(User user, Token token)
=> true;
Task OAuthCompleted(TicketReceivedContext context)
=> Task.CompletedTask;
/// <summary>
/// Bfore user updating
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
Task UserUpdating(User user);
Task UserUpdating(User user)
=> Task.CompletedTask;
/// <summary>
/// After user created
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
Task UserCreated(User user);
Task UserCreated(User user)
=> Task.CompletedTask;
/// <summary>
/// Reset password
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
Task SendVerificationCode(User user);
Task SendVerificationCode(User user)
=> Task.CompletedTask;
/// <summary>
/// Delete users
/// </summary>
/// <param name="userIds"></param>
/// <returns></returns>
Task DelUsers(List<string> userIds);
Task DelUsers(List<string> userIds)
=> Task.CompletedTask;
}

2
src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file

@ -254,7 +254,7 @@ public class UserService : IUserService
foreach (var hook in hooks)
{
user = await hook.Authenticate(id, password);
if (user == null)
if (user == null || string.IsNullOrEmpty(user.Id))
{
continue;
}

36
src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
View file

@ -11,6 +11,8 @@ using Microsoft.Net.Http.Headers;
using Microsoft.OpenApi.Models;
using Microsoft.IdentityModel.JsonWebTokens;
using BotSharp.OpenAPI.BackgroundServices;
using System.Text.Json.Serialization;
using Microsoft.AspNetCore.Authentication;
namespace BotSharp.OpenAPI;
@ -61,6 +63,9 @@ public static class BotSharpOpenApiExtensions
}
}).AddCookie(options =>
{
// Add these lines for cross-origin cookie support
options.Cookie.SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None;
options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
}).AddPolicyScheme(schema, "Mixed authentication", options =>
{
// runs on each request
@ -82,15 +87,16 @@ public static class BotSharpOpenApiExtensions
};
});
#region OpenId
// GitHub OAuth
if (!string.IsNullOrWhiteSpace(config["OAuth:GitHub:ClientId"]) && !string.IsNullOrWhiteSpace(config["OAuth:GitHub:ClientSecret"]))
{
builder = builder.AddGitHub(options =>
{
options.ClientId = config["OAuth:GitHub:ClientId"];
options.ClientSecret = config["OAuth:GitHub:ClientSecret"];
options.Scope.Add("user:email");
});
{
options.ClientId = config["OAuth:GitHub:ClientId"];
options.ClientSecret = config["OAuth:GitHub:ClientSecret"];
options.Events.OnTicketReceived = OnTicketReceivedContext;
});
}
// Google Identiy OAuth
@ -100,6 +106,7 @@ public static class BotSharpOpenApiExtensions
{
options.ClientId = config["OAuth:Google:ClientId"];
options.ClientSecret = config["OAuth:Google:ClientSecret"];
options.Events.OnTicketReceived = OnTicketReceivedContext;
});
}
@ -113,8 +120,9 @@ public static class BotSharpOpenApiExtensions
options.ClientId = config["OAuth:Keycloak:ClientId"];
options.ClientSecret = config["OAuth:Keycloak:ClientSecret"];
options.AccessType = AspNet.Security.OAuth.Keycloak.KeycloakAuthenticationAccessType.Confidential;
int version = Convert.ToInt32(config["OAuth:Keycloak:Version"]??"22") ;
options.Version = new Version(version,0);
int version = Convert.ToInt32(config["OAuth:Keycloak:Version"] ?? "22");
options.Version = new Version(version, 0);
options.Events.OnTicketReceived = OnTicketReceivedContext;
});
}
@ -129,13 +137,17 @@ public static class BotSharpOpenApiExtensions
options.Backchannel = builder.Services.BuildServiceProvider()
.GetRequiredService<IHttpClientFactory>()
.CreateClient();
options.Events.OnTicketReceived = OnTicketReceivedContext;
});
}
#endregion
// Add services to the container.
services.AddControllers()
.AddJsonOptions(options =>
{
options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
options.JsonSerializerOptions.Converters.Add(new RichContentJsonConverter());
options.JsonSerializerOptions.Converters.Add(new TemplateMessageJsonConverter());
});
@ -182,6 +194,16 @@ public static class BotSharpOpenApiExtensions
return services;
}
private static async Task OnTicketReceivedContext(TicketReceivedContext context)
{
var services = context.HttpContext.RequestServices;
var hooks = services.GetServices<IAuthenticationHook>();
foreach (var hook in hooks)
{
await hook.OAuthCompleted(context);
}
}
/// <summary>
/// Use Swagger/OpenAPI
/// </summary>