Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections

src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs

@@ -108,7 +108,7 @@ namespace Umbraco.Core.Models.EntityBase
         /// Please note that resetting the dirty properties could potentially
         /// obstruct the saving of a new or updated entity.
         /// </remarks>
-        internal void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        internal virtual void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
         {
             if (rememberPreviouslyChangedProperties)
             {

src/Umbraco.Core/Models/Membership/UserProfile.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -22,9 +23,13 @@ namespace Umbraco.Core.Models.Membership
         {
             SessionTimeout = 60;
             _sectionCollection = new ObservableCollection<string>();
+            _addedSections = new List<string>();
+            _removedSections = new List<string>();
             _sectionCollection.CollectionChanged += SectionCollectionChanged;
         }
 
+        private readonly List<string> _addedSections;
+        private readonly List<string> _removedSections;
         private readonly ObservableCollection<string> _sectionCollection;
         private int _sessionTimeout;
         private int _startContentId;
@@ -116,17 +121,68 @@ namespace Umbraco.Core.Models.Membership
 
         public void AddAllowedSection(string sectionAlias)
         {
-            _sectionCollection.Add(sectionAlias);
+            if (!_sectionCollection.Contains(sectionAlias))
+            {
+                _sectionCollection.Add(sectionAlias);    
+            }
         }
 
+        /// <summary>
+        /// Whenever resetting occurs, clear the remembered add/removed collections, even if 
+        /// rememberPreviouslyChangedProperties is true, the AllowedSections property will still
+        /// be flagged as dirty.
+        /// </summary>
+        /// <param name="rememberPreviouslyChangedProperties"></param>
+        internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            _addedSections.Clear();
+            _removedSections.Clear();
+            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+        }
+        
+        /// <summary>
+        /// Used internally to check if we need to add a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> AddedSections
+        {
+            get { return _addedSections; }
+        }
+
+        /// <summary>
+        /// Used internally to check if we need to remove  a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> RemovedSections
+        {
+            get { return _removedSections; }
+        } 
+
         /// <summary>
         /// Handles the collection changed event in order for us to flag the AllowedSections property as changed
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        void SectionCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
+        void SectionCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {         
             OnPropertyChanged(AllowedSectionsSelector);
+
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {                
+                //remove from the removed/added sections (since people could add/remove all they want in one request)
+                _removedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
+                _addedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
+
+                //add to the added sections
+                _addedSections.Add(e.NewItems.Cast<string>().First());
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                //remove from the removed/added sections (since people could add/remove all they want in one request)
+                _removedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
+                _addedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
+
+                //add to the added sections
+                _removedSections.Add(e.OldItems.Cast<string>().First());
+            }
         }
     }
 }

src/Umbraco.Core/Models/Rdbms/UserDto.cs

@@ -1,4 +1,5 @@
-using Umbraco.Core.Persistence;
+using System.Collections.Generic;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Models.Rdbms
@@ -59,5 +60,8 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("defaultToLiveEditing")]
         [Constraint(Default = "0")]
         public bool DefaultToLiveEditing { get; set; }
+
+        [ResultColumn]
+        public List<User2AppDto> User2AppDtos { get; set; }
     }
 }