friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some more log/error handling

Browse Source
This commit is contained in:
Stanley Dimant
2024-12-20 11:17:19 +01:00
parent 0cdf0d1667
commit 010fcb0d2e
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MareSynchronosServer/MareSynchronosAuthService/Controllers/OAuthController.cs
View File

@@ -12,6 +12,7 @@ using StackExchange.Redis;
using StackExchange.Redis.Extensions.Core.Abstractions; using StackExchange.Redis.Extensions.Core.Abstractions;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Globalization; using System.Globalization;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims; using System.Security.Claims;
using System.Text.Json; using System.Text.Json;
using System.Web; using System.Web;
@@ -145,26 +146,35 @@ public class OAuthController : AuthControllerBase
using var dbContext = await MareDbContextFactory.CreateDbContextAsync(); using var dbContext = await MareDbContextFactory.CreateDbContextAsync();
var mareUser = await dbContext.LodeStoneAuth.Include(u => u.User).SingleOrDefaultAsync(u => u.DiscordId == discordUserId); var mareUser = await dbContext.LodeStoneAuth.Include(u => u.User).SingleOrDefaultAsync(u => u.DiscordId == discordUserId);
if (mareUser == null) if (mareUser == default)
{ {
Logger.LogDebug("Failed to get Mare user for {session}, DiscordId: {id}", reqId, discordUserId); Logger.LogDebug("Failed to get Mare user for {session}, DiscordId: {id}", reqId, discordUserId);
return BadRequest("Could not find a Mare user associated to this Discord account."); return BadRequest("Could not find a Mare user associated to this Discord account.");
} }
var jwt = CreateJwt([ JwtSecurityToken? jwt = null;
new Claim(MareClaimTypes.Uid, mareUser.User!.UID), try
new Claim(MareClaimTypes.Expires, DateTime.UtcNow.AddDays(14).Ticks.ToString(CultureInfo.InvariantCulture)), {
new Claim(MareClaimTypes.DiscordId, discordUserId.ToString()), jwt = CreateJwt([
new Claim(MareClaimTypes.DiscordUser, discordUserName), new Claim(MareClaimTypes.Uid, mareUser.User!.UID),
new Claim(MareClaimTypes.OAuthLoginToken, true.ToString()) new Claim(MareClaimTypes.Expires, DateTime.UtcNow.AddDays(14).Ticks.ToString(CultureInfo.InvariantCulture)),
]); new Claim(MareClaimTypes.DiscordId, discordUserId.ToString()),
new Claim(MareClaimTypes.DiscordUser, discordUserName),
new Claim(MareClaimTypes.OAuthLoginToken, true.ToString())
]);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Failed to create the OAuth2 token for session {session} and Discord user {user}", reqId, discordUserId);
return BadRequest("Failed to create the OAuth2 token. Please contact the developer for more information.");
}
_cookieOAuthResponse[reqId] = jwt.RawData; _cookieOAuthResponse[reqId] = jwt.RawData;
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
bool isRemoved = false; bool isRemoved = false;
for (int i = 0; i < 10; i++) for (int i = 0; i < 30; i++)
{ {
await Task.Delay(TimeSpan.FromSeconds(3)).ConfigureAwait(false); await Task.Delay(TimeSpan.FromSeconds(3)).ConfigureAwait(false);
if (!_cookieOAuthResponse.ContainsKey(reqId)) if (!_cookieOAuthResponse.ContainsKey(reqId))