Remove ShareEnabled from C#

src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs

@@ -155,8 +155,6 @@ public async Task<IRpcMethodResult> UpdateSettings(string projectId, SFProjectSe
                     { "AdditionalTrainingSourceEnabled", settings?.AdditionalTrainingSourceEnabled?.ToString() },
                     { "AdditionalTrainingSourceParatextId", settings?.AdditionalTrainingSourceParatextId },
                     { "CheckingEnabled", settings?.CheckingEnabled?.ToString() },
-                    { "CheckingShareEnabled", settings?.CheckingShareEnabled?.ToString() },
-                    { "TranslateShareEnabled", settings?.TranslateShareEnabled?.ToString() },
                     { "TranslationSuggestionsEnabled", settings?.TranslationSuggestionsEnabled?.ToString() },
                     { "UsersSeeEachOthersResponses", settings?.UsersSeeEachOthersResponses?.ToString() },
                     { "HideCommunityCheckingText", settings?.HideCommunityCheckingText?.ToString() },

src/SIL.XForge.Scripture/Models/CheckingConfig.cs

@@ -4,7 +4,6 @@ public class CheckingConfig
 {
     public bool CheckingEnabled { get; set; }
     public bool UsersSeeEachOthersResponses { get; set; } = true;
-    public bool ShareEnabled { get; set; } = false;
     public string AnswerExportMethod { get; set; } = CheckingAnswerExport.All;
     public int? NoteTagId { get; set; }
 

src/SIL.XForge.Scripture/Models/SFProjectSettings.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace SIL.XForge.Scripture.Models;
 
 /// <summary>
@@ -10,6 +12,8 @@ public class SFProjectSettings
     public bool? TranslationSuggestionsEnabled { get; set; }
     public string? SourceParatextId { get; set; }
     public bool? BiblicalTermsEnabled { get; set; }
+
+    [Obsolete("For backwards compatibility with older frontend clients. Deprecated November 2024.")]
     public bool? TranslateShareEnabled { get; set; }
 
     // pre-translation settings
@@ -24,6 +28,8 @@ public class SFProjectSettings
     // checking settings
     public bool? CheckingEnabled { get; set; }
     public bool? UsersSeeEachOthersResponses { get; set; }
+
+    [Obsolete("For backwards compatibility with older frontend clients. Deprecated November 2024.")]
     public bool? CheckingShareEnabled { get; set; }
     public string? CheckingAnswerExport { get; set; }
     public bool? HideCommunityCheckingText { get; set; }

src/SIL.XForge.Scripture/Models/TranslateConfig.cs

@@ -4,7 +4,6 @@ public class TranslateConfig
 {
     public bool TranslationSuggestionsEnabled { get; set; }
     public TranslateSource? Source { get; set; }
-    public bool ShareEnabled { get; set; }
     public int? DefaultNoteTagId { get; set; }
     public bool PreTranslate { get; set; }
     public DraftConfig DraftConfig { get; set; } = new DraftConfig();

src/SIL.XForge.Scripture/Services/SFProjectService.cs

@@ -424,7 +424,6 @@ await projectDoc.SubmitJson0OpAsync(op =>
             );
             UpdateSetting(op, p => p.BiblicalTermsConfig.BiblicalTermsEnabled, settings.BiblicalTermsEnabled);
             UpdateSetting(op, p => p.TranslateConfig.Source, source, unsetSourceProject);
-            UpdateSetting(op, p => p.TranslateConfig.ShareEnabled, settings.TranslateShareEnabled);
             UpdateSetting(
                 op,
                 p => p.TranslateConfig.DraftConfig.AlternateSourceEnabled,
@@ -466,7 +465,6 @@ await projectDoc.SubmitJson0OpAsync(op =>
 
             UpdateSetting(op, p => p.CheckingConfig.CheckingEnabled, settings.CheckingEnabled);
             UpdateSetting(op, p => p.CheckingConfig.UsersSeeEachOthersResponses, settings.UsersSeeEachOthersResponses);
-            UpdateSetting(op, p => p.CheckingConfig.ShareEnabled, settings.CheckingShareEnabled);
             UpdateSetting(op, p => p.CheckingConfig.AnswerExportMethod, settings.CheckingAnswerExport);
             UpdateSetting(op, p => p.CheckingConfig.HideCommunityCheckingText, settings.HideCommunityCheckingText);
         });
@@ -632,19 +630,8 @@ await RealtimeService
         }
         SiteOptions siteOptions = SiteOptions.Value;
 
-        bool isAdmin = IsProjectAdmin(project, curUserId);
-        string[] availableRoles = new Dictionary<string, bool>
-        {
-            {
-                SFProjectRole.CommunityChecker,
-                project.CheckingConfig.CheckingEnabled && (isAdmin || project.CheckingConfig.ShareEnabled)
-            },
-            { SFProjectRole.Viewer, project.TranslateConfig.ShareEnabled || isAdmin },
-            { SFProjectRole.Commenter, project.TranslateConfig.ShareEnabled || isAdmin }
-        }
-            .Where(entry => entry.Value)
-            .Select(entry => entry.Key)
-            .ToArray();
+        bool isProjectAdmin = IsProjectAdmin(project, curUserId);
+        string[] availableRoles = GetAvailableRoles(project, isProjectAdmin);
 
         if (!availableRoles.Contains(role))
             throw new ForbiddenException();
@@ -670,7 +657,7 @@ await ProjectSecrets.UpdateAsync(
                         ExpirationTime = expTime,
                         ProjectRole = role,
                         ShareLinkType = ShareLinkType.Recipient,
-                        CreatedByAdmin = isAdmin
+                        CreatedByAdmin = isProjectAdmin
                     }
                 )
         );
@@ -723,20 +710,7 @@ int daysBeforeExpiration
             throw new ForbiddenException();
 
         bool isProjectAdmin = IsProjectAdmin(project, curUserId);
-
-        string[] availableRoles = new Dictionary<string, bool>
-        {
-            {
-                SFProjectRole.CommunityChecker,
-                project.CheckingConfig.CheckingEnabled && (isProjectAdmin || project.CheckingConfig.ShareEnabled)
-            },
-            { SFProjectRole.Viewer, isProjectAdmin || project.TranslateConfig.ShareEnabled },
-            { SFProjectRole.Commenter, isProjectAdmin || project.TranslateConfig.ShareEnabled }
-        }
-            .Where(entry => entry.Value)
-            .Select(entry => entry.Key)
-            .ToArray();
-
+        string[] availableRoles = GetAvailableRoles(project, isProjectAdmin);
         if (!availableRoles.Contains(role))
             throw new ForbiddenException();
 
@@ -754,7 +728,7 @@ await ProjectSecrets.UpdateAsync(
                         ProjectRole = role,
                         ShareLinkType = shareLinkType,
                         ExpirationTime = DateTime.UtcNow.AddDays(daysBeforeExpiration),
-                        CreatedByAdmin = isProjectAdmin
+                        CreatedByAdmin = isProjectAdmin,
                     }
                 )
         );
@@ -816,12 +790,12 @@ await ProjectSecrets.UpdateAsync(
     }
 
     /// <summary>Is there already a pending invitation to the project for the specified email address?</summary>
-    public async Task<bool> IsAlreadyInvitedAsync(string curUserId, string projectId, string email)
+    public async Task<bool> IsAlreadyInvitedAsync(string curUserId, string projectId, string? email)
     {
         SFProject project = await GetProjectAsync(projectId);
+        string[] availableRoles = GetAvailableRoles(project, isProjectAdmin: false);
         bool sharingEnabled =
-            project.TranslateConfig.ShareEnabled
-            || (project.CheckingConfig.CheckingEnabled && project.CheckingConfig.ShareEnabled);
+            availableRoles.Contains(SFProjectRole.Viewer) || availableRoles.Contains(SFProjectRole.CommunityChecker);
         if (!IsProjectAdmin(project, curUserId) && !(IsOnProject(project, curUserId) && sharingEnabled))
             throw new ForbiddenException();
 
@@ -849,7 +823,7 @@ public async Task<IReadOnlyList<InviteeStatus>> InvitedUsersAsync(string curUser
             {
                 Email = sk.Email,
                 Role = sk.ProjectRole,
-                Expired = sk.ExpirationTime < now
+                Expired = sk.ExpirationTime < now,
             })
             .ToArray();
     }
@@ -945,23 +919,14 @@ public async Task<ValidShareKey> CheckShareKeyValidity(string shareKey)
         // If the link was sent by a non-admin and an admin has since disabled non-admin sharing
         if (!projectSecretShareKey.CreatedByAdmin)
         {
-            string[] availableRoles = new Dictionary<string, bool>
-            {
-                { SFProjectRole.CommunityChecker, project.CheckingConfig.ShareEnabled },
-                { SFProjectRole.Viewer, project.TranslateConfig.ShareEnabled },
-                { SFProjectRole.Commenter, project.TranslateConfig.ShareEnabled },
-            }
-                .Where(entry => entry.Value)
-                .Select(entry => entry.Key)
-                .ToArray();
-
+            string[] availableRoles = GetAvailableRoles(project, isProjectAdmin: false);
             if (!availableRoles.Contains(projectSecretShareKey.ProjectRole))
             {
                 throw new DataNotFoundException("role_not_found");
             }
         }
 
-        return new ValidShareKey()
+        return new ValidShareKey
         {
             Project = project,
             ProjectSecret = projectSecret,
@@ -1841,4 +1806,38 @@ await projectDoc.SubmitJson0OpAsync(op =>
             }
         }
     }
+
+    // TODO: User similar role checking system to node backend/frontend
+    private static string[] GetAvailableRoles(SFProject project, bool isProjectAdmin) =>
+        new Dictionary<string, bool>
+        {
+            {
+                SFProjectRole.CommunityChecker,
+                project.CheckingConfig.CheckingEnabled
+                    && (
+                        isProjectAdmin
+                        || (
+                            project.RolePermissions.ContainsKey(SFProjectRole.CommunityChecker)
+                            && project.RolePermissions[SFProjectRole.CommunityChecker].Contains("user_invites.create")
+                        )
+                    )
+            },
+            {
+                SFProjectRole.Viewer,
+                (
+                    project.RolePermissions.ContainsKey(SFProjectRole.Viewer)
+                    && project.RolePermissions[SFProjectRole.Viewer].Contains("user_invites.create")
+                ) || isProjectAdmin
+            },
+            {
+                SFProjectRole.Commenter,
+                (
+                    project.RolePermissions.ContainsKey(SFProjectRole.Commenter)
+                    && project.RolePermissions[SFProjectRole.Commenter].Contains("user_invites.create")
+                ) || isProjectAdmin
+            },
+        }
+            .Where(entry => entry.Value)
+            .Select(entry => entry.Key)
+            .ToArray();
 }

test/SIL.XForge.Scripture.Tests/Controllers/SFProjectsRpcControllerTests.cs

@@ -775,14 +775,12 @@ public void UpdateSettings_UnknownError()
             BiblicalTermsEnabled = true,
             CheckingAnswerExport = string.Empty,
             CheckingEnabled = true,
-            CheckingShareEnabled = true,
             HideCommunityCheckingText = true,
             SourceParatextId = string.Empty,
             AlternateTrainingSourceEnabled = true,
             AlternateTrainingSourceParatextId = string.Empty,
             AdditionalTrainingSourceEnabled = true,
             AdditionalTrainingSourceParatextId = string.Empty,
-            TranslateShareEnabled = true,
             TranslationSuggestionsEnabled = true,
             UsersSeeEachOthersResponses = true,
         };

test/SIL.XForge.Scripture.Tests/Services/MachineProjectServiceTests.cs

@@ -2519,7 +2519,7 @@ public TestEnvironment(TestEnvironmentOptions? options = null)
                         Name = "project01",
                         ShortName = "P01",
                         ParatextId = Paratext01,
-                        CheckingConfig = new CheckingConfig { ShareEnabled = false },
+                        CheckingConfig = new CheckingConfig(),
                         UserRoles = [],
                         TranslateConfig = new TranslateConfig
                         {
@@ -2540,7 +2540,7 @@ public TestEnvironment(TestEnvironmentOptions? options = null)
                         Name = "project02",
                         ShortName = "P02",
                         ParatextId = Paratext02,
-                        CheckingConfig = new CheckingConfig { ShareEnabled = false },
+                        CheckingConfig = new CheckingConfig(),
                         UserRoles = [],
                         TranslateConfig = new TranslateConfig
                         {
@@ -2585,7 +2585,7 @@ public TestEnvironment(TestEnvironmentOptions? options = null)
                         Name = "project03",
                         ShortName = "P03",
                         ParatextId = Paratext03,
-                        CheckingConfig = new CheckingConfig { ShareEnabled = false },
+                        CheckingConfig = new CheckingConfig(),
                         UserRoles = [],
                         TranslateConfig = new TranslateConfig
                         {

test/SIL.XForge.Scripture.Tests/Services/ParatextServiceTests.cs

@@ -6259,7 +6259,7 @@ public SFProject NewSFProject() =>
                         WritingSystem = new WritingSystem { Tag = "qaa" },
                     },
                 },
-                CheckingConfig = new CheckingConfig { ShareEnabled = false },
+                CheckingConfig = new CheckingConfig(),
                 UserRoles = new Dictionary<string, string>
                 {
                     { User01, SFProjectRole.Administrator },