From 0c8be74969d35ea471d485d7e656ecdc80d455db Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sun, 23 Apr 2023 17:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0api/abp/application-configura?=
 =?UTF-8?q?tion=E7=9A=84api=E5=8C=85=E8=A3=85=EF=BC=9Aapi/auth/token/appli?=
 =?UTF-8?q?cation-configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TokenService.cs                           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
index c22fde641..56945a228 100644
--- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
+++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/TokenService.cs
@@ -1,9 +1,10 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using IdentityModel.Client;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -11,35 +12,31 @@ using Volo.Abp.Application.Services;
 
 namespace Win_in.Sfs.Auth.Tokens;
 
-[Route($"api/token")]
+[Route($"api")]
+[Authorize]
 public class TokenService : ApplicationService
 {
+    private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ILogger<TokenService> _logger;
     private readonly IConfiguration _configuration;
-    
 
-    public TokenService(IHttpClientFactory httpClientFactory, IConfiguration configuration, ILogger<TokenService> logger)
+    public TokenService(IHttpContextAccessor httpContextAccessor, IHttpClientFactory httpClientFactory, IConfiguration configuration, ILogger<TokenService> logger)
     {
+        this._httpContextAccessor = httpContextAccessor;
         this._httpClientFactory = httpClientFactory;
         this._configuration = configuration;
         this._logger = logger;
     }
 
-    [HttpPost]
+    [HttpPost("token")]
     [AllowAnonymous]
     public async Task<IActionResult> CreateAsync(LoginModel model)
     {
         var address = _configuration["AuthServer:Authority"];
-        var request = new DiscoveryDocumentRequest
-        {
-            Address = address,
-            Policy = new DiscoveryPolicy { RequireHttps = false }
-        };
-        var discovery = await _httpClientFactory.CreateClient().GetDiscoveryDocumentAsync(request).ConfigureAwait(false);
         var clientId = _configuration["AuthServer:ClientId"];
         var clientSecret = _configuration["AuthServer:ClientSecret"];
-        this._logger.LogInformation($"address:{address},TokenEndpoint:{discovery.TokenEndpoint},clientId:{clientId},clientSecret:{clientSecret}");
+
         var result = await _httpClientFactory.CreateClient().RequestPasswordTokenAsync(new PasswordTokenRequest
         {
             Address = $"{address.TrimEnd('/')}/connect/token",
@@ -49,11 +46,6 @@ public class TokenService : ApplicationService
             UserName = model.UserName,
             Password = model.Password
         }).ConfigureAwait(false);
-        Console.WriteLine($"Result:${(result.IsError ? result.ErrorDescription : result.AccessToken)}");
-        //if (result.RefreshToken == null)
-        //{
-        //    throw new UserFriendlyException("用户名或密码错误");
-        //}
 
         return new JsonResult(new
         {
@@ -72,18 +64,26 @@ public class TokenService : ApplicationService
         });
     }
 
-    [HttpGet("[action]")]
-    [AllowAnonymous]
-    public string Test()
+    [HttpGet("token/application-configuration")]
+    public async Task<IActionResult> ApplicationConfiguration()
     {
-        return "Test";
+        var address = _configuration["AuthServer:Authority"];
+        var url = $"{address.TrimEnd('/')}/api/abp/application-configuration";
+        var httpClient = _httpClientFactory.CreateClient();
+        var token = this._httpContextAccessor.HttpContext.Request.Headers.Authorization.ToString();
+        httpClient.DefaultRequestHeaders.Authorization = AuthenticationHeaderValue.Parse(token);
+        var response = await httpClient.GetAsync(url).ConfigureAwait(false);
+        var result = new ContentResult();
+        result.ContentType = "application/json";
+        result.Content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        return result;
     }
 
-    [HttpGet("/token/test")]
+    [HttpGet("token/test")]
     [AllowAnonymous]
-    public string Test1()
+    public string Test()
     {
-        return "Test";
+        return "test";
     }
 }