GithubBackup/Foxel
1
0
Fork 0
mirror of https://github.com/DrizzleTime/Foxel.git synced 2026-06-08 08:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve GitHub OAuth handling and update authentication flow

Browse Source
This commit is contained in:
shiyu
2025-05-19 12:16:53 +08:00
parent b65f1e4bbb
commit ab83c519c4
12 changed files with 488 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Services/UserService.cs
View File

@@ -97,7 +97,7 @@ public class UserService(IDbContextFactory<MyDbContext> dbContextFactory, IConfi
}
public async Task<(bool success, string message, User? user)> FindOrCreateGitHubUserAsync(
string githubId, string githubLogin, string? email)
string githubId, string? githubName, string? email)
{
if (string.IsNullOrEmpty(email))
{
@@ -106,17 +106,15 @@ public class UserService(IDbContextFactory<MyDbContext> dbContextFactory, IConfi
await using var context = await dbContextFactory.CreateDbContextAsync();
// 先尝试通过邮箱查找用户
var user = await context.Users.FirstOrDefaultAsync(u => u.Email == email);
if (user == null)
{
// 用户不存在，创建新用户
user = new User
{
UserName = $"{githubLogin}_{githubId.Substring(0, 5)}", // 创建唯一用户名
UserName = $"{githubName}",
Email = email,
PasswordHash = HashPassword(Guid.NewGuid().ToString()),
PasswordHash = HashPassword(Guid.NewGuid().ToString()),
GithubId = githubId,
CreatedAt = DateTime.UtcNow,
UpdatedAt = DateTime.UtcNow
@@ -125,15 +123,14 @@ public class UserService(IDbContextFactory<MyDbContext> dbContextFactory, IConfi
await context.SaveChangesAsync();
return (true, "GitHub用户注册成功", user);
}
else
if (string.IsNullOrEmpty(user.GithubId))
{
if (string.IsNullOrEmpty(user.GithubId))
{
user.GithubId = githubId;
user.UpdatedAt = DateTime.UtcNow;
await context.SaveChangesAsync();
}
return (true, "GitHub用户登录成功", user);
user.GithubId = githubId;
user.UpdatedAt = DateTime.UtcNow;
await context.SaveChangesAsync();
}
return (true, "GitHub用户登录成功", user);
}
}