xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/abp' into digital-collectibles

Browse Source
This commit is contained in:
橙子
2024-11-16 11:07:35 +08:00
parent 32e4145927 84cd83894b
commit a2e2072634
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Authentication/AuthService.cs
View File

@@ -24,7 +24,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
YiCrudAppService<AuthAggregateRoot, AuthOutputDto, Guid, AuthGetListInput, AuthCreateOrUpdateInputDto>, YiCrudAppService<AuthAggregateRoot, AuthOutputDto, Guid, AuthGetListInput, AuthCreateOrUpdateInputDto>,
IAuthService IAuthService
{ {
private HttpContext HttpContext { get; set; } private HttpContext? HttpContext { get; set; }
private ILogger<AuthService> _logger; private ILogger<AuthService> _logger;
private ISqlSugarRepository<AuthAggregateRoot, Guid> _repository; private ISqlSugarRepository<AuthAggregateRoot, Guid> _repository;
private IAccountManager _accountManager; private IAccountManager _accountManager;
@@ -33,7 +33,8 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
ILogger<AuthService> logger, ISqlSugarRepository<AuthAggregateRoot, Guid> repository) : base(repository) ILogger<AuthService> logger, ISqlSugarRepository<AuthAggregateRoot, Guid> repository) : base(repository)
{ {
_logger = logger; _logger = logger;
HttpContext = httpContextAccessor.HttpContext ?? throw new ApplicationException("未注册Http"); //可能为空
HttpContext = httpContextAccessor.HttpContext;
_repository = repository; _repository = repository;
_accountManager = accountManager; _accountManager = accountManager;
} }
@@ -87,6 +88,10 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
private async Task<(string, string)> GetOpenIdAndNameAsync(string scheme) private async Task<(string, string)> GetOpenIdAndNameAsync(string scheme)
{ {
if (HttpContext is null)
{
throw new AggregateException("HttpContext 参数为空");
}
var authenticateResult = await HttpContext.AuthenticateAsync(scheme); var authenticateResult = await HttpContext.AuthenticateAsync(scheme);
if (!authenticateResult.Succeeded) if (!authenticateResult.Succeeded)
{ {