Browse Source

Merge pull request #1622 from colinin/wechat_work_grant_identity_server

refactor(identityserver): Split the WeChat Work grant validator into OAuth and mini program flows
pull/1626/head
i2nets 1 month ago
committed by GitHub
parent
commit
7fcf648f36
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 3
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/AbpIdentityServerWeChatWorkModule.cs
  2. 13
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkGrantValidator.cs
  3. 55
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkMiniProgramGrantValidator.cs
  4. 49
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkOAuthGrantValidator.cs

3
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/AbpIdentityServerWeChatWorkModule.cs

@ -18,7 +18,8 @@ public class AbpIdentityServerWeChatWorkModule : AbpModule
{
PreConfigure<IIdentityServerBuilder>(builder =>
{
builder.AddExtensionGrantValidator<WeChatWorkGrantValidator>();
builder.AddExtensionGrantValidator<WeChatWorkOAuthGrantValidator>();
builder.AddExtensionGrantValidator<WeChatWorkMiniProgramGrantValidator>();
});
}

13
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkGrantValidator.cs

@ -5,6 +5,7 @@ using IdentityServer4.Services;
using IdentityServer4.Validation;
using LINGYUN.Abp.WeChat.Work;
using LINGYUN.Abp.WeChat.Work.Authorize;
using LINGYUN.Abp.WeChat.Work.Authorize.Models;
using LINGYUN.Abp.WeChat.Work.Localization;
using LINGYUN.Abp.WeChat.Work.Settings;
using Microsoft.AspNetCore.Identity;
@ -24,10 +25,8 @@ using Volo.Abp.Uow;
using IdentityUser = Volo.Abp.Identity.IdentityUser;
namespace LINGYUN.Abp.IdentityServer.WeChat.Work;
public class WeChatWorkGrantValidator : IExtensionGrantValidator
public abstract class WeChatWorkGrantValidator : IExtensionGrantValidator
{
public string GrantType => AbpWeChatWorkGlobalConsts.GrantType;
protected ILogger<WeChatWorkGrantValidator> Logger { get; }
protected IEventService EventService { get; }
protected UserManager<IdentityUser> UserManager { get; }
@ -38,7 +37,7 @@ public class WeChatWorkGrantValidator : IExtensionGrantValidator
protected IStringLocalizer<WeChatWorkResource> WeChatWorkLocalizer { get; }
protected IWeChatWorkUserFinder WeChatWorkUserFinder { get; }
public WeChatWorkGrantValidator(
protected WeChatWorkGrantValidator(
IEventService eventService,
ICurrentTenant currentTenant,
IGuidGenerator guidGenerator,
@ -60,6 +59,10 @@ public class WeChatWorkGrantValidator : IExtensionGrantValidator
WeChatWorkUserFinder = weChatWorkUserFinder;
}
public abstract string GrantType { get; }
protected abstract Task<WeChatWorkUserInfo> FindUserInfoAsync(ExtensionGrantValidationContext context, string code);
[UnitOfWork]
public async virtual Task ValidateAsync(ExtensionGrantValidationContext context)
{
@ -83,7 +86,7 @@ public class WeChatWorkGrantValidator : IExtensionGrantValidator
try
{
var userInfo = await WeChatWorkUserFinder.GetUserInfoAsync(code);
var userInfo = await FindUserInfoAsync(context, code);
var currentUser = await UserManager.FindByLoginAsync(AbpWeChatWorkGlobalConsts.ProviderName, userInfo.UserId);
if (currentUser == null)

55
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkMiniProgramGrantValidator.cs

@ -0,0 +1,55 @@
using IdentityServer4.Services;
using IdentityServer4.Validation;
using LINGYUN.Abp.WeChat.Work;
using LINGYUN.Abp.WeChat.Work.Authorize;
using LINGYUN.Abp.WeChat.Work.Authorize.Models;
using LINGYUN.Abp.WeChat.Work.Localization;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Logging;
using System.Threading.Tasks;
using Volo.Abp.Guids;
using Volo.Abp.Identity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Settings;
namespace LINGYUN.Abp.IdentityServer.WeChat.Work;
public class WeChatWorkMiniProgramGrantValidator : WeChatWorkGrantValidator
{
public WeChatWorkMiniProgramGrantValidator(
IEventService eventService,
ICurrentTenant currentTenant,
IGuidGenerator guidGenerator,
ISettingProvider settingProvider,
UserManager<Volo.Abp.Identity.IdentityUser> userManager,
IdentitySecurityLogManager identitySecurityLogManager,
IStringLocalizer<WeChatWorkResource> weChatWorkLocalizer,
IWeChatWorkUserFinder weChatWorkUserFinder,
ILogger<WeChatWorkGrantValidator> logger) :
base(
eventService,
currentTenant,
guidGenerator,
settingProvider,
userManager,
identitySecurityLogManager,
weChatWorkLocalizer,
weChatWorkUserFinder,
logger)
{
}
public override string GrantType => AbpWeChatWorkGlobalConsts.MiniProgramGrantType;
protected async override Task<WeChatWorkUserInfo> FindUserInfoAsync(ExtensionGrantValidationContext context, string code)
{
var code2Session = await WeChatWorkUserFinder.GetCode2SessionAsync(code);
return new WeChatWorkUserInfo
{
UserId = code2Session.UserId,
UserTicket = code2Session.SessionKey,
};
}
}

49
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkOAuthGrantValidator.cs

@ -0,0 +1,49 @@
using IdentityServer4.Services;
using IdentityServer4.Validation;
using LINGYUN.Abp.WeChat.Work;
using LINGYUN.Abp.WeChat.Work.Authorize;
using LINGYUN.Abp.WeChat.Work.Authorize.Models;
using LINGYUN.Abp.WeChat.Work.Localization;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Logging;
using System.Threading.Tasks;
using Volo.Abp.Guids;
using Volo.Abp.Identity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Settings;
namespace LINGYUN.Abp.IdentityServer.WeChat.Work;
public class WeChatWorkOAuthGrantValidator : WeChatWorkGrantValidator
{
public WeChatWorkOAuthGrantValidator(
IEventService eventService,
ICurrentTenant currentTenant,
IGuidGenerator guidGenerator,
ISettingProvider settingProvider,
UserManager<Volo.Abp.Identity.IdentityUser> userManager,
IdentitySecurityLogManager identitySecurityLogManager,
IStringLocalizer<WeChatWorkResource> weChatWorkLocalizer,
IWeChatWorkUserFinder weChatWorkUserFinder,
ILogger<WeChatWorkGrantValidator> logger) :
base(
eventService,
currentTenant,
guidGenerator,
settingProvider,
userManager,
identitySecurityLogManager,
weChatWorkLocalizer,
weChatWorkUserFinder,
logger)
{
}
public override string GrantType => AbpWeChatWorkGlobalConsts.OAuthGrantType;
protected async override Task<WeChatWorkUserInfo> FindUserInfoAsync(ExtensionGrantValidationContext context, string code)
{
return await WeChatWorkUserFinder.GetUserInfoAsync(code);
}
}
Loading…
Cancel
Save