Анонимный доступ к расписанию (#2014)

* исправить проблему с анонимным доступом к расписанию

* Добавить еще вариант пути к ical

Author: leotsarev

src/JoinRpg.Domain/JoinRpg.Domain.csproj

@@ -6,6 +6,7 @@
   <ItemGroup>
     <ProjectReference Include="..\JoinRpg.DataModel\JoinRpg.DataModel.csproj" />
     <ProjectReference Include="..\JoinRpg.Helpers\JoinRpg.Helpers.csproj" />
+    <ProjectReference Include="..\JoinRpg.Interfaces\JoinRpg.Interfaces.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />

src/JoinRpg.Domain/ProjectEntityExtensions.cs

@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using JoinRpg.DataModel;
+using JoinRpg.Interfaces;
 using MustUseReturnValueAttribute = JetBrains.Annotations.MustUseReturnValueAttribute;
 using NotNullAttribute = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 using PureAttribute = JetBrains.Annotations.PureAttribute;
@@ -29,6 +30,14 @@ public static bool HasMasterAccess([NotNull] this IProjectEntity entity, int? cu
         return entity.HasMasterAccess(currentUserId, acl => true);
     }
 
+    public static bool HasMasterAccess(this IProjectEntity entity, ICurrentUserAccessor currentUserAccessor)
+    {
+        ArgumentNullException.ThrowIfNull(entity);
+        ArgumentNullException.ThrowIfNull(currentUserAccessor);
+
+        return entity.HasMasterAccess(currentUserAccessor.UserIdOrDefault, acl => true);
+    }
+
     public static T RequestMasterAccess<T>([NotNull] this T field,
         int? currentUserId,
         Expression<Func<ProjectAcl, bool>>? accessType = null)

src/JoinRpg.Portal/Controllers/Schedule/ShowScheduleController.cs

@@ -54,6 +54,7 @@ public async Task<ActionResult> Index(int projectId)
 
     //TODO we ignore acces rights here
     [HttpGet("ical")]
+    [HttpGet("ical.ics")]
     public async Task<ActionResult> Ical(int projectId)
     {
         var schedule = await Manager.GetIcalSchedule();

src/JoinRpg.WebPortal.Managers/Schedule/SchedulePageManager.cs

@@ -84,7 +84,7 @@ private CalendarEvent BuildIcalEvent(ProgramItemPlaced evt)
     private void BuildAppointments(Project project, SchedulePageViewModel viewModel)
     {
         var result = new List<AppointmentViewModel>(64);
-        var hasMasterAccess = project.HasMasterAccess(CurrentUserAccessor.UserId);
+        var hasMasterAccess = project.HasMasterAccess(CurrentUserAccessor);
 
         for (var i = 0; i < viewModel.Rows.Count; i++)
         {
@@ -242,15 +242,11 @@ bool HasAccess(ProjectField roomField)
             {
                 return true;
             }
-            if (CurrentUserAccessor.UserIdOrDefault is null)
-            {
-                return false;
-            }
-            if (project.HasMasterAccess(CurrentUserAccessor.UserId))
+            if (project.HasMasterAccess(CurrentUserAccessor))
             {
                 return true;
             }
-            if (project.Claims.OfUserApproved(CurrentUserAccessor.UserId).Any())
+            if (CurrentUserAccessor.UserIdOrDefault is int userId && project.Claims.OfUserApproved(userId).Any())
             {
                 return roomField.CanPlayerView;
             }