merge branch 'master' into 'encrypted-string-perf'

test/Infrastructure.EFIntegration.Test/Repositories/AuthRequestRepositoryTests.cs

@@ -0,0 +1,50 @@
+using Bit.Core.Entities;
+using Bit.Core.Test.AutoFixture.Attributes;
+using Bit.Infrastructure.EFIntegration.Test.AutoFixture;
+using Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers;
+using Xunit;
+using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
+using SqlRepo = Bit.Infrastructure.Dapper.Repositories;
+
+namespace Bit.Infrastructure.EFIntegration.Test.Repositories;
+
+public class AuthRequestRepositoryTests
+{
+    [CiSkippedTheory, EfAuthRequestAutoData]
+    public async void CreateAsync_Works_DataMatches(
+        AuthRequest authRequest,
+        AuthRequestCompare equalityComparer,
+        List<EfRepo.AuthRequestRepository> suts,
+        SqlRepo.AuthRequestRepository sqlAuthRequestRepo,
+        User user,
+        List<EfRepo.UserRepository> efUserRepos,
+        SqlRepo.UserRepository sqlUserRepo
+        )
+    {
+        authRequest.ResponseDeviceId = null;
+        var savedAuthRequests = new List<AuthRequest>();
+        foreach (var sut in suts)
+        {
+            var i = suts.IndexOf(sut);
+
+            var efUser = await efUserRepos[i].CreateAsync(user);
+            sut.ClearChangeTracking();
+            authRequest.UserId = efUser.Id;
+
+            var postEfAuthRequest = await sut.CreateAsync(authRequest);
+            sut.ClearChangeTracking();
+
+            var savedAuthRequest = await sut.GetByIdAsync(postEfAuthRequest.Id);
+            savedAuthRequests.Add(savedAuthRequest);
+        }
+
+        var sqlUser = await sqlUserRepo.CreateAsync(user);
+        authRequest.UserId = sqlUser.Id;
+        var sqlAuthRequest = await sqlAuthRequestRepo.CreateAsync(authRequest);
+        var savedSqlAuthRequest = await sqlAuthRequestRepo.GetByIdAsync(sqlAuthRequest.Id);
+        savedAuthRequests.Add(savedSqlAuthRequest);
+
+        var distinctItems = savedAuthRequests.Distinct(equalityComparer);
+        Assert.True(!distinctItems.Skip(1).Any());
+    }
+}

test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/AuthRequestCompare.cs

@@ -0,0 +1,23 @@
+using System.Diagnostics.CodeAnalysis;
+using Bit.Core.Entities;
+
+namespace Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers;
+
+public class AuthRequestCompare : IEqualityComparer<AuthRequest>
+{
+    public bool Equals(AuthRequest x, AuthRequest y)
+    {
+        return x.AccessCode == y.AccessCode &&
+        x.MasterPasswordHash == y.MasterPasswordHash &&
+        x.PublicKey == y.PublicKey &&
+        x.RequestDeviceIdentifier == y.RequestDeviceIdentifier &&
+        x.RequestDeviceType == y.RequestDeviceType &&
+        x.RequestIpAddress == y.RequestIpAddress &&
+        x.RequestFingerprint == y.RequestFingerprint;
+    }
+
+    public int GetHashCode([DisallowNull] AuthRequest obj)
+    {
+        return base.GetHashCode();
+    }
+}