Include application base path in Logged out path

- Fixes #1166
Sustainsys · Mar 16, 2020 · ec96dbc · ec96dbc
1 parent 158bb27
commit ec96dbc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Samples/SampleOwinApplication/Controllers/HomeController.cs b/Samples/SampleOwinApplication/Controllers/HomeController.cs
@@ -11,6 +11,8 @@ public class HomeController : Controller
     {
         public ActionResult Index()
         {
+            var ctx = HttpContext.GetOwinContext();
+
             return View();
         }
 

diff --git a/Samples/SampleOwinApplication/Startup.cs b/Samples/SampleOwinApplication/Startup.cs
@@ -8,6 +8,14 @@ public partial class Startup
     {
         public void Configuration(IAppBuilder app)
         {
+            app.Map("/foo", a =>
+            {
+                a.Use((ctx, next) =>
+                {
+                    return next.Invoke();
+                });
+            });
+
             ConfigureAuth(app);
         }
     }

diff --git a/Sustainsys.Saml2.Owin/Saml2AuthenticationHandler.cs b/Sustainsys.Saml2.Owin/Saml2AuthenticationHandler.cs
@@ -171,7 +171,8 @@ protected async override Task ApplyResponseGrantAsync()
                     }
                     else
                     {
-                        redirectUrl = Context.Request.Path.ToUriComponent();
+                        // ApplicationUrl is base path, after consideration taken to PublicOrigin.
+                        redirectUrl = urls.ApplicationUrl.AbsolutePath + Context.Request.Path.ToString().TrimStart('/');
                     }
                 }
 

diff --git a/Tests/Owin.Tests/Saml2AuthenticationMiddlewareTests.cs b/Tests/Owin.Tests/Saml2AuthenticationMiddlewareTests.cs
@@ -275,7 +275,7 @@ public async Task Saml2AuthenticationMiddleware_CreatesRedirectOnAuthRevoke()
             context.Response.Headers["Location"].Should().StartWith("https://idp.example.com/logout?SAMLRequest");
             var returnUrl = ExtractRequestState(options.DataProtector, context).ReturnUrl;
 
-            returnUrl.Should().Be("/LoggedOut");
+            returnUrl.Should().Be("/ExternalPath/LoggedOut");
         }
 
         [TestMethod]