@@ -303,7 +303,7 @@ public async Task GetUserByPhoneNumberEmpty()
303303 public async Task ListUsersPaged ( )
304304 {
305305 var nextPageToken = Guid . NewGuid ( ) . ToString ( ) ;
306- var handlerInit = new MockMessageHandler ( )
306+ var firstCallHandler = new MockMessageHandler ( )
307307 {
308308 Response = new DownloadAccountResponse ( )
309309 {
@@ -317,7 +317,7 @@ public async Task ListUsersPaged()
317317 } ,
318318 } ;
319319
320- var handlerSecondCall = new MockMessageHandler ( )
320+ var secondCallHandler = new MockMessageHandler ( )
321321 {
322322 Response = new DownloadAccountResponse ( )
323323 {
@@ -333,8 +333,8 @@ public async Task ListUsersPaged()
333333
334334 var factory = new MockHttpClientFactory ( new MultipleMockMessageHandler ( new Dictionary < Func < HttpRequestMessage , bool > , MockMessageHandler >
335335 {
336- { initMessage => initMessage . RequestUri . Query . Equals ( "?maxResults=3&nextPageToken=" ) , handlerInit } ,
337- { initMessage => initMessage . RequestUri . Query . Equals ( $ "?maxResults=3&nextPageToken={ nextPageToken } ") , handlerSecondCall } ,
336+ { initMessage => initMessage . RequestUri . Query . Equals ( "?maxResults=3&nextPageToken=" ) , firstCallHandler } ,
337+ { initMessage => initMessage . RequestUri . Query . Equals ( $ "?maxResults=3&nextPageToken={ nextPageToken } ") , secondCallHandler } ,
338338 } ) ) ;
339339
340340 var userManager = new FirebaseUserManager (
@@ -345,10 +345,7 @@ public async Task ListUsersPaged()
345345 ClientFactory = factory ,
346346 } ) ;
347347
348- var requestOptions = new ListUsersOptions ( ) ;
349- var usersPage = new RestPagedAsyncEnumerable < ListUsersRequest , ExportedUserRecords , ExportedUserRecord > (
350- ( ) => userManager . CreateListUserRequest ( requestOptions ) ,
351- new ListUsersPageManager ( ) ) ;
348+ var usersPage = userManager . ListUsers ( new ListUsersOptions ( ) ) ;
352349
353350 var users = new List < ExportedUserRecord > ( ) ;
354351 var pageCounter = 0 ;
@@ -400,13 +397,15 @@ public async Task ListUsers()
400397 ProjectId = MockProjectId ,
401398 ClientFactory = factory ,
402399 } ) ;
403- var listUsersRequest = userManager . CreateListUserRequest ( new ListUsersOptions ( ) ) ;
404- var userRecords = await listUsersRequest . ExecuteAsync ( ) ;
405- Assert . Equal ( nextPageToken , userRecords . NextPageToken ) ;
406- Assert . Equal ( 3 , userRecords . Users . Count ) ;
407- Assert . Equal ( "user1" , userRecords . Users [ 0 ] . Uid ) ;
408- Assert . Equal ( "user2" , userRecords . Users [ 1 ] . Uid ) ;
409- Assert . Equal ( "user3" , userRecords . Users [ 2 ] . Uid ) ;
400+
401+ var usersPage = userManager . ListUsers ( new ListUsersOptions ( ) ) ;
402+ var listUsersRequest = await usersPage . ReadPageAsync ( 3 ) ;
403+ var userRecords = listUsersRequest . ToList ( ) ;
404+ Assert . Equal ( nextPageToken , listUsersRequest . NextPageToken ) ;
405+ Assert . Equal ( 3 , userRecords . Count ) ;
406+ Assert . Equal ( "user1" , userRecords [ 0 ] . Uid ) ;
407+ Assert . Equal ( "user2" , userRecords [ 1 ] . Uid ) ;
408+ Assert . Equal ( "user3" , userRecords [ 2 ] . Uid ) ;
410409 }
411410
412411 [ Fact ]
0 commit comments