Simplified DotNet FIC samples

Author: Tracy Boehrer

samples/csharp_dotnetcore/15.handling-attachments/15.handling-attachments.sln

@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandlingAttachmentsBot", "HandlingAttachmentsBot.csproj", "{947FDB48-7EE1-28F7-422C-CADC344A6F79}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{947FDB48-7EE1-28F7-422C-CADC344A6F79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{947FDB48-7EE1-28F7-422C-CADC344A6F79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{947FDB48-7EE1-28F7-422C-CADC344A6F79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{947FDB48-7EE1-28F7-422C-CADC344A6F79}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F4B3DA7F-690A-4A8F-8DAF-2004BA667EA0}
+	EndGlobalSection
+EndGlobal

samples/csharp_dotnetcore/86.bot-authentication-fic/Bots/AuthBotFIC.cs

@@ -1,39 +1,32 @@
-// Generated with Bot Builder V4 SDK Template for Visual Studio EchoBot v4.22.0
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Schema;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.BotBuilderSamples.Bots
 {
-    public class AuthBotFIC<T> : DialogBot<T> where T : Dialog
+    public class AuthBotFIC : ActivityHandler
     {
-        public AuthBotFIC(ConversationState conversationState, UserState userState, T dialog, ILogger<DialogBot<T>> logger)
-            : base(conversationState, userState, dialog, logger)
+        protected override async Task OnMessageActivityAsync(ITurnContext<IMessageActivity> turnContext, CancellationToken cancellationToken)
         {
+            var replyText = $"Echo: {turnContext.Activity.Text}";
+            await turnContext.SendActivityAsync(MessageFactory.Text(replyText, replyText), cancellationToken);
         }
 
         protected override async Task OnMembersAddedAsync(IList<ChannelAccount> membersAdded, ITurnContext<IConversationUpdateActivity> turnContext, CancellationToken cancellationToken)
         {
-            foreach (var member in turnContext.Activity.MembersAdded)
+            var welcomeText = "Hello and welcome!";
+            foreach (var member in membersAdded)
             {
                 if (member.Id != turnContext.Activity.Recipient.Id)
                 {
-                    await turnContext.SendActivityAsync(MessageFactory.Text("Welcome to AuthenticationBot using Federated Credentials. Type anything to get logged in. Type 'logout' to sign-out."), cancellationToken);
+                    await turnContext.SendActivityAsync(MessageFactory.Text(welcomeText, welcomeText), cancellationToken);
                 }
             }
         }
-
-        protected override async Task OnTokenResponseEventAsync(ITurnContext<IEventActivity> turnContext, CancellationToken cancellationToken)
-        {
-            Logger.LogInformation("Running dialog with Token Response Event Activity.");
-
-            // Run the Dialog with the new Token Response Event Activity.
-            await Dialog.RunAsync(turnContext, ConversationState.CreateProperty<DialogState>(nameof(DialogState)), cancellationToken);
-        }
     }
 }

samples/csharp_dotnetcore/86.bot-authentication-fic/Bots/DialogBot.cs

@@ -1,10 +1,10 @@
-# Authentication Bot using Federation Identity Certificate (FIC)
+# Bot using Federation Identity Credentials
 
+Bot Framework v4 bot authentication using Federation Identity Credentials (FIC). Currently, FIC feature is supported single tenant bots only.
 
+This bot has been created using [Bot Framework](https://dev.botframework.com/), is shows how to use the bot authentication capabilities of Azure Bot Service. In this sample, we use federated identity certificate configuration to create the Bot Framework Authentication.
 
-Bot Framework v4 bot authentication using Federation Identity Certificate (FIC). Currently, FIC feature is supported for Microsoft tenants only. 
-
-This bot has been created using [Bot Framework](https://dev.botframework.com/), is shows how to use the bot authencation capabilities of Azure Bot Service. In this sample, we use federated identity certificate configuration to create the Bot Framework Authentication.
+This bot uses `FederatedServiceClientCredentialsFactory` which is registered in Startup.cs.
 
 ## Prerequisites
 
@@ -45,7 +45,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com/),
       - Enter name for the credential and click on Add.
    - Navigate to the **App Service** for the bot 
      - Add the User managed identity created in previous step to the Azure App Service under Configuration -> Identity -> User Assigned Managed Identity.
-
+   
 - Set appsettings.json variables
 
   - MicrosoftAppType: {SingTenant | MultiTenant}
@@ -69,8 +69,5 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt
 - [Activity processing](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-activity-processing?view=azure-bot-service-4.0)
 - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
 - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
-- [.NET Core CLI tools](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x)
 - [Azure CLI](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)
 - [Azure Portal](https://portal.azure.com)
-- [Language Understanding using LUIS](https://docs.microsoft.com/en-us/azure/cognitive-services/luis/)
-- [Channels and Bot Connector Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-concepts?view=azure-bot-service-4.0)

samples/csharp_dotnetcore/86.bot-authentication-fic/Dialogs/LogoutDialog.cs

@@ -51,11 +51,8 @@ public void ConfigureServices(IServiceCollection services)
             // Create the Conversation state. (Used by the Dialog system itself.)
             services.AddSingleton<ConversationState>();
 
-            // The Dialog that will be run by the bot.
-            services.AddSingleton<MainDialog>();
-
              // Create the bot as a transient. In this case the ASP Controller is expecting an IBot.
-            services.AddTransient<IBot, AuthBotFIC<MainDialog>>();
+            services.AddTransient<IBot, AuthBotFIC>();
 
             services.AddHttpClient().AddControllers().AddNewtonsoftJson(options =>
             {

samples/csharp_dotnetcore/86.bot-authentication-fic/Dialogs/MainDialog.cs

@@ -3,5 +3,4 @@
   "MicrosoftAppId": "",
   "MicrosoftAppClientId": "",
   "MicrosoftAppTenantId": "",
-   "ConnectionName": ""
 }