dschilling
diff --git a/‎Sustainsys.Saml2.AspNetCore2/Saml2Handler.cs‎
Lines changed: 3 additions & 3 deletions b/‎Sustainsys.Saml2.AspNetCore2/Saml2Handler.cs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Tests/AspNetCore2.Tests/Saml2HandlerTests.cs‎
Lines changed: 0 additions & 8 deletions b/‎Tests/AspNetCore2.Tests/Saml2HandlerTests.cs‎
Lines changed: 0 additions & 8 deletions
@@ -9,6 +9,7 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
 using System.Diagnostics.CodeAnalysis;
+using Sustainsys.Saml2.Metadata;
 
 namespace Sustainsys.Saml2.AspNetCore2
 {
@@ -85,12 +86,11 @@ public async Task ChallengeAsync(AuthenticationProperties properties)
 
             var requestData = context.ToHttpRequestData(null);
 
-
-            Metadata.EntityId entityId = null;
+            EntityId entityId = null;
 
             if (properties.Items.TryGetValue("idp", out var entityIdString))
             {
-                entityId = new Metadata.EntityId(entityIdString);
+                entityId = new EntityId(entityIdString);
             }
 
             var result = SignInCommand.Run(
 
@@ -145,14 +145,6 @@ public async Task Saml2Handler_ChallengeAsync_RedirectsToSelectedIdp()
             response.StatusCode.Should().Be(303);
             response.Headers["Location"].Single()
                 .Should().StartWith("https://idp2.example.com/sso?SAMLRequest=");
-
-            var state = new StoredRequestState(StubDataProtector.Unprotect(
-                HttpRequestData.GetBinaryData(cookieData)));
-
-            state.ReturnUrl.OriginalString.Should().Be("https://sp.example.com/LoggedIn");
-
-            // Don't dual-store the return-url.
-            state.RelayData.Values.Should().NotContain("https://sp.example.com/LoggedIn");
         }
 
         [TestMethod]
Original file line number	Diff line number	Diff line change
@@ -9,6 +9,7 @@
9	9	using System.Security.Claims;
10	10	using Microsoft.AspNetCore.Http;
11	11	using System.Diagnostics.CodeAnalysis;
	12	+ using Sustainsys.Saml2.Metadata;
12	13
13	14	namespace Sustainsys.Saml2.AspNetCore2
14	15	{
@@ -85,12 +86,11 @@ public async Task ChallengeAsync(AuthenticationProperties properties)
85	86
86	87	var requestData = context.ToHttpRequestData(null);
87	88
88		-
89		- Metadata.EntityId entityId = null;
	89	+ EntityId entityId = null;
90	90
91	91	if (properties.Items.TryGetValue("idp", out var entityIdString))
92	92	{
93		- entityId = new Metadata.EntityId(entityIdString);
	93	+ entityId = new EntityId(entityIdString);
94	94	}
95	95
96	96	var result = SignInCommand.Run(