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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (139) hide show
  1. package/dist/package.json +10 -6
  2. package/dist/src/activityWireCompat.js +8 -3
  3. package/dist/src/activityWireCompat.js.map +1 -1
  4. package/dist/src/agent-client/agentClient.js +7 -3
  5. package/dist/src/agent-client/agentClient.js.map +1 -1
  6. package/dist/src/agent-client/agentResponseHandler.js +6 -2
  7. package/dist/src/agent-client/agentResponseHandler.js.map +1 -1
  8. package/dist/src/app/agentApplication.d.ts +26 -11
  9. package/dist/src/app/agentApplication.js +93 -82
  10. package/dist/src/app/agentApplication.js.map +1 -1
  11. package/dist/src/app/agentApplicationBuilder.d.ts +2 -2
  12. package/dist/src/app/agentApplicationBuilder.js.map +1 -1
  13. package/dist/src/app/agentApplicationOptions.d.ts +9 -2
  14. package/dist/src/app/appRoute.d.ts +7 -0
  15. package/dist/src/app/{authorization.d.ts → auth/authorization.d.ts} +33 -139
  16. package/dist/src/app/auth/authorization.js +188 -0
  17. package/dist/src/app/auth/authorization.js.map +1 -0
  18. package/dist/src/app/auth/authorizationManager.d.ts +71 -0
  19. package/dist/src/app/auth/authorizationManager.js +170 -0
  20. package/dist/src/app/auth/authorizationManager.js.map +1 -0
  21. package/dist/src/app/auth/handlerStorage.d.ts +36 -0
  22. package/dist/src/app/auth/handlerStorage.js +62 -0
  23. package/dist/src/app/auth/handlerStorage.js.map +1 -0
  24. package/dist/src/app/auth/handlers/agenticAuthorization.d.ts +97 -0
  25. package/dist/src/app/auth/handlers/agenticAuthorization.js +145 -0
  26. package/dist/src/app/auth/handlers/agenticAuthorization.js.map +1 -0
  27. package/dist/src/app/auth/handlers/azureBotAuthorization.d.ts +222 -0
  28. package/dist/src/app/auth/handlers/azureBotAuthorization.js +428 -0
  29. package/dist/src/app/auth/handlers/azureBotAuthorization.js.map +1 -0
  30. package/dist/src/app/auth/handlers/index.d.ts +2 -0
  31. package/dist/src/app/auth/handlers/index.js +19 -0
  32. package/dist/src/app/auth/handlers/index.js.map +1 -0
  33. package/dist/src/app/auth/index.d.ts +2 -0
  34. package/dist/src/app/auth/index.js +19 -0
  35. package/dist/src/app/auth/index.js.map +1 -0
  36. package/dist/src/app/auth/types.d.ts +104 -0
  37. package/dist/src/app/auth/types.js +24 -0
  38. package/dist/src/app/auth/types.js.map +1 -0
  39. package/dist/src/app/index.d.ts +2 -3
  40. package/dist/src/app/index.js +2 -3
  41. package/dist/src/app/index.js.map +1 -1
  42. package/dist/src/app/routeList.d.ts +1 -1
  43. package/dist/src/app/routeList.js +22 -5
  44. package/dist/src/app/routeList.js.map +1 -1
  45. package/dist/src/app/streaming/streamingResponse.js +2 -1
  46. package/dist/src/app/streaming/streamingResponse.js.map +1 -1
  47. package/dist/src/auth/MemoryCache.d.ts +16 -0
  48. package/dist/src/auth/MemoryCache.js +58 -0
  49. package/dist/src/auth/MemoryCache.js.map +1 -0
  50. package/dist/src/auth/authConfiguration.d.ts +44 -2
  51. package/dist/src/auth/authConfiguration.js +218 -53
  52. package/dist/src/auth/authConfiguration.js.map +1 -1
  53. package/dist/src/auth/authConstants.d.ts +11 -0
  54. package/dist/src/auth/authConstants.js +15 -0
  55. package/dist/src/auth/authConstants.js.map +1 -0
  56. package/dist/src/auth/authProvider.d.ts +23 -0
  57. package/dist/src/auth/connections.d.ts +40 -0
  58. package/dist/src/auth/connections.js +7 -0
  59. package/dist/src/auth/connections.js.map +1 -0
  60. package/dist/src/auth/index.d.ts +2 -0
  61. package/dist/src/auth/index.js +2 -0
  62. package/dist/src/auth/index.js.map +1 -1
  63. package/dist/src/auth/jwt-middleware.js +31 -18
  64. package/dist/src/auth/jwt-middleware.js.map +1 -1
  65. package/dist/src/auth/msalConnectionManager.d.ts +63 -0
  66. package/dist/src/auth/msalConnectionManager.js +124 -0
  67. package/dist/src/auth/msalConnectionManager.js.map +1 -0
  68. package/dist/src/auth/msalTokenProvider.d.ts +31 -0
  69. package/dist/src/auth/msalTokenProvider.js +167 -16
  70. package/dist/src/auth/msalTokenProvider.js.map +1 -1
  71. package/dist/src/baseAdapter.d.ts +10 -25
  72. package/dist/src/baseAdapter.js +2 -15
  73. package/dist/src/baseAdapter.js.map +1 -1
  74. package/dist/src/cloudAdapter.d.ts +40 -23
  75. package/dist/src/cloudAdapter.js +132 -56
  76. package/dist/src/cloudAdapter.js.map +1 -1
  77. package/dist/src/connector-client/connectorClient.d.ts +9 -0
  78. package/dist/src/connector-client/connectorClient.js +39 -9
  79. package/dist/src/connector-client/connectorClient.js.map +1 -1
  80. package/dist/src/index.d.ts +0 -1
  81. package/dist/src/index.js +0 -1
  82. package/dist/src/index.js.map +1 -1
  83. package/dist/src/oauth/index.d.ts +0 -1
  84. package/dist/src/oauth/index.js +0 -1
  85. package/dist/src/oauth/index.js.map +1 -1
  86. package/dist/src/oauth/userTokenClient.d.ts +30 -13
  87. package/dist/src/oauth/userTokenClient.js +64 -26
  88. package/dist/src/oauth/userTokenClient.js.map +1 -1
  89. package/dist/src/oauth/userTokenClient.types.d.ts +19 -6
  90. package/dist/src/turnContext.d.ts +7 -1
  91. package/dist/src/turnContext.js +11 -4
  92. package/dist/src/turnContext.js.map +1 -1
  93. package/package.json +10 -6
  94. package/src/activityWireCompat.ts +8 -3
  95. package/src/agent-client/agentClient.ts +9 -3
  96. package/src/agent-client/agentResponseHandler.ts +5 -2
  97. package/src/app/agentApplication.ts +97 -75
  98. package/src/app/agentApplicationBuilder.ts +2 -2
  99. package/src/app/agentApplicationOptions.ts +10 -2
  100. package/src/app/appRoute.ts +8 -0
  101. package/src/app/auth/authorization.ts +252 -0
  102. package/src/app/auth/authorizationManager.ts +213 -0
  103. package/src/app/auth/handlerStorage.ts +61 -0
  104. package/src/app/auth/handlers/agenticAuthorization.ts +194 -0
  105. package/src/app/auth/handlers/azureBotAuthorization.ts +599 -0
  106. package/src/app/auth/handlers/index.ts +2 -0
  107. package/src/app/auth/index.ts +2 -0
  108. package/src/app/auth/types.ts +111 -0
  109. package/src/app/index.ts +2 -3
  110. package/src/app/routeList.ts +24 -5
  111. package/src/app/streaming/streamingResponse.ts +2 -1
  112. package/src/auth/MemoryCache.ts +59 -0
  113. package/src/auth/authConfiguration.ts +258 -52
  114. package/src/auth/authConstants.ts +11 -0
  115. package/src/auth/authProvider.ts +31 -0
  116. package/src/auth/connections.ts +46 -0
  117. package/src/auth/index.ts +2 -0
  118. package/src/auth/jwt-middleware.ts +38 -21
  119. package/src/auth/msalConnectionManager.ts +150 -0
  120. package/src/auth/msalTokenProvider.ts +209 -9
  121. package/src/baseAdapter.ts +10 -29
  122. package/src/cloudAdapter.ts +192 -67
  123. package/src/connector-client/connectorClient.ts +49 -10
  124. package/src/index.ts +0 -1
  125. package/src/oauth/index.ts +0 -1
  126. package/src/oauth/userTokenClient.ts +79 -23
  127. package/src/oauth/userTokenClient.types.ts +20 -8
  128. package/src/turnContext.ts +16 -5
  129. package/dist/src/app/authorization.js +0 -387
  130. package/dist/src/app/authorization.js.map +0 -1
  131. package/dist/src/claimsIdentity.d.ts +0 -35
  132. package/dist/src/claimsIdentity.js +0 -43
  133. package/dist/src/claimsIdentity.js.map +0 -1
  134. package/dist/src/oauth/oAuthFlow.d.ts +0 -119
  135. package/dist/src/oauth/oAuthFlow.js +0 -316
  136. package/dist/src/oauth/oAuthFlow.js.map +0 -1
  137. package/src/app/authorization.ts +0 -432
  138. package/src/claimsIdentity.ts +0 -47
  139. package/src/oauth/oAuthFlow.ts +0 -378
@@ -1,34 +1,51 @@
1
1
  import { AxiosInstance } from 'axios';
2
2
  import { ConversationReference } from '@microsoft/agents-activity';
3
3
  import { AadResourceUrls, SignInResource, TokenExchangeRequest, TokenOrSinginResourceResponse, TokenResponse, TokenStatus } from './userTokenClient.types';
4
+ import { AuthProvider } from '../auth';
5
+ import { HeaderPropagationCollection } from '../headerPropagation';
4
6
  /**
5
7
  * Client for managing user tokens.
6
8
  */
7
9
  export declare class UserTokenClient {
8
- private msAppId;
9
10
  client: AxiosInstance;
11
+ private msAppId;
10
12
  /**
11
13
  * Creates a new instance of UserTokenClient.
12
14
  * @param msAppId The Microsoft application ID.
13
15
  */
14
16
  constructor(msAppId: string);
17
+ /**
18
+ * Creates a new instance of UserTokenClient.
19
+ * @param axiosInstance The axios instance.
20
+ */
21
+ constructor(axiosInstance: AxiosInstance);
22
+ /**
23
+ * Creates a new instance of UserTokenClient with authentication.
24
+ * @param baseURL - The base URL for the API.
25
+ * @param authConfig - The authentication configuration.
26
+ * @param authProvider - The authentication provider.
27
+ * @param scope - The scope for the authentication token.
28
+ * @param headers - Optional headers to propagate in the request.
29
+ * @returns A new instance of ConnectorClient.
30
+ */
31
+ static createClientWithScope(baseURL: string, authProvider: AuthProvider, scope: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
15
32
  /**
16
33
  * Gets the user token.
17
34
  * @param connectionName The connection name.
18
- * @param channelId The channel ID.
35
+ * @param channelIdComposite The channel ID.
19
36
  * @param userId The user ID.
20
37
  * @param code The optional code.
21
38
  * @returns A promise that resolves to the user token.
22
39
  */
23
- getUserToken(connectionName: string, channelId: string, userId: string, code?: string): Promise<TokenResponse>;
40
+ getUserToken(connectionName: string, channelIdComposite: string, userId: string, code?: string): Promise<TokenResponse>;
24
41
  /**
25
42
  * Signs the user out.
26
43
  * @param userId The user ID.
27
44
  * @param connectionName The connection name.
28
- * @param channelId The channel ID.
45
+ * @param channelIdComposite The channel ID.
29
46
  * @returns A promise that resolves when the sign-out operation is complete.
30
47
  */
31
- signOut(userId: string, connectionName: string, channelId: string): Promise<void>;
48
+ signOut(userId: string, connectionName: string, channelIdComposite: string): Promise<void>;
32
49
  /**
33
50
  * Gets the sign-in resource.
34
51
  * @param msAppId The application ID.
@@ -42,16 +59,16 @@ export declare class UserTokenClient {
42
59
  * Exchanges the token.
43
60
  * @param userId The user ID.
44
61
  * @param connectionName The connection name.
45
- * @param channelId The channel ID.
62
+ * @param channelIdComposite The channel ID.
46
63
  * @param tokenExchangeRequest The token exchange request.
47
64
  * @returns A promise that resolves to the exchanged token.
48
65
  */
49
- exchangeTokenAsync(userId: string, connectionName: string, channelId: string, tokenExchangeRequest: TokenExchangeRequest): Promise<TokenResponse>;
66
+ exchangeTokenAsync(userId: string, connectionName: string, channelIdComposite: string, tokenExchangeRequest: TokenExchangeRequest): Promise<TokenResponse>;
50
67
  /**
51
68
  * Gets the token or sign-in resource.
52
69
  * @param userId The user ID.
53
70
  * @param connectionName The connection name.
54
- * @param channelId The channel ID.
71
+ * @param channelIdComposite The channel ID.
55
72
  * @param conversation The conversation reference.
56
73
  * @param relatesTo The related conversation reference.
57
74
  * @param code The code.
@@ -59,23 +76,23 @@ export declare class UserTokenClient {
59
76
  * @param fwdUrl The forward URL.
60
77
  * @returns A promise that resolves to the token or sign-in resource response.
61
78
  */
62
- getTokenOrSignInResource(userId: string, connectionName: string, channelId: string, conversation: ConversationReference, relatesTo: ConversationReference, code: string, finalRedirect?: string, fwdUrl?: string): Promise<TokenOrSinginResourceResponse>;
79
+ getTokenOrSignInResource(userId: string, connectionName: string, channelIdComposite: string, conversation: ConversationReference, relatesTo: ConversationReference, code: string, finalRedirect?: string, fwdUrl?: string): Promise<TokenOrSinginResourceResponse>;
63
80
  /**
64
81
  * Gets the token status.
65
82
  * @param userId The user ID.
66
- * @param channelId The channel ID.
83
+ * @param channelIdComposite The channel ID.
67
84
  * @param include The optional include parameter.
68
85
  * @returns A promise that resolves to the token status.
69
86
  */
70
- getTokenStatus(userId: string, channelId: string, include?: string): Promise<TokenStatus[]>;
87
+ getTokenStatus(userId: string, channelIdComposite: string, include?: string): Promise<TokenStatus[]>;
71
88
  /**
72
89
  * Gets the AAD tokens.
73
90
  * @param userId The user ID.
74
91
  * @param connectionName The connection name.
75
- * @param channelId The channel ID.
92
+ * @param channelIdComposite The channel ID.
76
93
  * @param resourceUrls The resource URLs.
77
94
  * @returns A promise that resolves to the AAD tokens.
78
95
  */
79
- getAadTokens(userId: string, connectionName: string, channelId: string, resourceUrls: AadResourceUrls): Promise<Record<string, TokenResponse>>;
96
+ getAadTokens(userId: string, connectionName: string, channelIdComposite: string, resourceUrls: AadResourceUrls): Promise<Record<string, TokenResponse>>;
80
97
  updateAuthToken(token: string): void;
81
98
  }
@@ -7,6 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
8
  exports.UserTokenClient = void 0;
9
9
  const axios_1 = __importDefault(require("axios"));
10
+ const agents_activity_1 = require("@microsoft/agents-activity");
10
11
  const logger_1 = require("@microsoft/agents-activity/logger");
11
12
  const activityWireCompat_1 = require("../activityWireCompat");
12
13
  const getProductInfo_1 = require("../getProductInfo");
@@ -15,20 +16,21 @@ const logger = (0, logger_1.debug)('agents:user-token-client');
15
16
  * Client for managing user tokens.
16
17
  */
17
18
  class UserTokenClient {
18
- /**
19
- * Creates a new instance of UserTokenClient.
20
- * @param msAppId The Microsoft application ID.
21
- */
22
- constructor(msAppId) {
23
- this.msAppId = msAppId;
24
- const baseURL = 'https://api.botframework.com';
25
- this.client = axios_1.default.create({
26
- baseURL,
27
- headers: {
28
- Accept: 'application/json',
29
- 'User-Agent': (0, getProductInfo_1.getProductInfo)(),
30
- }
31
- });
19
+ constructor(param) {
20
+ this.msAppId = '';
21
+ if (typeof param === 'string') {
22
+ const baseURL = 'https://api.botframework.com';
23
+ this.client = axios_1.default.create({
24
+ baseURL,
25
+ headers: {
26
+ Accept: 'application/json',
27
+ 'User-Agent': (0, getProductInfo_1.getProductInfo)(),
28
+ }
29
+ });
30
+ }
31
+ else {
32
+ this.client = param;
33
+ }
32
34
  this.client.interceptors.request.use((config) => {
33
35
  const { method, url, data, headers, params } = config;
34
36
  const { Authorization, authorization, ...headersToLog } = headers || {};
@@ -75,15 +77,46 @@ class UserTokenClient {
75
77
  }
76
78
  });
77
79
  }
80
+ /**
81
+ * Creates a new instance of UserTokenClient with authentication.
82
+ * @param baseURL - The base URL for the API.
83
+ * @param authConfig - The authentication configuration.
84
+ * @param authProvider - The authentication provider.
85
+ * @param scope - The scope for the authentication token.
86
+ * @param headers - Optional headers to propagate in the request.
87
+ * @returns A new instance of ConnectorClient.
88
+ */
89
+ static async createClientWithScope(baseURL, authProvider, scope, headers) {
90
+ // TODO: add header propagation logic
91
+ const axiosInstance = axios_1.default.create({
92
+ baseURL,
93
+ headers: {
94
+ Accept: 'application/json',
95
+ 'Content-Type': 'application/json', // Required by transformRequest
96
+ 'User-Agent': (0, getProductInfo_1.getProductInfo)(),
97
+ },
98
+ transformRequest: [
99
+ (data, headers) => {
100
+ return JSON.stringify((0, activityWireCompat_1.normalizeOutgoingActivity)(data));
101
+ },
102
+ ],
103
+ });
104
+ const token = await authProvider.getAccessToken(scope);
105
+ if (token.length > 1) {
106
+ axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
107
+ }
108
+ return new UserTokenClient(axiosInstance);
109
+ }
78
110
  /**
79
111
  * Gets the user token.
80
112
  * @param connectionName The connection name.
81
- * @param channelId The channel ID.
113
+ * @param channelIdComposite The channel ID.
82
114
  * @param userId The user ID.
83
115
  * @param code The optional code.
84
116
  * @returns A promise that resolves to the user token.
85
117
  */
86
- async getUserToken(connectionName, channelId, userId, code) {
118
+ async getUserToken(connectionName, channelIdComposite, userId, code) {
119
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
87
120
  const params = { connectionName, channelId, userId, code };
88
121
  const response = await this.client.get('/api/usertoken/GetToken', { params });
89
122
  if (response === null || response === void 0 ? void 0 : response.data) {
@@ -95,10 +128,11 @@ class UserTokenClient {
95
128
  * Signs the user out.
96
129
  * @param userId The user ID.
97
130
  * @param connectionName The connection name.
98
- * @param channelId The channel ID.
131
+ * @param channelIdComposite The channel ID.
99
132
  * @returns A promise that resolves when the sign-out operation is complete.
100
133
  */
101
- async signOut(userId, connectionName, channelId) {
134
+ async signOut(userId, connectionName, channelIdComposite) {
135
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
102
136
  const params = { userId, connectionName, channelId };
103
137
  const response = await this.client.delete('/api/usertoken/SignOut', { params });
104
138
  if (response.status !== 200) {
@@ -130,11 +164,12 @@ class UserTokenClient {
130
164
  * Exchanges the token.
131
165
  * @param userId The user ID.
132
166
  * @param connectionName The connection name.
133
- * @param channelId The channel ID.
167
+ * @param channelIdComposite The channel ID.
134
168
  * @param tokenExchangeRequest The token exchange request.
135
169
  * @returns A promise that resolves to the exchanged token.
136
170
  */
137
- async exchangeTokenAsync(userId, connectionName, channelId, tokenExchangeRequest) {
171
+ async exchangeTokenAsync(userId, connectionName, channelIdComposite, tokenExchangeRequest) {
172
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
138
173
  const params = { userId, connectionName, channelId };
139
174
  const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
140
175
  if (response === null || response === void 0 ? void 0 : response.data) {
@@ -148,7 +183,7 @@ class UserTokenClient {
148
183
  * Gets the token or sign-in resource.
149
184
  * @param userId The user ID.
150
185
  * @param connectionName The connection name.
151
- * @param channelId The channel ID.
186
+ * @param channelIdComposite The channel ID.
152
187
  * @param conversation The conversation reference.
153
188
  * @param relatesTo The related conversation reference.
154
189
  * @param code The code.
@@ -156,7 +191,8 @@ class UserTokenClient {
156
191
  * @param fwdUrl The forward URL.
157
192
  * @returns A promise that resolves to the token or sign-in resource response.
158
193
  */
159
- async getTokenOrSignInResource(userId, connectionName, channelId, conversation, relatesTo, code, finalRedirect = '', fwdUrl = '') {
194
+ async getTokenOrSignInResource(userId, connectionName, channelIdComposite, conversation, relatesTo, code, finalRedirect = '', fwdUrl = '') {
195
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
160
196
  const state = Buffer.from(JSON.stringify({ conversation, relatesTo, connectionName, msAppId: this.msAppId })).toString('base64');
161
197
  const params = { userId, connectionName, channelId, state, code, finalRedirect, fwdUrl };
162
198
  const response = await this.client.get('/api/usertoken/GetTokenOrSignInResource', { params });
@@ -165,11 +201,12 @@ class UserTokenClient {
165
201
  /**
166
202
  * Gets the token status.
167
203
  * @param userId The user ID.
168
- * @param channelId The channel ID.
204
+ * @param channelIdComposite The channel ID.
169
205
  * @param include The optional include parameter.
170
206
  * @returns A promise that resolves to the token status.
171
207
  */
172
- async getTokenStatus(userId, channelId, include = null) {
208
+ async getTokenStatus(userId, channelIdComposite, include = null) {
209
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
173
210
  const params = { userId, channelId, include };
174
211
  const response = await this.client.get('/api/usertoken/GetTokenStatus', { params });
175
212
  return response.data;
@@ -178,11 +215,12 @@ class UserTokenClient {
178
215
  * Gets the AAD tokens.
179
216
  * @param userId The user ID.
180
217
  * @param connectionName The connection name.
181
- * @param channelId The channel ID.
218
+ * @param channelIdComposite The channel ID.
182
219
  * @param resourceUrls The resource URLs.
183
220
  * @returns A promise that resolves to the AAD tokens.
184
221
  */
185
- async getAadTokens(userId, connectionName, channelId, resourceUrls) {
222
+ async getAadTokens(userId, connectionName, channelIdComposite, resourceUrls) {
223
+ const [channelId] = agents_activity_1.Activity.parseChannelId(channelIdComposite);
186
224
  const params = { userId, connectionName, channelId };
187
225
  const response = await this.client.post('/api/usertoken/GetAadTokens', resourceUrls, { params });
188
226
  return response.data;
@@ -1 +1 @@
1
- {"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":"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"}
@@ -15,17 +15,30 @@ export interface TokenResponse {
15
15
  */
16
16
  export interface TokenExchangeRequest {
17
17
  /**
18
- * The URI for the token exchange request.
19
- */
18
+ * The URI for the token exchange request.
19
+ */
20
20
  uri?: string;
21
21
  /**
22
- * The token to be exchanged.
23
- */
22
+ * The token to be exchanged.
23
+ */
24
24
  token?: string;
25
+ }
26
+ /**
27
+ * Represents the response for a token exchange invoke operation.
28
+ */
29
+ export interface TokenExchangeInvokeResponse {
25
30
  /**
26
- * The ID associated with the token exchange request.
27
- */
31
+ * The connection name associated with the token exchange response.
32
+ */
33
+ connectionName: string;
34
+ /**
35
+ * The ID associated with the token exchange response.
36
+ */
28
37
  id?: string;
38
+ /**
39
+ * (Optional) Details about any failure that occurred during the token exchange.
40
+ */
41
+ failureDetail?: string;
29
42
  }
30
43
  /**
31
44
  * Represents a resource for exchanging tokens.
@@ -5,6 +5,7 @@ import { TurnContextStateCollection } from './turnContextStateCollection';
5
5
  import { AttachmentInfo } from './connector-client/attachmentInfo';
6
6
  import { AttachmentData } from './connector-client/attachmentData';
7
7
  import { StreamingResponse } from './app/streaming/streamingResponse';
8
+ import { JwtPayload } from 'jsonwebtoken';
8
9
  /**
9
10
  * Defines a handler for processing and sending activities.
10
11
  * Used for middleware that needs to intercept or modify activities being sent.
@@ -64,13 +65,14 @@ export declare class TurnContext {
64
65
  private readonly _turn;
65
66
  private readonly _locale;
66
67
  private readonly _streamingResponse;
68
+ private readonly _identity?;
67
69
  /**
68
70
  * Initializes a new instance of the TurnContext class.
69
71
  *
70
72
  * @param adapterOrContext The adapter that created this context, or another TurnContext to clone
71
73
  * @param request The activity for the turn (required when first parameter is an adapter)
72
74
  */
73
- constructor(adapterOrContext: BaseAdapter, request: Activity);
75
+ constructor(adapterOrContext: BaseAdapter, request: Activity, identity?: JwtPayload);
74
76
  constructor(adapterOrContext: TurnContext);
75
77
  /**
76
78
  * A list of reply activities that are buffered until the end of the turn.
@@ -138,6 +140,7 @@ export declare class TurnContext {
138
140
  */
139
141
  deleteActivity(idOrReference: string | ConversationReference): Promise<void>;
140
142
  /**
143
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
141
144
  * Uploads an attachment to the conversation.
142
145
  *
143
146
  * @param conversationId The ID of the conversation
@@ -146,6 +149,7 @@ export declare class TurnContext {
146
149
  */
147
150
  uploadAttachment(conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
148
151
  /**
152
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
149
153
  * Gets information about an attachment.
150
154
  *
151
155
  * @param attachmentId The ID of the attachment
@@ -153,6 +157,7 @@ export declare class TurnContext {
153
157
  */
154
158
  getAttachmentInfo(attachmentId: string): Promise<AttachmentInfo>;
155
159
  /**
160
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
156
161
  * Gets the content of an attachment.
157
162
  *
158
163
  * @param attachmentId The ID of the attachment
@@ -210,6 +215,7 @@ export declare class TurnContext {
210
215
  * and triggered the creation of this context.
211
216
  */
212
217
  get activity(): Activity;
218
+ get identity(): JwtPayload;
213
219
  /**
214
220
  * Gets or sets whether the turn has sent a response to the user.
215
221
  *
@@ -28,7 +28,7 @@ exports.AgentCallbackHandlerKey = 'agentCallbackHandler';
28
28
  * This class follows the builder pattern for registering middleware handlers.
29
29
  */
30
30
  class TurnContext {
31
- constructor(adapterOrContext, request) {
31
+ constructor(adapterOrContext, request, identity) {
32
32
  this._respondedRef = { responded: false };
33
33
  this._turnState = new turnContextStateCollection_1.TurnContextStateCollection();
34
34
  this._onSendActivities = [];
@@ -49,6 +49,7 @@ class TurnContext {
49
49
  else {
50
50
  this._adapter = adapterOrContext;
51
51
  this._activity = request;
52
+ this._identity = identity;
52
53
  }
53
54
  this._streamingResponse = new streamingResponse_1.StreamingResponse(this);
54
55
  }
@@ -196,6 +197,7 @@ class TurnContext {
196
197
  return await this.emit(this._onDeleteActivity, reference, async () => await this.adapter.deleteActivity(this, reference));
197
198
  }
198
199
  /**
200
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
199
201
  * Uploads an attachment to the conversation.
200
202
  *
201
203
  * @param conversationId The ID of the conversation
@@ -203,18 +205,20 @@ class TurnContext {
203
205
  * @returns A promise that resolves to the resource response
204
206
  */
205
207
  async uploadAttachment(conversationId, attachmentData) {
206
- return await this.adapter.uploadAttachment(conversationId, attachmentData);
208
+ return await this.adapter.uploadAttachment(this, conversationId, attachmentData);
207
209
  }
208
210
  /**
211
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
209
212
  * Gets information about an attachment.
210
213
  *
211
214
  * @param attachmentId The ID of the attachment
212
215
  * @returns A promise that resolves to the attachment information
213
216
  */
214
217
  async getAttachmentInfo(attachmentId) {
215
- return await this.adapter.getAttachmentInfo(attachmentId);
218
+ return await this.adapter.getAttachmentInfo(this, attachmentId);
216
219
  }
217
220
  /**
221
+ * @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
218
222
  * Gets the content of an attachment.
219
223
  *
220
224
  * @param attachmentId The ID of the attachment
@@ -222,7 +226,7 @@ class TurnContext {
222
226
  * @returns A promise that resolves to a readable stream of the attachment content
223
227
  */
224
228
  async getAttachment(attachmentId, viewId) {
225
- return await this.adapter.getAttachment(attachmentId, viewId);
229
+ return await this.adapter.getAttachment(this, attachmentId, viewId);
226
230
  }
227
231
  /**
228
232
  * Registers a handler for intercepting and processing activities being sent.
@@ -289,6 +293,9 @@ class TurnContext {
289
293
  get activity() {
290
294
  return this._activity;
291
295
  }
296
+ get identity() {
297
+ return this._identity;
298
+ }
292
299
  /**
293
300
  * Gets or sets whether the turn has sent a response to the user.
294
301
  *
@@ -1 +1 @@
1
- {"version":3,"file":"turnContext.js","sourceRoot":"","sources":["../../src/turnContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"turnContext.js","sourceRoot":"","sources":["../../src/turnContext.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.schemastore.org/package.json",
3
3
  "name": "@microsoft/agents-hosting",
4
- "version": "1.1.0-alpha.5",
4
+ "version": "1.1.0-alpha.58",
5
5
  "homepage": "https://github.com/microsoft/Agents-for-js",
6
6
  "repository": {
7
7
  "type": "git",
@@ -19,12 +19,13 @@
19
19
  "main": "dist/src/index.js",
20
20
  "types": "dist/src/index.d.ts",
21
21
  "dependencies": {
22
- "@azure/core-auth": "^1.10.0",
23
- "@azure/msal-node": "^3.7.2",
24
- "@microsoft/agents-activity": "1.1.0-alpha.5",
25
- "axios": "^1.11.0",
22
+ "@azure/core-auth": "^1.10.1",
23
+ "@azure/msal-node": "^3.8.0",
24
+ "@microsoft/agents-activity": "1.1.0-alpha.58",
25
+ "axios": "^1.12.2",
26
26
  "jsonwebtoken": "^9.0.2",
27
- "jwks-rsa": "^3.2.0"
27
+ "jwks-rsa": "^3.2.0",
28
+ "object-path": "^0.11.8"
28
29
  },
29
30
  "license": "MIT",
30
31
  "files": [
@@ -43,5 +44,8 @@
43
44
  },
44
45
  "engines": {
45
46
  "node": ">=20.0.0"
47
+ },
48
+ "devDependencies": {
49
+ "@types/object-path": "^0.11.4"
46
50
  }
47
51
  }
@@ -25,13 +25,18 @@ export function normalizeIncomingActivity (payload: any): object {
25
25
  * @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
26
26
  */
27
27
  export function normalizeOutgoingActivity (payload: any): object {
28
- if (payload && payload['relatesTo'] && payload['relatesTo']['agent']) {
29
- const relatesTo = payload['relatesTo']
28
+ const modifiedPayload = JSON.parse(JSON.stringify(payload))
29
+ if (modifiedPayload && modifiedPayload['relatesTo'] && modifiedPayload['relatesTo']['agent']) {
30
+ const relatesTo = modifiedPayload['relatesTo']
30
31
  const ov = relatesTo['agent']
31
32
  delete relatesTo['agent']
32
33
  relatesTo['bot'] = ov
33
34
  }
34
- return payload
35
+ if (modifiedPayload && modifiedPayload['_channelId']) {
36
+ modifiedPayload['channelId'] = modifiedPayload['_channelId'].toString()
37
+ delete modifiedPayload['_channelId']
38
+ }
39
+ return modifiedPayload
35
40
  }
36
41
 
37
42
  export function normalizeTokenExchangeState (payload: any): object {
@@ -92,17 +92,23 @@ export class AgentClient {
92
92
  const stateChanges = JSON.stringify(convRef)
93
93
  logger.debug('stateChanges: ', stateChanges)
94
94
 
95
- const authProvider = new MsalTokenProvider()
96
- const token = await authProvider.getAccessToken(authConfig, this.agentClientConfig.clientId)
95
+ const authProvider = new MsalTokenProvider(authConfig)
96
+ const token = await authProvider.getAccessToken(this.agentClientConfig.clientId)
97
97
 
98
98
  logger.debug('agent request: ', activityCopy)
99
99
 
100
+ let authHeader = '' // Allow anonymous auth.
101
+
102
+ if (token.trim().length > 0) {
103
+ authHeader = `Bearer ${token}`
104
+ }
105
+
100
106
  await conversationState.saveChanges(context, false, { channelId: activityCopy.channelId!, conversationId: activityCopy.conversation!.id })
101
107
  const response = await fetch(this.agentClientConfig.endPoint, {
102
108
  method: 'POST',
103
109
  headers: {
104
110
  'Content-Type': 'application/json',
105
- Authorization: `Bearer ${token}`,
111
+ Authorization: authHeader,
106
112
  'x-ms-conversation-id': activityCopy.conversation!.id
107
113
  },
108
114
  body: JSON.stringify(activityCopy)
@@ -58,7 +58,10 @@ const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler, convers
58
58
 
59
59
  logger.debug('received response: ', activity)
60
60
 
61
- const myTurnContext = new TurnContext(adapter, activity)
61
+ const connection = adapter.connectionManager.getDefaultConnection()
62
+ const appId = connection?.connectionSettings?.clientId ?? ''
63
+
64
+ const myTurnContext = new TurnContext(adapter, activity, CloudAdapter.createIdentity(appId))
62
65
  const conversationDataAccessor = conversationState.createProperty<ConversationReferenceState>(req.params!.conversationId)
63
66
  const conversationRefState = await conversationDataAccessor.get(myTurnContext, undefined, { channelId: activity.channelId!, conversationId: req.params!.conversationId })
64
67
 
@@ -82,7 +85,7 @@ const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler, convers
82
85
  res.status(200).send(response)
83
86
  }
84
87
 
85
- await adapter.continueConversation(conversationRefState.conversationReference, callback, true)
88
+ await adapter.continueConversation(myTurnContext.identity, conversationRefState.conversationReference, callback)
86
89
  }
87
90
 
88
91
  const applyActivityToTurnContext = (turnContext : TurnContext, activity : Activity) => {