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

Revert "fix: build failures caused by bad merge"

Browse Source 
This reverts commit 3e4639489b6b6c06b5a977a069002fe0c0eb2057.
This commit is contained in:
Justin Baur 2025-05-07 16:52:18 -04:00
parent 5909f6ef8e
commit 4fe99ab6ba
No known key found for this signature in database
1 changed files with 2 additions and 5 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

@ -35,6 +35,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
private readonly Dictionary<string, DynamicAuthenticationScheme> _cachedHandlerSchemes;
private readonly SemaphoreSlim _semaphore;
private readonly IServiceProvider _serviceProvider;
private DateTime? _lastSchemeLoad;
private IEnumerable<DynamicAuthenticationScheme> _schemesCopy = Array.Empty<DynamicAuthenticationScheme>();
private IEnumerable<DynamicAuthenticationScheme> _handlerSchemesCopy = Array.Empty<DynamicAuthenticationScheme>();
@ -49,8 +50,7 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
ILogger<DynamicAuthenticationSchemeProvider> logger,
GlobalSettings globalSettings,
SamlEnvironment samlEnvironment,
IServiceProvider serviceProvider,
IHttpMessageHandlerFactory httpMessageHandlerFactory)
IServiceProvider serviceProvider)
: base(options)
{
_oidcPostConfigureOptions = oidcPostConfigureOptions;
@ -78,7 +78,6 @@ 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,8 +310,6 @@ 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)