diff --git a/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ExistingUserRequirementHandler.cs b/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ExistingUserRequirementHandler.cs index 933e858..fac67ab 100644 --- a/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ExistingUserRequirementHandler.cs +++ b/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ExistingUserRequirementHandler.cs @@ -3,7 +3,6 @@ using MareSynchronosShared.Utils; using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using StackExchange.Redis.Extensions.Core.Abstractions; namespace MareSynchronosShared.RequirementHandlers; public class ExistingUserRequirementHandler : AuthorizationHandler @@ -22,9 +21,17 @@ public class ExistingUserRequirementHandler : AuthorizationHandler string.Equals(g.Type, MareClaimTypes.Uid, StringComparison.Ordinal))?.Value; if (uid == null) context.Fail(); + var discordIdString = context.User.Claims.SingleOrDefault(g => string.Equals(g.Type, MareClaimTypes.DiscordId, StringComparison.Ordinal))?.Value; + if (discordIdString == null) context.Fail(); + var user = await _dbContext.Users.AsNoTracking().SingleOrDefaultAsync(b => b.UID == uid).ConfigureAwait(false); if (user == null) context.Fail(); + if (!ulong.TryParse(discordIdString, out ulong discordId)) context.Fail(); + + var discordUser = _dbContext.LodeStoneAuth.AsNoTracking().SingleOrDefaultAsync(b => b.DiscordId == discordId); + if (discordUser == null) context.Fail(); + context.Succeed(requirement); } } \ No newline at end of file