Merge pull request #61922 from dotnet/wtgodbe/Port23

[release/2.3] Merge internal commits for May

Author: wtgodbe

eng/PatchConfig.props

@@ -20,6 +20,7 @@ Later on, this will be checked using this condition:
   </PropertyGroup>
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.3.2' ">
     <PackagesInPatch>
+      Microsoft.Extensions.Identity.Stores;
     </PackagesInPatch>
   </PropertyGroup>
 </Project>

src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs

@@ -165,6 +165,9 @@ await Assert.ThrowsAsync<ArgumentNullException>("user",
             await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetTwoFactorEnabledAsync(null));
             await Assert.ThrowsAsync<ArgumentNullException>("user",
                 async () => await store.SetTwoFactorEnabledAsync(null, true));
+            await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.RedeemCodeAsync(user: null, code: "fake", default));
+            await Assert.ThrowsAsync<ArgumentNullException>("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: null, default));
+            await Assert.ThrowsAsync<ArgumentException>("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: "", default));
             await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetAccessFailedCountAsync(null));
             await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.GetLockoutEnabledAsync(null));
             await Assert.ThrowsAsync<ArgumentNullException>("user", async () => await store.SetLockoutEnabledAsync(null, false));

src/Identity/Extensions.Stores/src/UserStoreBase.cs

@@ -1060,6 +1060,10 @@ public virtual async Task<bool> RedeemCodeAsync(TUser user, string code, Cancell
             {
                 throw new ArgumentNullException(nameof(code));
             }
+            if (code.Length == 0)
+            {
+                throw new ArgumentException("Must not be null or empty", nameof(code));
+            }
 
             var mergedCodes = await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken) ?? "";
             var splitCodes = mergedCodes.Split(';');