update oauth teams sso

microsoft · Jan 18, 2024 · 5a3cfe0 · 5a3cfe0
1 parent ff6adda
commit 5a3cfe0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/dotnet/samples/06.auth.teamsSSO.bot/AdapterWithErrorHandler.cs b/dotnet/samples/06.auth.teamsSSO.bot/AdapterWithErrorHandler.cs
@@ -1,13 +1,12 @@
-using Microsoft.Bot.Builder.Integration.AspNet.Core;
-using Microsoft.Bot.Builder.TraceExtensions;
-using Microsoft.Bot.Connector.Authentication;
+using Microsoft.Bot.Builder.TraceExtensions;
+using Microsoft.Teams.AI;
 
 namespace BotAuth
 {
-    public class AdapterWithErrorHandler : CloudAdapter
+    public class AdapterWithErrorHandler : TeamsAdapter
     {
-        public AdapterWithErrorHandler(BotFrameworkAuthentication auth, ILogger<CloudAdapter> logger)
-            : base(auth, logger)
+        public AdapterWithErrorHandler(IConfiguration configuration, ILogger<TeamsAdapter> logger)
+            : base(configuration, null, logger)
         {
             OnTurnError = async (turnContext, exception) =>
             {

diff --git a/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj b/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.1" />
     <PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Teams.AI" Version="1.0.*-*" />
+    <PackageReference Include="Microsoft.Teams.AI" Version="1.1.*-*" />
   </ItemGroup>
 
   <!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->

diff --git a/dotnet/samples/06.auth.teamsSSO.bot/Program.cs b/dotnet/samples/06.auth.teamsSSO.bot/Program.cs
@@ -27,13 +27,13 @@
 // Create the Cloud Adapter with error handling enabled.
 // Note: some classes expect a BotAdapter and some expect a BotFrameworkHttpAdapter, so
 // register the same adapter instance for both types.
-builder.Services.AddSingleton<CloudAdapter, AdapterWithErrorHandler>();
-builder.Services.AddSingleton<IBotFrameworkHttpAdapter>(sp => sp.GetService<CloudAdapter>());
+builder.Services.AddSingleton<TeamsAdapter, AdapterWithErrorHandler>();
+builder.Services.AddSingleton<IBotFrameworkHttpAdapter>(sp => sp.GetService<TeamsAdapter>());
 
 // Create the storage to persist turn state
 builder.Services.AddSingleton<IStorage, MemoryStorage>();
 
-builder.Services.AddSingleton<IConfidentialClientApplication>(sp =>
+builder.Services.AddSingleton(sp =>
 {
     IConfidentialClientApplication app = ConfidentialClientApplicationBuilder.Create(config.AAD_APP_CLIENT_ID)
                                         .WithClientSecret(config.AAD_APP_CLIENT_SECRET)
@@ -48,7 +48,7 @@
 builder.Services.AddTransient<IBot>(sp =>
 {
     IStorage storage = sp.GetService<IStorage>();
-    BotAdapter adapter = sp.GetService<CloudAdapter>()!;
+    TeamsAdapter adapter = sp.GetService<TeamsAdapter>()!;
     IConfidentialClientApplication msal = sp.GetService<IConfidentialClientApplication>();
     string signInLink = $"https://{config.BOT_DOMAIN}/auth-start.html";