tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 06:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

more refactoring of fileconfig creator

Browse Source
This commit is contained in:
Tom Gardham-Pallister 2017-02-08 18:23:07 +00:00
parent 26ac0fd3f4
commit 9d790a449b
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
View File

@ -88,17 +88,13 @@ namespace Ocelot.Configuration.Creator
private async Task<ReRoute> SetUpReRoute(FileReRoute fileReRoute, FileGlobalConfiguration globalConfiguration) private async Task<ReRoute> SetUpReRoute(FileReRoute fileReRoute, FileGlobalConfiguration globalConfiguration)
{ {
var globalRequestIdConfiguration = !string.IsNullOrEmpty(globalConfiguration?.RequestIdKey); var isAuthenticated = IsAuthenticated(fileReRoute);
var isAuthenticated = !string.IsNullOrEmpty(fileReRoute.AuthenticationOptions?.Provider); var isAuthorised = IsAuthenticated(fileReRoute);
var isAuthorised = fileReRoute.RouteClaimsRequirement?.Count > 0; var isCached = IsCached(fileReRoute);
var isCached = fileReRoute.FileCacheOptions.TtlSeconds > 0; var requestIdKey = BuildRequestId(fileReRoute, globalConfiguration);
var requestIdKey = globalRequestIdConfiguration
? globalConfiguration.RequestIdKey
: fileReRoute.RequestIdKey;
var loadBalancerKey = BuildLoadBalancerKey(fileReRoute); var loadBalancerKey = BuildLoadBalancerKey(fileReRoute);
@ -141,6 +137,32 @@ namespace Ocelot.Configuration.Creator
return reRoute; return reRoute;
} }
private bool IsAuthenticated(FileReRoute fileReRoute)
{
return !string.IsNullOrEmpty(fileReRoute.AuthenticationOptions?.Provider);
}
private bool IsAuthorised(FileReRoute fileReRoute)
{
return fileReRoute.RouteClaimsRequirement?.Count > 0;
}
private bool IsCached(FileReRoute fileReRoute)
{
return fileReRoute.FileCacheOptions.TtlSeconds > 0;
}
private string BuildRequestId(FileReRoute fileReRoute, FileGlobalConfiguration globalConfiguration)
{
var globalRequestIdConfiguration = !string.IsNullOrEmpty(globalConfiguration?.RequestIdKey);
var requestIdKey = globalRequestIdConfiguration
? globalConfiguration.RequestIdKey
: fileReRoute.RequestIdKey;
return requestIdKey;
}
private string BuildLoadBalancerKey(FileReRoute fileReRoute) private string BuildLoadBalancerKey(FileReRoute fileReRoute)
{ {
//note - not sure if this is the correct key, but this is probably the only unique key i can think of given my poor brain //note - not sure if this is the correct key, but this is probably the only unique key i can think of given my poor brain