@@ -303,7 +303,7 @@ public async Task GetUserByPhoneNumberEmpty()
303
303
public async Task ListUsersPaged ( )
304
304
{
305
305
var nextPageToken = Guid . NewGuid ( ) . ToString ( ) ;
306
- var handlerInit = new MockMessageHandler ( )
306
+ var firstCallHandler = new MockMessageHandler ( )
307
307
{
308
308
Response = new DownloadAccountResponse ( )
309
309
{
@@ -317,7 +317,7 @@ public async Task ListUsersPaged()
317
317
} ,
318
318
} ;
319
319
320
- var handlerSecondCall = new MockMessageHandler ( )
320
+ var secondCallHandler = new MockMessageHandler ( )
321
321
{
322
322
Response = new DownloadAccountResponse ( )
323
323
{
@@ -333,8 +333,8 @@ public async Task ListUsersPaged()
333
333
334
334
var factory = new MockHttpClientFactory ( new MultipleMockMessageHandler ( new Dictionary < Func < HttpRequestMessage , bool > , MockMessageHandler >
335
335
{
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 } ,
338
338
} ) ) ;
339
339
340
340
var userManager = new FirebaseUserManager (
@@ -345,10 +345,7 @@ public async Task ListUsersPaged()
345
345
ClientFactory = factory ,
346
346
} ) ;
347
347
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 ( ) ) ;
352
349
353
350
var users = new List < ExportedUserRecord > ( ) ;
354
351
var pageCounter = 0 ;
@@ -400,13 +397,15 @@ public async Task ListUsers()
400
397
ProjectId = MockProjectId ,
401
398
ClientFactory = factory ,
402
399
} ) ;
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 ) ;
410
409
}
411
410
412
411
[ Fact ]
0 commit comments