test(EtsyProvider): Update tests accordingly to review suggestions and code changes in Etsy Provider

Author: DevTKSS

test/AspNet.Security.OAuth.Providers.Tests/Etsy/EtsyAuthenticationOptionsTests.cs

@@ -24,89 +24,83 @@ public static void Validate_Does_Not_Throw_If_ClientSecret_Is_Not_Provided(strin
         options.Validate();
     }
 
-    [Theory]
-    [InlineData(true, false)]
-    [InlineData(false, false)]
-    [InlineData(false, true)]
-    public static void Validate_Throws_If_SaveTokens_Or_Pkce_Is_Disabled(bool usePkce, bool saveTokens)
+    [Fact]
+    public static void Validate_Does_Throw_If_Scope_Does_Not_Contain_Scope_shop_r()
     {
         // Arrange
         var options = new EtsyAuthenticationOptions()
         {
             ClientId = "my-client-id",
             ClientSecret = "my-client-secret",
-            SaveTokens = saveTokens,
-            UsePkce = usePkce,
         };
+        options.Scope.Clear();
+        options.Scope.Add(EtsyAuthenticationConstants.Scopes.EmailRead);
 
-        // Act and Assert
-        _ = Assert.Throws<ArgumentException>(options.Validate);
+        // Act
+        _ = Assert.Throws<ArgumentOutOfRangeException>(options.Validate);
     }
 
     [Fact]
-    public static void Validate_Throws_If_Scope_Is_Empty()
+    public static void Validate_Does_Not_Throw_When_IncludeDetailedUserInfo_Is_False_And_Contains_Scope_email_r()
     {
         // Arrange
         var options = new EtsyAuthenticationOptions()
         {
             ClientId = "my-client-id",
             ClientSecret = "my-client-secret",
-            Scope = { },
+            IncludeDetailedUserInfo = false,
         };
 
-        // Act and Assert
-        _ = Assert.Throws<ArgumentOutOfRangeException>(options.Validate);
+        // Adding email scope should be harmless when IncludeDetailedUserInfo is false
+        options.Scope.Add(EtsyAuthenticationConstants.Scopes.EmailRead);
+
+        // Act (no Assert)
+        options.Validate();
     }
 
     [Fact]
-    public static void Validate_Throws_If_Scope_Does_Not_Contain_Scope_shop_r()
+    public static void Validate_Throws_If_AuthorizationEndpoint_Is_Null()
     {
         // Arrange
         var options = new EtsyAuthenticationOptions()
         {
+            AuthorizationEndpoint = null!,
             ClientId = "my-client-id",
             ClientSecret = "my-client-secret",
         };
-        options.Scope.Clear();
-        options.Scope.Add(ClaimTypes.Email);
 
         // Act and Assert
-        _ = Assert.Throws<ArgumentOutOfRangeException>(options.Validate);
+        _ = Assert.Throws<ArgumentNullException>(nameof(options.AuthorizationEndpoint), options.Validate);
     }
 
     [Fact]
-    public static void Validate_Throws_If_IncludeDetailedUserInfo_Is_True_But_Does_Not_Contain_Scope_email_r()
+    public static void Validate_Throws_If_TokenEndpoint_Is_Null()
     {
         // Arrange
         var options = new EtsyAuthenticationOptions()
         {
             ClientId = "my-client-id",
             ClientSecret = "my-client-secret",
-            IncludeDetailedUserInfo = true,
+            TokenEndpoint = null!,
         };
 
-        // Not Adding email scope, shop scope is already added by default
-
         // Act and Assert
-        _ = Assert.Throws<ArgumentOutOfRangeException>(options.Validate);
+        _ = Assert.Throws<ArgumentNullException>(nameof(options.TokenEndpoint), options.Validate);
     }
 
     [Fact]
-    public static void Validate_Does_Not_Throw_When_IncludeDetailedUserInfo_Is_False_And_Contains_Scope_email_r()
+    public static void Validate_Throws_If_UserInformationEndpoint_Is_Null()
     {
         // Arrange
         var options = new EtsyAuthenticationOptions()
         {
             ClientId = "my-client-id",
             ClientSecret = "my-client-secret",
-            IncludeDetailedUserInfo = false,
+            TokenEndpoint = null!,
         };
 
-        // Adding email scope
-        options.Scope.Add(ClaimTypes.Email);
-
-        // Act (no Assert)
-        options.Validate();
+        // Act and Assert
+        _ = Assert.Throws<ArgumentNullException>(nameof(options.UserInformationEndpoint), options.Validate);
     }
 
     [Fact]
@@ -121,6 +115,7 @@ public static void Validate_Throws_If_CallbackPath_Is_Null()
         };
 
         // Act and Assert
-        _ = Assert.Throws<ArgumentNullException>(nameof(EtsyAuthenticationOptions.CallbackPath), options.Validate);
+        var ex = Assert.Throws<ArgumentException>(options.Validate);
+        ex.ParamName.ShouldBe(nameof(options.CallbackPath));
     }
 }

test/AspNet.Security.OAuth.Providers.Tests/Etsy/EtsyTests.cs

@@ -5,6 +5,7 @@
  */
 
 using AspNet.Security.OAuth.Etsy;
+using static AspNet.Security.OAuth.Etsy.EtsyAuthenticationConstants;
 
 namespace AspNet.Security.OAuth.Providers.Tests.Etsy;
 
@@ -23,16 +24,8 @@ protected internal override void RegisterAuthentication(AuthenticationBuilder bu
     }
 
     [Theory]
-    [InlineData(ClaimTypes.NameIdentifier, "789012")]
-    [InlineData(ClaimTypes.Email, "test@example.com")]
-    [InlineData(ClaimTypes.GivenName, "Test")]
-    [InlineData(ClaimTypes.Surname, "User")]
-    [InlineData("urn:etsy:user_id", "123456")]
-    [InlineData("urn:etsy:shop_id", "789012")]
-    [InlineData("urn:etsy:primary_email", "test@example.com")]
-    [InlineData("urn:etsy:first_name", "Test")]
-    [InlineData("urn:etsy:last_name", "User")]
-    [InlineData("urn:etsy:image_url", "https://i.etsystatic.com/test/test_75x75.jpg")]
+    [InlineData(ClaimTypes.NameIdentifier, "123456")]
+    [InlineData("shop_id", "789012")]
     public async Task Can_Sign_In_Using_Etsy(string claimType, string claimValue)
         => await AuthenticateUserAndAssertClaimValue(claimType, claimValue);
 
@@ -48,24 +41,28 @@ public async Task Does_Not_Include_Detailed_Claims_When_IncludeDetailedUserInfo_
         var claims = await AuthenticateUserAsync(server);
 
         // Assert basic claims are present
-        claims.ShouldContainKey("urn:etsy:user_id");
-        claims.ShouldContainKey("urn:etsy:shop_id");
+        claims.ShouldContainKey(ClaimTypes.NameIdentifier);
+        claims.ShouldContainKey(Claims.ShopId);
 
         // Detailed claims should be absent when flag is false
         claims.Keys.ShouldNotContain(ClaimTypes.Email);
         claims.Keys.ShouldNotContain(ClaimTypes.GivenName);
         claims.Keys.ShouldNotContain(ClaimTypes.Surname);
-        claims.Keys.ShouldNotContain("urn:etsy:primary_email");
-        claims.Keys.ShouldNotContain("urn:etsy:first_name");
-        claims.Keys.ShouldNotContain("urn:etsy:last_name");
-        claims.Keys.ShouldNotContain("urn:etsy:image_url");
+        claims.Keys.ShouldNotContain(Claims.ImageUrl);
     }
 
     [Fact]
     public async Task Includes_Detailed_Claims_When_IncludeDetailedUserInfo_Is_True()
     {
-        // Arrange: explicitly enable detailed user info enrichment (default may already be true, set explicitly for clarity)
-        void ConfigureServices(IServiceCollection services) => services.PostConfigureAll<EtsyAuthenticationOptions>(o => o.IncludeDetailedUserInfo = true);
+        // Arrange: enable detailed user info, configure claims to map.
+        // Note: email_r will be auto-added by the provider's post-configure step.
+        void ConfigureServices(IServiceCollection services) => services.PostConfigureAll<EtsyAuthenticationOptions>(o =>
+        {
+            o.IncludeDetailedUserInfo = true;
+
+            // User to include image claim
+            o.ClaimActions.MapImageClaim();
+        });
 
         using var server = CreateTestServer(ConfigureServices);
 
@@ -76,9 +73,6 @@ public async Task Includes_Detailed_Claims_When_IncludeDetailedUserInfo_Is_True(
         claims.ShouldContainKey(ClaimTypes.Email);
         claims.ShouldContainKey(ClaimTypes.GivenName);
         claims.ShouldContainKey(ClaimTypes.Surname);
-        claims.ShouldContainKey("urn:etsy:primary_email");
-        claims.ShouldContainKey("urn:etsy:first_name");
-        claims.ShouldContainKey("urn:etsy:last_name");
-        claims.ShouldContainKey("urn:etsy:image_url");
+        claims.ShouldContainKey(Claims.ImageUrl);
     }
 }