run code clean

microsoft · Feb 27, 2025 · 59398d6 · 59398d6
1 parent f6bb2c0
commit 59398d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/samples/basic/echo-bot/dotnet/AspNetExtensions.cs b/samples/basic/echo-bot/dotnet/AspNetExtensions.cs
@@ -1,23 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Agents.Authentication;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Protocols;
-using System.Collections.Concurrent;
-using System.Net.Http;
-using System.Threading.Tasks;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using Microsoft.IdentityModel.Tokens;
 using Microsoft.IdentityModel.Validators;
+using System.Collections.Concurrent;
+using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Agents.Samples
 {
@@ -99,23 +91,23 @@ public static void AddBotAspNetAuthentication(this IServiceCollection services,
             }
 
             bool isGov = tokenValidationSection.GetValue<bool>("IsGov", false);
-            var azureBotServiceTokenHandling = tokenValidationSection.GetValue<bool>("AzureBotServiceTokenHandling", true);
+            bool azureBotServiceTokenHandling = tokenValidationSection.GetValue<bool>("AzureBotServiceTokenHandling", true);
 
             // If the `AzureBotServiceOpenIdMetadataUrl` setting is not specified, use the default based on `IsGov`.  This is what is used to authenticate ABS tokens.
-            var azureBotServiceOpenIdMetadataUrl = tokenValidationSection["AzureBotServiceOpenIdMetadataUrl"];
+            string? azureBotServiceOpenIdMetadataUrl = tokenValidationSection["AzureBotServiceOpenIdMetadataUrl"];
             if (string.IsNullOrEmpty(azureBotServiceOpenIdMetadataUrl))
             {
                 azureBotServiceOpenIdMetadataUrl = isGov ? AuthenticationConstants.GovAzureBotServiceOpenIdMetadataUrl : AuthenticationConstants.PublicAzureBotServiceOpenIdMetadataUrl;
             }
 
             // If the `OpenIdMetadataUrl` setting is not specified, use the default based on `IsGov`.  This is what is used to authenticate Entra ID tokens.
-            var openIdMetadataUrl = tokenValidationSection["OpenIdMetadataUrl"];
+            string? openIdMetadataUrl = tokenValidationSection["OpenIdMetadataUrl"];
             if (string.IsNullOrEmpty(openIdMetadataUrl))
             {
                 openIdMetadataUrl = isGov ? AuthenticationConstants.GovOpenIdMetadataUrl : AuthenticationConstants.PublicOpenIdMetadataUrl;
             }
 
-            var openIdRefreshInterval = tokenValidationSection.GetValue<TimeSpan>("OpenIdMetadataRefresh", BaseConfigurationManager.DefaultAutomaticRefreshInterval);
+            TimeSpan openIdRefreshInterval = tokenValidationSection.GetValue<TimeSpan>("OpenIdMetadataRefresh", BaseConfigurationManager.DefaultAutomaticRefreshInterval);
 
             services.AddAuthentication(options =>
             {
@@ -145,7 +137,7 @@ public static void AddBotAspNetAuthentication(this IServiceCollection services,
                     // Create a ConfigurationManager based on the requestor.  This is to handle ABS non-Entra tokens.
                     OnMessageReceived = async context =>
                     {
-                        var authorizationHeader = context.Request.Headers.Authorization.ToString();
+                        string authorizationHeader = context.Request.Headers.Authorization.ToString();
 
                         if (string.IsNullOrEmpty(authorizationHeader))
                         {
@@ -165,7 +157,7 @@ public static void AddBotAspNetAuthentication(this IServiceCollection services,
                         }
 
                         JwtSecurityToken token = new(parts[1]);
-                        var issuer = token.Claims.FirstOrDefault(claim => claim.Type == AuthenticationConstants.IssuerClaim)?.Value;
+                        string? issuer = token.Claims.FirstOrDefault(claim => claim.Type == AuthenticationConstants.IssuerClaim)?.Value;
 
                         if (azureBotServiceTokenHandling && AuthenticationConstants.BotFrameworkTokenIssuer.Equals(issuer))
                         {

diff --git a/samples/basic/echo-bot/dotnet/BotController.cs b/samples/basic/echo-bot/dotnet/BotController.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.Agents.BotBuilder;
+using Microsoft.Agents.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Agents.Hosting.AspNetCore;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Agents.BotBuilder;
 
 namespace EchoBot
 {

diff --git a/samples/basic/echo-bot/dotnet/MyBot.cs b/samples/basic/echo-bot/dotnet/MyBot.cs
@@ -4,9 +4,6 @@
 using Microsoft.Agents.BotBuilder;
 using Microsoft.Agents.Core.Interfaces;
 using Microsoft.Agents.Core.Models;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace EchoBot
 {

diff --git a/samples/basic/echo-bot/dotnet/Program.cs b/samples/basic/echo-bot/dotnet/Program.cs
@@ -4,11 +4,8 @@
 using EchoBot;
 using Microsoft.Agents.Hosting.AspNetCore;
 using Microsoft.Agents.Samples;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
-var builder = WebApplication.CreateBuilder(args);
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers();
 builder.Services.AddHttpClient();
@@ -19,7 +16,7 @@
 // Add basic bot functionality
 builder.AddBot<MyBot>();
 
-var app = builder.Build();
+WebApplication app = builder.Build();
 
 if (app.Environment.IsDevelopment())
 {