From 65dd1d95621db2a55566c97cd664ee1be916aaa2 Mon Sep 17 00:00:00 2001
From: Malhar Khimsaria <96malhar@gmail.com>
Date: Mon, 15 Apr 2024 21:43:56 -0700
Subject: [PATCH] chore: Update User-Agent string (#142)

---
 ...on.Extensions.CognitoAuthentication.csproj |  6 +--
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../Util/CognitoAuthHelper.cs                 | 39 +++++++------------
 ...nitoAuthentication.IntegrationTests.csproj |  6 +--
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/Amazon.Extensions.CognitoAuthentication/Amazon.Extensions.CognitoAuthentication.csproj b/src/Amazon.Extensions.CognitoAuthentication/Amazon.Extensions.CognitoAuthentication.csproj
index 597cf87..c1a3817 100644
--- a/src/Amazon.Extensions.CognitoAuthentication/Amazon.Extensions.CognitoAuthentication.csproj
+++ b/src/Amazon.Extensions.CognitoAuthentication/Amazon.Extensions.CognitoAuthentication.csproj
@@ -28,7 +28,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <DelaySign>false</DelaySign>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.5.2</Version>
+    <Version>2.5.3</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,8 +36,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CognitoIdentity" Version="3.7.0.2" />
-    <PackageReference Include="AWSSDK.CognitoIdentityProvider" Version="3.7.0.2" />
+    <PackageReference Include="AWSSDK.CognitoIdentity" Version="3.7.300.74" />
+    <PackageReference Include="AWSSDK.CognitoIdentityProvider" Version="3.7.303.19" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Amazon.Extensions.CognitoAuthentication/Properties/AssemblyInfo.cs b/src/Amazon.Extensions.CognitoAuthentication/Properties/AssemblyInfo.cs
index aeaa14a..c44bec5 100644
--- a/src/Amazon.Extensions.CognitoAuthentication/Properties/AssemblyInfo.cs
+++ b/src/Amazon.Extensions.CognitoAuthentication/Properties/AssemblyInfo.cs
@@ -16,4 +16,4 @@
 
 
 [assembly: AssemblyVersion("1.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("2.5.3.0")]
\ No newline at end of file
diff --git a/src/Amazon.Extensions.CognitoAuthentication/Util/CognitoAuthHelper.cs b/src/Amazon.Extensions.CognitoAuthentication/Util/CognitoAuthHelper.cs
index df7b2c1..a74ffca 100644
--- a/src/Amazon.Extensions.CognitoAuthentication/Util/CognitoAuthHelper.cs
+++ b/src/Amazon.Extensions.CognitoAuthentication/Util/CognitoAuthHelper.cs
@@ -27,7 +27,9 @@ internal static class CognitoAuthHelper
     {
         [ThreadStatic] private static SHA256 sha256 = null;
 
-        private static string assemblyFileVersion = null;
+        private static readonly string _assemblyVersion = GetAssemblyFileVersion();
+
+        private static readonly string _userAgentSuffix = $"lib/AWSDotNetCognito#{_assemblyVersion}";
         /// <summary>
         /// Property to access the thread-safe SHA256 member variable. 
         /// Creates a SHA256 instance if one does not exist.
@@ -44,23 +46,7 @@ internal static SHA256 Sha256
                 return sha256;
             }
         }
-    
-        internal static string AssemblyFileVersion
-        {
-            get
-            {
-                if (assemblyFileVersion == null)
-                {
-                    var assembly = typeof(CognitoAuthHelper).GetTypeInfo().Assembly;
-                    AssemblyFileVersionAttribute attribute = assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
 
-                    assemblyFileVersion = attribute == null ? "Unknown" : attribute.Version;
-                }
-                
-                return assemblyFileVersion;
-            }
-        }
-        
         /// <summary>
         /// Computes the secret hash for the user pool using the corresponding userID, clientID, 
         /// and client secret
@@ -161,15 +147,20 @@ internal static List<AttributeType> CreateAttributeList(IDictionary<string, stri
 
         internal static void ServiceClientBeforeRequestEvent(object sender, RequestEventArgs e)
         {
-            Amazon.Runtime.WebServiceRequestEventArgs args = e as Amazon.Runtime.WebServiceRequestEventArgs;
-            if (args == null || !args.Headers.ContainsKey(UserAgentHeader))
+            WebServiceRequestEventArgs args = e as WebServiceRequestEventArgs;
+            if (args == null || !args.Headers.ContainsKey(UserAgentHeader) || args.Headers[UserAgentHeader].Contains(_userAgentSuffix))
                 return;
 
-            var metric = " AWSDotNetCognito/" + AssemblyFileVersion;
-            if (!args.Headers[UserAgentHeader].Contains(metric))
-            {
-                args.Headers[UserAgentHeader] = args.Headers[UserAgentHeader] + metric;
-            }
+            args.Headers[UserAgentHeader] = args.Headers[UserAgentHeader] + " " + _userAgentSuffix;
+        }
+
+        private static string GetAssemblyFileVersion()
+        {
+            var assembly = typeof(CognitoAuthHelper).GetTypeInfo().Assembly;
+            AssemblyFileVersionAttribute attribute = assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
+
+            var version = attribute == null ? "Unknown" : attribute.Version;
+            return version;
         }
     }
 }
diff --git a/test/Amazon.Extensions.CognitoAuthentication.IntegrationTests/Amazon.Extensions.CognitoAuthentication.IntegrationTests.csproj b/test/Amazon.Extensions.CognitoAuthentication.IntegrationTests/Amazon.Extensions.CognitoAuthentication.IntegrationTests.csproj
index c98c058..8ded8cd 100644
--- a/test/Amazon.Extensions.CognitoAuthentication.IntegrationTests/Amazon.Extensions.CognitoAuthentication.IntegrationTests.csproj
+++ b/test/Amazon.Extensions.CognitoAuthentication.IntegrationTests/Amazon.Extensions.CognitoAuthentication.IntegrationTests.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.7.0.3" />
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.1" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.0.3" />
+    <PackageReference Include="AWSSDK.Core" Version="3.7.303.14" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.301" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.307.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />