fix: resolve integration test issues

Author: jeastham1993

user-management/src/Stickerlandia.UserManagement.Agnostic/MicrsoftIdentityAuthService.cs

@@ -20,7 +20,6 @@ public class MicrosoftIdentityAuthService(
     IOpenIddictApplicationManager applicationManager,
     IOpenIddictScopeManager scopeManager,
     UserManagementDbContext dbContext,
-    SignInManager<PostgresUserAccount> signInManager,
     UserManager<PostgresUserAccount> userManager) : IAuthService
 {
     public async Task<ClaimsIdentity?> VerifyClient(string clientId)
@@ -56,34 +55,15 @@ OpenIddictConstants.Claims.Name when claim.Subject.HasScope(OpenIddictConstants.
     {
         var identity = new ClaimsIdentity(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme,
             OpenIddictConstants.Claims.Name, OpenIddictConstants.Claims.Role);
-        PostgresUserAccount? user = await userManager.FindByEmailAsync(username);
+        var user = await userManager.FindByEmailAsync(username);
         AuthenticationProperties properties = new();
 
         if (user == null)
             return null;
 
-        // Check that the user can sign in and is not locked out.
-        // If two-factor authentication is supported, it would also be appropriate to check that 2FA is enabled for the user
-        if (!await signInManager.CanSignInAsync(user) ||
-            (userManager.SupportsUserLockout && await userManager.IsLockedOutAsync(user)))
-            // Return bad request is the user can't sign in
-            return null;
-
         // Validate the username/password parameters and ensure the account is not locked out.
-        var result = await signInManager.CheckPasswordSignInAsync(user, password, false);
-        if (!result.Succeeded)
-        {
-            if (result.IsNotAllowed)
-                return null;
-
-            if (result.RequiresTwoFactor)
-                return null;
-
-            if (result.IsLockedOut)
-                return null;
-            else
-                return null;
-        }
+        var result = await userManager.CheckPasswordAsync(user, password);
+        if (!result) return null;
 
         // The user is now validated, so reset lockout counts, if necessary
         if (userManager.SupportsUserLockout) await userManager.ResetAccessFailedCountAsync(user);
@@ -95,6 +75,7 @@ OpenIddictConstants.Claims.Name when claim.Subject.HasScope(OpenIddictConstants.
         identity.SetResources(resources);
 
         // Add Custom claims
+        identity.AddClaim(new Claim(OpenIddictConstants.Claims.Name, user.Id));
         identity.AddClaim(new Claim(OpenIddictConstants.Claims.Subject, user.Id));
         identity.AddClaim(new Claim(OpenIddictConstants.Claims.Audience, "Resource"));
         identity.AddClaim(new Claim(OpenIddictConstants.Claims.Email, user.Email));

user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs

@@ -69,7 +69,7 @@ public static IServiceCollection AddPostgresAuthServices(this IServiceCollection
             options.UseOpenIddict();
         });
 
-        services.AddIdentity<PostgresUserAccount, IdentityRole>()
+        services.AddIdentityCore<PostgresUserAccount>()
             .AddEntityFrameworkStores<UserManagementDbContext>()
             .AddDefaultTokenProviders();
 

user-management/src/Stickerlandia.UserManagement.AspNet/ApiResponse.cs

@@ -40,6 +40,7 @@ public ApiResponse(bool isSuccess, T body, string message, HttpStatusCode status
     internal async Task<HttpResponseData> WriteResponse(HttpRequestData req)
     {
         var response = req.CreateResponse(StatusCode);
+        response.StatusCode = StatusCode;
         await response.WriteAsJsonAsync(this);
         return response;
     }

user-management/src/Stickerlandia.UserManagement.AspNet/GetUserDetailsEndpoint.cs

@@ -14,7 +14,7 @@ public static class GetUserDetails
         [FromServices] IAuthService authService,
         [FromServices] GetUserDetailsQueryHandler handler)
     {
-        if (user.Identity?.Name == null)
+        if (user.Identity.Name == null)
         {
             return new ApiResponse<UserAccountDTO?>(false, null, "User not authenticated", HttpStatusCode.Unauthorized);
         }

user-management/src/Stickerlandia.UserManagement.AspNet/Program.cs

@@ -82,11 +82,9 @@
     });
 });
 builder.Services.AddEndpointsApiExplorer();
-// Add response compression for improved performance
 builder.Services.AddResponseCompression(options => { options.EnableForHttps = true; });
 
 builder.Services.AddHostedService<OutboxWorker>();
-//builder.Services.AddHostedService<StickerClaimedWorker>();
 
 builder.Services.AddControllers();
 builder.Services.AddCors(options =>
@@ -124,8 +122,6 @@
     .UseAuthentication()
     .UseAuthorization();
 
-app.MapControllers();
-
 var api = app.NewVersionedApi("api");
 var v1ApiEndpoints = api.MapGroup("api/users/v{version:apiVersion}")
     .HasApiVersion(1.0);

user-management/src/Stickerlandia.UserManagement.Auth/AuthServiceExtensions.cs

@@ -47,9 +47,7 @@ public static IServiceCollection AddCoreAuthentication(this IServiceCollection s
 
                 // Register the ASP.NET Core host and configure the ASP.NET Core options.
                 options.UseAspNetCore()
-                    .EnableAuthorizationEndpointPassthrough()
-                    .EnableTokenEndpointPassthrough()
-                    .EnableEndSessionEndpointPassthrough();
+                    .EnableTokenEndpointPassthrough();
 
                 options.AddEventHandler<OpenIddictServerEvents.HandleUserInfoRequestContext>(options => options.UseInlineHandler(context =>
                 {

user-management/src/Stickerlandia.UserManagement.Auth/DynamoDbIdentityAuthService.cs

@@ -23,7 +23,6 @@ namespace Stickerlandia.UserManagement.Auth;
 /// DynamoDB-specific implementation of IAuthService using AWS DynamoDB for persistence
 /// </summary>
 public class DynamoDbIdentityAuthService(
-    SignInManager<IdentityUser> signInManager,
     UserManager<IdentityUser> userManager,
     IOpenIddictApplicationManager applicationManager,
     ILogger<DynamoDbIdentityAuthService> logger,
@@ -74,29 +73,9 @@ OpenIddictConstants.Claims.Name when claim.Subject.HasScope(OpenIddictConstants.
         if (user == null)
             return null;
 
-        // Check that the user can sign in and is not locked out.
-        // If two-factor authentication is supported, it would also be appropriate to check that 2FA is enabled for the user
-        if (!await signInManager.CanSignInAsync(user) ||
-            (userManager.SupportsUserLockout && await userManager.IsLockedOutAsync(user)))
-            // Return bad request is the user can't sign in
-            return null;
-
         // Validate the username/password parameters and ensure the account is not locked out.
-        var result = await signInManager.PasswordSignInAsync(user.UserName, password, false,
-            false);
-        if (!result.Succeeded)
-        {
-            if (result.IsNotAllowed)
-                return null;
-
-            if (result.RequiresTwoFactor)
-                return null;
-
-            if (result.IsLockedOut)
-                return null;
-            else
-                return null;
-        }
+        var result = await userManager.CheckPasswordAsync(user, password);
+        if (!result) return null;
 
         // The user is now validated, so reset lockout counts, if necessary
         if (userManager.SupportsUserLockout) await userManager.ResetAccessFailedCountAsync(user);

user-management/src/Stickerlandia.UserManagement.Auth/DynamoDbServiceExtensions.cs

@@ -42,7 +42,7 @@ public static IServiceCollection AddDynamoDbAuthServices(this IServiceCollection
         services.AddSingleton<IOpenIddictScopeStore<DynamoDbScope>, DynamoDbScopeStore>();
 
         // Configure Identity with DynamoDB stores
-        services.AddIdentity<IdentityUser, IdentityRole>(options =>
+        services.AddIdentityCore<IdentityUser>(options =>
         {
             options.ClaimsIdentity.UserNameClaimType = OpenIddictConstants.Claims.Name;
             options.ClaimsIdentity.UserIdClaimType = OpenIddictConstants.Claims.Subject;

user-management/tests/Stickerlandia.UserManagement.IntegrationTest/Drivers/AccountDriver.cs

@@ -70,8 +70,8 @@ public AccountDriver(ITestOutputHelper testOutputHelper, HttpClient httpClient,
             new("grant_type", "password"),
             new("username", emailAddress),
             new("password", password),
-            new("client_id", "user-authentication"), // Replace with your client_id
-            new("client_secret", "388D45FA-B36B-4988-BA59-B187D329C207") // Replace with your client_secret
+            new("client_id", "user-authentication"),
+            new("client_secret", "388D45FA-B36B-4988-BA59-B187D329C207")
         };
 
         var requestContent = new FormUrlEncodedContent(requestBody);

user-management/tests/Stickerlandia.UserManagement.IntegrationTest/Hooks/TestSetupFixture.cs

@@ -50,7 +50,7 @@ public TestSetupFixture()
 
             var messagingConnectionString = App.GetConnectionStringAsync("messaging").GetAwaiter().GetResult();
 
-            HttpClient = App.CreateHttpClient("api");
+            HttpClient = App.CreateHttpClient("api", "https");
             Messaging = MessagingProviderFactory.From(drivenAdapter, messagingConnectionString);
         }
         else