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

Merge branch 'abp' of https://gitee.com/ccnetcore/Yi into abp

Browse Source
This commit is contained in:
Xwen
2024-01-10 23:14:32 +08:00
parent 1267cf9845 c588936c7e
commit 93e4ab88fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
/// <returns></returns> /// <returns></returns>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>
[HttpGet("auth/oauth/login/{scheme}")] [HttpGet("auth/oauth/login/{scheme}")]
public async Task<string> AuthOauthLoginAsync([FromRoute] string scheme, [FromQuery] string code) public async Task<object> AuthOauthLoginAsync([FromRoute] string scheme, [FromQuery] string code)
{ {
(var openId, var _) = await GetOpenIdAndNameAsync(scheme); (var openId, var _) = await GetOpenIdAndNameAsync(scheme);
var authEntity = await _repository.GetAsync(x => x.OpenId == openId && x.AuthType == scheme); var authEntity = await _repository.GetAsync(x => x.OpenId == openId && x.AuthType == scheme);
@@ -50,7 +50,7 @@ namespace Yi.Framework.Rbac.Application.Services.Authentication
throw new UserFriendlyException("第三方登录失败，请先注册后，在个人中心进行绑定该第三方后使用"); throw new UserFriendlyException("第三方登录失败，请先注册后，在个人中心进行绑定该第三方后使用");
} }
var accessToken = await _accountManager.GetTokenByUserIdAsync(authEntity.UserId); var accessToken = await _accountManager.GetTokenByUserIdAsync(authEntity.UserId);
return accessToken; return new { token= accessToken };
} }
/// <summary> /// <summary>