Remove reference for Newtonsoft.Json in Amazon.Lambda.APIGatewayEvents when using netcoreapp3.1

Author: normj

Libraries/src/Amazon.Lambda.APIGatewayEvents/APIGatewayCustomAuthorizerContext.cs

@@ -4,6 +4,13 @@
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
+#if NETSTANDARD_2_0
+    using Newtonsoft.Json.Linq;
+#else
+    using System.Text.Json;
+#endif
+
+
     /// <summary>
     /// An object representing the expected format of an API Gateway custom authorizer response.
     /// </summary>
@@ -115,6 +122,7 @@ public Dictionary<string, string> Claims
                     object value;
                     if(this.TryGetValue("claims", out value))
                     {
+#if NETSTANDARD_2_0
                         JObject jsonClaims = value as JObject;
                         if (jsonClaims != null)
                         {
@@ -124,6 +132,18 @@ public Dictionary<string, string> Claims
 
                             }
                         }
+#else
+                        if(value is JsonElement jsonClaims)
+                        {
+                            foreach(JsonProperty property in jsonClaims.EnumerateObject())
+                            {
+                                if(property.Value.ValueKind == JsonValueKind.String)
+                                {
+                                    _claims[property.Name] = property.Value.GetString();
+                                }
+                            }
+                        }
+#endif
                     }
                 }
 

Libraries/src/Amazon.Lambda.APIGatewayEvents/Amazon.Lambda.APIGatewayEvents.csproj

@@ -12,11 +12,15 @@
     <PackageTags>AWS;Amazon;Lambda</PackageTags>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <DefineConstants>NETSTANDARD_2_0</DefineConstants>
+  </PropertyGroup>
+  
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <DefineConstants>NETCOREAPP_3_1</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 

Libraries/test/Amazon.Lambda.AspNetCoreServer.Test/Amazon.Lambda.AspNetCoreServer.Test.csproj

@@ -11,6 +11,14 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <DefineConstants>NETCOREAPP_2_1</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>NETCOREAPP_3_1</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <NoWarn>1701;1702;1705;CS0618</NoWarn>
   </PropertyGroup>

Libraries/test/Amazon.Lambda.AspNetCoreServer.Test/TestCallingWebAPI.cs

@@ -403,7 +403,12 @@ private async Task<APIGatewayProxyResponse> InvokeAPIGatewayRequest(TestLambdaCo
         private async Task<APIGatewayProxyResponse> InvokeAPIGatewayRequestWithContent(TestLambdaContext context, string requestContent)
         {
             var lambdaFunction = new ApiGatewayLambdaFunction();
-            var request = JsonConvert.DeserializeObject<APIGatewayProxyRequest>(requestContent);
+            var requestStream = new MemoryStream(System.Text.UTF8Encoding.UTF8.GetBytes(requestContent));
+#if NETCOREAPP_2_1
+            var request = new Amazon.Lambda.Serialization.Json.JsonSerializer().Deserialize<APIGatewayProxyRequest>(requestStream);
+#else
+            var request = new Amazon.Lambda.Serialization.SystemTextJson.LambdaJsonSerializer().Deserialize<APIGatewayProxyRequest>(requestStream);
+#endif
             return await lambdaFunction.FunctionHandlerAsync(request, context);
         }