From f5870ff0bc7c9a5c017d11a273e2de9f7502e714 Mon Sep 17 00:00:00 2001
From: CeciliaAvila <cecilia.avila@southworks.com>
Date: Mon, 21 Apr 2025 14:23:47 -0300
Subject: [PATCH 1/5] Remove unnecessary code in .NET FIC sample

---
 .../AdapterWithErrorHandler.cs                | 19 +-----------------
 .../AuthFederatedCredBot.csproj               |  4 ++--
 .../Controllers/BotController.cs              |  2 +-
 .../86.bot-authentication-fic/README.md       | 20 +++++++++----------
 .../86.bot-authentication-fic/Startup.cs      | 11 ----------
 .../appsettings.json                          |  2 +-
 .../wwwroot/default.htm                       |  2 +-
 7 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/AdapterWithErrorHandler.cs b/samples/csharp_dotnetcore/86.bot-authentication-fic/AdapterWithErrorHandler.cs
index 6761e30a1d..322a6d3790 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/AdapterWithErrorHandler.cs
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/AdapterWithErrorHandler.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
-using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Builder.TraceExtensions;
 using Microsoft.Bot.Connector.Authentication;
@@ -12,7 +10,7 @@ namespace Microsoft.BotBuilderSamples
 {
     public class AdapterWithErrorHandler : CloudAdapter
     {
-        public AdapterWithErrorHandler(BotFrameworkAuthentication auth, ILogger<IBotFrameworkHttpAdapter> logger, ConversationState conversationState = default)
+        public AdapterWithErrorHandler(BotFrameworkAuthentication auth, ILogger<IBotFrameworkHttpAdapter> logger)
             : base(auth, logger)
         {
             OnTurnError = async (turnContext, exception) =>
@@ -27,21 +25,6 @@ public AdapterWithErrorHandler(BotFrameworkAuthentication auth, ILogger<IBotFram
                 await turnContext.SendActivityAsync("The bot encountered an error or bug.");
                 await turnContext.SendActivityAsync("To continue to run this bot, please fix the bot source code.");
 
-                if (conversationState != null)
-                {
-                    try
-                    {
-                        // Delete the conversationState for the current conversation to prevent the
-                        // bot from getting stuck in a error-loop caused by being in a bad state.
-                        // ConversationState should be thought of as similar to "cookie-state" in a Web pages.
-                        await conversationState.DeleteAsync(turnContext);
-                    }
-                    catch (Exception e)
-                    {
-                        logger.LogError(e, $"Exception caught on attempting to Delete ConversationState : {e.Message}");
-                    }
-                }
-
                 // Send a trace activity, which will be displayed in the Bot Framework Emulator
                 await turnContext.TraceActivityAsync("OnTurnError Trace", exception.Message, "https://www.botframework.com/schemas/error", "TurnError");
             };
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/AuthFederatedCredBot.csproj b/samples/csharp_dotnetcore/86.bot-authentication-fic/AuthFederatedCredBot.csproj
index 33427e0d48..7b414c6343 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/AuthFederatedCredBot.csproj
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/AuthFederatedCredBot.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.23.0" />
   </ItemGroup>
 
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/Controllers/BotController.cs b/samples/csharp_dotnetcore/86.bot-authentication-fic/Controllers/BotController.cs
index ba57b68f80..77c1cf35b5 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/Controllers/BotController.cs
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/Controllers/BotController.cs
@@ -5,7 +5,7 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 
-namespace bot_authentication_fic.Controllers
+namespace Microsoft.BotBuilderSamples.Controllers
 {
     // This ASP Controller is created to handle a request. Dependency Injection will provide the Adapter and IBot
     // implementation at runtime. Multiple different IBot implementations running at different endpoints can be
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/README.md b/samples/csharp_dotnetcore/86.bot-authentication-fic/README.md
index 28cc0ed631..c740dda0c6 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/README.md
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/README.md
@@ -1,8 +1,8 @@
-# Bot using Federation Identity Credentials
+# Bot using Federated Identity Credentials
 
-Bot Framework v4 bot authentication using Federation Identity Credentials (FIC). Currently, FIC feature is supported single tenant bots only.
+Bot Framework v4 bot authentication using Federated Identity Credentials (FIC). Currently, FIC feature is supported in 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.
+This bot has been created using [Bot Framework](https://dev.botframework.com/), it shows how to use the bot authentication capabilities of Azure Bot Service. In this sample, we use federated identity credentials configuration to create the Bot Framework Authentication.
 
 This bot uses `FederatedServiceClientCredentialsFactory` which is registered in Startup.cs.
 
@@ -38,11 +38,11 @@ This bot uses `FederatedServiceClientCredentialsFactory` which is registered in
     - Record the **Default domain** on the **Overview** tab
   - Create Azure App and Bot
     - Create App Registration
-      - This can be either Single or Multi tenant.
+      - This should be Single tenant (Currently, FIC feature is supported in single tenant bots only).
       - Record the Application and Tenant ID's.
-      - To create trust using the FIC, we need to link the managed identity to the App Registration.  On the App Registration:
+      - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
         - Click on the add credential under **Certificates & Secrets**, **Federated credentials**
-        - On the Add a credential page, select the Federated credential scenario as **Customer Managed Keys**.
+        - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
         - Select the managed identity that you created in the previous step.
         - Enter name for the credential and click on **Add**.
         
@@ -51,9 +51,9 @@ This bot uses `FederatedServiceClientCredentialsFactory` which is registered in
 
 - For an existing bot
    - Navigate to the **App Registration** for the **Azure Bot**
-     - To create trust using the FIC, we need to link the managed identity to the App Registration.  On the App Registration:
+     - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
       - Click on the add credential under **Certificates & Secrets**, **Federated credentials**
-      - On the Add a credential page, select the Federated credential scenario as **Customer Managed Keys**.
+      - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
       - Select the managed identity that you created in the previous step.
       - Enter name for the credential and click on **Add**.
    - Navigate to the **App Service** for the bot 
@@ -61,7 +61,7 @@ This bot uses `FederatedServiceClientCredentialsFactory` which is registered in
    
 - Set appsettings.json variables
 
-  - MicrosoftAppType: SingTenant
+  - MicrosoftAppType: SingleTenant
 
   - MicrosoftAppId: {bot-appId}
 
@@ -69,7 +69,7 @@ This bot uses `FederatedServiceClientCredentialsFactory` which is registered in
 
   - MicrosoftAppClientId: {clientId of managed identity}
 
-- A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally.  It must be deployed to Azure.
+- A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally. It must be deployed to Azure.
 
 ## Deploy the bot to Azure
 
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/Startup.cs b/samples/csharp_dotnetcore/86.bot-authentication-fic/Startup.cs
index a4f40438d0..5be655e0cc 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/Startup.cs
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/Startup.cs
@@ -42,15 +42,6 @@ public void ConfigureServices(IServiceCollection services)
             // Create the Bot Adapter with error handling enabled.
             services.AddSingleton<IBotFrameworkHttpAdapter, AdapterWithErrorHandler>();
 
-            // Create the storage we'll be using for User and Conversation state. (Memory is great for testing purposes.)
-            services.AddSingleton<IStorage, MemoryStorage>();
-
-            // Create the User state. (Used in this bot's Dialog implementation.)
-            services.AddSingleton<UserState>();
-
-            // Create the Conversation state. (Used by the Dialog system itself.)
-            services.AddSingleton<ConversationState>();
-
              // Create the bot as a transient. In this case the ASP Controller is expecting an IBot.
             services.AddTransient<IBot, AuthBotFIC>();
 
@@ -61,7 +52,6 @@ public void ConfigureServices(IServiceCollection services)
 
         }
 
-
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
@@ -74,7 +64,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 .UseStaticFiles()
                 .UseWebSockets()
                 .UseRouting()
-                .UseAuthorization()
                 .UseEndpoints(endpoints =>
                 {
                     endpoints.MapControllers();
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/appsettings.json b/samples/csharp_dotnetcore/86.bot-authentication-fic/appsettings.json
index b3e43e309b..c165f1dafe 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/appsettings.json
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/appsettings.json
@@ -2,5 +2,5 @@
   "MicrosoftAppType": "",
   "MicrosoftAppId": "",
   "MicrosoftAppClientId": "",
-  "MicrosoftAppTenantId": "",
+  "MicrosoftAppTenantId": ""
 }
diff --git a/samples/csharp_dotnetcore/86.bot-authentication-fic/wwwroot/default.htm b/samples/csharp_dotnetcore/86.bot-authentication-fic/wwwroot/default.htm
index ab3f8fdbb7..70696a1e0f 100644
--- a/samples/csharp_dotnetcore/86.bot-authentication-fic/wwwroot/default.htm
+++ b/samples/csharp_dotnetcore/86.bot-authentication-fic/wwwroot/default.htm
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>bot_authentication_fic</title>
+    <title>AuthFederatedCredBot</title>
     <style>
         body {
             margin: 0px;

From c9c9b3e4605c523886b4ae226d643a08c32ec6aa Mon Sep 17 00:00:00 2001
From: CeciliaAvila <cecilia.avila@southworks.com>
Date: Tue, 22 Apr 2025 12:01:12 -0300
Subject: [PATCH 2/5] Update .NET 18.bot-authentication sample

---
 .../AuthenticationBot.csproj                  |   4 +-
 .../18.bot-authentication/README.md           | 113 +++++++++++-------
 .../18.bot-authentication/Startup.cs          |  15 +++
 .../18.bot-authentication/appsettings.json    |   2 +-
 4 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/samples/csharp_dotnetcore/18.bot-authentication/AuthenticationBot.csproj b/samples/csharp_dotnetcore/18.bot-authentication/AuthenticationBot.csproj
index c6c4b0cc70..b2edfcf3a3 100644
--- a/samples/csharp_dotnetcore/18.bot-authentication/AuthenticationBot.csproj
+++ b/samples/csharp_dotnetcore/18.bot-authentication/AuthenticationBot.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.22.4" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.23.0" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.23.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/csharp_dotnetcore/18.bot-authentication/README.md b/samples/csharp_dotnetcore/18.bot-authentication/README.md
index bc3c81d681..d7b72873c8 100644
--- a/samples/csharp_dotnetcore/18.bot-authentication/README.md
+++ b/samples/csharp_dotnetcore/18.bot-authentication/README.md
@@ -1,6 +1,6 @@
 # Bot Authentication
 
-Bot Framework v4 bot authentication sample
+Bot Framework v4 bot authentication sample.
 
 This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to use authentication in your bot using OAuth.
 
@@ -8,6 +8,8 @@ The sample uses the bot authentication capabilities in [Azure Bot Service](https
 
 NOTE: Microsoft Teams currently differs slightly in the way auth is integrated with the bot. Refer to sample 5 [here](https://github.com/OfficeDev/Microsoft-Teams-Samples#bots-samples-using-the-v4-sdk).
 
+NOTE: This sample has been updated to use Federated Identity Credentials (FIC), but it also supports ClientSecret authentication following this guide: [Add Authentication to your bot via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp).
+
 ## Prerequisites
 
 - [.NET SDK](https://dotnet.microsoft.com/download) version 8.0
@@ -17,6 +19,8 @@ NOTE: Microsoft Teams currently differs slightly in the way auth is integrated w
   dotnet --version
   ```
 
+- [Bot Framework SDK](https://github.com/microsoft/botbuilder-dotnet/releases) version 4.22.8 onwards
+
 ## To try this sample
 
 - Clone the repository
@@ -25,67 +29,84 @@ NOTE: Microsoft Teams currently differs slightly in the way auth is integrated w
     git clone https://github.com/microsoft/botbuilder-samples.git
     ```
 
-- Deploy your bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment)
-
-- [Add Authentication to your bot via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp)
-
-After Authentication has been configured via Azure Bot Service, you can test the bot.
-
-- Update `appsettings.json` with required configuration settings 
-    | Property                  | Value Description     | 
-    |----------------------|-----------|
-    | MicrosoftAppId       | Set the value of your Azure bot's app ID.  |
-    | MicrosoftAppPassword | Set the Azure Active Directory app client secret value.      | 
-    | ConnectionName       | Set the configured bot's OAuth connection name.      |
+- Create a MS Entra ID application to register a bot resource in Azure and a separate MS Entra ID application to function as the identity provider.
+
+  - Create a User Assigned Managed Identity
+      - Record the client ID of the managed identity.
+  - Create an App Service
+      - Add the User managed identity created in previous step to the Azure App Service under Configuration -> Identity -> User Assigned Managed Identity.
+      - Record the **Default domain** on the **Overview** tab.
+  - Create App Registration
+      - This should be Single tenant (Currently, FIC feature is supported in single tenant bots only).
+      - Record the Application and Tenant ID's.
+      - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
+        - Click on the add credential under **Certificates & Secrets**, **Federated credentials**.
+        - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
+        - Select the managed identity that you created in the previous step.
+        - Enter name for the credential and click on **Add**.
+  - Create an **Azure Bot** in the desired resource group and use the App Registration from the previous step
+     - Update the **Messaging endpoint** on the **Configuration** tab to:  https://{default-domain}/api/messages.
+  - Create the **Identity Provider** 
+     - Create the AppRegistration 
+        - Select SingleTenant and for the Redirect URL, use one of the followings: [OAuth URL support in Azure AI Bot Service](https://learn.microsoft.com/en-us/azure/bot-service/ref-oauth-redirect-urls?view=azure-bot-service-4.0).
+        - Record the Application and Tenant ID's.
+        - Click on the add credential under **Certificates & Secrets**, **Federated credentials**.
+        - On the Add a credential page, select the Federated credential scenario as **Other Issuer**.
+        - Provide information under **Connect your account** section:
+           - Issuer: "https://login.microsoftonline.com/{tenant-ID}/v2.0"
+           - Subject Identifier: "/eid1/c/pub/t/{base64-encoded-tenant-ID}/a/{base64-encoded-first-party-app-client-ID}/{unique-identifier-for-projected-identity}"
+           - Audience: api://AzureADTokenExchange
+           - Unique-identifier-for-projected-identity: Set a unique identifier
+
+             NOTE: You can encode the tenant ID using [this code](https://dotnetfiddle.net/p11CFZ), and for the encoded first-party-app-client-ID, you can use one of these values: `9ExAW52n_ky4ZiS_jhpJIQ`, `ND1y8_Vv60yhSNmdzSUR_A`.
+
+        - In the **API Permisions** tab, grant the following permisions: openid, profile, Mail.Read, Mail.Send, User.Read, User.ReadBasic.All.
+    - Register the Identity Provider with the bot
+        - Add an **OAuth Connection Settings** in your **Azure Bot** resource, on the **Configuration** tab.
+            - Service Provider: AAD v2 with Federated Credentials
+            - Client ID: The App Registration ID of the identity provider created in the previous step
+            - Unique Identifier: The unique identifier of the identity provider created in the previous step
+            - Token Exchange URL: leave it blank
+            - Login URL: leave it blank
+            - Tenant ID: The Tenant ID of the identity provider created in the previous step
+            - Scopes: The names of the permissions from the application registration
+        - Test the connection and concent the requested permissions.
+
+- After Authentication has been configured via Azure Bot Service, you can test the bot.
+
+    - Update `appsettings.json` with required configuration settings:
+        | Property                  | Value Description     | 
+        |----------------------|-----------|
+        | MicrosoftAppType     | SingleTenant       | Currently, FIC feature is supported in single tenant bots only. |
+        | MicrosoftAppId       | The bot's app ID.  |
+        | MicrosoftAppTenantId | The bot's app tenant ID.     | 
+        | MicrosoftAppClientId | The User Managed Identity ID.      | 
+        | ConnectionName       | The configured bot's OAuth connection name.      |
     
-- Run the bot from a terminal or from Visual Studio:
-
-  A) From a terminal, navigate to `samples/csharp_dotnetcore/18.bot-authentication`
-
-  ```bash
-  # run the bot
-  dotnet run
-  ```
+    - A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally. It must be deployed to Azure.
 
-  B) Or from Visual Studio
-
-  - Launch Visual Studio
-  - File -> Open -> Project/Solution
-  - Navigate to `samples/csharp_dotnetcore/18.bot-authentication` folder
-  - Select `AuthenticationBot.csproj` file
-  - Press `F5` to run the project
-
-## Testing the bot using Bot Framework Emulator
-
-[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
-
-- Install the latest Bot Framework Emulator from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
+## Deploy the bot to Azure
 
-### Connect to the bot using Bot Framework Emulator
+The easiest way to deploy the bot to the App Service for testing is using the Visual Studio **Publish** tool.
+- Right click the project and select **Publish**.
+- Click **+ New Profile**.
+- **Azure** -> **Azure App Service (Windows)**.
+- Select the existing App Service, then click **Finish**.
+- Click the **Publish** button.
 
-- Launch Bot Framework Emulator
-- File -> Open Bot
-- Enter a Bot URL of `http://localhost:3978/api/messages`
 
 ## Interacting with the bot
 
 This sample uses bot authentication capabilities in Azure Bot Service, providing features to make it easier to develop a bot that authenticates users to various identity providers such as Azure AD (Azure Active Directory), GitHub, Uber, etc. These updates also take steps towards an improved user experience by eliminating the magic code verification for some clients.
 
-## Deploy the bot to Azure
-
-To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
-
 ## Further reading
 
 - [Bot Framework Documentation](https://docs.botframework.com)
 - [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
 - [Azure Portal](https://portal.azure.com)
 - [Add Authentication to Your Bot Via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp)
+- [Implement Authentication with Federated Identity Credentials](https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-authentication-federated-credential?view=azure-bot-service-4.0&tabs=csharp)
 - [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)
diff --git a/samples/csharp_dotnetcore/18.bot-authentication/Startup.cs b/samples/csharp_dotnetcore/18.bot-authentication/Startup.cs
index d5d50ccb82..98dc00961f 100644
--- a/samples/csharp_dotnetcore/18.bot-authentication/Startup.cs
+++ b/samples/csharp_dotnetcore/18.bot-authentication/Startup.cs
@@ -6,6 +6,7 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Connector.Authentication;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -13,6 +14,13 @@ namespace Microsoft.BotBuilderSamples
 {
     public class Startup
     {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
@@ -21,6 +29,13 @@ public void ConfigureServices(IServiceCollection services)
                 options.SerializerSettings.MaxDepth = HttpHelper.BotMessageSerializerSettings.MaxDepth;
             });
 
+            // Create the Federated Service Client Credentials to be used as the ServiceClientCredentials for the Bot Framework SDK.
+            services.AddSingleton<ServiceClientCredentialsFactory>(
+                new FederatedServiceClientCredentialsFactory(
+                    Configuration["MicrosoftAppId"],
+                    Configuration["MicrosoftAppClientId"],
+                    Configuration["MicrosoftAppTenantId"]));
+
             // Create the Bot Framework Authentication to be used with the Bot Adapter.
             services.AddSingleton<BotFrameworkAuthentication, ConfigurationBotFrameworkAuthentication>();
 
diff --git a/samples/csharp_dotnetcore/18.bot-authentication/appsettings.json b/samples/csharp_dotnetcore/18.bot-authentication/appsettings.json
index 82a6cbc6d1..69509126eb 100644
--- a/samples/csharp_dotnetcore/18.bot-authentication/appsettings.json
+++ b/samples/csharp_dotnetcore/18.bot-authentication/appsettings.json
@@ -1,7 +1,7 @@
 {
   "MicrosoftAppType": "",
   "MicrosoftAppId": "",
-  "MicrosoftAppPassword": "",
+  "MicrosoftAppClientId": "",
   "MicrosoftAppTenantId": "",
   "ConnectionName": ""
 }

From 855c5d80127e313ef6e54443713b46ff4e336e81 Mon Sep 17 00:00:00 2001
From: CeciliaAvila <cecilia.avila@southworks.com>
Date: Tue, 22 Apr 2025 14:00:05 -0300
Subject: [PATCH 3/5] Remove old projects from solution

---
 .../csharp_dotnetcore/csharp_dotnetcore.sln   | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/samples/csharp_dotnetcore/csharp_dotnetcore.sln b/samples/csharp_dotnetcore/csharp_dotnetcore.sln
index 200f7a08ae..a2d91b31fd 100644
--- a/samples/csharp_dotnetcore/csharp_dotnetcore.sln
+++ b/samples/csharp_dotnetcore/csharp_dotnetcore.sln
@@ -41,10 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StateMangementBot", "45.sta
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoBot", "02.echo-bot\EchoBot.csproj", "{586D7BC9-1A3B-4056-BD34-E83242524822}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreBot.Tests", "13.core-bot.tests\CoreBot.Tests.csproj", "{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreBot-App-Insights", "21.corebot-app-insights\CoreBot-App-Insights.csproj", "{84584BDB-F423-45EB-96DD-C539A248E33F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Inspection", "47.inspection\Inspection.csproj", "{CC1FD48D-8F0E-4B89-A7C6-E17429CF80FE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skills-SimpleBotToBot", "Skills-SimpleBotToBot", "{A5567E91-578D-4212-A3CA-2EFEA116E109}"
@@ -65,8 +61,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogRootBot", "81.skills-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogSkillBot", "81.skills-skilldialog\DialogSkillBot\DialogSkillBot.csproj", "{97ED3103-3C3F-4906-B271-8601104CC725}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLP-With-Orchestrator", "14.nlp-with-orchestrator\NLP-With-Orchestrator.csproj", "{625CB637-3CA8-4F56-84E4-1D9028611C44}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skills-SSO-CloudAdapter", "Skills-SSO-CloudAdapter", "{1E03BC3C-FC24-4395-A84E-130759E4AD02}"
 	ProjectSection(SolutionItems) = preProject
 		82.skills-sso-cloudadapter\README.md = 82.skills-sso-cloudadapter\README.md
@@ -246,22 +240,6 @@ Global
 		{586D7BC9-1A3B-4056-BD34-E83242524822}.Release|Any CPU.Build.0 = Release|Any CPU
 		{586D7BC9-1A3B-4056-BD34-E83242524822}.Release|x64.ActiveCfg = Release|Any CPU
 		{586D7BC9-1A3B-4056-BD34-E83242524822}.Release|x64.Build.0 = Release|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Debug|x64.Build.0 = Debug|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{C41395BA-3343-45A4-8C03-7AFF94B9F3B2}.Release|x64.Build.0 = Release|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Debug|x64.Build.0 = Debug|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Release|x64.ActiveCfg = Release|Any CPU
-		{84584BDB-F423-45EB-96DD-C539A248E33F}.Release|x64.Build.0 = Release|Any CPU
 		{CC1FD48D-8F0E-4B89-A7C6-E17429CF80FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC1FD48D-8F0E-4B89-A7C6-E17429CF80FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC1FD48D-8F0E-4B89-A7C6-E17429CF80FE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -302,12 +280,6 @@ Global
 		{97ED3103-3C3F-4906-B271-8601104CC725}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97ED3103-3C3F-4906-B271-8601104CC725}.Release|x64.ActiveCfg = Release|Any CPU
 		{97ED3103-3C3F-4906-B271-8601104CC725}.Release|x64.Build.0 = Release|Any CPU
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Debug|x64.ActiveCfg = Debug|x64
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Debug|x64.Build.0 = Debug|x64
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Release|Any CPU.ActiveCfg = Release|x64
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Release|x64.ActiveCfg = Release|x64
-		{625CB637-3CA8-4F56-84E4-1D9028611C44}.Release|x64.Build.0 = Release|x64
 		{3CDB37CF-C783-4C38-9AEA-92B908737680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CDB37CF-C783-4C38-9AEA-92B908737680}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CDB37CF-C783-4C38-9AEA-92B908737680}.Debug|x64.ActiveCfg = Debug|Any CPU

From 088972646a79ddfea74e57dbbc4a48859caa1fa9 Mon Sep 17 00:00:00 2001
From: CeciliaAvila <cecilia.avila@southworks.com>
Date: Wed, 23 Apr 2025 14:39:07 -0300
Subject: [PATCH 4/5] Update JS 86.bot-auth-fic sample

---
 .../86.bot-authentication-fic/README.md       | 20 +++++++++----------
 .../86.bot-authentication-fic/package.json    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/samples/javascript_nodejs/86.bot-authentication-fic/README.md b/samples/javascript_nodejs/86.bot-authentication-fic/README.md
index 8a800af837..2efc58b227 100644
--- a/samples/javascript_nodejs/86.bot-authentication-fic/README.md
+++ b/samples/javascript_nodejs/86.bot-authentication-fic/README.md
@@ -1,8 +1,8 @@
-# Authentication Bot using Federation Identity Certificate (FIC)
+# Authentication Bot using Federated Identity Credentials (FIC)
 
-Bot Framework v4 bot authentication using Federation Identity Certificate (FIC). Currently, FIC feature is supported for Microsoft tenants only.
+Bot Framework v4 bot authentication using Federated Identity Credentials (FIC). Currently, FIC feature is supported in single tenant bots 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 has been created using [Bot Framework](https://dev.botframework.com/), it shows how to use the bot authentication capabilities of Azure Bot Service. In this sample, we use federated identity credentials configuration to create the Bot Framework Authentication.
 
 ## Prerequisites
 
@@ -23,11 +23,11 @@ This bot has been created using [Bot Framework](https://dev.botframework.com/),
 - For a new bot
   - Create Azure App and Bot
     - Create App Registration
-      - This can be either Single or Multi tenant.
+      - This should be Single Tenant (Currently, FIC feature is supported in single tenant bots only).
       - Record the Application and Tenant ID's.
-      - To create trust using the FIC, we need to link the managed identity to the App Registration.  On the App Registration:
+      - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
         - Click on the add credential under **Certificates & Secrets**, **Federated credentials**
-        - On the Add a credential page, select the Federated credential scenario as **Customer Managed Keys**.
+        - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
         - Select the managed identity that you created in the previous step.
         - Enter name for the credential and click on Add.
         
@@ -35,9 +35,9 @@ This bot has been created using [Bot Framework](https://dev.botframework.com/),
 
 - For an existing bot
    - Navigate to the **App Registration** for the **Azure Bot**
-     - To create trust using the FIC, we need to link the managed identity to the App Registration.  On the App Registration:
+     - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
       - Click on the add credential under **Certificates & Secrets**, **Federated credentials**
-      - On the Add a credential page, select the Federated credential scenario as **Customer Managed Keys**.
+      - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
       - Select the managed identity that you created in the previous step.
       - Enter name for the credential and click on Add.
    - Navigate to the **App Service** for the bot 
@@ -45,7 +45,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com/),
 
 - Set .env variables
 
-  - MicrosoftAppType: {SingTenant | MultiTenant}
+  - MicrosoftAppType: SingleTenant
 
   - MicrosoftAppId: {appId}
 
@@ -53,7 +53,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com/),
 
   - MicrosoftAppClientId: {clientId of managed identity}
 
-- A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally.  It must be deployed to Azure.
+- A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally. It must be deployed to Azure.
 
 ## Deploy the bot to Azure
 
diff --git a/samples/javascript_nodejs/86.bot-authentication-fic/package.json b/samples/javascript_nodejs/86.bot-authentication-fic/package.json
index 591eaaad32..778bd92aed 100644
--- a/samples/javascript_nodejs/86.bot-authentication-fic/package.json
+++ b/samples/javascript_nodejs/86.bot-authentication-fic/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bot-authentication-fic",
     "version": "1.0.0",
-    "description": "Bot Builder v4 bot authentication with Federation Identity Certificate (FIC) sample",
+    "description": "Bot Builder v4 bot authentication with Federated Identity Credentials (FIC) sample",
     "author": "Microsoft",
     "license": "MIT",
     "main": "index.js",

From b299a9524d1886ae0dbf28c968507c199a8011a4 Mon Sep 17 00:00:00 2001
From: CeciliaAvila <cecilia.avila@southworks.com>
Date: Wed, 23 Apr 2025 16:12:51 -0300
Subject: [PATCH 5/5] Update JS 18.bot-authentication sample

---
 .../18.bot-authentication/.env                |  4 +-
 .../18.bot-authentication/README.md           | 87 ++++++++++++++-----
 .../18.bot-authentication/index.js            | 10 ++-
 .../18.bot-authentication/package.json        |  4 +-
 4 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/samples/javascript_nodejs/18.bot-authentication/.env b/samples/javascript_nodejs/18.bot-authentication/.env
index c68dba5934..d562548d85 100644
--- a/samples/javascript_nodejs/18.bot-authentication/.env
+++ b/samples/javascript_nodejs/18.bot-authentication/.env
@@ -1,5 +1,5 @@
 MicrosoftAppType=
 MicrosoftAppId=
-MicrosoftAppPassword=
+MicrosoftAppClientId=
 MicrosoftAppTenantId=
-connectionName=
\ No newline at end of file
+connectionName=
diff --git a/samples/javascript_nodejs/18.bot-authentication/README.md b/samples/javascript_nodejs/18.bot-authentication/README.md
index 862b6c0cf5..5754e1c541 100644
--- a/samples/javascript_nodejs/18.bot-authentication/README.md
+++ b/samples/javascript_nodejs/18.bot-authentication/README.md
@@ -8,6 +8,8 @@ The sample uses the bot authentication capabilities in [Azure Bot Service](https
 
 NOTE: Microsoft Teams currently differs slightly in the way auth is integrated with the bot. Refer to sample 6 [here](https://github.com/OfficeDev/Microsoft-Teams-Samples#bots-samples-using-the-v4-sdk).
 
+NOTE: This sample has been updated to use Federated Identity Credentials (FIC), but it also supports ClientSecret authentication following this guide: [Add Authentication to your bot via Azure Bot Service](https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=userassigned%2Caadv2%2Cjavascript).
+
 ## Prerequisites
 
 - [Node.js](https://nodejs.org) version 18 or higher
@@ -16,6 +18,7 @@ NOTE: Microsoft Teams currently differs slightly in the way auth is integrated w
     # determine node version
     node --version
     ```
+- [Bot Framework SDK](https://github.com/microsoft/botbuilder-dotnet/releases) version 4.23.1 onwards
 
 ## To try this sample
 
@@ -37,45 +40,81 @@ NOTE: Microsoft Teams currently differs slightly in the way auth is integrated w
     npm install
     ```
 
-- Deploy your bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment)
-
-- [Add Authentication to your bot via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp)
-
-After Authentication has been configured via Azure Bot Service, you can test the bot.
-
-## Testing the bot using Bot Framework Emulator
-
-[Bot Framework Emulator](https://github.com/microsoft/botframework-emulator) is a desktop application that allows bot developers to test and debug their bots on localhost or running remotely through a tunnel.
-
-- Install the latest Bot Framework Emulator from [here](https://github.com/Microsoft/BotFramework-Emulator/releases)
-
-### Connect to the bot using Bot Framework Emulator
+- Create a MS Entra ID application to register a bot resource in Azure and a separate MS Entra ID application to function as the identity provider.
+
+  - Create a User Assigned Managed Identity
+      - Record the client ID of the managed identity.
+  - Create an App Service
+      - Add the User managed identity created in previous step to the Azure App Service under Configuration -> Identity -> User Assigned Managed Identity.
+      - Record the **Default domain** on the **Overview** tab.
+  - Create App Registration
+      - This should be Single tenant (Currently, FIC feature is supported in single tenant bots only).
+      - Record the Application and Tenant ID's.
+      - To create trust using the FIC, we need to link the managed identity to the App Registration. On the App Registration:
+        - Click on the add credential under **Certificates & Secrets**, **Federated credentials**.
+        - On the Add a credential page, select the Federated credential scenario as **Managed Identity**.
+        - Select the managed identity that you created in the previous step.
+        - Enter name for the credential and click on **Add**.
+  - Create an **Azure Bot** in the desired resource group and use the App Registration from the previous step
+     - Update the **Messaging endpoint** on the **Configuration** tab to:  https://{default-domain}/api/messages.
+  - Create the **Identity Provider** 
+     - Create the AppRegistration 
+        - Select SingleTenant and for the Redirect URL, use one of the followings: [OAuth URL support in Azure AI Bot Service](https://learn.microsoft.com/en-us/azure/bot-service/ref-oauth-redirect-urls?view=azure-bot-service-4.0).
+        - Record the Application and Tenant ID's.
+        - Click on the add credential under **Certificates & Secrets**, **Federated credentials**.
+        - On the Add a credential page, select the Federated credential scenario as **Other Issuer**.
+        - Provide information under **Connect your account** section:
+           - Issuer: "https://login.microsoftonline.com/{tenant-ID}/v2.0"
+           - Subject Identifier: "/eid1/c/pub/t/{base64-encoded-tenant-ID}/a/{base64-encoded-first-party-app-client-ID}/{unique-identifier-for-projected-identity}"
+           - Audience: api://AzureADTokenExchange
+           - Unique-identifier-for-projected-identity: Set a unique identifier
+
+             NOTE: You can encode the tenant ID using [this code](https://dotnetfiddle.net/p11CFZ), and for the encoded first-party-app-client-ID, you can use one of these values: `9ExAW52n_ky4ZiS_jhpJIQ`, `ND1y8_Vv60yhSNmdzSUR_A`.
+
+        - In the **API Permisions** tab, grant the following permisions: openid, profile, Mail.Read, Mail.Send, User.Read, User.ReadBasic.All.
+    - Register the Identity Provider with the bot
+        - Add an **OAuth Connection Settings** in your **Azure Bot** resource, on the **Configuration** tab.
+            - Service Provider: AAD v2 with Federated Credentials
+            - Client ID: The App Registration ID of the identity provider created in the previous step
+            - Unique Identifier: The unique identifier of the identity provider created in the previous step
+            - Token Exchange URL: leave it blank
+            - Login URL: leave it blank
+            - Tenant ID: The Tenant ID of the identity provider created in the previous step
+            - Scopes: The names of the permissions from the application registration
+        - Test the connection and concent the requested permissions.
+
+- Set .env variables
+
+  - MicrosoftAppType: SingleTenant
+
+  - MicrosoftAppId: {appId}
+
+  - MicrosoftAppTenantId: {tenantId}
+
+  - MicrosoftAppClientId: {clientId of managed identity}
+
+  - connectionName: {Configured bot's OAuth connection name.}
+
+- A bot using Federated Credentials, like UserManagedIdentity, cannot be run locally. It must be deployed to Azure.
 
-- Launch Bot Framework Emulator
-- File -> Open Bot
-- Enter a Bot URL of `http://localhost:3978/api/messages`
+## Deploy the bot to Azure
+To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
 
 ## Interacting with the bot
 
 This sample uses bot authentication capabilities in Azure Bot Service, providing features to make it easier to develop a bot that authenticates users to various identity providers such as Azure AD (Azure Active Directory), GitHub, Uber, etc. These updates also take steps towards an improved user experience by eliminating the magic code verification for some clients.
 
-## Deploy the bot to Azure
-
-To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](https://aka.ms/azuredeployment) for a complete list of deployment instructions.
-
 ## Further reading
 
 - [Bot Framework Documentation](https://docs.botframework.com)
 - [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
 - [Azure Portal](https://portal.azure.com)
-- [Add Authentication to Your Bot Via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp)
+- [Add Authentication to Your Bot Via Azure Bot Service](https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=userassigned%2Caadv2%2Cjavascript)
+- [Implement Authentication with Federated Identity Credentials](https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-authentication-federated-credential)
 - [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)
 - [Restify](https://www.npmjs.com/package/restify)
 - [dotenv](https://www.npmjs.com/package/dotenv)
diff --git a/samples/javascript_nodejs/18.bot-authentication/index.js b/samples/javascript_nodejs/18.bot-authentication/index.js
index b23ec9d090..21571dead1 100644
--- a/samples/javascript_nodejs/18.bot-authentication/index.js
+++ b/samples/javascript_nodejs/18.bot-authentication/index.js
@@ -13,6 +13,7 @@ const ENV_FILE = path.join(__dirname, '.env');
 require('dotenv').config({ path: ENV_FILE });
 
 const restify = require('restify');
+const { FederatedServiceClientCredentialsFactory } = require('botframework-connector');
 
 // Import required bot services.
 // See https://aka.ms/bot-services to learn more about the different parts of a bot.
@@ -27,7 +28,14 @@ const {
 const { AuthBot } = require('./bots/authBot');
 const { MainDialog } = require('./dialogs/mainDialog');
 
-const botFrameworkAuthentication = new ConfigurationBotFrameworkAuthentication(process.env);
+// Create the Federated Service Client Credentials to be used as the ServiceClientCredentials for the Bot Framework SDK.
+const serviceClientCredentialsFactory = new FederatedServiceClientCredentialsFactory(
+    process.env.MicrosoftAppId ?? '',
+    process.env.MicrosoftAppClientId ?? '',
+    process.env.MicrosoftAppTenantId
+);
+
+const botFrameworkAuthentication = new ConfigurationBotFrameworkAuthentication(process.env, serviceClientCredentialsFactory);
 // Create adapter.
 // See https://aka.ms/about-bot-adapter to learn more about adapters.
 const adapter = new CloudAdapter(botFrameworkAuthentication);
diff --git a/samples/javascript_nodejs/18.bot-authentication/package.json b/samples/javascript_nodejs/18.bot-authentication/package.json
index 859e9e73f8..9828a73ce9 100644
--- a/samples/javascript_nodejs/18.bot-authentication/package.json
+++ b/samples/javascript_nodejs/18.bot-authentication/package.json
@@ -16,8 +16,8 @@
         "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
     },
     "dependencies": {
-        "botbuilder": "~4.23.0",
-        "botbuilder-dialogs": "~4.23.0",
+        "botbuilder": "~4.23.1",
+        "botbuilder-dialogs": "~4.23.1",
         "dotenv": "^8.2.0",
         "restify": "~10.0.0"
     },