Clarify external account lookup and test structure

Author: niemyjski

src/Exceptionless.Core/Repositories/UserRepository.cs

@@ -131,17 +131,21 @@ public Task<bool> SetSavedViewOrdersAsync(User user, CommandOptionsDescriptor<Us
         provider = provider.ToLowerInvariant();
         var results = await FindAsync(q => q.FieldEquals(u => u.OAuthAccounts.First().ProviderUserId, providerUserId),
             o => o.SearchAfterPaging().PageLimit(100));
-        User? owner = null;
+        User? matchingUser = null;
         do
         {
-            foreach (var user in results.Documents.Where(u => u.OAuthAccounts.Any(o => o.Provider == provider && o.ProviderUserId == providerUserId)))
+            foreach (var user in results.Documents.Where(u => u.OAuthAccounts.Any(account =>
+                String.Equals(account.Provider, provider, StringComparison.Ordinal) &&
+                String.Equals(account.ProviderUserId, providerUserId, StringComparison.Ordinal))))
             {
-                if (owner is not null)
+                if (matchingUser is not null)
                     throw new UnauthorizedAccessException("The external account is linked to multiple users.");
-                owner = user;
+
+                matchingUser = user;
             }
         } while (await results.NextPageAsync());
-        return owner;
+
+        return matchingUser;
     }
 
     public async Task<User?> GetByVerifyEmailAddressTokenAsync(string token)

tests/Exceptionless.Tests/Api/Endpoints/AuthEndpointTests.cs

@@ -2101,26 +2101,43 @@ await SendRequestAsync(request => request
     [Fact]
     public async Task GetUserByOAuthProviderAsync_DifferentAccountEntries_DoNotMatch()
     {
+        // Arrange
         var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_USER_EMAIL);
         Assert.NotNull(user);
         user.AddOAuthAccount("google", "shared-subject", user.EmailAddress);
         user.AddOAuthAccount("github", "other-subject", user.EmailAddress);
         await _userRepository.SaveAsync(user, o => o.ImmediateConsistency());
-        Assert.Null(await _userRepository.GetUserByOAuthProviderAsync("github", "shared-subject"));
-        Assert.Equal(user.Id, (await _userRepository.GetUserByOAuthProviderAsync("google", "shared-subject"))!.Id);
+
+        // Act
+        var githubUser = await _userRepository.GetUserByOAuthProviderAsync("github", "shared-subject");
+        var googleUser = await _userRepository.GetUserByOAuthProviderAsync("google", "shared-subject");
+
+        // Assert
+        Assert.Null(githubUser);
+        Assert.NotNull(googleUser);
+        Assert.Equal(user.Id, googleUser.Id);
     }
 
     [Fact]
     public async Task GetUserByOAuthProviderAsync_DuplicateIdentity_RejectsAmbiguousOwner()
     {
+        // Arrange
         foreach (string email in new[] { SampleDataService.TEST_USER_EMAIL, SampleDataService.TEST_ORG_USER_EMAIL })
         {
             var user = await _userRepository.GetByEmailAddressAsync(email);
             Assert.NotNull(user);
             user.AddOAuthAccount("github", "duplicate-subject", user.EmailAddress);
             await _userRepository.SaveAsync(user, o => o.ImmediateConsistency());
         }
-        await Assert.ThrowsAsync<UnauthorizedAccessException>(() => _userRepository.GetUserByOAuthProviderAsync("github", "duplicate-subject"));
+
+        // Act
+        var exception = await Record.ExceptionAsync(async () =>
+        {
+            _ = await _userRepository.GetUserByOAuthProviderAsync("github", "duplicate-subject");
+        });
+
+        // Assert
+        Assert.IsType<UnauthorizedAccessException>(exception);
     }
 
     private async Task AssertExternalLoginAsync(TokenResult? result, string providerName, string providerUserId)

tests/http/users.http

@@ -2,8 +2,6 @@
 @email = admin@exceptionless.test
 @password = tester
 
-# External sign-in returns 401 when the account is unavailable. Existing provider links identify their exact provider and subject.
-
 ### login to test account
 # @name login
 POST {{apiUrl}}/auth/login