@microsoft/agents-hosting 0.5.4-ga4d0401645 → 0.5.12-g2d752e9b13

package/dist/src/oauth/oAuthFlow.d.ts

@@ -1,6 +1,7 @@
-import { AgentStatePropertyAccessor, UserState, TurnContext, UserTokenClient } from '../';
-import { TokenResponse } from './tokenResponse';
-export declare class FlowState {
+import { TurnContext, Storage } from '../';
+import { UserTokenClient } from './userTokenClient';
+import { TokenResponse } from './userTokenClient.types';
+export interface FlowState {
     flowStarted: boolean;
     flowExpires: number;
 }
@@ -8,6 +9,7 @@ export declare class FlowState {
  * Manages the OAuth flow
  */
 export declare class OAuthFlow {
+    private storage;
     /**
      * The user token client used for managing user tokens.
      */
@@ -15,11 +17,7 @@ export declare class OAuthFlow {
     /**
      * The current state of the OAuth flow.
      */
-    state: FlowState | null;
-    /**
-     * The accessor for managing the flow state in user state.
-     */
-    flowStateAccessor: AgentStatePropertyAccessor<FlowState | null>;
+    state: FlowState;
     /**
      * The ID of the token exchange request, used to deduplicate requests.
      */
@@ -40,7 +38,7 @@ export declare class OAuthFlow {
      * Creates a new instance of OAuthFlow.
      * @param userState The user state.
      */
-    constructor(userState: UserState, absOauthConnectionName: string, tokenClient?: UserTokenClient, cardTitle?: string, cardText?: string);
+    constructor(storage: Storage, absOauthConnectionName: string, tokenClient?: UserTokenClient, cardTitle?: string, cardText?: string);
     /**
      * Retrieves the user token from the user token service.
      * @param context The turn context containing the activity information.
@@ -53,7 +51,7 @@ export declare class OAuthFlow {
      * @param context The turn context.
      * @returns A promise that resolves to the user token.
      */
-    beginFlow(context: TurnContext): Promise<TokenResponse>;
+    beginFlow(context: TurnContext): Promise<TokenResponse | undefined>;
     /**
      * Continues the OAuth flow.
      * @param context The turn context.
@@ -73,4 +71,5 @@ export declare class OAuthFlow {
      */
     private getUserState;
     private initializeTokenClient;
+    private getFlowStateKey;
 }

package/dist/src/oauth/oAuthFlow.js

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthFlow = exports.FlowState = void 0;
+exports.OAuthFlow = void 0;
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 const logger_1 = require("./../logger");
 const agents_activity_1 = require("@microsoft/agents-activity");
 const __1 = require("../");
-const tokenResponse_1 = require("./tokenResponse");
+const userTokenClient_1 = require("./userTokenClient");
 const logger = (0, logger_1.debug)('agents:oauth-flow');
-class FlowState {
-    constructor() {
-        this.flowStarted = false;
-        this.flowExpires = 0;
-    }
-}
-exports.FlowState = FlowState;
 /**
  * Manages the OAuth flow
  */
@@ -23,7 +16,8 @@ class OAuthFlow {
      * Creates a new instance of OAuthFlow.
      * @param userState The user state.
      */
-    constructor(userState, absOauthConnectionName, tokenClient, cardTitle, cardText) {
+    constructor(storage, absOauthConnectionName, tokenClient, cardTitle, cardText) {
+        this.storage = storage;
         /**
          * The ID of the token exchange request, used to deduplicate requests.
          */
@@ -36,8 +30,7 @@ class OAuthFlow {
          * The text of the OAuth card.
          */
         this.cardText = 'login';
-        this.state = new FlowState();
-        this.flowStateAccessor = userState.createProperty('flowState');
+        this.state = { flowExpires: 0, flowStarted: false };
         this.absOauthConnectionName = absOauthConnectionName;
         this.userTokenClient = tokenClient !== null && tokenClient !== void 0 ? tokenClient : null;
         this.cardTitle = cardTitle !== null && cardTitle !== void 0 ? cardTitle : this.cardTitle;
@@ -73,26 +66,20 @@ class OAuthFlow {
         }
         logger.info('Starting OAuth flow for connectionName:', this.absOauthConnectionName);
         await this.initializeTokenClient(context);
-        const tokenResponse = await this.userTokenClient.getUserToken(this.absOauthConnectionName, context.activity.channelId, (_a = context.activity.from) === null || _a === void 0 ? void 0 : _a.id);
-        if ((tokenResponse === null || tokenResponse === void 0 ? void 0 : tokenResponse.status) === tokenResponse_1.TokenRequestStatus.Success) {
+        const act = context.activity;
+        const output = await this.userTokenClient.getTokenOrSignInResource((_a = act.from) === null || _a === void 0 ? void 0 : _a.id, this.absOauthConnectionName, act.channelId, act.getConversationReference(), act.relatesTo, undefined);
+        if (output && output.tokenResponse) {
             this.state.flowStarted = false;
             this.state.flowExpires = 0;
-            await this.flowStateAccessor.set(context, this.state);
-            logger.info('User token retrieved successfully from service');
-            return tokenResponse;
+            await this.storage.write({ [this.getFlowStateKey(context)]: this.state });
+            return output.tokenResponse;
         }
-        const authConfig = context.adapter.authConfig;
-        const signingResource = await this.userTokenClient.getSignInResource(authConfig.clientId, this.absOauthConnectionName, context.activity.getConversationReference(), context.activity.relatesTo);
-        const oCard = __1.CardFactory.oauthCard(this.absOauthConnectionName, this.cardTitle, this.cardText, signingResource);
+        const oCard = __1.CardFactory.oauthCard(this.absOauthConnectionName, this.cardTitle, this.cardText, output.signInResource);
         await context.sendActivity(__1.MessageFactory.attachment(oCard));
         this.state.flowStarted = true;
         this.state.flowExpires = Date.now() + 30000;
-        await this.flowStateAccessor.set(context, this.state);
-        logger.info('OAuth begin flow completed, waiting for user to sign in');
-        return {
-            token: undefined,
-            status: tokenResponse_1.TokenRequestStatus.InProgress
-        };
+        await this.storage.write({ [this.getFlowStateKey(context)]: this.state });
+        return undefined;
     }
     /**
      * Continues the OAuth flow.
@@ -107,7 +94,7 @@ class OAuthFlow {
             logger.warn('Flow expired');
             this.state.flowStarted = false;
             await context.sendActivity(__1.MessageFactory.text('Sign-in session expired. Please try again.'));
-            return { status: tokenResponse_1.TokenRequestStatus.Expired, token: undefined };
+            return { token: undefined };
         }
         const contFlowActivity = context.activity;
         if (contFlowActivity.type === agents_activity_1.ActivityTypes.Message) {
@@ -126,23 +113,23 @@ class OAuthFlow {
             logger.info('Continuing OAuth flow with tokenExchange');
             const tokenExchangeRequest = contFlowActivity.value;
             if (this.tokenExchangeId === tokenExchangeRequest.id) { // dedupe
-                return { status: tokenResponse_1.TokenRequestStatus.InProgress, token: undefined };
+                return { token: undefined };
             }
             this.tokenExchangeId = tokenExchangeRequest.id;
             const userTokenResp = await ((_f = this.userTokenClient) === null || _f === void 0 ? void 0 : _f.exchangeTokenAsync((_g = contFlowActivity.from) === null || _g === void 0 ? void 0 : _g.id, this.absOauthConnectionName, contFlowActivity.channelId, tokenExchangeRequest));
-            if ((userTokenResp === null || userTokenResp === void 0 ? void 0 : userTokenResp.status) === tokenResponse_1.TokenRequestStatus.Success) {
+            if (userTokenResp && userTokenResp.token) {
                 logger.info('Token exchanged');
                 this.state.flowStarted = false;
-                await this.flowStateAccessor.set(context, this.state);
+                await this.storage.write({ [this.getFlowStateKey(context)]: this.state });
                 return userTokenResp;
             }
             else {
                 logger.warn('Token exchange failed');
                 this.state.flowStarted = true;
-                return { status: tokenResponse_1.TokenRequestStatus.Failed, token: undefined };
+                return { token: undefined };
             }
         }
-        return { status: tokenResponse_1.TokenRequestStatus.Failed, token: undefined };
+        return { token: undefined };
     }
     /**
      * Signs the user out.
@@ -155,7 +142,7 @@ class OAuthFlow {
         await this.initializeTokenClient(context);
         await ((_a = this.userTokenClient) === null || _a === void 0 ? void 0 : _a.signOut((_b = context.activity.from) === null || _b === void 0 ? void 0 : _b.id, this.absOauthConnectionName, context.activity.channelId));
         this.state.flowExpires = 0;
-        await this.flowStateAccessor.set(context, this.state);
+        this.storage.write({ [this.getFlowStateKey(context)]: this.state });
         logger.info('User signed out successfully');
     }
     /**
@@ -164,18 +151,28 @@ class OAuthFlow {
      * @returns A promise that resolves to the user state.
      */
     async getUserState(context) {
-        let userProfile = await this.flowStateAccessor.get(context, null);
-        if (userProfile === null) {
-            userProfile = new FlowState();
-        }
+        var _a;
+        const key = this.getFlowStateKey(context);
+        const data = await this.storage.read([key]);
+        const userProfile = (_a = data[key]) !== null && _a !== void 0 ? _a : { flowStarted: false, flowExpires: 0 };
         return userProfile;
     }
     async initializeTokenClient(context) {
         if (this.userTokenClient === undefined || this.userTokenClient === null) {
             const scope = 'https://api.botframework.com';
             const accessToken = await context.adapter.authProvider.getAccessToken(context.adapter.authConfig, scope);
-            this.userTokenClient = new __1.UserTokenClient(accessToken);
+            this.userTokenClient = new userTokenClient_1.UserTokenClient(accessToken, context.adapter.authConfig.clientId);
+        }
+    }
+    getFlowStateKey(context) {
+        var _a, _b;
+        const channelId = context.activity.channelId;
+        const conversationId = (_a = context.activity.conversation) === null || _a === void 0 ? void 0 : _a.id;
+        const userId = (_b = context.activity.from) === null || _b === void 0 ? void 0 : _b.id;
+        if (!channelId || !conversationId || !userId) {
+            throw new Error('ChannelId, conversationId, and userId must be set in the activity');
         }
+        return `oauth/${channelId}/${conversationId}/${userId}/flowState`;
     }
 }
 exports.OAuthFlow = OAuthFlow;

package/dist/src/oauth/oAuthFlow.js.map

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

package/dist/src/oauth/userTokenClient.d.ts

@@ -1,18 +1,18 @@
 import { AxiosInstance } from 'axios';
-import { SigningResource } from './signingResource';
 import { ConversationReference } from '@microsoft/agents-activity';
-import { TokenExchangeRequest } from './tokenExchangeRequest';
-import { TokenResponse } from './tokenResponse';
+import { AadResourceUrls, SignInResource, TokenExchangeRequest, TokenOrSinginResourceResponse, TokenResponse, TokenStatus } from './userTokenClient.types';
 /**
  * Client for managing user tokens.
  */
 export declare class UserTokenClient {
     client: AxiosInstance;
+    msAppId: string;
     /**
      * Creates a new instance of UserTokenClient.
      * @param token The token to use for authentication.
+     * @param msAppId The Microsoft application ID.
      */
-    constructor(token: string);
+    constructor(token: string, appId: string);
     /**
      * Gets the user token.
      * @param connectionName The connection name.
@@ -32,12 +32,12 @@ export declare class UserTokenClient {
     signOut(userId: string, connectionName: string, channelId: string): Promise<void>;
     /**
      * Gets the sign-in resource.
-     * @param appId The application ID.
-     * @param cnxName The connection name.
+     * @param msAppId The application ID.
+     * @param connectionName The connection name.
      * @param activity The activity.
      * @returns A promise that resolves to the signing resource.
      */
-    getSignInResource(appId: string, cnxName: string, conversationReference: ConversationReference, relatesTo?: ConversationReference): Promise<SigningResource>;
+    getSignInResource(msAppId: string, connectionName: string, conversation: ConversationReference, relatesTo?: ConversationReference): Promise<SignInResource>;
     /**
      * Exchanges the token.
      * @param userId The user ID.
@@ -47,4 +47,34 @@ export declare class UserTokenClient {
      * @returns A promise that resolves to the exchanged token.
      */
     exchangeTokenAsync(userId: string, connectionName: string, channelId: string, tokenExchangeRequest: TokenExchangeRequest): Promise<TokenResponse>;
+    /**
+     * Gets the token or sign-in resource.
+     * @param userId The user ID.
+     * @param connectionName The connection name.
+     * @param channelId The channel ID.
+     * @param conversation The conversation reference.
+     * @param relatesTo The related conversation reference.
+     * @param code The code.
+     * @param finalRedirect The final redirect URL.
+     * @param fwdUrl The forward URL.
+     * @returns A promise that resolves to the token or sign-in resource response.
+     */
+    getTokenOrSignInResource(userId: string, connectionName: string, channelId: string, conversation: ConversationReference, relatesTo: ConversationReference, code: string, finalRedirect?: string, fwdUrl?: string): Promise<TokenOrSinginResourceResponse>;
+    /**
+     * Gets the token status.
+     * @param userId The user ID.
+     * @param channelId The channel ID.
+     * @param include The optional include parameter.
+     * @returns A promise that resolves to the token status.
+     */
+    getTokenStatus(userId: string, channelId: string, include?: string): Promise<TokenStatus[]>;
+    /**
+     * Gets the AAD tokens.
+     * @param userId The user ID.
+     * @param connectionName The connection name.
+     * @param channelId The channel ID.
+     * @param resourceUrls The resource URLs.
+     * @returns A promise that resolves to the AAD tokens.
+     */
+    getAadTokens(userId: string, connectionName: string, channelId: string, resourceUrls: AadResourceUrls): Promise<Record<string, TokenResponse>>;
 }

package/dist/src/oauth/userTokenClient.js

@@ -9,7 +9,6 @@ exports.UserTokenClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const logger_1 = require("../logger");
 const activityWireCompat_1 = require("../activityWireCompat");
-const tokenResponse_1 = require("./tokenResponse");
 const getProductInfo_1 = require("../getProductInfo");
 const logger = (0, logger_1.debug)('agents:user-token-client');
 /**
@@ -19,8 +18,10 @@ class UserTokenClient {
     /**
      * Creates a new instance of UserTokenClient.
      * @param token The token to use for authentication.
+     * @param msAppId The Microsoft application ID.
      */
-    constructor(token) {
+    constructor(token, appId) {
+        this.msAppId = appId;
         const baseURL = 'https://api.botframework.com';
         const axiosInstance = axios_1.default.create({
             baseURL,
@@ -45,16 +46,13 @@ class UserTokenClient {
         try {
             const params = { connectionName, channelId, userId, code };
             const response = await this.client.get('/api/usertoken/GetToken', { params });
-            return { ...response.data, status: tokenResponse_1.TokenRequestStatus.Success };
+            return response.data;
         }
         catch (error) {
             if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== 404) {
                 logger.error(error);
             }
-            return {
-                status: tokenResponse_1.TokenRequestStatus.Failed,
-                token: undefined
-            };
+            return { token: undefined };
         }
     }
     /**
@@ -79,18 +77,18 @@ class UserTokenClient {
     }
     /**
      * Gets the sign-in resource.
-     * @param appId The application ID.
-     * @param cnxName The connection name.
+     * @param msAppId The application ID.
+     * @param connectionName The connection name.
      * @param activity The activity.
      * @returns A promise that resolves to the signing resource.
      */
-    async getSignInResource(appId, cnxName, conversationReference, relatesTo) {
+    async getSignInResource(msAppId, connectionName, conversation, relatesTo) {
         try {
             const tokenExchangeState = {
-                connectionName: cnxName,
-                conversation: conversationReference,
+                connectionName,
+                conversation,
                 relatesTo,
-                msAppId: appId
+                msAppId
             };
             const tokenExchangeStateNormalized = (0, activityWireCompat_1.normalizeTokenExchangeState)(tokenExchangeState);
             const state = Buffer.from(JSON.stringify(tokenExchangeStateNormalized)).toString('base64');
@@ -115,13 +113,56 @@ class UserTokenClient {
         try {
             const params = { userId, connectionName, channelId };
             const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
-            return { ...response.data, status: tokenResponse_1.TokenRequestStatus.Success };
+            return response.data;
         }
         catch (error) {
             logger.error(error);
-            return { status: tokenResponse_1.TokenRequestStatus.Failed, token: undefined };
+            return { token: undefined };
         }
     }
+    /**
+     * Gets the token or sign-in resource.
+     * @param userId The user ID.
+     * @param connectionName The connection name.
+     * @param channelId The channel ID.
+     * @param conversation The conversation reference.
+     * @param relatesTo The related conversation reference.
+     * @param code The code.
+     * @param finalRedirect The final redirect URL.
+     * @param fwdUrl The forward URL.
+     * @returns A promise that resolves to the token or sign-in resource response.
+     */
+    async getTokenOrSignInResource(userId, connectionName, channelId, conversation, relatesTo, code, finalRedirect = '', fwdUrl = '') {
+        const state = Buffer.from(JSON.stringify({ conversation, relatesTo, connectionName, msAppId: this.msAppId })).toString('base64');
+        const params = { userId, connectionName, channelId, state, code, finalRedirect, fwdUrl };
+        const response = await this.client.get('/api/usertoken/GetTokenOrSignInResource', { params });
+        return response.data;
+    }
+    /**
+     * Gets the token status.
+     * @param userId The user ID.
+     * @param channelId The channel ID.
+     * @param include The optional include parameter.
+     * @returns A promise that resolves to the token status.
+     */
+    async getTokenStatus(userId, channelId, include = null) {
+        const params = { userId, channelId, include };
+        const response = await this.client.get('/api/usertoken/GetTokenStatus', { params });
+        return response.data;
+    }
+    /**
+     * Gets the AAD tokens.
+     * @param userId The user ID.
+     * @param connectionName The connection name.
+     * @param channelId The channel ID.
+     * @param resourceUrls The resource URLs.
+     * @returns A promise that resolves to the AAD tokens.
+     */
+    async getAadTokens(userId, connectionName, channelId, resourceUrls) {
+        const params = { userId, connectionName, channelId };
+        const response = await this.client.post('/api/usertoken/GetAadTokens', resourceUrls, { params });
+        return response.data;
+    }
 }
 exports.UserTokenClient = UserTokenClient;
 //# sourceMappingURL=userTokenClient.js.map

package/dist/src/oauth/userTokenClient.js.map

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

package/dist/src/oauth/userTokenClient.types.d.ts

@@ -0,0 +1,147 @@
+import { CardAction } from '@microsoft/agents-activity';
+/**
+ * Represents the response containing OAuth token information.
+ * This interface encapsulates all data related to an OAuth token response.
+ */
+export interface TokenResponse {
+    /**
+       * The OAuth token string, or undefined if no token is available.
+       */
+    token: string | undefined;
+}
+/**
+ * Represents a request for exchanging tokens.
+ * This interface defines the structure of a token exchange request, including the URI, token, and ID.
+ */
+export interface TokenExchangeRequest {
+    /**
+       * The URI for the token exchange request.
+       */
+    uri?: string;
+    /**
+       * The token to be exchanged.
+       */
+    token?: string;
+    /**
+       * The ID associated with the token exchange request.
+       */
+    id?: string;
+}
+/**
+ * Represents a resource for exchanging tokens.
+ * This interface defines the structure of a token exchange resource, including its ID, URI, and provider ID.
+ */
+export interface TokenExchangeResource {
+    /**
+       * The ID of the token exchange resource.
+       */
+    id?: string;
+    /**
+       * The URI of the token exchange resource.
+       */
+    uri?: string;
+    /**
+       * The provider ID for the token exchange resource.
+       */
+    providerId?: string;
+}
+/**
+ * Represents a resource for posting tokens.
+ * This interface defines the structure of a token post resource, including its SAS URL.
+ */
+export interface TokenPostResource {
+    /**
+       * The SAS URL for the token post resource.
+       */
+    sasUrl?: string;
+}
+/**
+ * Represents a resource for signing in.
+ * This interface defines the structure of a sign-in resource, including the sign-in link, token exchange resource, and token post resource.
+ */
+export interface SignInResource {
+    /**
+       * The link for signing in.
+       */
+    signInLink: string;
+    /**
+       * The resource for token exchange.
+       */
+    tokenExchangeResource: TokenExchangeResource;
+    /**
+       * The resource for token post.
+       */
+    tokenPostResource: TokenPostResource;
+}
+/**
+ * Represents an OAuth card.
+ * This interface defines the structure of an OAuth card, including its buttons, connection name, text, and associated resources.
+ */
+export interface OAuthCard {
+    /**
+       * The buttons associated with the OAuth card.
+       */
+    buttons: CardAction[];
+    /**
+       * The connection name for the OAuth card.
+       */
+    connectionName: string;
+    /**
+       * The text content of the OAuth card.
+       */
+    text: string;
+    /**
+       * The token exchange resource for the OAuth card.
+       */
+    tokenExchangeResource: TokenExchangeResource;
+    /**
+       * The token post resource for the OAuth card.
+       */
+    tokenPostResource: TokenPostResource;
+}
+/**
+ * Represents a response containing either a token or a sign-in resource.
+ * This interface defines the structure of a response that includes a token response and a sign-in resource.
+ */
+export interface TokenOrSinginResourceResponse {
+    /**
+       * The token response containing OAuth token information.
+       */
+    tokenResponse: TokenResponse;
+    /**
+       * The sign-in resource containing sign-in and token exchange information.
+       */
+    signInResource: SignInResource;
+}
+/**
+ * Represents the status of a token.
+ * This interface defines the structure of a token status, including channel ID, connection name, and other metadata.
+ */
+export interface TokenStatus {
+    /**
+       * The ID of the channel associated with the token.
+       */
+    channelId: string;
+    /**
+       * The connection name associated with the token.
+       */
+    connectionName: string;
+    /**
+       * Indicates whether a token is available.
+       */
+    hasToken: boolean;
+    /**
+       * The display name of the service provider.
+       */
+    serviceProviderDisplayName: string;
+}
+/**
+ * Represents a collection of Azure Active Directory (AAD) resource URLs.
+ * This interface defines the structure of a collection of resource URLs.
+ */
+export interface AadResourceUrls {
+    /**
+       * An array of resource URLs.
+       */
+    resourceUrls: string[];
+}

package/dist/src/oauth/{oAuthCard.js → userTokenClient.types.js}

@@ -2,4 +2,4 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=oAuthCard.js.map
+//# sourceMappingURL=userTokenClient.types.js.map

package/dist/src/oauth/userTokenClient.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"userTokenClient.types.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.types.ts"],"names":[],"mappings":";AAAA,4DAA4D;AAC5D,kCAAkC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@microsoft/agents-hosting",
-  "version": "0.5.4-ga4d0401645",
+  "version": "0.5.12-g2d752e9b13",
   "homepage": "https://github.com/microsoft/Agents-for-js",
   "repository": {
     "type": "git",
@@ -19,8 +19,8 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@azure/msal-node": "^3.5.3",
-    "@microsoft/agents-activity": "0.5.4-ga4d0401645",
+    "@azure/msal-node": "^3.6.0",
+    "@microsoft/agents-activity": "0.5.12-g2d752e9b13",
     "axios": "^1.9.0",
     "debug": "^4.3.7",
     "jsonwebtoken": "^9.0.2",