Skip to content

Fix two potential NREs #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maartenba merged 1 commit into from
Jan 24, 2025
Merged

Fix two potential NREs #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...tityServer/Configuration/DependencyInjection/PostConfigureApplicationCookieTicketStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void PostConfigure(string name, CookieAuthenticationOptions options)

IdentityServerLicenseValidator.Instance.ValidateServerSideSessions();
var licenseUsage = _httpContextAccessor.HttpContext?.RequestServices.GetRequiredService<LicenseUsageTracker>();
licenseUsage.FeatureUsed(LicenseFeature.ServerSideSessions);
licenseUsage?.FeatureUsed(LicenseFeature.ServerSideSessions);

var sessionStore = _httpContextAccessor.HttpContext!.RequestServices.GetService<IServerSideSessionStore>();
if (sessionStore is InMemoryServerSideSessionStore)
Expand Down Expand Up @@ -128,4 +128,4 @@ public Task<string> StoreAsync(AuthenticationTicket ticket)
{
return Inner.StoreAsync(ticket);
}
}
}
4 changes: 2 additions & 2 deletions ...-server/src/IdentityServer/Hosting/DynamicProviders/Store/CachingIdentityProviderStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void RemoveCacheEntry(IdentityProvider idp)
var optionsMonitorType = typeof(IOptionsMonitorCache<>).MakeGenericType(provider.OptionsType);
// need to resolve the provide type dynamically, thus the need for the http context accessor
// this will throw if attempted outside an http request, but that is checked in the caller
var optionsCache = _httpContextAccessor.HttpContext.RequestServices.GetService(optionsMonitorType);
var optionsCache = _httpContextAccessor.HttpContext?.RequestServices.GetService(optionsMonitorType);
if (optionsCache != null)
{
var mi = optionsMonitorType.GetMethod("TryRemove");
Expand All @@ -113,4 +113,4 @@ void RemoveCacheEntry(IdentityProvider idp)
}
}
}
}
}