Fixe l'accès en lecture anonyme des blogs

Yavsc/ApiControllers/PdfEstimateController.cs

@@ -2,23 +2,23 @@ using System.IO;
 using Microsoft.AspNet.Authorization;
 using Microsoft.AspNet.Mvc;
 using System.Web.Routing;
-
-namespace Yavsc.ApiControllers
-{
-    using Models;
-    using Helpers;
     using System.Linq;
     using Microsoft.Data.Entity;
     using System.Threading.Tasks;
     using Microsoft.Extensions.Logging;
-    using System;
-    using System.Security.Claims;
     using Microsoft.Extensions.Localization;
-    using Yavsc.Services;
-    using Yavsc.Models.Messaging;
-    using Yavsc.ViewModels;
     using Microsoft.Extensions.OptionsModel;
+    using System;
+    using System.Security.Claims;
+
+namespace Yavsc.ApiControllers
+{
+    using Models;
+    using Helpers;
+    using Services;
 
+    using Models.Messaging;
+    using ViewModels.Auth;
     [Route("api/pdfestimate"), Authorize]
     public class PdfEstimateController : Controller
     {

Yavsc/Controllers/BlogspotController.cs

@@ -11,7 +11,6 @@ using Microsoft.Extensions.OptionsModel;
 using Yavsc.Models;
 using Yavsc.ViewModels.Auth;
 using Microsoft.AspNet.Mvc.Rendering;
-using Yavsc.ViewModels;
 
 // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
 

Yavsc/Controllers/EstimateController.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Controllers
     using Models;
     using Models.Billing;
     using Models.Workflow;
-    using ViewModels;
+    using ViewModels.Auth;
     [Authorize]
     public class EstimateController : Controller
     {

Yavsc/ViewModels/Auth/Handlers/BlogViewHandler.cs

@@ -9,25 +9,26 @@ namespace Yavsc.ViewModels.Auth.Handlers
     {
         protected override void Handle(AuthorizationContext context, ViewRequirement requirement, Blog resource)
         {
-            if (context.User.IsInRole(Constants.BlogModeratorGroupName)
+            bool ok=false;
-            || context.User.IsInRole(Constants.AdminGroupName))
+             if (resource.Visible) {
-                context.Succeed(requirement);
-            else if (context.User.Identity.IsAuthenticated)
-            if (resource.AuthorId == context.User.GetUserId())
-                context.Succeed(requirement); 
-            else if (resource.Visible) {
                 if (resource.ACL==null)
-                    context.Succeed(requirement);
+                    ok=true;
-                else if (resource.ACL.Count>0)
+                else if (resource.ACL.Count==0) ok=true; 
-                    {
+                 else   {
-                        var uid = context.User.GetUserId();
+                        if (context.User.IsSignedIn()) {
-                        if (resource.ACL.Any(a=>a.Allowed!=null && a.Allowed.Members.Any(m=>m.MemberId == uid )))
+                            var uid = context.User.GetUserId();
-                            context.Succeed(requirement); 
+                            if (resource.ACL.Any(a=>a.Allowed!=null && a.Allowed.Members.Any(m=>m.MemberId == uid )))
-                        else context.Fail();
+                                ok=true; 
+                        } 
                     }
-                else context.Succeed(requirement); 
+            } 
-            }
+            if (ok) context.Succeed(requirement);
-            else context.Fail();
+            else {
+                if (context.User.IsInRole(Constants.AdminGroupName) || 
+                context.User.IsInRole(Constants.BlogModeratorGroupName))
+                 context.Succeed(requirement);
+                 else context.Fail();
+             }
         }
     }
 }

Yavsc/ViewModels/Auth/ViewRequirement.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNet.Authorization;
 
-namespace Yavsc.ViewModels
+namespace Yavsc.ViewModels.Auth
 {
     public class ViewRequirement : IAuthorizationRequirement
     {

Yavsc/Views/Blogspot/Index.cshtml

@@ -50,8 +50,11 @@
         </td>
         <td> 
             <ul class="actiongroup">
-                <li><a asp-action="Details" asp-route-id="@item.Id">Details</a>
+                @if (await AuthorizationService.AuthorizeAsync(User, item, new ViewRequirement())) {
+                <li>
+                    <a asp-action="Details" asp-route-id="@item.Id">Details</a>
             </li>
+                }
             @if (await AuthorizationService.AuthorizeAsync(User, item, new EditRequirement())) {
             <li><a asp-action="Edit" asp-route-id="@item.Id">@SR["Edit"]</a>
             </li>