From 76fca6c2ead6615afc0d0486728dec2d39f28909 Mon Sep 17 00:00:00 2001
From: bounav <benjamin.fourmond@ip-house.com>
Date: Wed, 11 Dec 2024 12:03:34 +0000
Subject: [PATCH] Replaced log4net dependency with
 Microsoft.Extensions.Logging.Abstractions

- This will allow anyone consuming this the ebay oauth client to plug-in the logging framework of they might favour
---
 .../ApiClient/Auth/OAuth2/CredentialUtil.cs    | 11 +++++------
 .../eBay/ApiClient/Auth/OAuth2/OAuth2Api.cs    | 18 ++++++++++++------
 .../ebay-oauth-csharp-client.csproj            |  2 +-
 .../ebay-oauth-csharp-client.nuspec            |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/CredentialUtil.cs b/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/CredentialUtil.cs
index f268e4c..63e8de5 100644
--- a/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/CredentialUtil.cs
+++ b/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/CredentialUtil.cs
@@ -21,14 +21,13 @@
 using System.IO;
 using eBay.ApiClient.Auth.OAuth2.Model;
 using YamlDotNet.RepresentationModel;
-using log4net;
 using System.Collections.Concurrent;
+using Microsoft.Extensions.Logging;
 
 namespace eBay.ApiClient.Auth.OAuth2
 {
     public static class CredentialUtil {
 
-        private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         static readonly ConcurrentDictionary<String, Credentials> envCredentials = new ConcurrentDictionary<String, Credentials>();
 
         public class Credentials {
@@ -56,17 +55,17 @@ public String Get(CredentialType credentialType)
         /*
          * Loading StreamReader
          */
-        public static void Load(String yamlFile)
+        public static void Load(String yamlFile, ILogger logger)
         {
             //Stream the input file
             StreamReader streamReader = new StreamReader(yamlFile);
-            Load(streamReader);
+            Load(streamReader, logger);
         }
 
         /*
          * Loading YAML file
          */
-        public static void Load(StreamReader streamReader)
+        public static void Load(StreamReader streamReader, ILogger logger)
         {
            
             //Load the stream
@@ -94,7 +93,7 @@ public static void Load(StreamReader streamReader)
                 }
 
             }
-            log.Info("Loaded configuration for eBay oAuth Token");
+            logger.LogInformation("Loaded configuration for eBay oAuth Token");
 
         }
 
diff --git a/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/OAuth2Api.cs b/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/OAuth2Api.cs
index 32b97c0..14b027b 100644
--- a/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/OAuth2Api.cs
+++ b/ebay-oauth-csharp-client/eBay/ApiClient/Auth/OAuth2/OAuth2Api.cs
@@ -23,13 +23,19 @@
 using System.Net;
 using Newtonsoft.Json;
 using System.Text;
-using log4net;
+using Microsoft.Extensions.Logging;
 
 namespace eBay.ApiClient.Auth.OAuth2
 {
     public class OAuth2Api
     {
-        private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly ILogger<OAuth2Api> logger;
+
+        public OAuth2Api(ILogger<OAuth2Api> logger)
+        {
+            this.logger = logger;
+        }
+
         private static AppTokenCache appTokenCache = new AppTokenCache();
 
         private class AppTokenCache
@@ -88,7 +94,7 @@ public OAuthResponse GetApplicationToken(OAuthEnvironment environment, IList<Str
                 oAuthResponse = appTokenCache.GetValue(environment);
                 if (oAuthResponse != null && oAuthResponse.AccessToken != null && oAuthResponse.AccessToken.Token != null)
                 {
-                    log.Info("Returning token from cache for " + environment.ConfigIdentifier());
+                    logger.LogInformation("Returning token from cache for " + environment.ConfigIdentifier());
                     return oAuthResponse;
                 }
             }
@@ -151,7 +157,7 @@ public String GenerateUserAuthorizationUrl(OAuthEnvironment environment, IList<S
 
             sb.Append(OAuth2Util.CreateRequestPayload(queryParams));
 
-            log.Debug("Authorization url " + sb);
+            logger.LogDebug("Authorization url " + sb);
             return sb.ToString();
         }
 
@@ -280,7 +286,7 @@ public OAuthResponse HandleApiResponse(RestResponse response, TokenType tokenTyp
             if (response.StatusCode != HttpStatusCode.OK)
             {
                 oAuthResponse.ErrorMessage = response.Content;
-                log.Error("Error in fetching the token. Error:" + oAuthResponse.ErrorMessage);
+                logger.LogError("Error in fetching the token. Error:" + oAuthResponse.ErrorMessage);
             }
             else
             {
@@ -306,7 +312,7 @@ public OAuthResponse HandleApiResponse(RestResponse response, TokenType tokenTyp
                     oAuthResponse.RefreshToken = refreshToken;
                 }
             }
-            log.Info("Fetched the token successfully from API");
+            logger.LogInformation("Fetched the token successfully from API");
             return oAuthResponse;
         }
     }
diff --git a/ebay-oauth-csharp-client/ebay-oauth-csharp-client.csproj b/ebay-oauth-csharp-client/ebay-oauth-csharp-client.csproj
index 1896b25..bdcc96e 100644
--- a/ebay-oauth-csharp-client/ebay-oauth-csharp-client.csproj
+++ b/ebay-oauth-csharp-client/ebay-oauth-csharp-client.csproj
@@ -9,9 +9,9 @@
     <Folder Include="eBay\ApiClient\Auth\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     <PackageReference Include="YamlDotNet" Version="13.1.1" />
     <PackageReference Include="RestSharp" Version="112.0.0" />
-    <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>
diff --git a/ebay-oauth-csharp-client/ebay-oauth-csharp-client.nuspec b/ebay-oauth-csharp-client/ebay-oauth-csharp-client.nuspec
index 6796e27..13dec93 100644
--- a/ebay-oauth-csharp-client/ebay-oauth-csharp-client.nuspec
+++ b/ebay-oauth-csharp-client/ebay-oauth-csharp-client.nuspec
@@ -19,7 +19,7 @@
       <group targetFramework="net6.0">
         <dependency id="YamlDotNet" version="13.1.1" />
         <dependency id="RestSharp" version="110.2.0" />
-        <dependency id="log4net" version="2.0.15" />
+        <dependency id="Microsoft.Extensions.Logging.Abstractions" version="9.0.0" />
         <dependency id="Newtonsoft.Json" version="13.0.3" />
       </group>
     </dependencies>