Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and

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

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