mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-29 16:11:05 +01:00
Merge pull request #1187 from tgstation/Patches [TGSDeploy]
Add a null check for the OAuth config section
This commit is contained in:
@@ -42,6 +42,10 @@ namespace Tgstation.Server.Host.Security.OAuth
|
||||
var securityConfiguration = securityConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(securityConfigurationOptions));
|
||||
|
||||
var validatorsBuilder = new List<IOAuthValidator>();
|
||||
validators = validatorsBuilder;
|
||||
|
||||
if (securityConfiguration.OAuth == null)
|
||||
return;
|
||||
|
||||
if (securityConfiguration.OAuth.TryGetValue(OAuthProvider.GitHub, out var gitHubConfig))
|
||||
validatorsBuilder.Add(
|
||||
@@ -73,8 +77,6 @@ namespace Tgstation.Server.Host.Security.OAuth
|
||||
assemblyInformationProvider,
|
||||
loggerFactory.CreateLogger<KeycloakOAuthValidator>(),
|
||||
keyCloakConfig));
|
||||
|
||||
validators = validatorsBuilder;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
|
||||
@@ -106,6 +106,8 @@ namespace Tgstation.Server.Tests
|
||||
args.Add($"Security:OAuth:{I}:RedirectUrl=https://fakest.com");
|
||||
args.Add($"Security:OAuth:{I}:ServerUrl=https://fakestest.com");
|
||||
}
|
||||
else
|
||||
args.Add($"Security:OAuth=null");
|
||||
|
||||
// SPECIFICALLY DELETE THE DEV APPSETTINGS, WE DON'T WANT IT IN THE WAY
|
||||
File.Delete("appsettings.Development.json");
|
||||
|
||||
Reference in New Issue
Block a user