Updated packages and fixed build errors and tests..now need to update nuspec

This commit is contained in:
tom.pallister
2017-01-11 17:23:34 +00:00
parent 536db48049
commit b2d33f0ec5
12 changed files with 271 additions and 242 deletions

View File

@ -5,7 +5,6 @@ using System.Linq;
using System.Net;
using System.Security.Claims;
using IdentityServer4.Models;
using IdentityServer4.Services.InMemory;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@ -17,6 +16,9 @@ using Xunit;
namespace Ocelot.AcceptanceTests
{
using IdentityServer4;
using IdentityServer4.Test;
public class ClaimsToQueryStringForwardingTests : IDisposable
{
private IWebHost _servicebuilder;
@ -31,12 +33,11 @@ namespace Ocelot.AcceptanceTests
[Fact]
public void should_return_response_200_and_foward_claim_as_query_string()
{
var user = new InMemoryUser
var user = new TestUser()
{
Username = "test",
Password = "test",
Enabled = true,
Subject = "registered|1231231",
SubjectId = "registered|1231231",
Claims = new List<Claim>
{
new Claim("CustomerId", "123"),
@ -122,7 +123,7 @@ namespace Ocelot.AcceptanceTests
_servicebuilder.Start();
}
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType, InMemoryUser user)
private void GivenThereIsAnIdentityServerOn(string url, string scopeName, AccessTokenType tokenType, TestUser user)
{
_identityServerBuilder = new WebHostBuilder()
.UseUrls(url)
@ -133,27 +134,34 @@ namespace Ocelot.AcceptanceTests
.ConfigureServices(services =>
{
services.AddLogging();
services.AddDeveloperIdentityServer()
.AddInMemoryScopes(new List<Scope>
services.AddIdentityServer()
.AddTemporarySigningCredential()
.AddInMemoryApiResources(new List<ApiResource>
{
new Scope
new ApiResource
{
Name = scopeName,
Name = scopeName,
Description = "My API",
Enabled = true,
AllowUnrestrictedIntrospection = true,
ScopeSecrets = new List<Secret>()
DisplayName = "test",
Scopes = new List<Scope>()
{
new Scope("api"),
new Scope("openid"),
new Scope("offline_access")
},
ApiSecrets = new List<Secret>()
{
new Secret
{
Value = "secret".Sha256()
}
},
IncludeAllClaimsForUser = true
},
StandardScopes.OpenId,
StandardScopes.OfflineAccess
UserClaims = new List<string>()
{
"CustomerId", "LocationId", "UserType", "UserId"
}
}
})
.AddInMemoryClients(new List<Client>
{
@ -168,7 +176,7 @@ namespace Ocelot.AcceptanceTests
RequireClientSecret = false
}
})
.AddInMemoryUsers(new List<InMemoryUser>
.AddTestUsers(new List<TestUser>
{
user
});