sam/Foxnouns.NET
sam/Foxnouns.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

fix: don't pass CancellationToken to method that shouldn't abort

Browse source 
also add license header to project
This commit is contained in:
sam 2024-11-02 21:23:49 +01:00
parent d982342ab8
commit 5a22807410
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Foxnouns.Backend/Controllers/Authentication/DiscordAuthController.cs
View file

@ -28,18 +28,15 @@ public class DiscordAuthController(
// TODO: duplicating attribute doesn't work, find another way to mark both as possible response
// leaving it here for documentation purposes
[ProducesResponseType<AuthController.CallbackResponse>(StatusCodes.Status200OK)]
public async Task<IActionResult> CallbackAsync(
[FromBody] AuthController.CallbackRequest req,
CancellationToken ct = default
)
public async Task<IActionResult> CallbackAsync([FromBody] AuthController.CallbackRequest req)
{
CheckRequirements();
await keyCacheService.ValidateAuthStateAsync(req.State, ct);
await keyCacheService.ValidateAuthStateAsync(req.State);
var remoteUser = await remoteAuthService.RequestDiscordTokenAsync(req.Code, req.State, ct);
var user = await authService.AuthenticateUserAsync(AuthType.Discord, remoteUser.Id, ct: ct);
var remoteUser = await remoteAuthService.RequestDiscordTokenAsync(req.Code);
var user = await authService.AuthenticateUserAsync(AuthType.Discord, remoteUser.Id);
if (user != null)
return Ok(await GenerateUserTokenAsync(user, ct));
return Ok(await GenerateUserTokenAsync(user));
_logger.Debug(
"Discord user {Username} ({Id}) authenticated with no local account",
@ -51,8 +48,7 @@ public class DiscordAuthController(
await keyCacheService.SetKeyAsync(
$"discord:{ticket}",
remoteUser,
Duration.FromMinutes(20),
ct
Duration.FromMinutes(20)
);
return Ok(

1
Foxnouns.Backend/Services/RemoteAuthService.cs
View file

@ -13,7 +13,6 @@ public class RemoteAuthService(Config config, ILogger logger)
public async Task<RemoteUser> RequestDiscordTokenAsync(
string code,
string state,
CancellationToken ct = default
)
{