add qq oauth

Author: Meowv

src/Meowv.Blog.Api/appsettings.yml

@@ -72,7 +72,7 @@ authorize:
     redirectUrl: 'https://admin.meowv.com/oauth/weibo'
     scope: 'all'
   qq:
-    clientId: '101931838'
+    clientId: '101935194'
     clientSecret: ''
-    redirectUrl: 'https://api.meowv.com/api/meowv/oauth/qq/token'
+    redirectUrl: 'https://admin.meowv.com/oauth/qq'
     scope: 'get_user_info'

src/Meowv.Blog.Application/Authorize/OAuth/Impl/OAuthQQService.cs

@@ -24,13 +24,13 @@ public override async Task<User> GetUserByOAuthAsync(string type, string code, s
             var accessToken = await GetAccessTokenAsync(code, state);
             var userInfo = await GetUserInfoAsync(accessToken);
 
-            return await UserService.CreateUserAsync(userInfo.Email, type, userInfo.Id, userInfo.Name, userInfo.Avatar, userInfo.Email);
+            return await UserService.CreateUserAsync(userInfo.Name, type, userInfo.Id, userInfo.Name, userInfo.Avatar, userInfo.Email);
         }
 
         public override async Task<AccessTokenBase> GetAccessTokenAsync(string code, string state)
         {
             var param = BuildAccessTokenParams(code, state);
-            Options.Value.AccessTokenUrl = $"{Options.Value.AccessTokenUrl}?{param.ToQueryStringWithEncode()}";
+            Options.Value.AccessTokenUrl = $"{Options.Value.AccessTokenUrl}?{param.ToQueryString()}";
 
             using var client = HttpClient.CreateClient();
             var response = await client.GetStringAsync(Options.Value.AccessTokenUrl);
@@ -47,12 +47,17 @@ public override async Task<QQUserInfo> GetUserInfoAsync(AccessTokenBase accessTo
         {
             using var client = HttpClient.CreateClient();
 
-            var openIdResponse = await client.GetStringAsync($"{Options.Value.OpenIdUrl}?access_token={accessToken.AccessToken}");
-          
+            var openIdResponse = await client.GetStringAsync($"{Options.Value.OpenIdUrl}?access_token={accessToken.AccessToken}&fmt=json");
+            var openId = openIdResponse.DeserializeToObject<QQOpenId>().OpenId;
+
+            var param = BuildUserInfoParams(accessToken.AccessToken, openId);
+            Options.Value.UserInfoUrl = $"{Options.Value.UserInfoUrl}?{param.ToQueryString()}";
 
             var response = await client.GetStringAsync(Options.Value.UserInfoUrl);
 
             var userInfo = response.DeserializeToObject<QQUserInfo>();
+            userInfo.Id = openId;
+            
             return userInfo;
         }
 
@@ -80,5 +85,15 @@ protected Dictionary<string, string> BuildAccessTokenParams(string code, string
                 ["state"] = state
             };
         }
+
+        protected Dictionary<string, string> BuildUserInfoParams(string accessToken, string openId)
+        {
+            return new Dictionary<string, string>()
+            {
+                ["access_token"] = accessToken,
+                ["oauth_consumer_key"] = Options.Value.ClientId,
+                ["openid"] = openId,
+            };
+        }
     }
 }

src/Meowv.Blog.Response/Dto/Authorize/QQUserInfo.cs

@@ -1,6 +1,23 @@
-namespace Meowv.Blog.Dto.Authorize
+using Newtonsoft.Json;
+
+namespace Meowv.Blog.Dto.Authorize
 {
-    public class QQUserInfo : UserInfoBase
+    public class QQUserInfo
     {
+        public string Id { get; set; }
+
+        [JsonProperty("nickname")]
+        public string Name { get; set; }
+
+        [JsonProperty("figureurl_qq")]
+        public string Avatar { get; set; }
+
+        public string Email { get; set; } = "";
+    }
+
+    public class QQOpenId
+    {
+        [JsonProperty("openid")]
+        public string OpenId { get; set; }
     }
 }