Add exception handling for auth (microsoft#509)

* add exception handling for auth scenario

* remove useless change

* resolve comment

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Authentication/MultiProviderAuthDialog.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -18,6 +19,7 @@ public class MultiProviderAuthDialog : ComponentDialog
     {
         private ISkillConfiguration _skillConfiguration;
         private CommonResponseBuilder _responseBuilder = new CommonResponseBuilder();
+        private string _selectedAuthType = string.Empty;
 
         public MultiProviderAuthDialog(ISkillConfiguration skillConfiguration)
             : base(nameof(MultiProviderAuthDialog))
@@ -116,26 +118,50 @@ private async Task<DialogTurnResult> PromptForProvider(WaterfallStepContext step
 
         private async Task<DialogTurnResult> PromptForAuth(WaterfallStepContext stepContext, CancellationToken cancellationToken)
         {
-            var authType = string.Empty;
             if (stepContext.Result is string)
             {
-                authType = stepContext.Result as string;
+                _selectedAuthType = stepContext.Result as string;
             }
             else if (stepContext.Result is FoundChoice)
             {
                 var choice = stepContext.Result as FoundChoice;
-                authType = choice.Value;
+                _selectedAuthType = choice.Value;
             }
 
-            return await stepContext.PromptAsync(authType, new PromptOptions());
+            return await stepContext.PromptAsync(_selectedAuthType, new PromptOptions());
         }
 
         private async Task<DialogTurnResult> HandleTokenResponse(WaterfallStepContext stepContext, CancellationToken cancellationToken)
         {
             var tokenResponse = stepContext.Result as TokenResponse;
-            var result = await CreateProviderTokenResponse(stepContext.Context, tokenResponse);
+            if (tokenResponse != null && !string.IsNullOrWhiteSpace(tokenResponse.Token))
+            {
+                var result = await CreateProviderTokenResponse(stepContext.Context, tokenResponse);
+
+                return await stepContext.EndDialogAsync(result);
+            }
+            else
+            {
+                TelemetryClient.TrackEvent("TokenRetrievalFailure", new Dictionary<string, string>
+                {
+                    {
+                        "userId", stepContext.Context.Activity.From.Id
+                    },
+                    {
+                        "conversationId", stepContext.Context.Activity.Conversation.Id
+                    },
+                    {
+                        "activityId", stepContext.Context.Activity.Id
+                    },
+                    {
+                        "activeDialog", stepContext.ActiveDialog?.Id
+                    }
+                });
 
-            return await stepContext.EndDialogAsync(result);
+                stepContext.Context.Activity.CreateReply(CommonResponses.ErrorMessage_AuthFailure, null, new StringDictionary { { "authType", _selectedAuthType } });
+
+                return new DialogTurnResult(DialogTurnStatus.Cancelled);
+            }
         }
 
         private async Task<ProviderTokenResponse> CreateProviderTokenResponse(ITurnContext context, TokenResponse tokenResponse)
@@ -154,7 +180,7 @@ private async Task<ProviderTokenResponse> CreateProviderTokenResponse(ITurnConte
         private Task<bool> AuthPromptValidator(PromptValidatorContext<TokenResponse> promptContext, CancellationToken cancellationToken)
         {
             var token = promptContext.Recognized.Value;
-            if (token != null)
+            if (token != null && !string.IsNullOrWhiteSpace(token.Token))
             {
                 return Task.FromResult(true);
             }

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Resources/CommonResponses.cs

@@ -1,7 +1,6 @@
 // https://docs.microsoft.com/en-us/visualstudio/modeling/t4-include-directive?view=vs-2017
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 using Microsoft.Bot.Solutions.Dialogs;
@@ -29,6 +28,8 @@ static CommonResponses()
 
         public static BotResponse ErrorMessage => GetBotResponse();
 
+        public static BotResponse ErrorMessage_AuthFailure => GetBotResponse();
+
         public static BotResponse ErrorMessage_SkillError => GetBotResponse();
 
         public static BotResponse SkillAuthenticationTitle => GetBotResponse();

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Resources/CommonResponses.json

@@ -8,7 +8,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ConfirmSaveInfoFailed": {
     "replies": [
       {
@@ -22,7 +21,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ErrorMessage": {
     "replies": [
       {
@@ -48,7 +46,15 @@
     ],
     "inputHint": "acceptingInput"
   },
-
+  "ErrorMessage_AuthFailure": {
+    "replies": [
+      {
+        "text": "Sorry, it looks like something went wrong when trying to get authenticated for your {authType} connection! Please try again later.",
+        "speak": "Sorry, it looks like something went wrong when trying to get authenticated for your {authType} connection! Please try again later."
+      }
+    ],
+    "inputHint": "acceptingInput"
+  },
   "ErrorMessage_SkillError": {
     "replies": [
       {
@@ -58,7 +64,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "SkillAuthenticationTitle": {
     "replies": [
       {
@@ -68,7 +73,6 @@
     ],
     "inputHint": "acceptingInput"
   },
-
   "SkillAuthenticationPrompt": {
     "replies": [
       {
@@ -78,7 +82,6 @@
     ],
     "inputHint": "acceptingInput"
   },
-
   "AuthProvidersPrompt": {
     "replies": [
       {
@@ -88,7 +91,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ConfiguredAuthProvidersPrompt": {
     "replies": [
       {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Resources/CommonResponses.zh.json

@@ -8,7 +8,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ConfirmSaveInfoFailed": {
     "replies": [
       {
@@ -22,7 +21,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ErrorMessage": {
     "replies": [
       {
@@ -48,7 +46,15 @@
     ],
     "inputHint": "acceptingInput"
   },
-
+  "ErrorMessage_AuthFailure": {
+    "replies": [
+      {
+        "text": "对不起，在尝试为了您的{authType}获得授权的时候出现了问题。请稍候重试。",
+        "speak": "对不起，在尝试为了您的{authType}获得授权的时候出现了问题。请稍候重试。"
+      }
+    ],
+    "inputHint": "acceptingInput"
+  },
   "ErrorMessage_SkillError": {
     "replies": [
       {
@@ -58,7 +64,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "SkillAuthenticationTitle": {
     "replies": [
       {
@@ -68,7 +73,6 @@
     ],
     "inputHint": "acceptingInput"
   },
-
   "SkillAuthenticationPrompt": {
     "replies": [
       {
@@ -78,7 +82,6 @@
     ],
     "inputHint": "acceptingInput"
   },
-
   "AuthProvidersPrompt": {
     "replies": [
       {
@@ -88,7 +91,6 @@
     ],
     "inputHint": "expectingInput"
   },
-
   "ConfiguredAuthProvidersPrompt": {
     "replies": [
       {

solutions/Virtual-Assistant/src/csharp/skills/calendarskill/Dialogs/Shared/CalendarSkillDialog.cs

@@ -962,7 +962,7 @@ private IDictionary<string, string> AssembleTelemetryData(WaterfallStepContext s
             {
                 { "activityId", sc.Context.Activity.Id },
                 { "userId", sc.Context.Activity.From.Id },
-                { "activeDialog", sc.ActiveDialog.ToString() }
+                { "activeDialog", sc.ActiveDialog?.Id }
             };
             return telemetryData;
         }

solutions/Virtual-Assistant/src/csharp/skills/emailskill/Dialogs/Shared/EmailSkillDialog.cs

@@ -1317,7 +1317,7 @@ private IDictionary<string, string> AssembleTelemetryData(WaterfallStepContext s
             {
                 { "activityId", sc.Context.Activity.Id },
                 { "userId", sc.Context.Activity.From.Id },
-                { "activeDialog", sc.ActiveDialog.ToString() }
+                { "activeDialog", sc.ActiveDialog?.Id }
             };
 
             return telemetryData;

solutions/Virtual-Assistant/src/csharp/skills/todoskill/Dialogs/Shared/ToDoSkillDialog.cs

@@ -1152,7 +1152,7 @@ private IDictionary<string, string> AssembleTelemetryData(WaterfallStepContext s
             var telemetryData = new Dictionary<string, string>();
             telemetryData.Add("activityId", sc.Context.Activity.Id);
             telemetryData.Add("userId", sc.Context.Activity.From.Id);
-            telemetryData.Add("activeDialog", sc.ActiveDialog.ToString());
+            telemetryData.Add("activeDialog", sc.ActiveDialog?.Id);
 
             return telemetryData;
         }