From 1345cccd02fb3de563e629b8c1321ec736d50da9 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 21 Oct 2025 17:55:12 -0400 Subject: [PATCH 1/4] Fix being unable to see your own OIDC connections --- .../Security/AuthenticationContextFactory.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs index 540cf72c23..7e22505e43 100644 --- a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs +++ b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs @@ -175,6 +175,7 @@ namespace Tgstation.Server.Host.Security .Include(x => x.Group) .ThenInclude(x => x!.PermissionSet) .Include(x => x.OAuthConnections) + .Include(x => x.OidcConnections) .FirstOrDefaultAsync(cancellationToken); if (user == default) { From 1a733692545663d84bbc62e357c1b50b8fb18fef Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 21 Oct 2025 17:55:35 -0400 Subject: [PATCH 2/4] Version bump to 6.18.1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 80026e5567..0ade4b9f55 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.18.0 + 6.18.1 5.8.0 10.13.0 0.6.0 From 599b4005c59c9eca6621ef22805fdb2d03f034f5 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 21 Oct 2025 19:41:32 -0400 Subject: [PATCH 3/4] Better debugging message --- tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs index dab176cdc5..bcff8cf8e3 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs @@ -10,6 +10,8 @@ using Moq; using Newtonsoft.Json; +using Remora.Discord.Rest.Extensions; + using System; using System.Collections.Generic; using System.Globalization; @@ -1229,7 +1231,7 @@ namespace Tgstation.Server.Tests.Live.Instance Assert.AreEqual("https://github.com/Cyberboss", embedsResponse.Embed.Author.Url); Assert.IsTrue(DateTimeOffset.TryParse(embedsResponse.Embed.Timestamp, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var timestamp)); var timestampCheck = startTime < timestamp && endTime > timestamp; - Assert.IsTrue(timestampCheck); + Assert.IsTrue(timestampCheck, $"Expected between {startTime.ToString("O")} and {endTime.ToString("O")}, got {timestamp.ToString("O")}"); Assert.AreEqual("https://github.com/tgstation/tgstation-server", embedsResponse.Embed.Url); Assert.AreEqual(3, embedsResponse.Embed.Fields?.Count); Assert.AreEqual("field1", embedsResponse.Embed.Fields.ElementAt(0).Name); From 73f76035177beb5786085c0685a92ca10d229b2d Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 15 Nov 2025 12:03:39 -0500 Subject: [PATCH 4/4] Maybe fix build error --- tests/Tgstation.Server.Host.Tests/IO/TestIOManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Tgstation.Server.Host.Tests/IO/TestIOManager.cs b/tests/Tgstation.Server.Host.Tests/IO/TestIOManager.cs index 60fa057449..36dfe283fe 100644 --- a/tests/Tgstation.Server.Host.Tests/IO/TestIOManager.cs +++ b/tests/Tgstation.Server.Host.Tests/IO/TestIOManager.cs @@ -90,7 +90,8 @@ namespace Tgstation.Server.Host.IO.Tests Assert.IsFalse(await ioManager.FileExists(symlinkedFile, CancellationToken.None)); Assert.IsFalse(await ioManager.FileExists(ioManager.ConcatPath(symlinkedDir, "test1.txt"), CancellationToken.None)); Assert.IsTrue(await ioManager.FileExists(fileInTargetDir, CancellationToken.None)); - Assert.IsTrue(expectedBytes.SequenceEqual(await ioManager.ReadAllBytes(fileInTargetDir, CancellationToken.None))); + var readResult = await ioManager.ReadAllBytes(fileInTargetDir, CancellationToken.None); + Assert.IsTrue(expectedBytes.SequenceEqual(readResult)); } catch {