@microsoft/agents-hosting 1.1.0-alpha.2 → 1.1.0-alpha.58

package/dist/src/baseAdapter.d.ts

@@ -2,15 +2,13 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { AuthConfiguration } from './auth/authConfiguration';
-import { AuthProvider } from './auth/authProvider';
 import { Middleware, MiddlewareHandler, MiddlewareSet } from './middlewareSet';
 import { TurnContext } from './turnContext';
 import { Activity, ConversationReference } from '@microsoft/agents-activity';
 import { ResourceResponse } from './connector-client/resourceResponse';
 import { AttachmentData } from './connector-client/attachmentData';
 import { AttachmentInfo } from './connector-client/attachmentInfo';
-import { UserTokenClient } from './oauth';
+import { JwtPayload } from 'jsonwebtoken';
 /**
  * Abstract base class for all adapters in the Agents framework.
  *
@@ -32,30 +30,14 @@ export declare abstract class BaseAdapter {
      */
     protected middleware: MiddlewareSet;
     private turnError;
-    /**
-     * Symbol key used to store agent identity information in the TurnContext.
-     */
-    readonly AgentIdentityKey: symbol;
     /**
      * Symbol key used to store connector client instances in the TurnContext.
      */
     readonly ConnectorClientKey: symbol;
     /**
-     * Symbol key used to store OAuth scope information in the TurnContext.
-     */
-    readonly OAuthScopeKey: symbol;
-    /**
-     * The authentication provider used for token management.
-     */
-    authProvider: AuthProvider;
-    /**
-     * The user token client used for managing user tokens.
-     */
-    userTokenClient: UserTokenClient | null;
-    /**
-     * The authentication configuration for the adapter.
+     * Symbol key used to store User Token Client instances in the TurnContext.
      */
-    abstract authConfig: AuthConfiguration;
+    readonly UserTokenClientKey: symbol;
     /**
      * Sends a set of activities to the conversation.
      * @param context - The TurnContext for the current turn.
@@ -83,27 +65,30 @@ export declare abstract class BaseAdapter {
      * @param logic - The logic to execute.
      * @returns A promise representing the completion of the continue operation.
      */
-    abstract continueConversation(reference: Partial<ConversationReference>, logic: (revocableContext: TurnContext) => Promise<void>): Promise<void>;
+    abstract continueConversation(botAppIdOrIdentity: string | JwtPayload, reference: Partial<ConversationReference>, logic: (revocableContext: TurnContext) => Promise<void>): Promise<void>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Uploads an attachment.
      * @param conversationId - The conversation ID.
      * @param attachmentData - The attachment data.
      * @returns A promise representing the ResourceResponse for the uploaded attachment.
      */
-    abstract uploadAttachment(conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
+    abstract uploadAttachment(context: TurnContext, conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets attachment information.
      * @param attachmentId - The attachment ID.
      * @returns A promise representing the AttachmentInfo for the requested attachment.
      */
-    abstract getAttachmentInfo(attachmentId: string): Promise<AttachmentInfo>;
+    abstract getAttachmentInfo(context: TurnContext, attachmentId: string): Promise<AttachmentInfo>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets an attachment.
      * @param attachmentId - The attachment ID.
      * @param viewId - The view ID.
      * @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
      */
-    abstract getAttachment(attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
+    abstract getAttachment(context: TurnContext, attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
     /**
      * Gets the error handler for the adapter.
      * @returns The current error handler function.

package/dist/src/baseAdapter.js

@@ -5,7 +5,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAdapter = void 0;
-const msalTokenProvider_1 = require("./auth/msalTokenProvider");
 const middlewareSet_1 = require("./middlewareSet");
 const logger_1 = require("@microsoft/agents-activity/logger");
 const logger = (0, logger_1.debug)('agents:base-adapter');
@@ -38,26 +37,14 @@ class BaseAdapter {
             await context.sendActivity('The agent encountered an error or bug.');
             await context.sendActivity('To continue to run this agent, please fix the source code.');
         };
-        /**
-         * Symbol key used to store agent identity information in the TurnContext.
-         */
-        this.AgentIdentityKey = Symbol('AgentIdentity');
         /**
          * Symbol key used to store connector client instances in the TurnContext.
          */
         this.ConnectorClientKey = Symbol('ConnectorClient');
         /**
-         * Symbol key used to store OAuth scope information in the TurnContext.
-         */
-        this.OAuthScopeKey = Symbol('OAuthScope');
-        /**
-         * The authentication provider used for token management.
-         */
-        this.authProvider = new msalTokenProvider_1.MsalTokenProvider();
-        /**
-         * The user token client used for managing user tokens.
+         * Symbol key used to store User Token Client instances in the TurnContext.
          */
-        this.userTokenClient = null;
+        this.UserTokenClientKey = Symbol('UserTokenClient');
     }
     /**
      * Gets the error handler for the adapter.

package/dist/src/baseAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../src/baseAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../src/baseAdapter.ts"],"names":[],"mappings":"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"}

package/dist/src/cloudAdapter.d.ts

@@ -10,6 +10,7 @@ import { Request } from './auth/request';
 import { ConnectorClient } from './connector-client/connectorClient';
 import { AuthConfiguration } from './auth/authConfiguration';
 import { AuthProvider } from './auth/authProvider';
+import { MsalConnectionManager } from './auth/msalConnectionManager';
 import { Activity, ConversationReference, ConversationParameters } from '@microsoft/agents-activity';
 import { ResourceResponse } from './connector-client/resourceResponse';
 import { InvokeResponse } from './invoke/invokeResponse';
@@ -17,25 +18,25 @@ import { AttachmentInfo } from './connector-client/attachmentInfo';
 import { AttachmentData } from './connector-client/attachmentData';
 import { UserTokenClient } from './oauth';
 import { HeaderPropagationCollection, HeaderPropagationDefinition } from './headerPropagation';
+import { JwtPayload } from 'jsonwebtoken';
 /**
  * Adapter for handling agent interactions with various channels through cloud-based services.
  *
  * @remarks
- * CloudAdapter processes incoming HTTP requests from Microsoft Bot Framework channels,
+ * CloudAdapter processes incoming HTTP requests from Azure Bot Service channels,
  * authenticates them, and generates outgoing responses. It manages the communication
  * flow between agents and users across different channels, handling activities, attachments,
  * and conversation continuations.
  */
 export declare class CloudAdapter extends BaseAdapter {
     /**
-     * Client for connecting to the Bot Framework Connector service
+     * Client for connecting to the Azure Bot Service
      */
-    connectorClient: ConnectorClient;
-    authConfig: AuthConfiguration;
+    connectionManager: MsalConnectionManager;
     /**
      * Creates an instance of CloudAdapter.
      * @param authConfig - The authentication configuration for securing communications
-     * @param authProvider - Optional custom authentication provider. If not specified, a default MsalTokenProvider will be used
+     * @param authProvider - No longer used
      */
     constructor(authConfig?: AuthConfiguration, authProvider?: AuthProvider, userTokenClient?: UserTokenClient);
     /**
@@ -57,22 +58,41 @@ export declare class CloudAdapter extends BaseAdapter {
      * @returns A promise that resolves to a ConnectorClient instance
      * @protected
      */
-    protected createConnectorClient(serviceUrl: string, scope: string, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
+    protected createConnectorClient(serviceUrl: string, scope: string, audience: string, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
+    protected createConnectorClientWithIdentity(identity: JwtPayload, activity: Activity, scope: string, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
+    static createIdentity(appId: string): JwtPayload;
     /**
      * Sets the connector client on the turn context.
      *
      * @param context - The current turn context
      * @protected
      */
-    protected setConnectorClient(context: TurnContext): void;
+    protected setConnectorClient(context: TurnContext, connectorClient?: ConnectorClient): void;
     /**
+     * Creates a user token client for a specific service URL and scope.
+     *
+     * @param serviceUrl - The URL of the service to connect to
+     * @param scope - The authentication scope to use
+     * @param headers - Optional headers to propagate in the request
+     * @returns A promise that resolves to a ConnectorClient instance
+     * @protected
+     */
+    protected createUserTokenClient(tokenServiceEndpoint?: string, scope?: string, audience?: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
+    /**
+     * Sets the user token client on the turn context.
+     *
+     * @param context - The current turn context
+     * @protected
+     */
+    protected setUserTokenClient(context: TurnContext, userTokenClient?: UserTokenClient): void;
+    /**
+     * @deprecated This function will not be supported in future versions.  Create TurnContext directly.
      * Creates a TurnContext for the given activity and logic.
      * @param activity - The activity to process.
      * @param logic - The logic to execute.
      * @returns The created TurnContext.
      */
-    createTurnContext(activity: Activity, logic: AgentHandler): TurnContext;
-    createTurnContextWithScope(activity: Activity, logic: AgentHandler, scope: string): Promise<TurnContext>;
+    createTurnContext(activity: Activity, logic: AgentHandler, identity?: JwtPayload): TurnContext;
     /**
      * Sends multiple activities to the conversation.
      * @param context - The TurnContext for the current turn.
@@ -80,12 +100,6 @@ export declare class CloudAdapter extends BaseAdapter {
      * @returns A promise representing the array of ResourceResponses for the sent activities.
      */
     sendActivities(context: TurnContext, activities: Activity[]): Promise<ResourceResponse[]>;
-    /**
-     * Replies to an activity.
-     * @param activity - The activity to reply to.
-     * @returns A promise representing the ResourceResponse for the sent activity.
-     */
-    replyToActivity(activity: Activity): Promise<ResourceResponse>;
     /**
      * Processes an incoming request and sends the response.
      * @param request - The incoming request.
@@ -115,12 +129,12 @@ export declare class CloudAdapter extends BaseAdapter {
      * @param logic - The logic to execute.
      * @returns A promise representing the completion of the continue operation.
      */
-    continueConversation(reference: ConversationReference, logic: (revocableContext: TurnContext) => Promise<void>, isResponse?: Boolean): Promise<void>;
+    continueConversation(botAppIdOrIdentity: string | JwtPayload, reference: ConversationReference, logic: (revocableContext: TurnContext) => Promise<void>, isResponse?: Boolean): Promise<void>;
     /**
-   * Processes the turn results and returns an InvokeResponse if applicable.
-   * @param context - The TurnContext for the current turn.
-   * @returns The InvokeResponse if applicable, otherwise undefined.
-   */
+    * Processes the turn results and returns an InvokeResponse if applicable.
+    * @param context - The TurnContext for the current turn.
+    * @returns The InvokeResponse if applicable, otherwise undefined.
+    */
     protected processTurnResults(context: TurnContext): InvokeResponse | undefined;
     /**
      * Creates an activity to represent the result of creating a conversation.
@@ -143,23 +157,26 @@ export declare class CloudAdapter extends BaseAdapter {
      */
     createConversationAsync(agentAppId: string, channelId: string, serviceUrl: string, audience: string, conversationParameters: ConversationParameters, logic: (context: TurnContext) => Promise<void>): Promise<void>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Uploads an attachment.
      * @param conversationId - The conversation ID.
      * @param attachmentData - The attachment data.
      * @returns A promise representing the ResourceResponse for the uploaded attachment.
      */
-    uploadAttachment(conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
+    uploadAttachment(context: TurnContext, conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets attachment information.
      * @param attachmentId - The attachment ID.
      * @returns A promise representing the AttachmentInfo for the requested attachment.
      */
-    getAttachmentInfo(attachmentId: string): Promise<AttachmentInfo>;
+    getAttachmentInfo(context: TurnContext, attachmentId: string): Promise<AttachmentInfo>;
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets an attachment.
      * @param attachmentId - The attachment ID.
      * @param viewId - The view ID.
      * @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
      */
-    getAttachment(attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
+    getAttachment(context: TurnContext, attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
 }

package/dist/src/cloudAdapter.js

@@ -43,8 +43,9 @@ const baseAdapter_1 = require("./baseAdapter");
 const turnContext_1 = require("./turnContext");
 const connectorClient_1 = require("./connector-client/connectorClient");
 const authConfiguration_1 = require("./auth/authConfiguration");
+const authConstants_1 = require("./auth/authConstants");
+const msalConnectionManager_1 = require("./auth/msalConnectionManager");
 const agents_activity_1 = require("@microsoft/agents-activity");
-const msalTokenProvider_1 = require("./auth/msalTokenProvider");
 const uuid = __importStar(require("uuid"));
 const logger_1 = require("@microsoft/agents-activity/logger");
 const statusCodes_1 = require("./statusCodes");
@@ -56,7 +57,7 @@ const logger = (0, logger_1.debug)('agents:cloud-adapter');
  * Adapter for handling agent interactions with various channels through cloud-based services.
  *
  * @remarks
- * CloudAdapter processes incoming HTTP requests from Microsoft Bot Framework channels,
+ * CloudAdapter processes incoming HTTP requests from Azure Bot Service channels,
  * authenticates them, and generates outgoing responses. It manages the communication
  * flow between agents and users across different channels, handling activities, attachments,
  * and conversation continuations.
@@ -65,13 +66,12 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
     /**
      * Creates an instance of CloudAdapter.
      * @param authConfig - The authentication configuration for securing communications
-     * @param authProvider - Optional custom authentication provider. If not specified, a default MsalTokenProvider will be used
+     * @param authProvider - No longer used
      */
     constructor(authConfig, authProvider, userTokenClient) {
         super();
-        this.authConfig = authConfig !== null && authConfig !== void 0 ? authConfig : (0, authConfiguration_1.loadAuthConfigFromEnv)();
-        this.authProvider = authProvider !== null && authProvider !== void 0 ? authProvider : new msalTokenProvider_1.MsalTokenProvider();
-        this.userTokenClient = userTokenClient !== null && userTokenClient !== void 0 ? userTokenClient : new oauth_1.UserTokenClient(this.authConfig.clientId);
+        authConfig = (0, authConfiguration_1.getAuthConfigWithDefaults)(authConfig);
+        this.connectionManager = new msalConnectionManager_1.MsalConnectionManager(undefined, undefined, authConfig);
     }
     /**
      * Determines whether a connector client is needed based on the delivery mode and service URL of the given activity.
@@ -107,8 +107,53 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
      * @returns A promise that resolves to a ConnectorClient instance
      * @protected
      */
-    async createConnectorClient(serviceUrl, scope, headers) {
-        return connectorClient_1.ConnectorClient.createClientWithAuth(serviceUrl, this.authConfig, this.authProvider, scope, headers);
+    async createConnectorClient(serviceUrl, scope, audience, headers) {
+        // get the correct token provider
+        const tokenProvider = this.connectionManager.getTokenProvider(audience, serviceUrl);
+        const token = await tokenProvider.getAccessToken(scope);
+        return connectorClient_1.ConnectorClient.createClientWithToken(serviceUrl, token, headers);
+    }
+    async createConnectorClientWithIdentity(identity, activity, scope, headers) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        let audience;
+        if (Array.isArray(identity.aud)) {
+            audience = identity.aud[0];
+        }
+        else {
+            audience = identity.aud;
+        }
+        if (!audience) {
+            // anonymous
+            return connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, null, headers);
+        }
+        let connectorClient;
+        const tokenProvider = this.connectionManager.getTokenProvider(audience, (_a = activity.serviceUrl) !== null && _a !== void 0 ? _a : '');
+        if (activity.isAgenticRequest()) {
+            logger.debug('Activity is from an agentic source, using special scope', activity.recipient);
+            if (((_b = activity.recipient) === null || _b === void 0 ? void 0 : _b.role) === agents_activity_1.RoleTypes.AgenticIdentity && activity.getAgenticInstanceId()) {
+                // get agentic instance token
+                const token = await tokenProvider.getAgenticInstanceToken((_c = activity.getAgenticInstanceId()) !== null && _c !== void 0 ? _c : '');
+                connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
+            }
+            else if (((_d = activity.recipient) === null || _d === void 0 ? void 0 : _d.role) === agents_activity_1.RoleTypes.AgenticUser && activity.getAgenticInstanceId() && activity.getAgenticUser()) {
+                const scope = (_f = (_e = tokenProvider.connectionSettings) === null || _e === void 0 ? void 0 : _e.scope) !== null && _f !== void 0 ? _f : authConstants_1.ApxProductionScope;
+                const token = await tokenProvider.getAgenticUserToken((_g = activity.getAgenticInstanceId()) !== null && _g !== void 0 ? _g : '', (_h = activity.getAgenticUser()) !== null && _h !== void 0 ? _h : '', [scope]);
+                connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
+            }
+            else {
+                throw new Error('Could not create connector client for agentic user');
+            }
+        }
+        else {
+            const token = await tokenProvider.getAccessToken(scope);
+            connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
+        }
+        return connectorClient;
+    }
+    static createIdentity(appId) {
+        return {
+            aud: appId
+        };
     }
     /**
      * Sets the connector client on the turn context.
@@ -116,21 +161,41 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
      * @param context - The current turn context
      * @protected
      */
-    setConnectorClient(context) {
-        context.turnState.set('connectorClient', this.connectorClient);
+    setConnectorClient(context, connectorClient) {
+        context.turnState.set(this.ConnectorClientKey, connectorClient);
+    }
+    /**
+     * Creates a user token client for a specific service URL and scope.
+     *
+     * @param serviceUrl - The URL of the service to connect to
+     * @param scope - The authentication scope to use
+     * @param headers - Optional headers to propagate in the request
+     * @returns A promise that resolves to a ConnectorClient instance
+     * @protected
+     */
+    async createUserTokenClient(tokenServiceEndpoint = 'https://api.botframework.com', scope = 'https://api.botframework.com', audience = 'https://api.botframework.com', headers) {
+        // get the correct token provider
+        const tokenProvider = this.connectionManager.getTokenProvider(audience, tokenServiceEndpoint);
+        return oauth_1.UserTokenClient.createClientWithScope(tokenServiceEndpoint, tokenProvider, scope, headers);
+    }
+    /**
+     * Sets the user token client on the turn context.
+     *
+     * @param context - The current turn context
+     * @protected
+     */
+    setUserTokenClient(context, userTokenClient) {
+        context.turnState.set(this.UserTokenClientKey, userTokenClient);
     }
     /**
+     * @deprecated This function will not be supported in future versions.  Create TurnContext directly.
      * Creates a TurnContext for the given activity and logic.
      * @param activity - The activity to process.
      * @param logic - The logic to execute.
      * @returns The created TurnContext.
      */
-    createTurnContext(activity, logic) {
-        return new turnContext_1.TurnContext(this, activity);
-    }
-    async createTurnContextWithScope(activity, logic, scope) {
-        this.connectorClient = await connectorClient_1.ConnectorClient.createClientWithAuth(activity.serviceUrl, this.authConfig, this.authProvider, scope);
-        return new turnContext_1.TurnContext(this, activity);
+    createTurnContext(activity, logic, identity) {
+        return new turnContext_1.TurnContext(this, activity, identity);
     }
     /**
      * Sends multiple activities to the conversation.
@@ -166,12 +231,11 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
                 if (!activity.serviceUrl || (activity.conversation == null) || !activity.conversation.id) {
                     throw new Error('Invalid activity object');
                 }
-                this.connectorClient = await this.createConnectorClient(activity.serviceUrl, 'https://api.botframework.com');
                 if (activity.replyToId) {
-                    response = await this.connectorClient.replyToActivity(activity.conversation.id, activity.replyToId, activity);
+                    response = await context.turnState.get(this.ConnectorClientKey).replyToActivity(activity.conversation.id, activity.replyToId, activity);
                 }
                 else {
-                    response = await this.connectorClient.sendToConversation(activity.conversation.id, activity);
+                    response = await context.turnState.get(this.ConnectorClientKey).sendToConversation(activity.conversation.id, activity);
                 }
             }
             if (!response) {
@@ -181,17 +245,6 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
         }
         return responses;
     }
-    /**
-     * Replies to an activity.
-     * @param activity - The activity to reply to.
-     * @returns A promise representing the ResourceResponse for the sent activity.
-     */
-    async replyToActivity(activity) {
-        if (!activity.serviceUrl || (activity.conversation == null) || !activity.conversation.id || !activity.id) {
-            throw new Error('Invalid activity object');
-        }
-        return await this.connectorClient.replyToActivity(activity.conversation.id, activity.id, activity);
-    }
     /**
      * Processes an incoming request and sends the response.
      * @param request - The incoming request.
@@ -226,13 +279,16 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
             return end(statusCodes_1.StatusCodes.BAD_REQUEST);
         }
         logger.debug('Received activity: ', activity);
-        const context = this.createTurnContext(activity, logic);
+        const context = new turnContext_1.TurnContext(this, activity, request.user);
         const scope = (_d = (_b = (_a = request.user) === null || _a === void 0 ? void 0 : _a.azp) !== null && _b !== void 0 ? _b : (_c = request.user) === null || _c === void 0 ? void 0 : _c.appid) !== null && _d !== void 0 ? _d : 'https://api.botframework.com';
         // if Delivery Mode == ExpectReplies, we don't need a connector client.
         if (this.resolveIfConnectorClientIsNeeded(activity)) {
-            logger.debug('Creating connector client with scope: ', scope);
-            this.connectorClient = await this.createConnectorClient(activity.serviceUrl, scope, headers);
-            this.setConnectorClient(context);
+            const connectorClient = await this.createConnectorClientWithIdentity(request.user, activity, scope, headers);
+            this.setConnectorClient(context, connectorClient);
+        }
+        if (!activity.isAgenticRequest()) {
+            const userTokenClient = await this.createUserTokenClient();
+            this.setUserTokenClient(context, userTokenClient);
         }
         if ((activity === null || activity === void 0 ? void 0 : activity.type) === agents_activity_1.ActivityTypes.InvokeResponse ||
             (activity === null || activity === void 0 ? void 0 : activity.type) === agents_activity_1.ActivityTypes.Invoke ||
@@ -278,7 +334,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
         if (!activity.serviceUrl || (activity.conversation == null) || !activity.conversation.id || !activity.id) {
             throw new Error('Invalid activity object');
         }
-        const response = await this.connectorClient.updateActivity(activity.conversation.id, activity.id, activity);
+        const response = await context.turnState.get(this.ConnectorClientKey).updateActivity(activity.conversation.id, activity.id, activity);
         return response.id ? { id: response.id } : undefined;
     }
     /**
@@ -294,7 +350,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
         if (!reference || !reference.serviceUrl || (reference.conversation == null) || !reference.conversation.id || !reference.activityId) {
             throw new Error('Invalid conversation reference object');
         }
-        await this.connectorClient.deleteActivity(reference.conversation.id, reference.activityId);
+        await context.turnState.get(this.ConnectorClientKey).deleteActivity(reference.conversation.id, reference.activityId);
     }
     /**
      * Continues a conversation.
@@ -302,24 +358,29 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
      * @param logic - The logic to execute.
      * @returns A promise representing the completion of the continue operation.
      */
-    async continueConversation(reference, logic, isResponse = false) {
+    async continueConversation(botAppIdOrIdentity, reference, logic, isResponse = false) {
+        var _a, _b;
         if (!reference || !reference.serviceUrl || (reference.conversation == null) || !reference.conversation.id) {
             throw new Error('Invalid conversation reference object');
         }
-        let context;
-        if (isResponse) {
-            context = await this.createTurnContextWithScope(agents_activity_1.Activity.getContinuationActivity(reference), logic, 'https://api.botframework.com');
-        }
-        else {
-            context = this.createTurnContext(agents_activity_1.Activity.getContinuationActivity(reference), logic);
-        }
+        const botAppId = typeof botAppIdOrIdentity === 'string' ? botAppIdOrIdentity : botAppIdOrIdentity.aud;
+        const identity = typeof botAppIdOrIdentity !== 'string'
+            ? botAppIdOrIdentity
+            : CloudAdapter.createIdentity(botAppId);
+        const continuationActivity = agents_activity_1.Activity.getContinuationActivity(reference);
+        const context = new turnContext_1.TurnContext(this, agents_activity_1.Activity.getContinuationActivity(reference), identity);
+        const scope = (_b = (_a = identity.azp) !== null && _a !== void 0 ? _a : identity.appid) !== null && _b !== void 0 ? _b : 'https://api.botframework.com';
+        const connectorClient = await this.createConnectorClientWithIdentity(identity, continuationActivity, scope);
+        this.setConnectorClient(context, connectorClient);
+        const userTokenClient = await this.createUserTokenClient();
+        this.setUserTokenClient(context, userTokenClient);
         await this.runMiddleware(context, logic);
     }
     /**
-   * Processes the turn results and returns an InvokeResponse if applicable.
-   * @param context - The TurnContext for the current turn.
-   * @returns The InvokeResponse if applicable, otherwise undefined.
-   */
+    * Processes the turn results and returns an InvokeResponse if applicable.
+    * @param context - The TurnContext for the current turn.
+    * @returns The InvokeResponse if applicable, otherwise undefined.
+    */
     processTurnResults(context) {
         logger.info('<--Sending back turn results');
         // Handle ExpectedReplies scenarios where all activities have been buffered and sent back at once in an invoke response.
@@ -386,52 +447,67 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
             throw new TypeError('`conversationParameters` must be defined');
         if (!logic)
             throw new TypeError('`logic` must be defined');
-        const restClient = await this.createConnectorClient(serviceUrl, audience);
+        const restClient = await this.createConnectorClient(serviceUrl, audience, audience);
+        const userTokenClient = await this.createUserTokenClient();
         const createConversationResult = await restClient.createConversation(conversationParameters);
         const createActivity = this.createCreateActivity(createConversationResult.id, channelId, serviceUrl, conversationParameters);
-        const context = new turnContext_1.TurnContext(this, createActivity);
+        const context = new turnContext_1.TurnContext(this, createActivity, CloudAdapter.createIdentity(agentAppId));
+        this.setConnectorClient(context, restClient);
+        this.setUserTokenClient(context, userTokenClient);
         await this.runMiddleware(context, logic);
     }
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Uploads an attachment.
      * @param conversationId - The conversation ID.
      * @param attachmentData - The attachment data.
      * @returns A promise representing the ResourceResponse for the uploaded attachment.
      */
-    async uploadAttachment(conversationId, attachmentData) {
+    async uploadAttachment(context, conversationId, attachmentData) {
+        if (context === undefined) {
+            throw new Error('context is required');
+        }
         if (conversationId === undefined) {
             throw new Error('conversationId is required');
         }
         if (attachmentData === undefined) {
             throw new Error('attachmentData is required');
         }
-        return await this.connectorClient.uploadAttachment(conversationId, attachmentData);
+        return await context.turnState.get(this.ConnectorClientKey).uploadAttachment(conversationId, attachmentData);
     }
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets attachment information.
      * @param attachmentId - The attachment ID.
      * @returns A promise representing the AttachmentInfo for the requested attachment.
      */
-    async getAttachmentInfo(attachmentId) {
+    async getAttachmentInfo(context, attachmentId) {
+        if (context === undefined) {
+            throw new Error('context is required');
+        }
         if (attachmentId === undefined) {
             throw new Error('attachmentId is required');
         }
-        return await this.connectorClient.getAttachmentInfo(attachmentId);
+        return await context.turnState.get(this.ConnectorClientKey).getAttachmentInfo(attachmentId);
     }
     /**
+     * @deprecated This function will not be supported in future versions.  Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
      * Gets an attachment.
      * @param attachmentId - The attachment ID.
      * @param viewId - The view ID.
      * @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
      */
-    async getAttachment(attachmentId, viewId) {
+    async getAttachment(context, attachmentId, viewId) {
+        if (context === undefined) {
+            throw new Error('context is required');
+        }
         if (attachmentId === undefined) {
             throw new Error('attachmentId is required');
         }
         if (viewId === undefined) {
             throw new Error('viewId is required');
         }
-        return await this.connectorClient.getAttachment(attachmentId, viewId);
+        return await context.turnState.get(this.ConnectorClientKey).getAttachment(attachmentId, viewId);
     }
 }
 exports.CloudAdapter = CloudAdapter;