(GH-369) Fix a bug in IpAddreses.GetUnassignedAsync that caused only …

…the first 10 addresses to be returned
Jericho · Jan 11, 2022 · 8d76915 · 8d76915
1 parent dadb4b4
commit 8d76915
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Source/StrongGrid.UnitTests/Resources/ApiKeysTests.cs b/Source/StrongGrid.UnitTests/Resources/ApiKeysTests.cs
@@ -112,7 +112,7 @@ public async Task GetAllAsync()
 			var apiKeys = new ApiKeys(client);
 
 			// Act
-			var result = await apiKeys.GetAllAsync(null, CancellationToken.None).ConfigureAwait(false);
+			var result = await apiKeys.GetAllAsync(cancellationToken: CancellationToken.None).ConfigureAwait(false);
 
 			// Assert
 			mockHttp.VerifyNoOutstandingExpectation();

diff --git a/Source/StrongGrid/Extensions/Public.cs b/Source/StrongGrid/Extensions/Public.cs
@@ -1150,14 +1150,20 @@ public static Task<Segment> UpdateAsync(this ISegments segments, string segmentI
 		/// </returns>
 		public static async Task<IpAddress[]> GetUnassignedAsync(this IIpAddresses ipAddresses, CancellationToken cancellationToken = default)
 		{
-			var allIpAddresses = await ipAddresses.GetAllAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+			var unassignedIpAddresses = new List<IpAddress>();
+			var currentOffset = 0;
 
-			var unassignedIpAddresses = allIpAddresses.Records
-				.Where(ip => ip.Pools == null || !ip.Pools.Any())
-				.ToArray();
+			while (true)
+			{
+				var allIpAddresses = await ipAddresses.GetAllAsync(limit: Utils.MaxSendGridPagingLimit, offset: currentOffset, cancellationToken: cancellationToken).ConfigureAwait(false);
+				unassignedIpAddresses.AddRange(allIpAddresses.Where(ip => ip.Pools == null || !ip.Pools.Any()));
 
-			return unassignedIpAddresses;
-		}
+				if (allIpAddresses.Length < Utils.MaxSendGridPagingLimit) break;
 
+				currentOffset += Utils.MaxSendGridPagingLimit;
+			}
+
+			return unassignedIpAddresses.ToArray();
+		}
 	}
 }
diff --git a/Source/StrongGrid/Utilities/Utils.cs b/Source/StrongGrid/Utilities/Utils.cs
@@ -11,6 +11,8 @@ internal static class Utils
 	{
 		private static readonly byte[] Secp256R1Prefix = Convert.FromBase64String("MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE");
 
+		public const int MaxSendGridPagingLimit = 500;
+
 		public static RecyclableMemoryStreamManager MemoryStreamManager { get; } = new RecyclableMemoryStreamManager();
 
 		/// <summary>