updated phone skill to latest packages

Author: lauren-mills

skills/src/csharp/phoneskill/phoneskill/Bots/DialogBot.cs

@@ -11,23 +11,23 @@
 
 namespace PhoneSkill.Bots
 {
-    public class DialogBot<T> : ActivityHandler
+    public class DialogBot<T> : IBot
         where T : Dialog
     {
+        private readonly Dialog _dialog;
+        private readonly BotState _conversationState;
+        private readonly BotState _userState;
         private readonly IBotTelemetryClient _telemetryClient;
-        private DialogSet _dialogs;
 
         public DialogBot(IServiceProvider serviceProvider, T dialog)
         {
-            var conversationState = serviceProvider.GetService<ConversationState>() ?? throw new ArgumentNullException(nameof(ConversationState));
-            _telemetryClient = serviceProvider.GetService<IBotTelemetryClient>() ?? throw new ArgumentNullException(nameof(IBotTelemetryClient));
-
-            var dialogState = conversationState.CreateProperty<DialogState>(nameof(PhoneSkill));
-            _dialogs = new DialogSet(dialogState);
-            _dialogs.Add(dialog);
+            _dialog = dialog;
+            _conversationState = serviceProvider.GetService<ConversationState>();
+            _userState = serviceProvider.GetService<UserState>();
+            _telemetryClient = serviceProvider.GetService<IBotTelemetryClient>();
         }
 
-        public override async Task OnTurnAsync(ITurnContext turnContext, CancellationToken cancellationToken)
+        public async Task OnTurnAsync(ITurnContext turnContext, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Client notifying this bot took to long to respond (timed out)
             if (turnContext.Activity.Code == EndOfConversationCodes.BotTimedOut)
@@ -36,16 +36,11 @@ public override async Task OnTurnAsync(ITurnContext turnContext, CancellationTok
                 return;
             }
 
-            var dc = await _dialogs.CreateContextAsync(turnContext);
+            await _dialog.RunAsync(turnContext, _conversationState.CreateProperty<DialogState>(nameof(DialogState)), cancellationToken);
 
-            if (dc.ActiveDialog != null)
-            {
-                var result = await dc.ContinueDialogAsync();
-            }
-            else
-            {
-                await dc.BeginDialogAsync(typeof(T).Name);
-            }
+            // Save any state changes that might have occured during the turn.
+            await _conversationState.SaveChangesAsync(turnContext, false, cancellationToken);
+            await _userState.SaveChangesAsync(turnContext, false, cancellationToken);
         }
     }
 }

skills/src/csharp/phoneskill/phoneskill/Controllers/BotController.cs

@@ -5,20 +5,22 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Builder.Skills;
+using Microsoft.Bot.Builder.Skills.Auth;
 using Microsoft.Bot.Builder.Solutions;
 
 namespace PhoneSkill.Controllers
 {
     [ApiController]
     public class BotController : SkillController
-	{
-		public BotController(
-			IBot bot,
-			BotSettingsBase botSettings,
-			IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
-			SkillWebSocketAdapter skillWebSocketAdapter)
-			: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter)
-		{
-		}
-	}
+    {
+        public BotController(
+            IBot bot,
+            BotSettingsBase botSettings,
+            IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
+            SkillWebSocketAdapter skillWebSocketAdapter,
+            IWhitelistAuthenticationProvider whitelistAuthenticationProvider)
+            : base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter, whitelistAuthenticationProvider)
+        {
+        }
+    }
 }

skills/src/csharp/phoneskill/phoneskill/PhoneSkill.csproj

@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.5.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.5.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.5.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.5.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.5.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.6.0-rc4" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.6.0-rc4" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.5.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.5.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.5.1" />

skills/src/csharp/phoneskill/phoneskill/Startup.cs

@@ -12,6 +12,7 @@
 using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Builder.Skills;
+using Microsoft.Bot.Builder.Skills.Auth;
 using Microsoft.Bot.Builder.Solutions;
 using Microsoft.Bot.Builder.Solutions.Responses;
 using Microsoft.Bot.Builder.Solutions.TaskExtensions;
@@ -104,6 +105,9 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<SkillWebSocketBotAdapter, PhoneSkillWebSocketBotAdapter>();
             services.AddTransient<SkillWebSocketAdapter>();
 
+            // Register WhiteListAuthProvider
+            services.AddSingleton<IWhitelistAuthenticationProvider, WhitelistAuthenticationProvider>();
+
             // Configure bot
             services.AddTransient<MainDialog>();
             services.AddTransient<IBot, DialogBot<MainDialog>>();

skills/src/csharp/phoneskill/phoneskilltest/PhoneSkillTest.csproj

@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />