moved ListUsers-logic to FirebaseUserManager

Author: ChristopherLenz

FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseUserManagerTest.cs

@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -125,7 +126,7 @@ await Assert.ThrowsAsync<FirebaseException>(
         public async Task ListUsersPaged()
         {
             var nextPageToken = Guid.NewGuid().ToString();
-            var handlerInit = new MockMessageHandler()
+            var firstCallHandler = new MockMessageHandler()
             {
                 Response = new DownloadAccountResponse()
                 {
@@ -139,7 +140,7 @@ public async Task ListUsersPaged()
                 },
             };
 
-            var handlerSecondCall = new MockMessageHandler()
+            var secondCallHandler = new MockMessageHandler()
             {
                 Response = new DownloadAccountResponse()
                 {
@@ -155,8 +156,8 @@ public async Task ListUsersPaged()
 
             var factory = new MockHttpClientFactory(new MultipleMockMessageHandler(new Dictionary<Func<HttpRequestMessage, bool>, MockMessageHandler>
             {
-                { initMessage => initMessage.RequestUri.Query.Equals("?maxResults=3&nextPageToken="), handlerInit },
-                { initMessage => initMessage.RequestUri.Query.Equals($"?maxResults=3&nextPageToken={nextPageToken}"), handlerSecondCall },
+                { initMessage => initMessage.RequestUri.Query.Equals("?maxResults=3&nextPageToken="), firstCallHandler },
+                { initMessage => initMessage.RequestUri.Query.Equals($"?maxResults=3&nextPageToken={nextPageToken}"), secondCallHandler },
             }));
 
             var userManager = new FirebaseUserManager(
@@ -167,11 +168,7 @@ public async Task ListUsersPaged()
                     ClientFactory = factory,
                 });
 
-            var requestOptions = new ListUsersOptions();
-            var usersPage = new RestPagedAsyncEnumerable<ListUsersRequest, ExportedUserRecords, ExportedUserRecord>(
-                () => userManager.CreateListUserRequest(requestOptions),
-                new ListUsersPageManager());
-
+            var usersPage = userManager.ListUsers(new ListUsersOptions());
             var users = new List<ExportedUserRecord>();
             var pageCounter = 0;
 
@@ -222,13 +219,14 @@ public async Task ListUsers()
                     ProjectId = MockProjectId,
                     ClientFactory = factory,
                 });
-            var listUsersRequest = userManager.CreateListUserRequest(new ListUsersOptions());
-            var userRecords = await listUsersRequest.ExecuteAsync();
-            Assert.Equal(nextPageToken, userRecords.NextPageToken);
-            Assert.Equal(3, userRecords.Users.Count);
-            Assert.Equal("user1", userRecords.Users[0].Uid);
-            Assert.Equal("user2", userRecords.Users[1].Uid);
-            Assert.Equal("user3", userRecords.Users[2].Uid);
+            var usersPage = userManager.ListUsers(new ListUsersOptions());
+            var listUsersRequest = await usersPage.ReadPageAsync(3);
+            var userRecords = listUsersRequest.ToList();
+            Assert.Equal(nextPageToken, listUsersRequest.NextPageToken);
+            Assert.Equal(3, userRecords.Count);
+            Assert.Equal("user1", userRecords[0].Uid);
+            Assert.Equal("user2", userRecords[1].Uid);
+            Assert.Equal("user3", userRecords[2].Uid);
         }
 
         [Fact]

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseAuth.cs

@@ -357,11 +357,7 @@ public PagedAsyncEnumerable<ExportedUserRecords, ExportedUserRecord> ListUsersAs
         {
             var userManager = this.IfNotDeleted(() => this.userManager.Value);
 
-            var restPagedAsyncEnumerable = new RestPagedAsyncEnumerable<ListUsersRequest, ExportedUserRecords, ExportedUserRecord>(
-                () => userManager.CreateListUserRequest(requestOptions),
-                new ListUsersPageManager());
-
-            return restPagedAsyncEnumerable;
+            return userManager.ListUsers(requestOptions);
         }
 
         /// <summary>

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

@@ -17,6 +17,8 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Google.Api.Gax;
+using Google.Api.Gax.Rest;
 using Google.Apis.Http;
 using Google.Apis.Json;
 using Newtonsoft.Json.Linq;
@@ -99,9 +101,13 @@ public async Task<UserRecord> GetUserById(
             return new UserRecord(user);
         }
 
-        public ListUsersRequest CreateListUserRequest(ListUsersOptions requestOptions)
+        public PagedAsyncEnumerable<ExportedUserRecords, ExportedUserRecord> ListUsers(ListUsersOptions requestOptions)
         {
-            return new ListUsersRequest(this.baseUrl, this.httpClient, requestOptions);
+            var restPagedAsyncEnumerable = new RestPagedAsyncEnumerable<ListUsersRequest, ExportedUserRecords, ExportedUserRecord>(
+                () => this.CreateListUserRequest(requestOptions),
+                new ListUsersPageManager());
+
+            return restPagedAsyncEnumerable;
         }
 
         /// <summary>
@@ -161,6 +167,11 @@ public void Dispose()
             this.httpClient.Dispose();
         }
 
+        internal ListUsersRequest CreateListUserRequest(ListUsersOptions requestOptions)
+        {
+            return new ListUsersRequest(this.baseUrl, this.httpClient, requestOptions);
+        }
+
         private async Task<TResult> PostAndDeserializeAsync<TResult>(
             string path, object body, CancellationToken cancellationToken)
         {