Merge pull request #880 from colinin/fix-identity-server-case-issues

fix(identity-server): fix case issues

aspnet-core/NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
     <packageSources>
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="LocalNuget" value="./LocalNuget" />
+        <!--<add key="LocalNuget" value="./LocalNuget" />-->
     </packageSources>
 </configuration>

aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Work.Application.Contracts/LINGYUN/Abp/WeChat/Work/Authorize/IWeChatWorkAuthorizeAppService.cs

@@ -11,7 +11,6 @@ public interface IWeChatWorkAuthorizeAppService : IApplicationService
         string scope = "snsapi_base");
 
     Task<string> GenerateOAuth2LoginAsync(
-        string appid,
         string redirectUri,
         string loginType = "ServiceApp",
         string agentid = "");

aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Work.Application/LINGYUN/Abp/WeChat/Work/Authorize/WeChatWorkAuthorizeAppService.cs

@@ -1,4 +1,6 @@
-using System;
+using LINGYUN.Abp.WeChat.Work.Settings;
+using System;
+using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Volo.Abp;
@@ -25,13 +27,17 @@ public class WeChatWorkAuthorizeAppService : ApplicationService, IWeChatWorkAuth
     {
         var state = _encryptionService.Encrypt($"agentid={agentid}&redirectUri={redirectUri}&responseType={responseType}&scope={scope}&random={Guid.NewGuid():D}").ToMd5();
 
-        return await _authorizeGenerator.GenerateOAuth2AuthorizeAsync(agentid, HttpUtility.UrlEncode(redirectUri), state, responseType, scope);
+        return await _authorizeGenerator.GenerateOAuth2AuthorizeAsync(agentid, HttpUtility.UrlEncode(redirectUri, Encoding.UTF8), state, responseType, scope);
     }
 
-    public async virtual Task<string> GenerateOAuth2LoginAsync(string appid, string redirectUri, string loginType = "ServiceApp", string agentid = "")
+    public async virtual Task<string> GenerateOAuth2LoginAsync(string redirectUri, string loginType = "ServiceApp", string agentid = "")
     {
         var state = _encryptionService.Encrypt($"agentid={agentid}&redirectUri={redirectUri}&loginType={loginType}&agentid={agentid}&random={Guid.NewGuid():D}").ToMd5();
 
-        return await _authorizeGenerator.GenerateOAuth2LoginAsync(agentid, HttpUtility.UrlEncode(redirectUri), state, loginType, agentid);
+        var corpId = await SettingProvider.GetOrNullAsync(WeChatWorkSettingNames.Connection.CorpId);
+
+        Check.NotNullOrEmpty(corpId, nameof(corpId));
+
+        return await _authorizeGenerator.GenerateOAuth2LoginAsync(corpId, HttpUtility.UrlEncode(redirectUri, Encoding.UTF8), state, loginType, agentid);
     }
 }

aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Work.HttpApi/LINGYUN/Abp/WeChat/Work/Authorize/WeChatWorkAuthorizeController.cs

@@ -2,13 +2,15 @@
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Auditing;
 
 namespace LINGYUN.Abp.WeChat.Work.Authorize;
 
-[Controller]
+[DisableAuditing]
-[RemoteService(Name = AbpWeChatWorkRemoteServiceConsts.RemoteServiceName)]
+[RemoteService(false)]
-[Area(AbpWeChatWorkRemoteServiceConsts.ModuleName)]
+[ApiExplorerSettings(IgnoreApi = true)]
 [Route("api/wechat/work/authorize")]
+[Area(AbpWeChatWorkRemoteServiceConsts.ModuleName)]
 public class WeChatWorkAuthorizeController : AbpControllerBase, IWeChatWorkAuthorizeAppService
 {
     private readonly IWeChatWorkAuthorizeAppService _service;
@@ -32,11 +34,10 @@ public class WeChatWorkAuthorizeController : AbpControllerBase, IWeChatWorkAutho
     [HttpGet]
     [Route("oauth2/login")]
     public virtual Task<string> GenerateOAuth2LoginAsync(
-        [FromQuery] string appid,
         [FromQuery(Name = "redirect_uri")] string redirectUri,
         [FromQuery(Name = "login_type")] string loginType = "ServiceApp",
         [FromQuery(Name = "agent_id")] string agentid = "")
     {
-        return _service.GenerateOAuth2LoginAsync(agentid, redirectUri, loginType, agentid);
+        return _service.GenerateOAuth2LoginAsync(redirectUri, loginType, agentid);
     }
 }

aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile → aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Dockerfile

@@ -11,4 +11,4 @@ EXPOSE 80/tcp
 VOLUME [ "./app/Logs" ]
 VOLUME [ "./app/Modules" ]
 
-ENTRYPOINT ["dotnet", "LY.MicroService.identityServer.HttpApi.Host.dll"]
+ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.HttpApi.Host.dll"]