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

Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and

Browse Source 
AdditionalScopes to Allowed Scoped in order to be more consistent with
Identity Server naming conventions.
This commit is contained in:
David Derman
2017-03-14 16:54:55 -04:00
parent 3e8a296631
commit a3b387aeb1
17 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/Ocelot.AcceptanceTests/AuthenticationTests.cs
View File

@ -51,12 +51,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Post",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = _identityServerRootUrl,
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
}
}
}
@ -89,12 +89,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Post",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = _identityServerRootUrl,
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
}
}
}
@ -127,12 +127,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Get",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = _identityServerRootUrl,
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
}
}
}
@ -168,12 +168,12 @@ namespace Ocelot.AcceptanceTests
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = _identityServerRootUrl,
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
}
}
}
@ -208,12 +208,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Post",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = _identityServerRootUrl,
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
}
}
}
@ -252,7 +252,7 @@ namespace Ocelot.AcceptanceTests
_servicebuilder.Start();
}
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType)
private void GivenThereIsAnIdentityServerOn(string url, string apiName, AccessTokenType tokenType)
{
_identityServerBuilder = new WebHostBuilder()
.UseUrls(url)
@ -269,7 +269,7 @@ namespace Ocelot.AcceptanceTests
{
new ApiResource
{
Name = scopeName,
Name = apiName,
Description = "My API",
Enabled = true,
DisplayName = "test",
@ -299,7 +299,7 @@ namespace Ocelot.AcceptanceTests
ClientId = "client",
AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
ClientSecrets = new List<Secret> {new Secret("secret".Sha256())},
AllowedScopes = new List<string> { scopeName, "openid", "offline_access" },
AllowedScopes = new List<string> { apiName, "openid", "offline_access" },
AccessTokenType = tokenType,
Enabled = true,
RequireClientSecret = false

18
test/Ocelot.AcceptanceTests/AuthorisationTests.cs
View File

@ -45,12 +45,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Get",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = "http://localhost:51888",
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
},
AddHeadersToRequest =
{
@ -102,12 +102,12 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Get",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>(),
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
ProviderRootUrl = "http://localhost:51888",
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret"
ApiName = "api",
ApiSecret = "secret"
},
AddHeadersToRequest =
{
@ -161,7 +161,7 @@ namespace Ocelot.AcceptanceTests
_servicebuilder.Start();
}
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType)
private void GivenThereIsAnIdentityServerOn(string url, string apiName, AccessTokenType tokenType)
{
_identityServerBuilder = new WebHostBuilder()
.UseUrls(url)
@ -178,7 +178,7 @@ namespace Ocelot.AcceptanceTests
{
new ApiResource
{
Name = scopeName,
Name = apiName,
Description = "My API",
Enabled = true,
DisplayName = "test",
@ -209,7 +209,7 @@ namespace Ocelot.AcceptanceTests
ClientId = "client",
AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
ClientSecrets = new List<Secret> {new Secret("secret".Sha256())},
AllowedScopes = new List<string> { scopeName, "openid", "offline_access" },
AllowedScopes = new List<string> { apiName, "openid", "offline_access" },
AccessTokenType = tokenType,
Enabled = true,
RequireClientSecret = false

12
test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs
View File

@ -59,15 +59,15 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Get",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>
AllowedScopes = new List<string>
{
"openid", "offline_access"
},
Provider = "IdentityServer",
ProviderRootUrl = "http://localhost:52888",
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret",
ApiName = "api",
ApiSecret = "secret",
},
AddHeadersToRequest =
{
@ -119,7 +119,7 @@ namespace Ocelot.AcceptanceTests
_servicebuilder.Start();
}
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType, TestUser user)
private void GivenThereIsAnIdentityServerOn(string url, string apiName, AccessTokenType tokenType, TestUser user)
{
_identityServerBuilder = new WebHostBuilder()
.UseUrls(url)
@ -136,7 +136,7 @@ namespace Ocelot.AcceptanceTests
{
new ApiResource
{
Name = scopeName,
Name = apiName,
Description = "My API",
Enabled = true,
DisplayName = "test",
@ -166,7 +166,7 @@ namespace Ocelot.AcceptanceTests
ClientId = "client",
AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
ClientSecrets = new List<Secret> {new Secret("secret".Sha256())},
AllowedScopes = new List<string> { scopeName, "openid", "offline_access" },
AllowedScopes = new List<string> { apiName, "openid", "offline_access" },
AccessTokenType = tokenType,
Enabled = true,
RequireClientSecret = false

12
test/Ocelot.AcceptanceTests/ClaimsToQueryStringForwardingTests.cs
View File

@ -59,15 +59,15 @@ namespace Ocelot.AcceptanceTests
UpstreamHttpMethod = "Get",
AuthenticationOptions = new FileAuthenticationOptions
{
AdditionalScopes = new List<string>
AllowedScopes = new List<string>
{
"openid", "offline_access"
},
Provider = "IdentityServer",
ProviderRootUrl = "http://localhost:57888",
RequireHttps = false,
ScopeName = "api",
ScopeSecret = "secret",
ApiName = "api",
ApiSecret = "secret",
},
AddQueriesToRequest =
{
@ -126,7 +126,7 @@ namespace Ocelot.AcceptanceTests
_servicebuilder.Start();
}
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType, TestUser user)
private void GivenThereIsAnIdentityServerOn(string url, string apiName, AccessTokenType tokenType, TestUser user)
{
_identityServerBuilder = new WebHostBuilder()
.UseUrls(url)
@ -143,7 +143,7 @@ namespace Ocelot.AcceptanceTests
{
new ApiResource
{
Name = scopeName,
Name = apiName,
Description = "My API",
Enabled = true,
DisplayName = "test",
@ -173,7 +173,7 @@ namespace Ocelot.AcceptanceTests
ClientId = "client",
AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
ClientSecrets = new List<Secret> {new Secret("secret".Sha256())},
AllowedScopes = new List<string> { scopeName, "openid", "offline_access" },
AllowedScopes = new List<string> { apiName, "openid", "offline_access" },
AccessTokenType = tokenType,
Enabled = true,
RequireClientSecret = false

2
test/Ocelot.AcceptanceTests/configuration.json
View File

@ -1 +1 @@
{"ReRoutes":[{"DownstreamPathTemplate":"41879/","UpstreamPathTemplate":"/","UpstreamHttpMethod":"Get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"http","DownstreamHost":"localhost","DownstreamPort":41879,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null,"RateLimitOptions":{"ClientWhitelist":[],"EnableRateLimiting":false,"Period":null,"PeriodTimespan":0.0,"Limit":0}}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0},"AdministrationPath":null,"RateLimitOptions":{"ClientIdHeader":"ClientId","QuotaExceededMessage":null,"RateLimitCounterPrefix":"ocelot","DisableRateLimitHeaders":false,"HttpStatusCode":429}}}
{"ReRoutes":[{"DownstreamPathTemplate":"41879/","UpstreamPathTemplate":"/","UpstreamHttpMethod":"Get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ApiName":null,"RequireHttps":false,"AllowedScopes":[],"ApiSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"http","DownstreamHost":"localhost","DownstreamPort":41879,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null,"RateLimitOptions":{"ClientWhitelist":[],"EnableRateLimiting":false,"Period":null,"PeriodTimespan":0.0,"Limit":0}}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0},"AdministrationPath":null,"RateLimitOptions":{"ClientIdHeader":"ClientId","QuotaExceededMessage":null,"RateLimitCounterPrefix":"ocelot","DisableRateLimitHeaders":false,"HttpStatusCode":429}}}