diff --git a/src/Tgstation.Server.Host/Authority/UserAuthority.cs b/src/Tgstation.Server.Host/Authority/UserAuthority.cs
index 59769f696f..4d404c7a3c 100644
--- a/src/Tgstation.Server.Host/Authority/UserAuthority.cs
+++ b/src/Tgstation.Server.Host/Authority/UserAuthority.cs
@@ -39,16 +39,6 @@ namespace Tgstation.Server.Host.Authority
///
readonly IUsersDataLoader usersDataLoader;
- ///
- /// The for the .
- ///
- readonly IOAuthConnectionsDataLoader oAuthConnectionsDataLoader;
-
- ///
- /// The for the .
- ///
- readonly IOidcConnectionsDataLoader oidcConnectionsDataLoader;
-
///
/// The for the .
///
@@ -111,66 +101,6 @@ namespace Tgstation.Server.Host.Authority
.ToDictionaryAsync(user => user.Id!.Value, cancellationToken);
}
- ///
- /// Implements the .
- ///
- /// The of s to load the OAuthConnections for.
- /// The to load from.
- /// The for the operation.
- /// A resulting in a of the requested s.
- [DataLoader]
- public static async ValueTask> GetOAuthConnections(
- IReadOnlyList userIds,
- IDatabaseContext databaseContext,
- CancellationToken cancellationToken)
- {
- ArgumentNullException.ThrowIfNull(userIds);
- ArgumentNullException.ThrowIfNull(databaseContext);
-
- var list = await databaseContext
- .OAuthConnections
- .Where(x => userIds.Contains(x.User!.Id!.Value))
- .ToListAsync(cancellationToken);
-
- return list.ToLookup(
- oAuthConnection => oAuthConnection.UserId,
- x => new GraphQL.Types.OAuth.OAuthConnection
- {
- ExternalUserId = x.ExternalUserId!,
- Provider = x.Provider,
- });
- }
-
- ///
- /// Implements the .
- ///
- /// The of s to load the OidcConnections for.
- /// The to load from.
- /// The for the operation.
- /// A resulting in a of the requested s.
- [DataLoader]
- public static async ValueTask> GetOidcConnections(
- IReadOnlyList userIds,
- IDatabaseContext databaseContext,
- CancellationToken cancellationToken)
- {
- ArgumentNullException.ThrowIfNull(userIds);
- ArgumentNullException.ThrowIfNull(databaseContext);
-
- var list = await databaseContext
- .OidcConnections
- .Where(x => userIds.Contains(x.User!.Id!.Value))
- .ToListAsync(cancellationToken);
-
- return list.ToLookup(
- oidcConnection => oidcConnection.UserId,
- x => new GraphQL.Types.OAuth.OidcConnection
- {
- ExternalUserId = x.ExternalUserId!,
- SchemeKey = x.SchemeKey!,
- });
- }
-
///
/// Check if a given has a valid specified.
///
@@ -195,8 +125,6 @@ namespace Tgstation.Server.Host.Authority
/// The to use.
/// The to use.
/// The value of .
- /// The value of .
- /// The value of .
/// The value of .
/// The value of .
/// The value of .
@@ -209,8 +137,6 @@ namespace Tgstation.Server.Host.Authority
IDatabaseContext databaseContext,
ILogger logger,
IUsersDataLoader usersDataLoader,
- IOAuthConnectionsDataLoader oAuthConnectionsDataLoader,
- IOidcConnectionsDataLoader oidcConnectionsDataLoader,
ISystemIdentityFactory systemIdentityFactory,
IPermissionsUpdateNotifyee permissionsUpdateNotifyee,
ICryptographySuite cryptographySuite,
@@ -224,8 +150,6 @@ namespace Tgstation.Server.Host.Authority
logger)
{
this.usersDataLoader = usersDataLoader ?? throw new ArgumentNullException(nameof(usersDataLoader));
- this.oAuthConnectionsDataLoader = oAuthConnectionsDataLoader ?? throw new ArgumentNullException(nameof(oAuthConnectionsDataLoader));
- this.oidcConnectionsDataLoader = oidcConnectionsDataLoader ?? throw new ArgumentNullException(nameof(oidcConnectionsDataLoader));
this.systemIdentityFactory = systemIdentityFactory ?? throw new ArgumentNullException(nameof(systemIdentityFactory));
this.permissionsUpdateNotifyee = permissionsUpdateNotifyee ?? throw new ArgumentNullException(nameof(permissionsUpdateNotifyee));
this.cryptographySuite = cryptographySuite ?? throw new ArgumentNullException(nameof(cryptographySuite));