add username

src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/GithubAuthorizationController.cs

@@ -23,15 +23,13 @@ public class GithubAuthorizationController : ControllerBase
     private readonly AppDbContext appDbContext;
     private readonly GithubOptions githubOptions;
     private readonly PassportService passportService;
-    private readonly UserManager<HutaoUser> userManager;
 
     public GithubAuthorizationController(IServiceProvider serviceProvider)
     {
         httpClient = serviceProvider.GetRequiredService<HttpClient>();
         appDbContext = serviceProvider.GetRequiredService<AppDbContext>();
         githubOptions = serviceProvider.GetRequiredService<AppOptions>().Github;
         passportService = serviceProvider.GetRequiredService<PassportService>();
-        userManager = serviceProvider.GetRequiredService<UserManager<HutaoUser>>();
     }
 
     [Authorize]
@@ -53,7 +51,7 @@ public async Task<IActionResult> RedirectLoginAsync()
         return Redirect($"https://github.com/login/oauth/authorize?client_id={githubOptions.ClientId}&state={state}");
     }
 
-    [HttpGet("Authorize")]
+    [HttpGet("Github/Authorize")]
     public async Task<IActionResult> HandleAuthorizationCallbackAsync([FromQuery(Name = "code")] string code, [FromQuery(Name = "state")] string state)
     {
         if (string.IsNullOrEmpty(code) || string.IsNullOrEmpty(state))

src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/PassportController.cs

@@ -180,6 +180,7 @@ public async Task<IActionResult> GetUserInfoAsync()
         return Response<UserInfo>.Success("获取用户信息成功", new()
         {
             NormalizedUserName = user.NormalizedUserName ?? user.UserName,
+            UserName = user.UserName,
             IsLicensedDeveloper = user.IsLicensedDeveloper,
             IsMaintainer = user.IsMaintainer,
             GachaLogExpireAt = DateTimeOffset.FromUnixTimeSeconds(user.GachaLogExpireAt),

src/Snap.Hutao.Server/Snap.Hutao.Server/Model/Passport/UserInfo.cs

@@ -7,6 +7,8 @@ public class UserInfo
 {
     public string? NormalizedUserName { get; set; }
 
+    public string? UserName { get; set; }
+
     public bool IsLicensedDeveloper { get; set; }
 
     public bool IsMaintainer { get; set; }