From 216c0cf0ce82cd5574a0fb0745099e6319a63a6d Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <ebicoglu@users.noreply.github.com>
Date: Thu, 11 Apr 2019 14:12:14 +0300
Subject: [PATCH] Fixed permission for project list page.

---
 modules/docs/app/VoloDocs.Web/Pages/Index.cshtml       |  2 +-
 modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs    | 10 +---------
 .../Volo/Docs/Admin/DocsAdminPermissions.cs            |  6 +-----
 .../Pages/Docs/Admin/Projects/Index.cshtml.cs          |  2 ++
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml
index 7796e9a37e..6f6c083531 100644
--- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml
+++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml
@@ -28,7 +28,7 @@
             <div class="alert alert-secondary col-md-6 text-center" role="alert">
                 <p>@L["NoProjectWarning"]</p>
                 <hr />
-                <a href="@Model.CreateProjectLink">@L["CreateYourFirstProject"] <i class="fa fa-arrow-circle-right"></i></a>
+                <a href="/Docs/Admin/Projects">@L["CreateYourFirstProject"] <i class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
     }
diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs
index 9143b59ced..8b6ffd2cdf 100644
--- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs
+++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Volo.Abp.Users;
 using Volo.Docs;
 using Volo.Docs.Projects;
 
@@ -11,23 +10,16 @@ namespace VoloDocs.Web.Pages
     public class IndexModel : PageModel
     {
         public IReadOnlyList<ProjectDto> Projects { get; set; }
-        public string CreateProjectLink { get; set; }
 
         private readonly IProjectAppService _projectAppService;
-        private readonly ICurrentUser _currentUser;
 
-        public IndexModel(IProjectAppService projectAppService, ICurrentUser currentUser)
+        public IndexModel(IProjectAppService projectAppService)
         {
             _projectAppService = projectAppService;
-            _currentUser = currentUser;
         }
 
         public async Task<IActionResult> OnGet()
         {
-            CreateProjectLink = _currentUser.Id.HasValue
-                ? "/Docs/Admin/Projects"
-                : "/Account/Login?returnUrl=/Docs/Admin/Projects";
-
             Projects = (await _projectAppService.GetListAsync()).Items;
 
             if (Projects.Count == 1)
diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs
index 7865c14aa3..565b70c7f5 100644
--- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Volo.Docs.Admin
+namespace Volo.Docs.Admin
 {
     public class DocsAdminPermissions
     {
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
index 66a7008a1f..0ee140360e 100644
--- 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,7 +1,9 @@
+using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
 {
+    [Authorize(DocsAdminPermissions.Projects.Default)]
     public class IndexModel : AbpPageModel
     {
         public void OnGet()