Update related method to async.

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs

@@ -122,40 +122,40 @@ public abstract class AbpPageModel : PageModel
         return localizer;
     }
 
-    protected RedirectResult RedirectSafely(string returnUrl, string? returnUrlHash = null)
+    protected virtual async Task<RedirectResult> RedirectSafelyAsync(string returnUrl, string? returnUrlHash = null)
     {
-        return Redirect(GetRedirectUrl(returnUrl, returnUrlHash));
+        return Redirect(await GetRedirectUrlAsync(returnUrl, returnUrlHash));
     }
 
-    protected virtual string GetRedirectUrl(string returnUrl, string? returnUrlHash = null)
+    protected virtual async Task<string> GetRedirectUrlAsync(string returnUrl, string? returnUrlHash = null)
     {
-        returnUrl = NormalizeReturnUrl(returnUrl);
+        returnUrl = await NormalizeReturnUrlAsync(returnUrl);
 
         if (!returnUrlHash.IsNullOrWhiteSpace())
         {
-            returnUrl = returnUrl + returnUrlHash;
+            returnUrl += returnUrlHash;
         }
 
         return returnUrl;
     }
 
-    private string NormalizeReturnUrl(string returnUrl)
+    protected virtual async Task<string> NormalizeReturnUrlAsync(string returnUrl)
     {
         if (returnUrl.IsNullOrEmpty())
         {
-            return GetAppHomeUrl();
+            return await GetAppHomeUrlAsync();
         }
 
-        if (Url.IsLocalUrl(returnUrl) || AppUrlProvider.IsRedirectAllowedUrl(returnUrl))
+        if (Url.IsLocalUrl(returnUrl) || await AppUrlProvider.IsRedirectAllowedUrlAsync(returnUrl))
         {
             return returnUrl;
         }
 
-        return GetAppHomeUrl();
+        return await GetAppHomeUrlAsync();
     }
 
-    protected virtual string GetAppHomeUrl()
+    protected virtual Task<string> GetAppHomeUrlAsync()
     {
-        return "~/"; //TODO: ???
+        return Task.FromResult("~/"); //TODO: ???
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -104,14 +105,14 @@ public abstract class AbpController : Controller, IAvoidDuplicateCrossCuttingCon
         return localizer;
     }
 
-    protected virtual RedirectResult RedirectSafely(string returnUrl, string? returnUrlHash = null)
+    protected virtual async Task<RedirectResult> RedirectSafelyAsync(string returnUrl, string? returnUrlHash = null)
     {
-        return Redirect(GetRedirectUrl(returnUrl, returnUrlHash));
+        return Redirect(await GetRedirectUrlAsync(returnUrl, returnUrlHash));
     }
 
-    protected virtual string GetRedirectUrl(string returnUrl, string? returnUrlHash = null)
+    protected virtual async Task<string> GetRedirectUrlAsync(string returnUrl, string? returnUrlHash = null)
     {
-        returnUrl = NormalizeReturnUrl(returnUrl);
+        returnUrl = await NormalizeReturnUrlAsync(returnUrl);
 
         if (!returnUrlHash.IsNullOrWhiteSpace())
         {
@@ -121,23 +122,23 @@ public abstract class AbpController : Controller, IAvoidDuplicateCrossCuttingCon
         return returnUrl;
     }
 
-    protected virtual string NormalizeReturnUrl(string returnUrl)
+    protected virtual async Task<string> NormalizeReturnUrlAsync(string returnUrl)
     {
         if (returnUrl.IsNullOrEmpty())
         {
-            return GetAppHomeUrl();
+            return await GetAppHomeUrlAsync();
         }
 
-        if (Url.IsLocalUrl(returnUrl) || AppUrlProvider.IsRedirectAllowedUrl(returnUrl))
+        if (Url.IsLocalUrl(returnUrl) || await AppUrlProvider.IsRedirectAllowedUrlAsync(returnUrl))
         {
             return returnUrl;
         }
 
-        return GetAppHomeUrl();
+        return await GetAppHomeUrlAsync();
     }
 
-    protected virtual string GetAppHomeUrl()
+    protected virtual Task<string> GetAppHomeUrlAsync()
     {
-        return Url.Content("~/");
+        return Task.FromResult(Url.Content("~/"));
     }
 }

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

@@ -22,38 +22,38 @@ public abstract class ChallengeAccountController : AbpController
     }
 
     [HttpGet]
-    public virtual ActionResult Login(string returnUrl = "", string returnUrlHash = "")
+    public virtual async Task<ActionResult> LoginAsync(string returnUrl = "", string returnUrlHash = "")
     {
         if (CurrentUser.IsAuthenticated)
         {
-            return RedirectSafely(returnUrl, returnUrlHash);
+            return await RedirectSafelyAsync(returnUrl, returnUrlHash);
         }
 
-        return Challenge(new AuthenticationProperties { RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
+        return Challenge(new AuthenticationProperties { RedirectUri = await GetRedirectUrlAsync(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
     }
 
     [HttpGet]
-    public virtual async Task<ActionResult> Logout(string returnUrl = "", string returnUrlHash = "")
+    public virtual async Task<ActionResult> LogoutAsync(string returnUrl = "", string returnUrlHash = "")
     {
         await HttpContext.SignOutAsync();
 
         if (HttpContext.User.Identity?.AuthenticationType == AuthenticationType)
         {
-            return RedirectSafely(returnUrl, returnUrlHash);
+            return await RedirectSafelyAsync(returnUrl, returnUrlHash);
         }
 
-        return SignOut(new AuthenticationProperties { RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
+        return SignOut(new AuthenticationProperties { RedirectUri = await GetRedirectUrlAsync(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
     }
 
     [HttpGet]
-    public virtual async Task<IActionResult> FrontChannelLogout(string sid)
+    public virtual async Task<IActionResult> FrontChannelLogoutAsync(string sid)
     {
         if (User.Identity != null && User.Identity.IsAuthenticated)
         {
             var currentSid = User.FindFirst("sid")?.Value ?? string.Empty;
             if (string.Equals(currentSid, sid, StringComparison.Ordinal))
             {
-                await Logout();
+                await LogoutAsync();
             }
         }
 
@@ -61,7 +61,7 @@ public abstract class ChallengeAccountController : AbpController
     }
 
     [HttpGet]
-    public virtual Task<IActionResult> AccessDenied()
+    public virtual Task<IActionResult> AccessDeniedAsync()
     {
         return Task.FromResult<IActionResult>(Challenge(
             new AuthenticationProperties
@@ -78,9 +78,9 @@ public abstract class ChallengeAccountController : AbpController
     }
 
     [HttpGet]
-    public virtual async Task<ActionResult> Challenge(string returnUrl = "", string returnUrlHash = "")
+    public virtual async Task<ActionResult> ChallengeAsync(string returnUrl = "", string returnUrlHash = "")
     {
         await HttpContext.SignOutAsync();
-        return Challenge(new AuthenticationProperties { RedirectUri = GetRedirectUrl(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
+        return Challenge(new AuthenticationProperties { RedirectUri = await GetRedirectUrlAsync(returnUrl, returnUrlHash) }, ChallengeAuthenticationSchemas);
     }
 }

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs

@@ -177,7 +177,7 @@ public class IdentityServerSupportedLoginModel : LoginModel
         // Clear the dynamic claims cache.
         await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(user.Id, user.TenantId);
 
-        return RedirectSafely(ReturnUrl, ReturnUrlHash);
+        return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
     }
 
     public override async Task<IActionResult> OnPostExternalLogin(string provider)

modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.cshtml.cs

@@ -18,28 +18,28 @@ public class LoggedOutModel : AccountPageModel
     [BindProperty(SupportsGet = true)]
     public string PostLogoutRedirectUri { get; set; }
 
-    public virtual Task<IActionResult> OnGetAsync()
+    public virtual async Task<IActionResult> OnGetAsync()
     {
-        NormalizeUrl();
+        await NormalizeUrlAsync();
-        return Task.FromResult<IActionResult>(Page());
+        return Page();
     }
 
-    public virtual Task<IActionResult> OnPostAsync()
+    public virtual async Task<IActionResult> OnPostAsync()
     {
-        NormalizeUrl();
+        await NormalizeUrlAsync();
-        return Task.FromResult<IActionResult>(Page());
+        return Page();
     }
     
-    protected virtual void NormalizeUrl()
+    protected virtual async Task NormalizeUrlAsync()
     {
         if (!PostLogoutRedirectUri.IsNullOrWhiteSpace())
         {
-            PostLogoutRedirectUri = Url.Content(GetRedirectUrl(PostLogoutRedirectUri));
+            PostLogoutRedirectUri = Url.Content(await GetRedirectUrlAsync(PostLogoutRedirectUri));
         }
         
         if(!SignOutIframeUrl.IsNullOrWhiteSpace())
         {
-            SignOutIframeUrl = Url.Content(GetRedirectUrl(SignOutIframeUrl));
+            SignOutIframeUrl = Url.Content(await GetRedirectUrlAsync(SignOutIframeUrl));
         }
     }
 }

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs

@@ -143,7 +143,7 @@ public class LoginModel : AccountPageModel
         // Clear the dynamic claims cache.
         await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(user.Id, user.TenantId);
 
-        return RedirectSafely(ReturnUrl, ReturnUrlHash);
+        return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
     }
 
     /// <summary>
@@ -237,7 +237,7 @@ public class LoginModel : AccountPageModel
                 await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(user.Id, user.TenantId);
             }
 
-            return RedirectSafely(returnUrl, returnUrlHash);
+            return await RedirectSafelyAsync(returnUrl, returnUrlHash);
         }
 
         //TODO: Handle other cases for result!
@@ -279,7 +279,7 @@ public class LoginModel : AccountPageModel
         // Clear the dynamic claims cache.
         await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(user.Id, user.TenantId);
 
-        return RedirectSafely(returnUrl, returnUrlHash);
+        return await RedirectSafelyAsync(returnUrl, returnUrlHash);
     }
 
     protected virtual async Task ReplaceEmailToUsernameOfInputIfNeeds()

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs

@@ -27,7 +27,7 @@ public class LogoutModel : AccountPageModel
         await SignInManager.SignOutAsync();
         if (ReturnUrl != null)
         {
-            return RedirectSafely(ReturnUrl, ReturnUrlHash);
+            return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
         }
 
         if (await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin))

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs

@@ -38,7 +38,7 @@ public class ManageModel : AccountPageModel
         {
             if (!Url.IsLocalUrl(ReturnUrl) &&
                 !ReturnUrl.StartsWith(UriHelper.BuildAbsolute(Request.Scheme, Request.Host, Request.PathBase).RemovePostFix("/")) &&
-                !AppUrlProvider.IsRedirectAllowedUrl(ReturnUrl))
+                !await AppUrlProvider.IsRedirectAllowedUrlAsync(ReturnUrl))
             {
                 ReturnUrl = null;
             }

modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPasswordConfirmation.cshtml.cs

@@ -14,10 +14,10 @@ public class ResetPasswordConfirmationModel : AccountPageModel
     [BindProperty(SupportsGet = true)]
     public string ReturnUrlHash { get; set; }
 
-    public virtual Task<IActionResult> OnGetAsync()
+    public virtual async Task<IActionResult> OnGetAsync()
     {
-        ReturnUrl = GetRedirectUrl(ReturnUrl, ReturnUrlHash);
+        ReturnUrl = await GetRedirectUrlAsync(ReturnUrl, ReturnUrlHash);
 
-        return Task.FromResult<IActionResult>(Page());
+        return Page();
     }
 }