From 1c139b685af5480820eea0a451a2ea3599215d47 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 20 Dec 2013 18:12:54 +1100
Subject: [PATCH] updates legacy membership provider to use efficient paging.

---
 src/Umbraco.Tests/Views/web.config            | 55 -------------------
 .../Providers/MembersMembershipProvider.cs    |  8 +--
 .../members/UmbracoMembershipProvider.cs      | 29 +++-------
 3 files changed, 9 insertions(+), 83 deletions(-)
 delete mode 100644 src/Umbraco.Tests/Views/web.config

diff --git a/src/Umbraco.Tests/Views/web.config b/src/Umbraco.Tests/Views/web.config
deleted file mode 100644
index aa5e0eb2e3..0000000000
--- a/src/Umbraco.Tests/Views/web.config
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-				<add namespace="Umbraco.Web" />
-				<add namespace="Umbraco.Core" />
-				<add namespace="Umbraco.Core.Models" />
-				<add namespace="Umbraco.Web.Mvc" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
-    </httpHandlers>
-
-    <!--
-        Enabling request validation in view pages would cause validation to occur
-        after the input has already been processed by the controller. By default
-        MVC performs request validation before a controller processes the input.
-        To change this behavior apply the ValidateInputAttribute to a
-        controller or action.
-    -->
-    <pages
-        validateRequest="false"
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
-      </controls>
-    </pages>
-  </system.web>
-
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index d1b9c9a14e..5e263f76a4 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -204,11 +204,8 @@ namespace Umbraco.Web.Security.Providers
         public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
             var byEmail = MemberService.FindMembersByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
-            //totalRecords = byEmail.Length;
-            //var pagedResult = new PagedResult<IMember>(totalRecords, pageIndex, pageSize);
-
+            
             var collection = new MembershipUserCollection();
-            //foreach (var m in byEmail.Skip(pagedResult.SkipSize).Take(pageSize))
             foreach (var m in byEmail)
             {
                 collection.Add(m.AsConcreteMembershipUser());
@@ -229,11 +226,8 @@ namespace Umbraco.Web.Security.Providers
         public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
             var byEmail = MemberService.FindMembersByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
-            //totalRecords = byEmail.Length;
-            //var pagedResult = new PagedResult<IMember>(totalRecords, pageIndex, pageSize);
 
             var collection = new MembershipUserCollection();
-            //foreach (var m in byEmail.Skip(pagedResult.SkipSize).Take(pageSize))
             foreach (var m in byEmail)
             {
                 collection.Add(m.AsConcreteMembershipUser());
diff --git a/src/umbraco.providers/members/UmbracoMembershipProvider.cs b/src/umbraco.providers/members/UmbracoMembershipProvider.cs
index 6bac76be81..fa3a70804e 100644
--- a/src/umbraco.providers/members/UmbracoMembershipProvider.cs
+++ b/src/umbraco.providers/members/UmbracoMembershipProvider.cs
@@ -344,11 +344,8 @@ namespace umbraco.providers.members
         public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
             var byEmail = ApplicationContext.Current.Services.MemberService.FindMembersByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
-            //totalRecords = byEmail.Length;
-            //var pagedResult = new PagedResult<IMember>(totalRecords, pageIndex, pageSize);
-
-            var collection = new MembershipUserCollection();            
-            //foreach (var m in byEmail.Skip(pagedResult.SkipSize).Take(pageSize))
+            
+            var collection = new MembershipUserCollection();                        
             foreach (var m in byEmail)
             {
                 collection.Add(ConvertToMembershipUser(m));
@@ -369,11 +366,8 @@ namespace umbraco.providers.members
         public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
             var byEmail = ApplicationContext.Current.Services.MemberService.FindMembersByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
-            //totalRecords = byEmail.Length;
-            //var pagedResult = new PagedResult<IMember>(totalRecords, pageIndex, pageSize);
-
-            var collection = new MembershipUserCollection();
-            //foreach (var m in byEmail.Skip(pagedResult.SkipSize).Take(pageSize))
+            
+            var collection = new MembershipUserCollection();            
             foreach (var m in byEmail)
             {
                 collection.Add(ConvertToMembershipUser(m));
@@ -392,22 +386,15 @@ namespace umbraco.providers.members
         /// </returns>
         public override MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords)
         {
-            var counter = 0;
-            var startIndex = pageSize * pageIndex;
-            var endIndex = startIndex + pageSize - 1;
             var membersList = new MembershipUserCollection();
-            var memberArray = Member.GetAll;
-            totalRecords = memberArray.Length;
 
-            foreach (var m in memberArray)
+            var pagedMembers = ApplicationContext.Current.Services.MemberService.GetAllMembers(pageIndex, pageSize, out totalRecords);
+
+            foreach (var m in pagedMembers)
             {
-                if (counter >= startIndex)
-                    membersList.Add(ConvertToMembershipUser(m));
-                if (counter >= endIndex) break;
-                counter++;
+                membersList.Add(ConvertToMembershipUser(m));
             }
             return membersList;
-
         }
 
         /// <summary>