Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts: src/Umbraco.Core/Models/Member.cs src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs src/Umbraco.Core/Persistence/Factories/MemberFactory.cs src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs src/Umbraco.Core/Services/IMembershipUserService.cs src/Umbraco.Core/Services/UserService.cs src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs src/Umbraco.Tests/Services/ContentServiceTests.cs src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs src/Umbraco.Web/Controllers/UmbProfileController.cs src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs src/Umbraco.Web/Security/WebSecurity.cs src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
2014-03-18 18:47:49 +11:00
parent e0e0076a7a 7a7720c460
commit fd14065f14
49 changed files with 1189 additions and 780 deletions
--- a/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
+++ b/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Web.Security;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Models.Membership
+{
+    internal static class MembershipUserExtensions
+    {
+        internal static UmbracoMembershipMember AsConcreteMembershipUser(this IMembershipUser member, string providerName)
+        {
+            var membershipMember = new UmbracoMembershipMember(member, providerName);
+            return membershipMember;
+        }
+
+        internal static IMembershipUser AsIMember(this UmbracoMembershipMember membershipMember)
+        {
+            var member = membershipMember;
+            if (member != null)
+            {
+                return member.Member;
+            }
+
+            throw new NotImplementedException();
+        }
+
+        private static MembershipScenario? _scenario = null;
+        /// <summary>
+        /// Returns the currently configured membership scenario for members in umbraco
+        /// </summary>
+        /// <value></value>
+        internal static MembershipScenario GetMembershipScenario(this IMemberService memberService)
+        {
+            if (_scenario.HasValue == false)
+            {
+                if (System.Web.Security.Membership.Provider.Name == Constants.Conventions.Member.UmbracoMemberProviderName)
+                {
+                    return MembershipScenario.NativeUmbraco;
+                }
+                var memberType = ApplicationContext.Current.Services.MemberTypeService.Get(Constants.Conventions.MemberTypes.DefaultAlias);
+                return memberType != null
+                           ? MembershipScenario.CustomProviderWithUmbracoLink
+                           : MembershipScenario.StandaloneCustomProvider;
+            }
+            return _scenario.Value;
+        }
+    }
+}