From 07b3fe213595ab99c3e74919c71b496311bac560 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Fri, 12 Sep 2014 14:42:55 -0700
Subject: [PATCH] #32 - Port comment and flow cleanup from Katana.

---
 .../CookieAuthenticationHandler.cs                            | 4 ++--
 .../Notifications/CookieAuthenticationNotifications.cs        | 4 ++--
 .../Notifications/CookieResponseSignOutContext.cs             | 2 +-
 .../Notifications/ICookieAuthenticationNotifications.cs       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs b/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs
index 45ee685990..1a2b7eeb82 100644
--- a/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationHandler.cs
@@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Security.Cookies
                         Context,
                         Options.CookieName,
                         cookieValue,
-                        cookieOptions);
+                        signInContext.CookieOptions);
 
                     var signedInContext = new CookieResponseSignedInContext(
                         Context,
@@ -238,7 +238,7 @@ namespace Microsoft.AspNet.Security.Cookies
                     Options.CookieManager.DeleteCookie(
                         Context,
                         Options.CookieName,
-                        cookieOptions);
+                        context.CookieOptions);
                 }
                 else if (_shouldRenew)
                 {
diff --git a/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieAuthenticationNotifications.cs b/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieAuthenticationNotifications.cs
index e378a08c17..c38489ed83 100644
--- a/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieAuthenticationNotifications.cs
+++ b/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieAuthenticationNotifications.cs
@@ -95,10 +95,10 @@ namespace Microsoft.AspNet.Security.Cookies
         }
 
         /// <summary>
-        /// Called when a Challenge, SignIn, or SignOut causes a redirect in the cookie middleware
+        /// Implements the interface method by invoking the related delegate method
         /// </summary>
         /// <param name="context">Contains information about the event</param>
-        public void ApplyRedirect(CookieApplyRedirectContext context)
+        public virtual void ApplyRedirect(CookieApplyRedirectContext context)
         {
             OnApplyRedirect.Invoke(context);
         }
diff --git a/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieResponseSignOutContext.cs b/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieResponseSignOutContext.cs
index b484b74365..a7cf4129ac 100644
--- a/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieResponseSignOutContext.cs
+++ b/src/Microsoft.AspNet.Security.Cookies/Notifications/CookieResponseSignOutContext.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Security.Cookies
 
         /// <summary>
         /// The options for creating the outgoing cookie.
-        /// May be replace or altered during the ResponseSignIn call.
+        /// May be replace or altered during the ResponseSignOut call.
         /// </summary>
         public CookieOptions CookieOptions
         {
diff --git a/src/Microsoft.AspNet.Security.Cookies/Notifications/ICookieAuthenticationNotifications.cs b/src/Microsoft.AspNet.Security.Cookies/Notifications/ICookieAuthenticationNotifications.cs
index b6ced343f4..edfb6b69cc 100644
--- a/src/Microsoft.AspNet.Security.Cookies/Notifications/ICookieAuthenticationNotifications.cs
+++ b/src/Microsoft.AspNet.Security.Cookies/Notifications/ICookieAuthenticationNotifications.cs
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Security.Cookies
         void ApplyRedirect(CookieApplyRedirectContext context);
 
         /// <summary>
-        /// 
+        /// Called during the sign-out flow to augment the cookie cleanup process.
         /// </summary>
         /// <param name="context">Contains information about the login session as well as information about the authentication cookie.</param>
         void ResponseSignOut(CookieResponseSignOutContext context);