Browse Source
Merge pull request #293 from colinin/4.4
fix: build error CS0117
pull/364/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
320 additions and
320 deletions
-
aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs
-
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN/Abp/IdentityServer/WeChat/WeChatGrantValidator.cs
|
|
|
@ -69,7 +69,7 @@ namespace LINGYUN.Abp.Account |
|
|
|
|
|
|
|
var wehchatOpenId = await WeChatOpenIdFinder.FindAsync(input.Code, options.AppId, options.AppSecret); |
|
|
|
|
|
|
|
var user = await UserManager.FindByLoginAsync(AbpWeChatMiniProgramConsts.ProviderKey, wehchatOpenId.OpenId); |
|
|
|
var user = await UserManager.FindByLoginAsync(AbpWeChatMiniProgramConsts.ProviderName, wehchatOpenId.OpenId); |
|
|
|
if (user != null) |
|
|
|
{ |
|
|
|
// 应该要抛出微信号已注册异常,而不是直接返回注册用户数据,否则造成用户信息泄露
|
|
|
|
@ -92,7 +92,7 @@ namespace LINGYUN.Abp.Account |
|
|
|
|
|
|
|
(await UserManager.AddDefaultRolesAsync(user)).CheckErrors(); |
|
|
|
|
|
|
|
var userLogin = new UserLoginInfo(AbpWeChatMiniProgramConsts.ProviderKey, wehchatOpenId.OpenId, AbpWeChatGlobalConsts.DisplayName); |
|
|
|
var userLogin = new UserLoginInfo(AbpWeChatMiniProgramConsts.ProviderName, wehchatOpenId.OpenId, AbpWeChatGlobalConsts.DisplayName); |
|
|
|
(await UserManager.AddLoginAsync(user, userLogin)).CheckErrors(); |
|
|
|
|
|
|
|
await CurrentUnitOfWork.SaveChangesAsync(); |
|
|
|
|
|
|
|
@ -109,7 +109,7 @@ namespace LINGYUN.Abp.IdentityServer.WeChat |
|
|
|
new UserLoginInfo( |
|
|
|
LoginProvider, |
|
|
|
wechatOpenId.OpenId, |
|
|
|
LoginProvider))).CheckErrors(); |
|
|
|
AbpWeChatGlobalConsts.DisplayName))).CheckErrors(); |
|
|
|
} |
|
|
|
|
|
|
|
if (await UserManager.IsLockedOutAsync(currentUser)) |
|
|
|
|