diff --git a/src/Tgstation.Server.Api/Models/OAuthProvider.cs b/src/Tgstation.Server.Api/Models/OAuthProvider.cs index 0581cf3369..bc766e0bcc 100644 --- a/src/Tgstation.Server.Api/Models/OAuthProvider.cs +++ b/src/Tgstation.Server.Api/Models/OAuthProvider.cs @@ -1,4 +1,6 @@ -using Newtonsoft.Json; +using System; + +using Newtonsoft.Json; using Newtonsoft.Json.Converters; namespace Tgstation.Server.Api.Models @@ -20,8 +22,9 @@ namespace Tgstation.Server.Api.Models Discord, /// - /// https://tgstation13.org. + /// Pre-hostening https://tgstation13.org. No longer supported. /// + [Obsolete("tgstation13.org no longer has a custom OAuth solution", true)] TGForums, /// diff --git a/src/Tgstation.Server.Host/GraphQL/Types/OAuth/OAuthProviderInfos.cs b/src/Tgstation.Server.Host/GraphQL/Types/OAuth/OAuthProviderInfos.cs index da9bffe4b3..87f486120a 100644 --- a/src/Tgstation.Server.Host/GraphQL/Types/OAuth/OAuthProviderInfos.cs +++ b/src/Tgstation.Server.Host/GraphQL/Types/OAuth/OAuthProviderInfos.cs @@ -58,7 +58,6 @@ namespace Tgstation.Server.Host.GraphQL.Types.OAuth Discord = TryBuild(OAuthProvider.Discord, info => new BasicOAuthProviderInfo(info)); GitHub = TryBuild(OAuthProvider.GitHub, info => new RedirectOAuthProviderInfo(info)); - TGForums = TryBuild(OAuthProvider.TGForums, info => new RedirectOAuthProviderInfo(info)); Keycloak = TryBuild(OAuthProvider.Keycloak, info => new FullOAuthProviderInfo(info)); InvisionCommunity = TryBuild(OAuthProvider.InvisionCommunity, info => new FullOAuthProviderInfo(info)); } diff --git a/src/Tgstation.Server.Host/Security/OAuth/OAuthProviders.cs b/src/Tgstation.Server.Host/Security/OAuth/OAuthProviders.cs index 5b5af32ba9..8e631eea0f 100644 --- a/src/Tgstation.Server.Host/Security/OAuth/OAuthProviders.cs +++ b/src/Tgstation.Server.Host/Security/OAuth/OAuthProviders.cs @@ -57,13 +57,6 @@ namespace Tgstation.Server.Host.Security.OAuth loggerFactory.CreateLogger(), discordConfig)); - if (securityConfiguration.OAuth.TryGetValue(OAuthProvider.TGForums, out var tgConfig)) - validatorsBuilder.Add( - new TGForumsOAuthValidator( - httpClientFactory, - loggerFactory.CreateLogger(), - tgConfig)); - if (securityConfiguration.OAuth.TryGetValue(OAuthProvider.Keycloak, out var keyCloakConfig)) validatorsBuilder.Add( new KeycloakOAuthValidator( diff --git a/src/Tgstation.Server.Host/Security/OAuth/TGForumsOAuthValidator.cs b/src/Tgstation.Server.Host/Security/OAuth/TGForumsOAuthValidator.cs deleted file mode 100644 index c81a54ec73..0000000000 --- a/src/Tgstation.Server.Host/Security/OAuth/TGForumsOAuthValidator.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; - -using Microsoft.Extensions.Logging; - -using Tgstation.Server.Api.Models; -using Tgstation.Server.Common.Http; -using Tgstation.Server.Host.Configuration; - -namespace Tgstation.Server.Host.Security.OAuth -{ - /// - /// for /tg/ forums. - /// - sealed class TGForumsOAuthValidator : GenericOAuthValidator - { - /// - public override OAuthProvider Provider => OAuthProvider.TGForums; - - /// - protected override Uri TokenUrl => new("https://tgstation13.org/phpBB/app.php/tgapi/oauth/token"); - - /// - protected override Uri UserInformationUrl => new("https://tgstation13.org/phpBB/app.php/tgapi/user/me"); - - /// - /// Initializes a new instance of the class. - /// - /// The for the . - /// The for the . - /// The for the . - public TGForumsOAuthValidator( - IAbstractHttpClientFactory httpClientFactory, - ILogger logger, - OAuthConfiguration oAuthConfiguration) - : base( - httpClientFactory, - logger, - oAuthConfiguration) - { - } - - /// - protected override string DecodeTokenPayload(dynamic responseJson) => responseJson.access_token; - - /// - protected override string DecodeUserInformationPayload(dynamic responseJson) => responseJson.phpbb_username; - - /// - protected override OAuthTokenRequest CreateTokenRequest(string code) => new(OAuthConfiguration, code, "user"); - } -}