Move Wechat tests to Weixin

Move the Wechat-specific tests to the WeixinTests class to match the way the rest of the test project is organised.

Author: martincostello

test/AspNet.Security.OAuth.Providers.Tests/Wechat/WechatTests.cs

@@ -44,6 +44,67 @@ public async Task Can_Sign_In_Using_Weixin(string claimType, string claimValue)
         AssertClaim(claims, claimType, claimValue);
     }
 
+    [Theory]
+    [InlineData(ClaimTypes.NameIdentifier, "my-id")]
+    [InlineData(ClaimTypes.Name, "John Smith")]
+    [InlineData(ClaimTypes.Gender, "Male")]
+    [InlineData(ClaimTypes.Country, "CN")]
+    [InlineData("urn:weixin:city", "Beijing")]
+    [InlineData("urn:weixin:headimgurl", "https://weixin.qq.local/image.png")]
+    [InlineData("urn:weixin:openid", "my-open-id")]
+    [InlineData("urn:weixin:privilege", "a,b,c")]
+    [InlineData("urn:weixin:province", "Hebei")]
+    public async Task Can_Sign_In_Using_Wechat(string claimType, string claimValue)
+    {
+        // Arrange
+        static void ConfigureServices(IServiceCollection services)
+        {
+            services.PostConfigureAll<WeixinAuthenticationOptions>((options) =>
+            {
+                options.AuthorizationEndpoint = "https://open.weixin.qq.com/connect/oauth2/authorize";
+            });
+        }
+
+        using var server = CreateTestServer(ConfigureServices);
+
+        // Act
+        var claims = await AuthenticateUserAsync(server);
+
+        // Assert
+        AssertClaim(claims, claimType, claimValue);
+    }
+
+    [Theory]
+    [InlineData(ClaimTypes.NameIdentifier, "my-open-id")]
+    [InlineData(ClaimTypes.Name, "John Smith")]
+    [InlineData(ClaimTypes.Gender, "Male")]
+    [InlineData(ClaimTypes.Country, "CN")]
+    [InlineData("urn:weixin:city", "Beijing")]
+    [InlineData("urn:weixin:headimgurl", "https://weixin.qq.local/image.png")]
+    [InlineData("urn:weixin:openid", "my-open-id")]
+    [InlineData("urn:weixin:privilege", "a,b,c")]
+    [InlineData("urn:weixin:province", "Hebei")]
+    public async Task Can_Sign_In_Using_Weixin_With_No_Union_Id(string claimType, string claimValue)
+    {
+        // Arrange
+        static void ConfigureServices(IServiceCollection services)
+        {
+            services.PostConfigureAll<WeixinAuthenticationOptions>((options) =>
+            {
+                options.AuthorizationEndpoint = "https://open.weixin.qq.com/connect/oauth2/authorize";
+                options.UserInformationEndpoint = "https://api.weixin.qq.com/sns/userinfo/nounionid";
+            });
+        }
+
+        using var server = CreateTestServer(ConfigureServices);
+
+        // Act
+        var claims = await AuthenticateUserAsync(server);
+
+        // Assert
+        AssertClaim(claims, claimType, claimValue);
+    }
+
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
@@ -55,7 +116,7 @@ public async Task BuildChallengeUrl_Generates_Correct_Url(bool usePkce)
             UsePkce = usePkce,
         };
 
-        string redirectUrl = "https://my-site.local/signin-weixin";
+        var redirectUrl = "https://my-site.local/signin-weixin";
 
         // Act
         Uri actual = await BuildChallengeUriAsync(

test/AspNet.Security.OAuth.Providers.Tests/Wechat/bundle.json

@@ -30,6 +30,25 @@
           "c"
         ]
       }
+    },
+    {
+      "uri": "https://api.weixin.qq.com/sns/userinfo/nounionid?access_token=secret-access-token&openid=my-open-id",
+      "contentFormat": "json",
+      "contentJson": {
+        "unionid": "",
+        "nickname": "John Smith",
+        "sex": "Male",
+        "country": "CN",
+        "openid": "my-open-id",
+        "province": "Hebei",
+        "city": "Beijing",
+        "headimgurl": "https://weixin.qq.local/image.png",
+        "privilege": [
+          "a",
+          "b",
+          "c"
+        ]
+      }
     }
   ]
 }