Merge pull request umbraco#614 from Alain-es/patch-2

Shazwazza · Shazwazza · commit 11e946d61ce4 · 2015-01-07T10:24:54.000+11:00
Fix bug U4-6071: Feature request - Add a specific section to all users
diff --git a/src/Umbraco.Core/Services/IUserService.cs b/src/Umbraco.Core/Services/IUserService.cs
@@ -53,6 +53,14 @@ public interface IUserService : IMembershipUserService
         /// <param name="sectionAlias">Alias of the section to remove</param>
         void DeleteSectionFromAllUsers(string sectionAlias);
         
+        /// <summary>
+        /// Add a specific section to all users or those specified as parameters
+        /// </summary>
+        /// <remarks>This is useful when a new section is created to allow specific users accessing it</remarks>
+        /// <param name="sectionAlias">Alias of the section to add</param>
+        /// <param name="userIds">Specifiying nothing will add the section to all user</param>
+        void AddSectionToAllUsers(string sectionAlias, params int[] userIds);
+        
         /// <summary>
         /// Get permissions set for a user and optional node ids
         /// </summary>
@@ -117,4 +125,4 @@ public interface IUserService : IMembershipUserService
 
         #endregion
     }
-}
+}
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
@@ -672,6 +672,36 @@ public void DeleteSectionFromAllUsers(string sectionAlias)
                 uow.Commit();
             }
         }
+        
+        /// <summary>
+        /// Add a specific section to all users or those specified as parameters
+        /// </summary>
+        /// <remarks>This is useful when a new section is created to allow specific users accessing it</remarks>
+        /// <param name="sectionAlias">Alias of the section to add</param>
+        /// <param name="userIds">Specifiying nothing will add the section to all user</param>
+        public void AddSectionToAllUsers(string sectionAlias, params int[] userIds)
+        {
+            var uow = _uowProvider.GetUnitOfWork();
+            using (var repository = _repositoryFactory.CreateUserRepository(uow))
+            {
+                IEnumerable<IUser> users;
+                if (userIds.Any())
+                {
+                    users = repository.GetAll(userIds);
+                }
+                else
+                {
+                    users = repository.GetAll();
+                }
+                foreach (var user in users.Where(u => !u.AllowedSections.InvariantContains(sectionAlias)))
+                {
+                    //now add the section for each user and commit
+                    user.AddAllowedSection(sectionAlias);
+                    repository.AddOrUpdate(user);
+                }
+                uow.Commit();
+            }
+        }    
 
         /// <summary>
         /// Get permissions set for a user and optional node ids
@@ -745,4 +775,4 @@ public IEnumerable<EntityPermission> GetPermissions(IUser user, params int[] nod
         /// </summary>
         public static event TypedEventHandler<IUserService, DeleteEventArgs<IUserType>> DeletedUserType;
     }
-}
+}
diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs
@@ -451,6 +451,43 @@ public void Can_Remove_Section_From_All_Assigned_Users()
 
         }
 
+        [Test]
+        public void Can_Add_Section_To_All_Users()
+        {
+            var userType = ServiceContext.UserService.GetUserTypeByAlias("admin");
+
+            var user1 = ServiceContext.UserService.CreateUserWithIdentity("test1", "test1@test.com", userType);
+            var user2 = ServiceContext.UserService.CreateUserWithIdentity("test2", "test2@test.com", userType);
+            var user3 = ServiceContext.UserService.CreateUserWithIdentity("test3", "test3@test.com", userType);
+            var user4 = ServiceContext.UserService.CreateUserWithIdentity("test4", "test4@test.com", userType);
+
+            //now add the section to specific users
+            ServiceContext.UserService.AddSectionToAllUsers("test", (int)user1.Id, (int)user2.Id);
+
+            //assert
+            var result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
+            var result2 = ServiceContext.UserService.GetUserById((int)user2.Id);
+            var result3 = ServiceContext.UserService.GetUserById((int)user3.Id);
+            var result4 = ServiceContext.UserService.GetUserById((int)user4.Id);
+            Assert.IsTrue(result1.AllowedSections.Contains("test"));
+            Assert.IsTrue(result2.AllowedSections.Contains("test"));
+            Assert.IsFalse(result3.AllowedSections.Contains("test"));
+            Assert.IsFalse(result4.AllowedSections.Contains("test"));
+
+            //now add the section to all users
+            ServiceContext.UserService.AddSectionToAllUsers("test");
+
+            //assert
+            result1 = ServiceContext.UserService.GetUserById((int)user1.Id);
+            result2 = ServiceContext.UserService.GetUserById((int)user2.Id);
+            result3 = ServiceContext.UserService.GetUserById((int)user3.Id);
+            result4 = ServiceContext.UserService.GetUserById((int)user4.Id);
+            Assert.IsTrue(result1.AllowedSections.Contains("test"));
+            Assert.IsTrue(result2.AllowedSections.Contains("test"));
+            Assert.IsTrue(result3.AllowedSections.Contains("test"));
+            Assert.IsTrue(result4.AllowedSections.Contains("test"));
+        }
+
         [Test]
         public void Get_By_Profile_Username()
         {
@@ -512,4 +549,4 @@ public void Get_User_By_Username()
             Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(0));
         }
     }
-}
+}
