Fix invalid redirection after 2FA signin (#44395) (#44435)

2 files changed, 8 insertions, 0 deletions

diff --git a/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs b/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs
index 91f83d012c..ce4275e10f 100644
--- a/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs
+++ b/src/Identity/Core/src/IdentityCookiesBuilderExtensions.cs
@@ -100,6 +100,10 @@ public static class IdentityCookieAuthenticationBuilderExtensions
         builder.AddCookie(IdentityConstants.TwoFactorUserIdScheme, o =>
         {
             o.Cookie.Name = IdentityConstants.TwoFactorUserIdScheme;
+            o.Events = new CookieAuthenticationEvents
+            {
+                OnRedirectToReturnUrl = _ => Task.CompletedTask
+            };
             o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
         });
         return new OptionsBuilder<CookieAuthenticationOptions>(builder.Services, IdentityConstants.TwoFactorUserIdScheme);
diff --git a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
index 5cf717b3c3..ee8c3d9569 100644
--- a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
+++ b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs
@@ -72,6 +72,10 @@ public static class IdentityServiceCollectionExtensions
         .AddCookie(IdentityConstants.TwoFactorUserIdScheme, o =>
         {
             o.Cookie.Name = IdentityConstants.TwoFactorUserIdScheme;
+            o.Events = new CookieAuthenticationEvents
+            {
+                OnRedirectToReturnUrl = _ => Task.CompletedTask
+            };
             o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
         });