Merge branch 'release/0.27.1'

Jericho · Mar 26, 2021 · 3049d35 · 3049d35
2 parents 8c40f04 + 5d51f01
commit 3049d35
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 46 deletions.
diff --git a/Source/ZoomNet.IntegrationTests/ConsoleUtils.cs b/Source/ZoomNet.IntegrationTests/ConsoleUtils.cs
@@ -28,5 +28,16 @@ public static void CenterConsole()
 
 			NativeMethods.MoveWindow(hWin, left, top, consoleWidth, consoleHeight, false);
 		}
+
+		public static char Prompt(string prompt)
+		{
+			while (Console.KeyAvailable)
+			{
+				Console.ReadKey(false);
+			}
+			Console.Out.WriteLine(prompt);
+			var result = Console.ReadKey();
+			return result.KeyChar;
+		}
 	}
 }
diff --git a/Source/ZoomNet.IntegrationTests/Tests/Users.cs b/Source/ZoomNet.IntegrationTests/Tests/Users.cs
@@ -15,7 +15,7 @@ public async Task RunAsync(string userId, IZoomClient client, TextWriter log, Ca
 			await log.WriteLineAsync("\n***** USERS *****\n").ConfigureAwait(false);
 
 			// GET ALL THE USERS
-			var paginatedUsers = await client.Users.GetAllAsync(UserStatus.Active, null, 100, 1, cancellationToken).ConfigureAwait(false);
+			var paginatedUsers = await client.Users.GetAllAsync(UserStatus.Active, null, 100, (string)null, cancellationToken).ConfigureAwait(false);
 			await log.WriteLineAsync($"There are {paginatedUsers.Records.Length} users").ConfigureAwait(false);
 
 			// CLEANUP PREVIOUS INTEGRATION TESTS THAT MIGHT HAVE BEEN INTERRUPTED BEFORE THEY HAD TIME TO CLEANUP AFTER THEMSELVES

diff --git a/Source/ZoomNet.IntegrationTests/TestsRunner.cs b/Source/ZoomNet.IntegrationTests/TestsRunner.cs
@@ -91,7 +91,7 @@ public async Task<int> RunAsync()
 
 			// Ensure the Console is tall enough and centered on the screen
 			Console.WindowHeight = Math.Min(60, Console.LargestWindowHeight);
-			Utils.CenterConsole();
+			ConsoleUtils.CenterConsole();
 
 			// These are the integration tests that we will execute
 			var integrationTests = new Type[]
@@ -157,7 +157,7 @@ public async Task<int> RunAsync()
 			var promptLog = new StringWriter();
 			await promptLog.WriteLineAsync("\n\n**************************************************").ConfigureAwait(false);
 			await promptLog.WriteLineAsync("Press any key to exit").ConfigureAwait(false);
-			Utils.Prompt(promptLog.ToString());
+			ConsoleUtils.Prompt(promptLog.ToString());
 
 			// Return code indicating success/failure
 			var resultCode = (int)ResultCodes.Success;

diff --git a/Source/ZoomNet.IntegrationTests/Utils.cs b/Source/ZoomNet.IntegrationTests/Utils.cs
diff --git a/Source/ZoomNet/Resources/IUsers.cs b/Source/ZoomNet/Resources/IUsers.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -25,8 +26,22 @@ public interface IUsers
 		/// <returns>
 		/// An array of <see cref="User">users</see>.
 		/// </returns>
+		[Obsolete("Zoom is in the process of deprecating the \"page number\" and \"page count\" fields.")]
 		Task<PaginatedResponse<User>> GetAllAsync(UserStatus status = UserStatus.Active, string roleId = null, int recordsPerPage = 30, int page = 1, CancellationToken cancellationToken = default);
 
+		/// <summary>
+		/// Retrieve all users on your account.
+		/// </summary>
+		/// <param name="status">The user status. Allowed values: Active, Inactive, pending.</param>
+		/// <param name="roleId">Unique identifier for the role. Provide this parameter if you would like to filter the response by a specific role.</param>
+		/// <param name="recordsPerPage">The number of records returned within a single API call.</param>
+		/// <param name="pagingToken">The paging token.</param>
+		/// <param name="cancellationToken">The cancellation token.</param>
+		/// <returns>
+		/// An array of <see cref="User">users</see>.
+		/// </returns>
+		Task<PaginatedResponseWithToken<User>> GetAllAsync(UserStatus status = UserStatus.Active, string roleId = null, int recordsPerPage = 30, string pagingToken = null, CancellationToken cancellationToken = default);
+
 		/// <summary>
 		/// Creates a user.
 		/// </summary>