lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-11-07 18:04:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整User为SysUser、Resource为SysResource

Browse Source
This commit is contained in:
yubaolee
2025-02-19 12:44:42 +08:00
parent 839256e8bb
commit 2a2d83d026
27 changed files with 417 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenAuth.Identity/CustomProfileService.cs
View File

@@ -78,12 +78,12 @@ namespace OpenAuth.IdentityServer
return Task.CompletedTask;
}
private User GetUserById(string id)
private SysUser GetUserById(string id)
{
User user;
SysUser sysUser;
if (id == Define.SYSTEM_USERNAME)
{
user = new User
sysUser = new SysUser
{
Account = Define.SYSTEM_USERNAME,
Id = Define.SYSTEM_USERNAME,
@@ -92,10 +92,10 @@ namespace OpenAuth.IdentityServer
}
else
{
user = UserManager.Get(id);
sysUser = UserManager.Get(id);
}
return user;
return sysUser;
}
}
}

14
OpenAuth.Identity/Quickstart/Account/AccountController.cs
View File

@@ -107,10 +107,10 @@ namespace OpenAuth.IdentityServer.Quickstart.Account
if (ModelState.IsValid)
{
User user;
SysUser sysUser;
if (model.Username == Define.SYSTEM_USERNAME && model.Password == Define.SYSTEM_USERPWD)
{
user = new User
sysUser = new SysUser
{
Account = Define.SYSTEM_USERNAME,
Password = Define.SYSTEM_USERPWD,
@@ -119,12 +119,12 @@ namespace OpenAuth.IdentityServer.Quickstart.Account
}
else
{
user = _userManager.GetByAccount(model.Username);
sysUser = _userManager.GetByAccount(model.Username);
}
if (user != null &&(user.Password ==model.Password))
if (sysUser != null &&(sysUser.Password ==model.Password))
{
if (user.Status != 0) //判断用户状态
if (sysUser.Status != 0) //判断用户状态
{
await _events.RaiseAsync(new UserLoginFailureEvent(model.Username, "invalid user status"));
ModelState.AddModelError(string.Empty, "user.status must be 0");
@@ -132,7 +132,7 @@ namespace OpenAuth.IdentityServer.Quickstart.Account
return View(err);
}
await _events.RaiseAsync(new UserLoginSuccessEvent(user.Account, user.Id, user.Account));
await _events.RaiseAsync(new UserLoginSuccessEvent(sysUser.Account, sysUser.Id, sysUser.Account));
// only set explicit expiration here if user chooses "remember me".
// otherwise we rely upon expiration configured in cookie middleware.
@@ -147,7 +147,7 @@ namespace OpenAuth.IdentityServer.Quickstart.Account
};
// issue authentication cookie with subject ID and username
await HttpContext.SignInAsync(user.Id, user.Account, props);
await HttpContext.SignInAsync(sysUser.Id, sysUser.Account, props);
if (context != null)
{