nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-03 02:32:16 -05:00
Code

fix: build failures caused by bad merge

Browse Source
This commit is contained in:
tangowithfoxtrot 2025-04-30 13:27:14 -07:00
parent 761e794f7f
commit 3e4639489b
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
View File

@ -36,7 +36,6 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
private readonly SemaphoreSlim _semaphore;
private readonly IServiceProvider _serviceProvider;
private readonly IHttpMessageHandlerFactory _httpMessageHandlerFactory;
private DateTime? _lastSchemeLoad;
private IEnumerable<DynamicAuthenticationScheme> _schemesCopy = Array.Empty<DynamicAuthenticationScheme>();
private IEnumerable<DynamicAuthenticationScheme> _handlerSchemesCopy = Array.Empty<DynamicAuthenticationScheme>();
@ -51,7 +50,8 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
ILogger<DynamicAuthenticationSchemeProvider> logger,
GlobalSettings globalSettings,
SamlEnvironment samlEnvironment,
IServiceProvider serviceProvider)
IServiceProvider serviceProvider,
IHttpMessageHandlerFactory httpMessageHandlerFactory)
: base(options)
{
_oidcPostConfigureOptions = oidcPostConfigureOptions;
@ -79,6 +79,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
_cachedHandlerSchemes = new Dictionary<string, DynamicAuthenticationScheme>();
_semaphore = new SemaphoreSlim(1);
_serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
_httpMessageHandlerFactory = httpMessageHandlerFactory;
}
private bool CacheIsValid
@ -311,6 +312,8 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
// Prevents URLs that go beyond 1024 characters which may break for some servers
AuthenticationMethod = config.RedirectBehavior,
GetClaimsFromUserInfoEndpoint = config.GetClaimsFromUserInfoEndpoint,
// Make sure all communication goes through the Platform supplied HttpMessageHandler
BackchannelHttpHandler = _httpMessageHandlerFactory.CreateHandler(),
};
oidcOptions.Scope
.AddIfNotExists(OpenIdConnectScopes.OpenId)