Browse Source
Apply the same split the OpenIddict grant already got to the legacy IdentityServer module, so the OAuth login and the mini program login stop sharing a single validator, and drop the removed AbpWeChatWorkGlobalConsts.GrantType constant that broke this project's build. - WeChatWorkGrantValidator becomes abstract: GrantType becomes abstract and the user lookup moves behind a FindUserInfoAsync hook; the constructor becomes protected - add WeChatWorkOAuthGrantValidator (grant type wecom_oauth, user info exchange) and WeChatWorkMiniProgramGrantValidator (grant type wecom_mp, code2session exchange mapped to the user id plus the session key as user ticket) - register both validators in AbpIdentityServerWeChatWorkModule Fixes the CS0117 build error introduced when AbpWeChatWorkGlobalConsts.GrantType was renamed.pull/1622/head
4 changed files with 114 additions and 6 deletions
@ -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, |
|||
}; |
|||
} |
|||
} |
|||
@ -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…
Reference in new issue