Skip to content

Commit d59a2a6

Browse files
authored
chore: Update User-Agent string (#237)
1 parent ba6bf8c commit d59a2a6

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/Amazon.AspNetCore.Identity.Cognito/Amazon.AspNetCore.Identity.Cognito.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
44
<CodeAnalysisRuleSet>../ruleset.xml</CodeAnalysisRuleSet>
5-
<Version>3.0.1</Version>
5+
<Version>3.0.2</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<PackageId>Amazon.AspNetCore.Identity.Cognito</PackageId>
88
<Title>ASP.NET Core Identity Provider for Amazon Cognito</Title>
@@ -16,8 +16,8 @@
1616
<RepositoryUrl>https://github.com/aws/aws-aspnet-cognito-identity-provider/</RepositoryUrl>
1717
<Company>Amazon Web Services</Company>
1818
<SignAssembly>true</SignAssembly>
19-
<AssemblyVersion>3.0.1</AssemblyVersion>
20-
<FileVersion>3.0.1</FileVersion>
19+
<AssemblyVersion>3.0.2</AssemblyVersion>
20+
<FileVersion>3.0.2</FileVersion>
2121
</PropertyGroup>
2222

2323
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -29,10 +29,10 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Amazon.Extensions.CognitoAuthentication" Version="2.3.0" />
33-
<PackageReference Include="AWSSDK.CognitoIdentity" Version="3.7.0.3" />
34-
<PackageReference Include="AWSSDK.CognitoIdentityProvider" Version="3.7.0.3" />
35-
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.0.1" />
32+
<PackageReference Include="Amazon.Extensions.CognitoAuthentication" Version="2.5.2" />
33+
<PackageReference Include="AWSSDK.CognitoIdentity" Version="3.7.300.74" />
34+
<PackageReference Include="AWSSDK.CognitoIdentityProvider" Version="3.7.303.19" />
35+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
3636
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1">
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Amazon.AspNetCore.Identity.Cognito/Extensions/CognitoServiceCollectionExtensions.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ internal static class CognitoUserPoolFactory
9292
{
9393
private const string MissingConfigurationExceptionMessage = "No IConfiguration object instance was found in the service collection. Could not instanciate a CognitoUserPool object.";
9494
private const string UserAgentHeader = "User-Agent";
95-
private static string _assemblyFileVersion = "Unknown";
95+
private static readonly string _assemblyFileVersion = GetAssemblyFileVersion();
96+
private static readonly string _userAgentSuffix = $"lib/CognitoASPNETCoreIdentityProvider#{_assemblyFileVersion}";
9697

9798
public static CognitoUserPool CreateUserPoolClient(IServiceProvider provider)
9899
{
@@ -111,8 +112,6 @@ public static CognitoUserPool CreateUserPoolClient(IServiceProvider provider)
111112
}
112113
}
113114

114-
_assemblyFileVersion = GetAssemblyFileVersion();
115-
116115
var cognitoClient = provider.GetService<IAmazonCognitoIdentityProvider>();
117116

118117
if (cognitoClient is AmazonCognitoIdentityProviderClient eventProvider)
@@ -127,10 +126,10 @@ public static CognitoUserPool CreateUserPoolClient(IServiceProvider provider)
127126
private static void ServiceClientBeforeRequestEvent(object sender, Amazon.Runtime.RequestEventArgs e)
128127
{
129128
Amazon.Runtime.WebServiceRequestEventArgs args = e as Amazon.Runtime.WebServiceRequestEventArgs;
130-
if (args == null || !args.Headers.ContainsKey(UserAgentHeader))
129+
if (args == null || !args.Headers.ContainsKey(UserAgentHeader) || args.Headers[UserAgentHeader].Contains(_userAgentSuffix))
131130
return;
132131

133-
args.Headers[UserAgentHeader] = args.Headers[UserAgentHeader] + " CognitoASPNETCoreIdentityProvider/" + _assemblyFileVersion;
132+
args.Headers[UserAgentHeader] = args.Headers[UserAgentHeader] + " " + _userAgentSuffix;
134133
}
135134

136135
private static string GetAssemblyFileVersion()

0 commit comments

Comments
 (0)