Merge pull request #296 from microsoft/users/tracyboehrer/ac-fixes

AdaptiveCardInvokeResponseFactory.AdaptiveCard accepts wrong Value content

Author: tracyboehrer

src/libraries/Builder/Microsoft.Agents.Builder/App/AdaptiveCards/AdaptiveCardInvokeResponseFactory.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.Agents.Core.Models;
+using System.Net;
 
 namespace Microsoft.Agents.Builder.App.AdaptiveCards
 {
@@ -13,15 +14,15 @@ public static class AdaptiveCardInvokeResponseFactory
         /// <summary>
         /// Returns response with type "application/vnd.microsoft.card.adaptive".
         /// </summary>
-        /// <param name="adaptiveCard">An Adaptive Card.</param>
+        /// <param name="adaptiveCardJson">An AdaptiveCard JSON value.</param>
         /// <returns>The response that includes an Adaptive Card that the client should display.</returns>
-        public static AdaptiveCardInvokeResponse AdaptiveCard(AdaptiveCard adaptiveCard)
+        public static AdaptiveCardInvokeResponse AdaptiveCard(string adaptiveCardJson)
         {
             return new AdaptiveCardInvokeResponse
             {
                 StatusCode = 200,
                 Type = "application/vnd.microsoft.card.adaptive",
-                Value = adaptiveCard
+                Value = adaptiveCardJson
             };
         }
 
@@ -39,5 +40,52 @@ public static AdaptiveCardInvokeResponse Message(string message)
                 Value = message
             };
         }
+
+        /// <summary>
+        /// Creates an Error of type "BadRequest" AdaptiveCardInvokeResponse.
+        /// </summary>
+        /// <param name="message"></param>
+        public static AdaptiveCardInvokeResponse BadRequest(string message)
+        {
+            return Error(HttpStatusCode.BadRequest, "BadRequest", message);
+        }
+
+        /// <summary>
+        /// Creates an Error of type "NotSupported" AdaptiveCardInvokeResponse.
+        /// </summary>
+        /// <param name="message"></param>
+        public static AdaptiveCardInvokeResponse NotSupported(string message)
+        {
+            return Error(HttpStatusCode.BadRequest, "NotSupported", message);
+        }
+
+        /// <summary>
+        /// Creates an Error of type InternalError AdaptiveCardInvokeResponse.
+        /// </summary>
+        /// <param name="message"></param>
+        public static AdaptiveCardInvokeResponse InternalError(string message)
+        {
+            return Error(HttpStatusCode.InternalServerError, HttpStatusCode.InternalServerError.ToString(), message);
+        }
+
+        /// <summary>
+        /// Creates an Error AdaptiveCardInvokeResponse.
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="statusCode">Defaults to HttpStatusCode.BadRequest.</param>
+        /// <param name="code">Defaults to HttpStatusCode.ToString()</param>
+        public static AdaptiveCardInvokeResponse Error(HttpStatusCode statusCode, string code, string message)
+        {
+            return new AdaptiveCardInvokeResponse()
+            {
+                StatusCode = (int)statusCode,
+                Type = "application/vnd.microsoft.error",
+                Value = new Error()
+                {
+                    Code = code ?? statusCode.ToString(),
+                    Message = message
+                }
+            };
+        }
     }
-}
+}

src/libraries/Builder/Microsoft.Agents.Builder/Microsoft.Agents.Builder.csproj

@@ -19,14 +19,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-        <PackageReference Include="AdaptiveCards" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
         <PackageReference Include="System.Memory.Data" />
 		<PackageReference Include="System.Text.Json" />
 		<PackageReference Include="Microsoft.Extensions.Http" />
-		<PackageReference Include="Newtonsoft.Json" />
     </ItemGroup>
 
     <ItemGroup>

src/samples/Compat/SkillsDialog/DialogSkillBot/Dialogs/ActivityRouterDialog.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Agents.Builder.Dialogs;
 using Microsoft.Agents.Core.Models;
-using Newtonsoft.Json;
+using Microsoft.Agents.Core.Serialization;
 
 namespace DialogSkillBot.Dialogs
 {
@@ -97,7 +97,7 @@ private static async Task<DialogTurnResult> BeginGetWeather(WaterfallStepContext
             var location = new Location();
             if (activity.Value != null)
             {
-                location = JsonConvert.DeserializeObject<Location>(JsonConvert.SerializeObject(activity.Value));
+                location = ProtocolJsonSerializer.ToObject<Location>(activity.Value);
             }
 
             // We haven't implemented the GetWeatherDialog so we just display a TODO message.
@@ -113,14 +113,14 @@ private async Task<DialogTurnResult> BeginBookFlight(WaterfallStepContext stepCo
             var bookingDetails = new BookingDetails();
             if (activity.Value != null)
             {
-                bookingDetails = JsonConvert.DeserializeObject<BookingDetails>(JsonConvert.SerializeObject(activity.Value));
+                bookingDetails = ProtocolJsonSerializer.ToObject<BookingDetails>(activity.Value);
             }
 
             // Start the booking dialog.
             var bookingDialog = FindDialog(nameof(BookingDialog));
             return await stepContext.BeginDialogAsync(bookingDialog.Id, bookingDetails, cancellationToken);
         }
 
-        private string GetObjectAsJsonString(object value) => value == null ? string.Empty : JsonConvert.SerializeObject(value);
+        private string GetObjectAsJsonString(object value) => value == null ? string.Empty : ProtocolJsonSerializer.ToJson(value);
     }
 }