Merge pull request #87 from Tynab/develop

remote ecommerce
Tynab · Feb 3, 2024 · 2414475 · 2414475
2 parents 2b9b33c + c7f2b07
commit 2414475
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 13 deletions.
diff --git a/src/YANLib.Application.Contracts/Responses/CertificateResponse.cs b/src/YANLib.Application.Contracts/Responses/CertificateResponse.cs
@@ -5,9 +5,14 @@ namespace YANLib.Responses;
 public sealed record CertificateResponse
 {
     public string Id { get; set; }
+
     public string Name { get; set; }
+
     public double? GPA { get; set; }
+
     public string DeveloperId { get; set; }
+
     public DateTime CreatedAt { get; set; }
+
     public DateTime? UpdatedAt { get; set; }
 }
diff --git a/src/YANLib.Application.Contracts/Responses/DeveloperResponse.cs b/src/YANLib.Application.Contracts/Responses/DeveloperResponse.cs
@@ -6,13 +6,22 @@ namespace YANLib.Responses;
 public sealed record DeveloperResponse
 {
     public string Id { get; set; }
+
     public string Name { get; set; }
+
     public string Phone { get; set; }
+
     public string IdCard { get; set; }
+
     public bool IsActive { get; set; }
+
     public int Version { get; set; }
+
     public DateTime CreatedAt { get; set; }
+
     public DateTime? UpdatedAt { get; set; }
+
     public DeveloperTypeResponse DeveloperType { get; set; }
+
     public List<CertificateResponse> Certificates { get; set; }
 }
diff --git a/src/YANLib.Application.Contracts/Responses/DeveloperTypeResponse.cs b/src/YANLib.Application.Contracts/Responses/DeveloperTypeResponse.cs
@@ -5,8 +5,12 @@ namespace YANLib.Responses;
 public sealed record DeveloperTypeResponse
 {
     public int Code { get; set; }
+
     public string Name { get; set; }
+
     public bool IsActive { get; set; }
+
     public DateTime CreatedAt { get; set; }
+
     public DateTime? UpdatedAt { get; set; }
 }
diff --git a/src/YANLib.Application.Contracts/Services/IEcommerceService.cs b/src/YANLib.Application.Contracts/Services/IEcommerceService.cs
@@ -6,7 +6,7 @@ namespace YANLib.Services;
 
 public interface IEcommerceService : IApplicationService
 {
-    public ValueTask<string> GetAccessToken(EcommerceLoginRequest request);
+    public ValueTask<object> GetAccessToken(EcommerceLoginRequest request);
 
-    public ValueTask<string> GetRefreshToken(string accessToken);
+    public ValueTask<object> GetRefreshToken(string accessToken);
 }
diff --git a/src/YANLib.Application/RemoteService/RemoteService.cs b/src/YANLib.Application/RemoteService/RemoteService.cs
@@ -32,16 +32,21 @@ public async ValueTask<T> InvokeApi<T>(string remoteRoot, string path, Method me
             if (headers.IsNotEmptyAndNull())
             {
                 headers.ForEach(x => req.AddHeader(x.Key, x.Value));
+
+                if (jsonInput.IsNotWhiteSpaceAndNull())
+                {
+                    _ = req.AddParameter(headers["Content-Type"], jsonInput, RequestBody);
+                }
             }
             else
             {
                 _ = req.AddHeader("Accept", "*/*");
                 _ = req.AddHeader("Content-Type", "application/json");
-            }
 
-            if (jsonInput.IsNotWhiteSpaceAndNull())
-            {
-                _ = req.AddParameter("application/json", jsonInput, RequestBody);
+                if (jsonInput.IsNotWhiteSpaceAndNull())
+                {
+                    _ = req.AddParameter("application/json", jsonInput, RequestBody);
+                }
             }
 
             if (queryParams.IsNotEmptyAndNull())

diff --git a/src/YANLib.Application/Services/EcommerceService.cs b/src/YANLib.Application/Services/EcommerceService.cs
@@ -19,18 +19,17 @@ IRemoteService remoteService
     private readonly ILogger<EcommerceService> _logger = logger;
     private readonly IRemoteService _remoteService = remoteService;
 
-    public async ValueTask<string> GetAccessToken(EcommerceLoginRequest request)
+    public async ValueTask<object> GetAccessToken(EcommerceLoginRequest request)
     {
         var json = request.Serialize();
 
         try
         {
-            var hdrs = new Dictionary<string, string>
+            return await _remoteService.InvokeApi<object>(EcommerceApi, Login, Post, headers: new Dictionary<string, string>
             {
                 { "Accept", "*/*" },
                 { "Content-Type", "application/x-www-form-urlencoded" }
-            };
-            return await _remoteService.InvokeApi<string>(EcommerceApi, Login, Post, jsonInput: json);
+            }, queryParams: request.Serialize().Deserialize<Dictionary<string, object>>());
         }
         catch (Exception ex)
         {
@@ -40,11 +39,11 @@ public async ValueTask<string> GetAccessToken(EcommerceLoginRequest request)
         }
     }
 
-    public async ValueTask<string> GetRefreshToken(string accessToken)
+    public async ValueTask<object> GetRefreshToken(string accessToken)
     {
         try
         {
-            return await _remoteService.InvokeApi<string>(EcommerceApi, Refresh, Get, new Dictionary<string, string>
+            return await _remoteService.InvokeApi<object>(EcommerceApi, TokenRefresh, Get, new Dictionary<string, string>
             {
                 { "Authorization", $"Bearer {accessToken}" }
             });

diff --git a/src/YANLib.Domain/YANLibConsts.cs b/src/YANLib.Domain/YANLibConsts.cs
@@ -50,7 +50,7 @@ public readonly struct RemoteService
         public readonly struct Path
         {
             public const string Login = "login";
-            public const string Refresh = "refresh";
+            public const string TokenRefresh = "token/refresh";
         }
     }
 }