Merge pull request #59 from EasyAbp/fix-login

Add the `Scope` login input and rename the claim from `appid` to `wechat_appid`
EasyAbp · Dec 3, 2022 · 8c66b73 · 8c66b73
2 parents fdfecb8 + 83c907e
commit 8c66b73
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.4.3</Version>
+    <Version>1.5.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...rams.Application.Contracts/EasyAbp/WeChatManagement/MiniPrograms/Login/Dtos/LoginInput.cs b/...rams.Application.Contracts/EasyAbp/WeChatManagement/MiniPrograms/Login/Dtos/LoginInput.cs
@@ -23,5 +23,7 @@ public class LoginInput
         /// 查找并使用最近一次登录的租户登录（忽略当前租户环境）
         /// </summary>
         public bool LookupUseRecentlyTenant { get; set; }
+
+        public string Scope { get; set; }
     }
 }
diff --git a/...ms.Application.Contracts/EasyAbp/WeChatManagement/MiniPrograms/Login/Dtos/PcLoginInput.cs b/...ms.Application.Contracts/EasyAbp/WeChatManagement/MiniPrograms/Login/Dtos/PcLoginInput.cs
@@ -8,5 +8,7 @@ public class PcLoginInput
     {
         [Required]
         public string Token { get; set; }
+
+        public string Scope { get; set; }
     }
 }
diff --git a/...t.MiniPrograms.Application/EasyAbp/WeChatManagement/MiniPrograms/Login/LoginAppService.cs b/...t.MiniPrograms.Application/EasyAbp/WeChatManagement/MiniPrograms/Login/LoginAppService.cs
@@ -170,7 +170,7 @@ public virtual async Task<LoginOutput> LoginAsync(LoginInput input)
             }
 
             var response = await RequestAuthServerLoginAsync(input.AppId, loginResult.UnionId,
-                loginResult.Code2SessionResponse.OpenId);
+                loginResult.Code2SessionResponse.OpenId, input.Scope);
 
             if (response.IsError)
             {
@@ -341,7 +341,7 @@ protected virtual async Task TryRemoveUserInfoAsync(IdentityUser identityUser)
             }
         }
 
-        protected virtual async Task<TokenResponse> RequestAuthServerLoginAsync(string appId, string unionId, string openId)
+        protected virtual async Task<TokenResponse> RequestAuthServerLoginAsync(string appId, string unionId, string openId, string scope)
         {
             var client = _httpClientFactory.CreateClient(WeChatMiniProgramConsts.AuthServerHttpClientName);
 
@@ -358,6 +358,7 @@ protected virtual async Task<TokenResponse> RequestAuthServerLoginAsync(string a
                     {"appid", appId},
                     {"unionid", unionId},
                     {"openid", openId},
+                    {"scope", scope},
                 }
             };
 
@@ -497,7 +498,7 @@ public virtual async Task<PcLoginRequestTokensOutput> PcLoginRequestTokensAsync(
             await _pcLoginAuthorizationCache.RemoveAsync(input.Token);
 
             var response = await RequestAuthServerLoginAsync(cacheItem.AppId, cacheItem.UnionId,
-                cacheItem.OpenId);
+                cacheItem.OpenId, input.Scope);
 
             if (response.IsError)
             {

diff --git a/...syAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainOpenIddictModule.cs b/...syAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainOpenIddictModule.cs
@@ -20,6 +20,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
             builder.Configure(openIddictServerOptions =>
             {
                 openIddictServerOptions.GrantTypes.Add(WeChatMiniProgramConsts.GrantType);
+                openIddictServerOptions.Claims.Add(WeChatMiniProgramConsts.AppIdClaim);
             });
         });
     }
@@ -28,8 +29,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
     {
         context.Services.Configure<AbpOpenIddictExtensionGrantsOptions>(options =>
         {
-            options.Grants.Add(WeChatMiniProgramConsts.GrantType,
-                new WeChatMiniProgramTokenExtensionGrant());
+            options.Grants.Add(WeChatMiniProgramConsts.GrantType, new WeChatMiniProgramTokenExtensionGrant());
         });
     }
 }
diff --git a/....OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs b/....OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs
@@ -94,7 +94,7 @@ public virtual async Task<IActionResult> HandleAsync(ExtensionGrantContext conte
 
             principal.SetScopes(context.Request.GetScopes());
             principal.SetResources(await GetResourcesAsync(context.Request.GetScopes(), scopeManager));
-            principal.SetClaim("appid", appId); // 记录 appid
+            principal.SetClaim(WeChatMiniProgramConsts.AppIdClaim, appId); // 记录 appid
 
             await openIddictClaimDestinationsManager.SetAsync(principal);
 

diff --git a/...ment.MiniPrograms.Domain/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramConsts.cs b/...ment.MiniPrograms.Domain/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramConsts.cs
@@ -5,5 +5,7 @@ public class WeChatMiniProgramConsts
         public const string GrantType = "WeChatMiniProgram_credentials";
 
         public const string AuthServerHttpClientName = "EasyAbpWeChatMagementMiniProgram";
+
+        public const string AppIdClaim = "wechat_appid";
     }
 }
diff --git a/...syAbp.WeChatManagement.MiniPrograms.Application.Tests/MiniPrograms/FakeLoginAppService.cs b/...syAbp.WeChatManagement.MiniPrograms.Application.Tests/MiniPrograms/FakeLoginAppService.cs
@@ -39,7 +39,8 @@ public class FakeLoginAppService : LoginAppService
     {
     }
 
-    protected override Task<TokenResponse> RequestAuthServerLoginAsync(string appId, string unionId, string openId)
+    protected override Task<TokenResponse> RequestAuthServerLoginAsync(
+        string appId, string unionId, string openId, string scope)
     {
         return Task.FromResult(new TokenResponse());
     }