Port 7.7 - WIP

src/Umbraco.Core/Security/BackOfficeUserManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -6,6 +7,8 @@ using System.Web.Security;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin.Security.DataProtection;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Services;
 
@@ -23,18 +26,43 @@ namespace Umbraco.Core.Security
         {
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the constructor specifying all dependencies instead")]
         public BackOfficeUserManager(
             IUserStore<BackOfficeIdentityUser, int> store,
             IdentityFactoryOptions<BackOfficeUserManager> options,
             MembershipProviderBase membershipProvider)
+            : this(store, options, membershipProvider, UmbracoConfig.For.UmbracoSettings().Content)
+        {
+        }
+
+        public BackOfficeUserManager(
+            IUserStore<BackOfficeIdentityUser, int> store,
+            IdentityFactoryOptions<BackOfficeUserManager> options,
+            MembershipProviderBase membershipProvider,
+            IContentSection contentSectionConfig)
             : base(store)
         {
-            if (options == null) throw new ArgumentNullException("options");;
-            InitUserManager(this, membershipProvider, options);
+            if (options == null) throw new ArgumentNullException("options"); ;
+            InitUserManager(this, membershipProvider, contentSectionConfig, options);
         }
 
         #region Static Create methods
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying all dependencies instead")]
+        public static BackOfficeUserManager Create(
+            IdentityFactoryOptions<BackOfficeUserManager> options,
+            IUserService userService,         
+            IExternalLoginService externalLoginService,
+            MembershipProviderBase membershipProvider)
+        {
+            return Create(options, userService,
+                ApplicationContext.Current.Services.EntityService,
+                externalLoginService, membershipProvider,
+                UmbracoConfig.For.UmbracoSettings().Content);
+        }
+
         /// <summary>
         /// Creates a BackOfficeUserManager instance with all default options and the default BackOfficeUserManager
         /// </summary>
@@ -44,6 +72,7 @@ namespace Umbraco.Core.Security
         /// <param name="entityService"></param>
         /// <param name="externalLoginService"></param>
         /// <param name="membershipProvider"></param>
+        /// <param name="contentSectionConfig"></param>
         /// <returns></returns>
         public static BackOfficeUserManager Create(
             IdentityFactoryOptions<BackOfficeUserManager> options,
@@ -51,7 +80,8 @@ namespace Umbraco.Core.Security
             IMemberTypeService memberTypeService,
             IEntityService entityService,
             IExternalLoginService externalLoginService,
-            MembershipProviderBase membershipProvider)
+            MembershipProviderBase membershipProvider,
+            IContentSection contentSectionConfig)
         {
             if (options == null) throw new ArgumentNullException("options");
             if (userService == null) throw new ArgumentNullException("userService");
@@ -59,7 +89,18 @@ namespace Umbraco.Core.Security
             if (externalLoginService == null) throw new ArgumentNullException("externalLoginService");
 
             var manager = new BackOfficeUserManager(new BackOfficeUserStore(userService, memberTypeService, entityService, externalLoginService, membershipProvider));
-            manager.InitUserManager(manager, membershipProvider, options);
+            manager.InitUserManager(manager, membershipProvider, contentSectionConfig, options);
+            return manager;
+        }
+        
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying all dependencies instead")]
+        public static BackOfficeUserManager Create(
+           IdentityFactoryOptions<BackOfficeUserManager> options,
+           BackOfficeUserStore customUserStore,
+           MembershipProviderBase membershipProvider)
+        {
+            var manager = new BackOfficeUserManager(customUserStore, options, membershipProvider);
             return manager;
         }
 
@@ -69,31 +110,45 @@ namespace Umbraco.Core.Security
         /// <param name="options"></param>
         /// <param name="customUserStore"></param>
         /// <param name="membershipProvider"></param>
+        /// <param name="contentSectionConfig"></param>
         /// <returns></returns>
         public static BackOfficeUserManager Create(
-           IdentityFactoryOptions<BackOfficeUserManager> options,
-           BackOfficeUserStore customUserStore,
-           MembershipProviderBase membershipProvider)
+            IdentityFactoryOptions<BackOfficeUserManager> options,
+            BackOfficeUserStore customUserStore,
+            MembershipProviderBase membershipProvider,
+            IContentSection contentSectionConfig)
         {
-            var manager = new BackOfficeUserManager(customUserStore, options, membershipProvider);
+            var manager = new BackOfficeUserManager(customUserStore, options, membershipProvider, contentSectionConfig);
             return manager;
         }
         #endregion
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying all dependencies instead")]
+        protected void InitUserManager(
+            BackOfficeUserManager manager,
+            MembershipProviderBase membershipProvider,         
+            IdentityFactoryOptions<BackOfficeUserManager> options)
+        {
+            InitUserManager(manager, membershipProvider, UmbracoConfig.For.UmbracoSettings().Content, options);
+        }
+
         /// <summary>
         /// Initializes the user manager with the correct options
         /// </summary>
         /// <param name="manager"></param>
         /// <param name="membershipProvider"></param>
+        /// <param name="contentSectionConfig"></param>
         /// <param name="options"></param>
         /// <returns></returns>
         protected void InitUserManager(
             BackOfficeUserManager manager,
             MembershipProviderBase membershipProvider,
+            IContentSection contentSectionConfig,
             IdentityFactoryOptions<BackOfficeUserManager> options)
         {
             //NOTE: This method is mostly here for backwards compat
-            base.InitUserManager(manager, membershipProvider, options.DataProtectionProvider);
+            base.InitUserManager(manager, membershipProvider, options.DataProtectionProvider, contentSectionConfig);
         }
     }
 
@@ -138,6 +193,16 @@ namespace Umbraco.Core.Security
         }
         #endregion
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying all dependencies instead")]
+        protected void InitUserManager(
+            BackOfficeUserManager<T> manager,
+            MembershipProviderBase membershipProvider,
+            IDataProtectionProvider dataProtectionProvider)
+        {
+            InitUserManager(manager, membershipProvider, dataProtectionProvider, UmbracoConfig.For.UmbracoSettings().Content);
+        }
+
         /// <summary>
         /// Initializes the user manager with the correct options
         /// </summary>
@@ -146,11 +211,13 @@ namespace Umbraco.Core.Security
         /// The <see cref="MembershipProviderBase"/> for the users called UsersMembershipProvider
         /// </param>
         /// <param name="dataProtectionProvider"></param>
+        /// <param name="contentSectionConfig"></param>
         /// <returns></returns>
         protected void InitUserManager(
             BackOfficeUserManager<T> manager,
             MembershipProviderBase membershipProvider,
-            IDataProtectionProvider dataProtectionProvider)
+            IDataProtectionProvider dataProtectionProvider,
+            IContentSection contentSectionConfig)
         {
             // Configure validation logic for usernames
             manager.UserValidator = new BackOfficeUserValidator<T>(manager)
@@ -180,7 +247,9 @@ namespace Umbraco.Core.Security
             //custom identity factory for creating the identity object for which we auth against in the back office
             manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory<T>();
 
-            manager.EmailService = new EmailService();
+            manager.EmailService = new EmailService(
+                contentSectionConfig.NotificationEmailAddress,
+                new EmailSender());
 
             //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to suport it
 
@@ -266,6 +335,24 @@ namespace Umbraco.Core.Security
             return password;
         }
 
+        /// <summary>
+        /// Override to check the user approval value as well as the user lock out date, by default this only checks the user's locked out date
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// In the ASP.NET Identity world, there is only one value for being locked out, in Umbraco we have 2 so when checking this for Umbraco we need to check both values
+        /// </remarks>
+        public override async Task<bool> IsLockedOutAsync(int userId)
+        {
+            var user = await FindByIdAsync(userId);
+            if (user == null)
+                throw new InvalidOperationException("No user found by id " + userId);
+            if (user.IsApproved == false)
+                return true;
+
+            return await base.IsLockedOutAsync(userId);
+        }
 
         #region Overrides for password logic