Merge pull request #8002 from abpframework/maliming/ChallengeAccountController

Set RedirectUri property of AuthenticationProperties.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs

@@ -108,12 +108,12 @@ namespace Volo.Abp.AspNetCore.Mvc
             return localizer;
         }
 
-        protected RedirectResult RedirectSafely(string returnUrl, string returnUrlHash = null)
+        protected virtual RedirectResult RedirectSafely(string returnUrl, string returnUrlHash = null)
         {
             return Redirect(GetRedirectUrl(returnUrl, returnUrlHash));
         }
 
-        private string GetRedirectUrl(string returnUrl, string returnUrlHash = null)
+        protected virtual string GetRedirectUrl(string returnUrl, string returnUrlHash = null)
         {
             returnUrl = NormalizeReturnUrl(returnUrl);
 
@@ -125,7 +125,7 @@ namespace Volo.Abp.AspNetCore.Mvc
             return returnUrl;
         }
 
-        private string NormalizeReturnUrl(string returnUrl)
+        protected virtual string NormalizeReturnUrl(string returnUrl)
         {
             if (returnUrl.IsNullOrEmpty())
             {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Authentication/ChallengeAccountController.cs

@@ -23,20 +23,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Authentication
             {
                 return RedirectSafely(returnUrl, returnUrlHash);
             }
-            else
-            {
-                return Challenge(
-                    new AuthenticationProperties
-                    {
-                        Parameters =
-                        {
-                            {"returnUrl", returnUrl},
-                            {"returnUrlHash", returnUrlHash}
-                        }
-                    },
-                    ChallengeAuthenticationSchemas
-                );
-            }
+
+            return Challenge(new AuthenticationProperties {RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash)}, ChallengeAuthenticationSchemas);
         }
 
         [HttpGet]
@@ -44,20 +32,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Authentication
         {
             await HttpContext.SignOutAsync();
 
-            if (HttpContext.User.Identity.AuthenticationType == AuthenticationType)
+            if (HttpContext.User.Identity?.AuthenticationType == AuthenticationType)
             {
                 return RedirectSafely(returnUrl, returnUrlHash);
             }
 
-            return new SignOutResult(ChallengeAuthenticationSchemas);
+            return SignOut(new AuthenticationProperties {RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash)}, ChallengeAuthenticationSchemas);
         }
 
         [HttpGet]
         public async Task<IActionResult> FrontChannelLogout(string sid)
         {
-            if (User.Identity.IsAuthenticated)
+            if (User.Identity != null && User.Identity.IsAuthenticated)
             {
-                var currentSid = User.FindFirst("sid").Value ?? string.Empty;
+                var currentSid = User.FindFirst("sid")?.Value ?? string.Empty;
                 if (string.Equals(currentSid, sid, StringComparison.Ordinal))
                 {
                     await Logout();