Merge pull request #3579 from abpframework/maliming/IActionResult

Use IActionResult as the return value of the page method in the module.
abpframework · Apr 19, 2020 · cf44b8b · cf44b8b
2 parents efbfdf8 + 21b3e1c
commit cf44b8b
Show file tree

Hide file tree

Showing 34 changed files with 100 additions and 65 deletions.
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs
@@ -42,7 +42,7 @@ public ConsentModel(
             _resourceStore = resourceStore;
         }
 
-        public virtual async Task OnGet()
+        public virtual async Task<IActionResult> OnGet()
         {
             var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl);
             if (request == null)
@@ -74,6 +74,8 @@ public virtual async Task OnGet()
             {
                 ConsentInput.ApiScopes.Add(GetOfflineAccessScope(true));
             }
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPost(string userDecision)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
@@ -24,9 +24,9 @@ public virtual async Task<IActionResult> OnGetAsync()
             return RedirectToPage("/Account/Login");
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.Identity;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Account.Web.Pages.Account
 {
@@ -17,16 +18,18 @@ public ManageModel(IProfileAppService profileAppService)
             ProfileAppService = profileAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var user = await ProfileAppService.GetAsync();
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
+
+            return Page();
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -31,9 +31,11 @@ public RegisterModel(IAccountAppService accountAppService)
             AccountAppService = accountAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             await CheckSelfRegistrationAsync();
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
@@ -41,9 +41,9 @@ public virtual async Task<IActionResult> OnGetAsync()
             //);
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs
@@ -24,7 +24,7 @@ public CreateModel(IBlogAppService blogAppService, IAuthorizationService authori
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Create))
             {
@@ -34,7 +34,7 @@ public async Task<ActionResult> OnGetAsync()
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             var blogDto = ObjectMapper.Map<BlogCreateModalView, CreateBlogDto>(Blog);
 

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs
@@ -29,7 +29,7 @@ public EditModel(IBlogAppService blogAppService, IAuthorizationService authoriza
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Update))
             {
@@ -43,14 +43,16 @@ public async Task<ActionResult> OnGetAsync()
             return Page();
         }
 
-        public async Task OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             await _blogAppService.Update(Blog.Id, new UpdateBlogDto()
             {
                 Name = Blog.Name,
                 ShortName = Blog.ShortName,
                 Description = Blog.Description
             });
+
+            return Page();
         }
 
         public class BlogEditViewModel

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs
@@ -15,7 +15,7 @@ public IndexModel(IAuthorizationService authorization)
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Management))
             {

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs
@@ -19,7 +19,7 @@ public IndexModel(IBlogAppService blogAppService)
             _blogAppService = blogAppService;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var result = await _blogAppService.GetListAsync();
 

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
@@ -46,12 +46,14 @@ public DetailModel(IPostAppService postAppService, IBlogAppService blogAppServic
             _commentAppService = commentAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             await GetData();
+
+            return Page();
         }
 
-        public async Task OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             var comment = await _commentAppService.CreateAsync(new CreateCommentDto()
             {
@@ -63,6 +65,8 @@ public async Task OnPostAsync()
             FocusCommentId = comment.Id;
 
             await GetData();
+
+            return Page();
         }
 
         private async Task GetData()

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs
@@ -33,7 +33,7 @@ public EditModel(IPostAppService postAppService, IBlogAppService blogAppService,
             _authorization = authorization;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Update))
             {
@@ -47,7 +47,7 @@ public async Task<ActionResult> OnGetAsync()
             return Page();
         }
 
-        public async Task<ActionResult> OnPostAsync()
+        public virtual async Task<ActionResult> OnPostAsync()
         {
             var post = new UpdatePostDto
             {

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
@@ -35,11 +35,13 @@ public IndexModel(IPostAppService postAppService, IBlogAppService blogAppService
             _tagAppService = tagAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             Blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
             Posts = (await _postAppService.GetListByBlogIdAndTagName(Blog.Id, TagName)).Items;
             PopularTags = (await _tagAppService.GetPopularTags(Blog.Id, new GetPopularTagsInput {ResultCount = 10, MinimumPostCount = 2}));
+
+            return Page();
         }
     }
 }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs
@@ -35,7 +35,7 @@ public NewModel(IPostAppService postAppService, IBlogAppService blogAppService,
             _blogOptions = blogOptions.Value;
         }
 
-        public async Task<ActionResult> OnGetAsync()
+        public virtual async Task<ActionResult> OnGetAsync()
         {
             if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Create))
             {
@@ -51,7 +51,7 @@ public async Task<ActionResult> OnGetAsync()
             return Page();
         }
 
-        public async Task<ActionResult> OnPost()
+        public virtual async Task<ActionResult> OnPost()
         {
             var blog = await _blogAppService.GetAsync(Post.BlogId);
 

diff --git a/...es/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs b/...es/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs
@@ -1,13 +1,14 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Volo.ClientSimulation.Pages.ClientSimulation
 {
     public class IndexModel : PageModel
     {
-        public async Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/...-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs b/...-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs
@@ -16,19 +16,19 @@ public SimulationAreaModel(Simulation simulation)
             Simulation = simulation;
         }
 
-        public Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
             Snapshot = Simulation.CreateSnapshot();
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public async Task<IActionResult> OnPostStartAsync()
+        public virtual async Task<IActionResult> OnPostStartAsync()
         {
             Simulation.Start();
             return new NoContentResult();
         }
 
-        public async Task<IActionResult> OnPostStopAsync()
+        public virtual async Task<IActionResult> OnPostStopAsync()
         {
             Simulation.Stop();
             return new NoContentResult();

diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs
@@ -24,7 +24,7 @@ public IndexModel(IOptions<DocsUiOptions> urlOptions, IProjectAppService project
             _urlUiOptions = urlOptions.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var projects = await _projectAppService.GetListAsync();
 

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs
@@ -29,7 +29,7 @@ public CreateModel(IProjectAdminAppService projectAppService)
             _projectAppService = projectAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(string source)
+        public virtual async Task<ActionResult> OnGetAsync(string source)
         {
             if (source != null && source.ToLowerInvariant() == "github")
             {
@@ -42,7 +42,7 @@ public async Task<ActionResult> OnGetAsync(string source)
             }
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (GithubProject != null)
             {

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs
@@ -29,7 +29,7 @@ public EditModel(IProjectAdminAppService projectAppService)
             _projectAppService = projectAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(Guid id)
+        public virtual async Task<ActionResult> OnGetAsync(Guid id)
         {
             var project = await _projectAppService.GetAsync(id);
 
@@ -42,7 +42,7 @@ public async Task<ActionResult> OnGetAsync(Guid id)
             throw new BusinessException("UnknowDocumentSourceExceptionMessage");
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (GithubProject != null)
             {

diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs
@@ -1,13 +1,16 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
 {
     [Authorize(DocsAdminPermissions.Projects.Default)]
     public class IndexModel : DocsAdminPageModel
     {
-        public void OnGet()
+        public virtual Task<IActionResult> OnGet()
         {
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs
@@ -23,7 +23,7 @@ public PullModel(IProjectAdminAppService projectAppService,
             _documentAppService = documentAppService;
         }
 
-        public async Task<ActionResult> OnGetAsync(Guid id)
+        public virtual async Task<ActionResult> OnGetAsync(Guid id)
         {
             var project = await _projectAppService.GetAsync(id);
 
@@ -36,7 +36,7 @@ public async Task<ActionResult> OnGetAsync(Guid id)
             return Page();
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             if (PullDocument.All)
             {

diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs
@@ -25,7 +25,7 @@ public IndexModel(
             _uiOptions = urlOptions.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             DocumentsUrlPrefix = _uiOptions.RoutePrefix;
 

diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -92,7 +92,7 @@ public IndexModel(
             _uiOptions = options.Value;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             try
             {

diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
@@ -39,7 +39,7 @@ public SearchModel(IProjectAppService projectAppService,
 
         public List<DocumentSearchOutput> SearchOutputs { get; set; } = new List<DocumentSearchOutput>();
 
-        public async Task<IActionResult> OnGetAsync(string keyword)
+        public virtual async Task<IActionResult> OnGetAsync(string keyword)
         {
             if (!await _documentAppService.FullSearchEnabledAsync())
             {

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
@@ -16,9 +16,9 @@ public CreateModalModel(IIdentityRoleAppService identityRoleAppService)
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ public IndexModel( @@
                 _uiOptions = options.Value;
             }
-            public async Task<IActionResult> OnGetAsync()
+            public virtual async Task<IActionResult> OnGetAsync()
             {
                 try
                 {
@@ Expand Down @@