update ts user-agent implementation to match dotnet

js/packages/teams-ai/src/Application.spec.ts

@@ -14,16 +14,14 @@ import {
     FileConsentCardResponse
 } from 'botbuilder';
 
-import { PasswordServiceClientCredentialFactory } from 'botframework-connector';
-
 import { Application, ConversationUpdateEvents, MessageReactionEvents, TeamsMessageEvents } from './Application';
 import { AdaptiveCardsOptions } from './AdaptiveCards';
 import { AIOptions } from './AI';
 import { TaskModulesOptions } from './TaskModules';
 import { TurnState } from './TurnState';
 import { createTestConversationUpdate, createTestInvoke } from './internals';
 import { TestPlanner } from './planners/TestPlanner';
-import { TeamsBotFrameworkAuthentication } from './TeamsBotFrameworkAuthentication';
+import { TeamsAdapter } from './TeamsAdapter';
 
 class MockUserTokenClient {
     /**
@@ -158,11 +156,7 @@ describe('Application', () => {
 
     describe('botAuthentication', () => {
         const app = new Application({
-            adapter: {
-                authentication: new TeamsBotFrameworkAuthentication({
-                    credentialsFactory: new PasswordServiceClientCredentialFactory('', '')
-                })
-            }
+            adapter: new TeamsAdapter()
         });
 
         it('should initialize `CloudAdapter`', () => {
@@ -244,11 +238,7 @@ describe('Application', () => {
 
         beforeEach(() => {
             app = new Application({
-                adapter: {
-                    authentication: new TeamsBotFrameworkAuthentication({
-                        credentialsFactory: new PasswordServiceClientCredentialFactory('', '')
-                    })
-                },
+                adapter: new TeamsAdapter(),
                 authentication: authenticationSettings
             });
 
@@ -272,11 +262,7 @@ describe('Application', () => {
         it('should start signin flow', async () => {
             const authSettings = { ...authenticationSettings, autoSignIn: true };
             const app = new Application({
-                adapter: {
-                    authentication: new TeamsBotFrameworkAuthentication({
-                        credentialsFactory: new PasswordServiceClientCredentialFactory('', '')
-                    })
-                },
+                adapter: new TeamsAdapter(),
                 authentication: authSettings
             });
 

js/packages/teams-ai/src/Application.ts

@@ -11,7 +11,6 @@ import {
     Activity,
     ActivityTypes,
     BotAdapter,
-    CloudAdapter,
     ConversationReference,
     FileConsentCardResponse,
     O365ConnectorCardActionQuery,
@@ -36,7 +35,7 @@ import {
     setUserInSignInFlow,
     userInSignInFlow
 } from './authentication/BotAuthenticationBase';
-import { BotAdapterOptions } from './BotAdapterOptions';
+import { TeamsAdapter } from './TeamsAdapter';
 
 /**
  * @private
@@ -72,7 +71,7 @@ export interface ApplicationOptions<TState extends TurnState> {
     /**
      * Optional. Options used to initialize your `BotAdapter`
      */
-    adapter?: BotAdapter | BotAdapterOptions;
+    adapter?: TeamsAdapter;
 
     /**
      * Optional. OAuth prompt settings to use for authentication.
@@ -247,13 +246,7 @@ export class Application<TState extends TurnState = TurnState> {
 
         // Create Adapter
         if (this._options.adapter) {
-            if ('authentication' in this._options.adapter) {
-                if (this._options.adapter?.authentication) {
-                    this._adapter = new CloudAdapter(this._options.adapter.authentication);
-                }
-            } else {
-                this._adapter = this._options.adapter as BotAdapter;
-            }
+            this._adapter = this._options.adapter;
         }
 
         // Create AI component if configured with a planner

js/packages/teams-ai/src/ApplicationBuilder.spec.ts

@@ -1,24 +1,17 @@
 import { strict as assert } from 'assert';
 import { MemoryStorage } from 'botbuilder';
-import { PasswordServiceClientCredentialFactory } from 'botframework-connector';
 
 import { ApplicationBuilder } from './ApplicationBuilder';
 import { AdaptiveCardsOptions } from './AdaptiveCards';
 import { AIOptions } from './AI';
 import { TurnState } from './TurnState';
 import { TestPlanner } from './planners';
 import { TaskModulesOptions } from './TaskModules';
-import { BotAdapterOptions } from './BotAdapterOptions';
-import { TeamsBotFrameworkAuthentication } from './TeamsBotFrameworkAuthentication';
+import { TeamsAdapter } from './TeamsAdapter';
 
 describe('ApplicationBuilder', () => {
     const botAppId = 'testBot';
-    const adapter: BotAdapterOptions = {
-        authentication: new TeamsBotFrameworkAuthentication({
-            credentialsFactory: new PasswordServiceClientCredentialFactory('', '')
-        })
-    };
-
+    const adapter = new TeamsAdapter();
     const adaptiveCards: AdaptiveCardsOptions = { actionSubmitFilter: 'cardFilter' };
     const ai: AIOptions<TurnState> = { planner: new TestPlanner() };
     const longRunningMessages = true;

js/packages/teams-ai/src/ApplicationBuilder.ts

@@ -1,7 +1,7 @@
-import { Storage, BotAdapter } from 'botbuilder';
+import { Storage } from 'botbuilder';
 
 import { Application, ApplicationOptions } from './Application';
-import { BotAdapterOptions } from './BotAdapterOptions';
+import { TeamsAdapter } from './TeamsAdapter';
 import { AIOptions } from './AI';
 import { TurnState } from './TurnState';
 import { AdaptiveCardsOptions } from './AdaptiveCards';
@@ -18,11 +18,11 @@ export class ApplicationBuilder<TState extends TurnState = TurnState> {
     /**
      * Configures the application to use long running messages.
      * Default state for longRunningMessages is false
-     * @param {BotAdapter | BotAdapterOptions} adapter The adapter to use for routing incoming requests.
+     * @param {TeamsAdapter} adapter The adapter to use for routing incoming requests.
      * @param {string} botAppId The Microsoft App ID for the bot.
      * @returns {this} The ApplicationBuilder instance.
      */
-    public withLongRunningMessages(adapter: BotAdapter | BotAdapterOptions, botAppId: string): this {
+    public withLongRunningMessages(adapter: TeamsAdapter, botAppId: string): this {
         if (!botAppId) {
             throw new Error(
                 `The Application.longRunningMessages property is unavailable because botAppId cannot be null or undefined.`
@@ -77,14 +77,11 @@ export class ApplicationBuilder<TState extends TurnState = TurnState> {
 
     /**
      * Configures user authentication settings.
-     * @param {BotAdapter | BotAdapterOptions} adapter The adapter to use for user authentication.
+     * @param {TeamsAdapter} adapter The adapter to use for user authentication.
      * @param {AuthenticationOptions} authenticationOptions The options to configure the authentication manager.
      * @returns {this} The ApplicationBuilder instance.
      */
-    public withAuthentication(
-        adapter: BotAdapter | BotAdapterOptions,
-        authenticationOptions: AuthenticationOptions
-    ): this {
+    public withAuthentication(adapter: TeamsAdapter, authenticationOptions: AuthenticationOptions): this {
         this._options.adapter = adapter;
         this._options.authentication = authenticationOptions;
         return this;

js/packages/teams-ai/src/TeamsAdapter.ts

@@ -0,0 +1,41 @@
+import {
+    CloudAdapter,
+    ConfigurationBotFrameworkAuthentication,
+    ConfigurationBotFrameworkAuthenticationOptions
+} from 'botbuilder';
+
+import {
+    AuthenticationConfiguration,
+    ConnectorClientOptions,
+    ServiceClientCredentialsFactory
+} from 'botframework-connector';
+
+import packageInfo from '../package.json';
+
+const USER_AGENT = `teamsai-js/${packageInfo.version}`;
+
+/**
+ * An adapter that implements the Bot Framework Protocol and can be hosted in different cloud environments both public and private.
+ */
+export class TeamsAdapter extends CloudAdapter {
+    constructor(
+        botFrameworkAuthConfig?: ConfigurationBotFrameworkAuthenticationOptions,
+        credentialsFactory?: ServiceClientCredentialsFactory,
+        authConfiguration?: AuthenticationConfiguration,
+        connectorClientOptions?: ConnectorClientOptions
+    ) {
+        super(
+            new ConfigurationBotFrameworkAuthentication(
+                botFrameworkAuthConfig || {},
+                credentialsFactory,
+                authConfiguration,
+                undefined,
+                {
+                    ...(connectorClientOptions || {}),
+                    userAgent: USER_AGENT,
+                    userAgentHeaderName: undefined
+                }
+            )
+        );
+    }
+}

js/packages/teams-ai/src/index.ts

@@ -29,5 +29,4 @@ export * from './TestTurnState';
 export * from './TurnState';
 export * from './Utilities';
 export * from './authentication/TeamsBotSsoPrompt';
-export * from './TeamsBotFrameworkAuthentication';
-export * from './BotAdapterOptions';
+export * from './TeamsAdapter';