@microsoft/agents-hosting 1.1.4-geb1c05c291 → 1.2.0-alpha.19.g9aeee229e8
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.
- package/dist/package.json +4 -4
- package/dist/src/activityHandler.js +7 -4
- package/dist/src/activityHandler.js.map +1 -1
- package/dist/src/app/index.d.ts +1 -0
- package/dist/src/app/index.js +1 -0
- package/dist/src/app/index.js.map +1 -1
- package/dist/src/app/streaming/streamingResponse.d.ts +138 -88
- package/dist/src/app/streaming/streamingResponse.js +241 -107
- package/dist/src/app/streaming/streamingResponse.js.map +1 -1
- package/dist/src/app/teamsAttachmentDownloader.d.ts +36 -0
- package/dist/src/app/teamsAttachmentDownloader.js +103 -0
- package/dist/src/app/teamsAttachmentDownloader.js.map +1 -0
- package/dist/src/auth/authConfiguration.d.ts +6 -0
- package/dist/src/auth/authConfiguration.js +15 -9
- package/dist/src/auth/authConfiguration.js.map +1 -1
- package/dist/src/auth/authProvider.d.ts +7 -1
- package/dist/src/auth/msalTokenProvider.d.ts +7 -1
- package/dist/src/auth/msalTokenProvider.js +48 -3
- package/dist/src/auth/msalTokenProvider.js.map +1 -1
- package/dist/src/cloudAdapter.d.ts +39 -14
- package/dist/src/cloudAdapter.js +52 -26
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/connector-client/connectorClient.js +10 -9
- package/dist/src/connector-client/connectorClient.js.map +1 -1
- package/dist/src/errorHelper.d.ts +4 -0
- package/dist/src/errorHelper.js +588 -0
- package/dist/src/errorHelper.js.map +1 -0
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/package.json +4 -4
- package/src/activityHandler.ts +8 -5
- package/src/app/index.ts +1 -0
- package/src/app/streaming/streamingResponse.ts +252 -107
- package/src/app/teamsAttachmentDownloader.ts +110 -0
- package/src/auth/authConfiguration.ts +13 -2
- package/src/auth/authProvider.ts +8 -1
- package/src/auth/msalTokenProvider.ts +62 -3
- package/src/cloudAdapter.ts +56 -29
- package/src/connector-client/connectorClient.ts +11 -10
- package/src/errorHelper.ts +674 -0
- package/src/index.ts +1 -0
- package/src/oauth/userTokenClient.ts +2 -2
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License.
|
|
5
|
+
*/
|
|
6
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
7
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
|
+
};
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.TeamsAttachmentDownloader = void 0;
|
|
11
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
12
|
+
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
13
|
+
const axios_1 = __importDefault(require("axios"));
|
|
14
|
+
const zod_1 = require("zod");
|
|
15
|
+
const logger = (0, logger_1.debug)('agents:teamsAttachmentDownloader');
|
|
16
|
+
/**
|
|
17
|
+
* Downloads attachments from Teams using the bots access token.
|
|
18
|
+
*/
|
|
19
|
+
class TeamsAttachmentDownloader {
|
|
20
|
+
constructor(stateKey = 'inputFiles') {
|
|
21
|
+
this._httpClient = axios_1.default.create();
|
|
22
|
+
this._stateKey = stateKey;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Download any files relative to the current user's input.
|
|
26
|
+
*
|
|
27
|
+
* @param {TurnContext} context Context for the current turn of conversation.
|
|
28
|
+
* @returns {Promise<InputFile[]>} Promise that resolves to an array of downloaded input files.
|
|
29
|
+
*/
|
|
30
|
+
async downloadFiles(context) {
|
|
31
|
+
var _a;
|
|
32
|
+
if (context.activity.channelId !== agents_activity_1.Channels.Msteams && context.activity.channelId !== agents_activity_1.Channels.M365Copilot) {
|
|
33
|
+
return Promise.resolve([]);
|
|
34
|
+
}
|
|
35
|
+
// Filter out HTML attachments
|
|
36
|
+
const attachments = (_a = context.activity.attachments) === null || _a === void 0 ? void 0 : _a.filter((a) => a.contentType && !a.contentType.startsWith('text/html'));
|
|
37
|
+
if (!attachments || attachments.length === 0) {
|
|
38
|
+
return Promise.resolve([]);
|
|
39
|
+
}
|
|
40
|
+
const connectorClient = context.turnState.get(context.adapter.ConnectorClientKey);
|
|
41
|
+
this._httpClient.defaults.headers = connectorClient.axiosInstance.defaults.headers;
|
|
42
|
+
const files = [];
|
|
43
|
+
for (const attachment of attachments) {
|
|
44
|
+
const file = await this.downloadFile(attachment);
|
|
45
|
+
if (file) {
|
|
46
|
+
files.push(file);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return files;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* @private
|
|
53
|
+
* @param {Attachment} attachment - Attachment to download.
|
|
54
|
+
* @returns {Promise<InputFile>} - Promise that resolves to the downloaded input file.
|
|
55
|
+
*/
|
|
56
|
+
async downloadFile(attachment) {
|
|
57
|
+
let inputFile;
|
|
58
|
+
if (attachment.contentUrl && attachment.contentUrl.startsWith('https://')) {
|
|
59
|
+
try {
|
|
60
|
+
const contentSchema = zod_1.z.object({ downloadUrl: zod_1.z.string().url() });
|
|
61
|
+
const parsed = contentSchema.safeParse(attachment.content);
|
|
62
|
+
const downloadUrl = parsed.success ? parsed.data.downloadUrl : attachment.contentUrl;
|
|
63
|
+
const response = await this._httpClient.get(downloadUrl, { responseType: 'arraybuffer' });
|
|
64
|
+
const content = Buffer.from(response.data, 'binary');
|
|
65
|
+
const contentType = response.headers['content-type'] || 'application/octet-stream';
|
|
66
|
+
inputFile = { content, contentType, contentUrl: attachment.contentUrl };
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
logger.error(`Failed to download Teams attachment: ${error}`);
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
if (!attachment.content) {
|
|
75
|
+
logger.error('Attachment missing content');
|
|
76
|
+
return undefined;
|
|
77
|
+
}
|
|
78
|
+
if (!(attachment.content instanceof ArrayBuffer) && !Buffer.isBuffer(attachment.content)) {
|
|
79
|
+
logger.error('Attachment content is not ArrayBuffer or Buffer');
|
|
80
|
+
return undefined;
|
|
81
|
+
}
|
|
82
|
+
inputFile = {
|
|
83
|
+
content: Buffer.from(attachment.content),
|
|
84
|
+
contentType: attachment.contentType,
|
|
85
|
+
contentUrl: attachment.contentUrl
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
return inputFile;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Downloads files from the attachments in the current turn context and stores them in state.
|
|
92
|
+
*
|
|
93
|
+
* @param context The turn context containing the activity with attachments.
|
|
94
|
+
* @param state The turn state to store the files in.
|
|
95
|
+
* @returns A promise that resolves when the downloaded files are stored.
|
|
96
|
+
*/
|
|
97
|
+
async downloadAndStoreFiles(context, state) {
|
|
98
|
+
const files = await this.downloadFiles(context);
|
|
99
|
+
state.setValue(this._stateKey, files);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
exports.TeamsAttachmentDownloader = TeamsAttachmentDownloader;
|
|
103
|
+
//# sourceMappingURL=teamsAttachmentDownloader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"teamsAttachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/teamsAttachmentDownloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,10 @@ export interface AuthConfiguration {
|
|
|
27
27
|
* The path to the certificate key file.
|
|
28
28
|
*/
|
|
29
29
|
certKeyFile?: string;
|
|
30
|
+
/**
|
|
31
|
+
* Indicates whether to send the X5C param or not (for SNI authentication).
|
|
32
|
+
*/
|
|
33
|
+
sendX5C?: boolean;
|
|
30
34
|
/**
|
|
31
35
|
* A list of valid issuers for the authentication configuration.
|
|
32
36
|
*/
|
|
@@ -83,6 +87,7 @@ export interface AuthConfiguration {
|
|
|
83
87
|
*
|
|
84
88
|
* certPemFile=your-cert-pem-file
|
|
85
89
|
* certKeyFile=your-cert-key-file
|
|
90
|
+
* sendX5C=false
|
|
86
91
|
*
|
|
87
92
|
* FICClientId=your-FIC-client-id
|
|
88
93
|
*
|
|
@@ -122,6 +127,7 @@ export declare const loadPrevAuthConfigFromEnv: () => AuthConfiguration;
|
|
|
122
127
|
*
|
|
123
128
|
* certPemFile=your-cert-pem-file
|
|
124
129
|
* certKeyFile=your-cert-key-file
|
|
130
|
+
* sendX5C=false
|
|
125
131
|
*
|
|
126
132
|
* FICClientId=your-FIC-client-id
|
|
127
133
|
*
|
|
@@ -30,6 +30,7 @@ const DEFAULT_CONNECTION = 'serviceConnection';
|
|
|
30
30
|
*
|
|
31
31
|
* certPemFile=your-cert-pem-file
|
|
32
32
|
* certKeyFile=your-cert-key-file
|
|
33
|
+
* sendX5C=false
|
|
33
34
|
*
|
|
34
35
|
* FICClientId=your-FIC-client-id
|
|
35
36
|
*
|
|
@@ -109,6 +110,7 @@ const loadPrevAuthConfigFromEnv = () => {
|
|
|
109
110
|
clientSecret: process.env.MicrosoftAppPassword,
|
|
110
111
|
certPemFile: process.env.certPemFile,
|
|
111
112
|
certKeyFile: process.env.certKeyFile,
|
|
113
|
+
sendX5C: process.env.sendX5C === 'true',
|
|
112
114
|
connectionName: process.env.connectionName,
|
|
113
115
|
FICClientId: process.env.MicrosoftAppClientId,
|
|
114
116
|
authority,
|
|
@@ -143,17 +145,19 @@ function loadConnectionsMapFromEnv() {
|
|
|
143
145
|
const connectionsMap = [];
|
|
144
146
|
const CONNECTIONS_PREFIX = 'connections__';
|
|
145
147
|
const CONNECTIONS_MAP_PREFIX = 'connectionsMap__';
|
|
146
|
-
for (const [key,
|
|
148
|
+
for (const [key, rawValue] of Object.entries(envVars)) {
|
|
147
149
|
if (key.startsWith(CONNECTIONS_PREFIX)) {
|
|
148
150
|
// Convert to dot notation
|
|
149
151
|
let path = key.substring(CONNECTIONS_PREFIX.length).replace(/__/g, '.');
|
|
150
152
|
// Remove ".settings." from the path
|
|
151
153
|
path = path.replace('.settings.', '.');
|
|
154
|
+
// Convert "true"/"false" strings into boolean values
|
|
155
|
+
const value = rawValue === 'true' ? true : rawValue === 'false' ? false : rawValue;
|
|
152
156
|
object_path_1.default.set(connectionsObj, path, value);
|
|
153
157
|
}
|
|
154
158
|
else if (key.startsWith(CONNECTIONS_MAP_PREFIX)) {
|
|
155
159
|
const path = key.substring(CONNECTIONS_MAP_PREFIX.length).replace(/__/g, '.');
|
|
156
|
-
object_path_1.default.set(connectionsMap, path,
|
|
160
|
+
object_path_1.default.set(connectionsMap, path, rawValue);
|
|
157
161
|
}
|
|
158
162
|
}
|
|
159
163
|
// Convert connectionsObj to Map<string, AuthConfiguration>
|
|
@@ -195,6 +199,7 @@ function loadConnectionsMapFromEnv() {
|
|
|
195
199
|
*
|
|
196
200
|
* certPemFile=your-cert-pem-file
|
|
197
201
|
* certKeyFile=your-cert-key-file
|
|
202
|
+
* sendX5C=false
|
|
198
203
|
*
|
|
199
204
|
* FICClientId=your-FIC-client-id
|
|
200
205
|
*
|
|
@@ -233,7 +238,7 @@ function getAuthConfigWithDefaults(config) {
|
|
|
233
238
|
};
|
|
234
239
|
}
|
|
235
240
|
function buildLegacyAuthConfig(envPrefix = '', customConfig) {
|
|
236
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
241
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
237
242
|
const prefix = envPrefix ? `${envPrefix}_` : '';
|
|
238
243
|
const authority = (_b = (_a = customConfig === null || customConfig === void 0 ? void 0 : customConfig.authority) !== null && _a !== void 0 ? _a : process.env[`${prefix}authorityEndpoint`]) !== null && _b !== void 0 ? _b : 'https://login.microsoftonline.com';
|
|
239
244
|
const clientId = (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.clientId) !== null && _c !== void 0 ? _c : process.env[`${prefix}clientId`];
|
|
@@ -250,13 +255,14 @@ function buildLegacyAuthConfig(envPrefix = '', customConfig) {
|
|
|
250
255
|
clientSecret: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.clientSecret) !== null && _e !== void 0 ? _e : process.env[`${prefix}clientSecret`],
|
|
251
256
|
certPemFile: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.certPemFile) !== null && _f !== void 0 ? _f : process.env[`${prefix}certPemFile`],
|
|
252
257
|
certKeyFile: (_g = customConfig === null || customConfig === void 0 ? void 0 : customConfig.certKeyFile) !== null && _g !== void 0 ? _g : process.env[`${prefix}certKeyFile`],
|
|
253
|
-
|
|
254
|
-
|
|
258
|
+
sendX5C: (_h = customConfig === null || customConfig === void 0 ? void 0 : customConfig.sendX5C) !== null && _h !== void 0 ? _h : (process.env[`${prefix}sendX5C`] === 'true'),
|
|
259
|
+
connectionName: (_j = customConfig === null || customConfig === void 0 ? void 0 : customConfig.connectionName) !== null && _j !== void 0 ? _j : process.env[`${prefix}connectionName`],
|
|
260
|
+
FICClientId: (_k = customConfig === null || customConfig === void 0 ? void 0 : customConfig.FICClientId) !== null && _k !== void 0 ? _k : process.env[`${prefix}FICClientId`],
|
|
255
261
|
authority,
|
|
256
|
-
scope: (
|
|
257
|
-
issuers: (
|
|
258
|
-
altBlueprintConnectionName: (
|
|
259
|
-
WIDAssertionFile: (
|
|
262
|
+
scope: (_l = customConfig === null || customConfig === void 0 ? void 0 : customConfig.scope) !== null && _l !== void 0 ? _l : process.env[`${prefix}scope`],
|
|
263
|
+
issuers: (_m = customConfig === null || customConfig === void 0 ? void 0 : customConfig.issuers) !== null && _m !== void 0 ? _m : getDefaultIssuers(tenantId, authority),
|
|
264
|
+
altBlueprintConnectionName: (_o = customConfig === null || customConfig === void 0 ? void 0 : customConfig.altBlueprintConnectionName) !== null && _o !== void 0 ? _o : process.env[`${prefix}altBlueprintConnectionName`],
|
|
265
|
+
WIDAssertionFile: (_p = customConfig === null || customConfig === void 0 ? void 0 : customConfig.WIDAssertionFile) !== null && _p !== void 0 ? _p : process.env[`${prefix}WIDAssertionFile`]
|
|
260
266
|
};
|
|
261
267
|
}
|
|
262
268
|
function getDefaultIssuers(tenantId, authority) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authConfiguration.js","sourceRoot":"","sources":["../../../src/auth/authConfiguration.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;
|
|
1
|
+
{"version":3,"file":"authConfiguration.js","sourceRoot":"","sources":["../../../src/auth/authConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,19 @@ import { AuthConfiguration } from './authConfiguration';
|
|
|
7
7
|
* Represents an authentication provider.
|
|
8
8
|
*/
|
|
9
9
|
export interface AuthProvider {
|
|
10
|
+
/**
|
|
11
|
+
* The AuthConfiguration used for token acquisition.
|
|
12
|
+
*/
|
|
13
|
+
connectionSettings?: AuthConfiguration;
|
|
10
14
|
/**
|
|
11
15
|
* Gets an access token for the specified authentication configuration and scope.
|
|
12
16
|
* @param authConfig - The authentication configuration.
|
|
13
17
|
* @param scope - The scope for which the access token is requested.
|
|
14
18
|
* @returns A promise that resolves to the access token.
|
|
15
19
|
*/
|
|
16
|
-
getAccessToken
|
|
20
|
+
getAccessToken(authConfig: AuthConfiguration, scope: string): Promise<string>;
|
|
21
|
+
getAccessToken(scope: string): Promise<string>;
|
|
22
|
+
getAccessToken(authConfigOrScope: AuthConfiguration | string, scope?: string): Promise<string>;
|
|
17
23
|
/**
|
|
18
24
|
* Get an access token for the agentic application
|
|
19
25
|
* @param tenantId
|
|
@@ -44,10 +44,16 @@ export declare class MsalTokenProvider implements AuthProvider {
|
|
|
44
44
|
* @param tokenBodyParameters
|
|
45
45
|
* @returns
|
|
46
46
|
*/
|
|
47
|
-
private
|
|
47
|
+
private acquireTokenForAgenticScenarios;
|
|
48
48
|
getAgenticUserToken(tenantId: string, agentAppInstanceId: string, agenticUserId: string, scopes: string[]): Promise<string>;
|
|
49
49
|
getAgenticApplicationToken(tenantId: string, agentAppInstanceId: string): Promise<string>;
|
|
50
50
|
private readonly sysOptions;
|
|
51
|
+
/**
|
|
52
|
+
* Generates the client assertion using the provided certificate.
|
|
53
|
+
* @param authConfig The authentication configuration.
|
|
54
|
+
* @returns The client assertion.
|
|
55
|
+
*/
|
|
56
|
+
private getAssertionFromCert;
|
|
51
57
|
/**
|
|
52
58
|
* Acquires a token using a user-assigned identity.
|
|
53
59
|
* @param authConfig The authentication configuration.
|
|
@@ -13,6 +13,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
13
13
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
14
14
|
const uuid_1 = require("uuid");
|
|
15
15
|
const MemoryCache_1 = require("./MemoryCache");
|
|
16
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
16
17
|
const fs_1 = __importDefault(require("fs"));
|
|
17
18
|
const crypto_1 = __importDefault(require("crypto"));
|
|
18
19
|
const audience = 'api://AzureADTokenExchange';
|
|
@@ -182,7 +183,7 @@ class MsalTokenProvider {
|
|
|
182
183
|
* @param tokenBodyParameters
|
|
183
184
|
* @returns
|
|
184
185
|
*/
|
|
185
|
-
async
|
|
186
|
+
async acquireTokenForAgenticScenarios(tenantId, clientId, clientAssertion, scopes, tokenBodyParameters) {
|
|
186
187
|
if (!this.connectionSettings) {
|
|
187
188
|
throw new Error('Connection settings must be provided when calling getAgenticInstanceToken');
|
|
188
189
|
}
|
|
@@ -204,6 +205,9 @@ class MsalTokenProvider {
|
|
|
204
205
|
else {
|
|
205
206
|
data.client_secret = this.connectionSettings.clientSecret;
|
|
206
207
|
}
|
|
208
|
+
if (data.grant_type !== 'user_fic') {
|
|
209
|
+
data.client_info = '2';
|
|
210
|
+
}
|
|
207
211
|
const token = await axios_1.default.post(url, data, {
|
|
208
212
|
headers: {
|
|
209
213
|
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
|
|
@@ -220,7 +224,7 @@ class MsalTokenProvider {
|
|
|
220
224
|
logger.debug('Getting agentic user token');
|
|
221
225
|
const agentToken = await this.getAgenticApplicationToken(tenantId, agentAppInstanceId);
|
|
222
226
|
const instanceToken = await this.getAgenticInstanceToken(tenantId, agentAppInstanceId);
|
|
223
|
-
const token = await this.
|
|
227
|
+
const token = await this.acquireTokenForAgenticScenarios(tenantId, agentAppInstanceId, agentToken, scopes, {
|
|
224
228
|
user_id: agenticUserId,
|
|
225
229
|
user_federated_identity_credential: instanceToken,
|
|
226
230
|
grant_type: 'user_fic',
|
|
@@ -236,7 +240,18 @@ class MsalTokenProvider {
|
|
|
236
240
|
throw new Error('Connection settings must be provided when calling getAgenticApplicationToken');
|
|
237
241
|
}
|
|
238
242
|
logger.debug('Getting agentic application token');
|
|
239
|
-
|
|
243
|
+
let clientAssertion;
|
|
244
|
+
if (this.connectionSettings.WIDAssertionFile !== undefined) {
|
|
245
|
+
clientAssertion = fs_1.default.readFileSync(this.connectionSettings.WIDAssertionFile, 'utf8');
|
|
246
|
+
}
|
|
247
|
+
else if (this.connectionSettings.FICClientId !== undefined) {
|
|
248
|
+
clientAssertion = await this.fetchExternalToken(this.connectionSettings.FICClientId);
|
|
249
|
+
}
|
|
250
|
+
else if (this.connectionSettings.certPemFile !== undefined &&
|
|
251
|
+
this.connectionSettings.certKeyFile !== undefined) {
|
|
252
|
+
clientAssertion = this.getAssertionFromCert(this.connectionSettings);
|
|
253
|
+
}
|
|
254
|
+
const token = await this.acquireTokenForAgenticScenarios(tenantId, this.connectionSettings.clientId, clientAssertion, ['api://AzureAdTokenExchange/.default'], {
|
|
240
255
|
grant_type: 'client_credentials',
|
|
241
256
|
fmi_path: agentAppInstanceId,
|
|
242
257
|
});
|
|
@@ -245,6 +260,36 @@ class MsalTokenProvider {
|
|
|
245
260
|
}
|
|
246
261
|
return token;
|
|
247
262
|
}
|
|
263
|
+
/**
|
|
264
|
+
* Generates the client assertion using the provided certificate.
|
|
265
|
+
* @param authConfig The authentication configuration.
|
|
266
|
+
* @returns The client assertion.
|
|
267
|
+
*/
|
|
268
|
+
getAssertionFromCert(authConfig) {
|
|
269
|
+
const base64url = (buf) => buf.toString('base64').replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
|
270
|
+
const privateKeyPem = fs_1.default.readFileSync(authConfig.certKeyFile);
|
|
271
|
+
const pubKeyObject = new crypto_1.default.X509Certificate(fs_1.default.readFileSync(authConfig.certPemFile));
|
|
272
|
+
const der = pubKeyObject.raw;
|
|
273
|
+
const x5tS256 = base64url(crypto_1.default.createHash('sha256').update(der).digest());
|
|
274
|
+
let x5c;
|
|
275
|
+
if (authConfig.sendX5C) {
|
|
276
|
+
x5c = Buffer.from(authConfig.certPemFile, 'base64').toString();
|
|
277
|
+
}
|
|
278
|
+
const now = Math.floor(Date.now() / 1000);
|
|
279
|
+
const payload = {
|
|
280
|
+
aud: `${this.resolveAuthority(authConfig.tenantId)}/oauth2/v2.0/token`,
|
|
281
|
+
iss: authConfig.clientId,
|
|
282
|
+
sub: authConfig.clientId,
|
|
283
|
+
jti: (0, uuid_1.v4)(),
|
|
284
|
+
nbf: now,
|
|
285
|
+
iat: now,
|
|
286
|
+
exp: now + 600, // 10 minutes
|
|
287
|
+
};
|
|
288
|
+
return jsonwebtoken_1.default.sign(payload, privateKeyPem, {
|
|
289
|
+
algorithm: 'PS256',
|
|
290
|
+
header: { alg: 'PS256', typ: 'JWT', 'x5t#S256': x5tS256, x5c }
|
|
291
|
+
});
|
|
292
|
+
}
|
|
248
293
|
/**
|
|
249
294
|
* Acquires a token using a user-assigned identity.
|
|
250
295
|
* @param authConfig The authentication configuration.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msalTokenProvider.js","sourceRoot":"","sources":["../../../src/auth/msalTokenProvider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"msalTokenProvider.js","sourceRoot":"","sources":["../../../src/auth/msalTokenProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,15 +10,15 @@ import { Request } from './auth/request';
|
|
|
10
10
|
import { ConnectorClient } from './connector-client/connectorClient';
|
|
11
11
|
import { AuthConfiguration } from './auth/authConfiguration';
|
|
12
12
|
import { AuthProvider } from './auth/authProvider';
|
|
13
|
-
import { MsalConnectionManager } from './auth/msalConnectionManager';
|
|
14
13
|
import { Activity, ConversationReference, ConversationParameters } from '@microsoft/agents-activity';
|
|
15
14
|
import { ResourceResponse } from './connector-client/resourceResponse';
|
|
16
15
|
import { InvokeResponse } from './invoke/invokeResponse';
|
|
17
|
-
import { AttachmentInfo } from './connector-client/attachmentInfo';
|
|
18
16
|
import { AttachmentData } from './connector-client/attachmentData';
|
|
17
|
+
import { AttachmentInfo } from './connector-client/attachmentInfo';
|
|
19
18
|
import { UserTokenClient } from './oauth';
|
|
20
19
|
import { HeaderPropagationCollection, HeaderPropagationDefinition } from './headerPropagation';
|
|
21
20
|
import { JwtPayload } from 'jsonwebtoken';
|
|
21
|
+
import { Connections } from './auth/connections';
|
|
22
22
|
/**
|
|
23
23
|
* Adapter for handling agent interactions with various channels through cloud-based services.
|
|
24
24
|
*
|
|
@@ -32,11 +32,12 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
32
32
|
/**
|
|
33
33
|
* Client for connecting to the Azure Bot Service
|
|
34
34
|
*/
|
|
35
|
-
connectionManager:
|
|
35
|
+
connectionManager: Connections;
|
|
36
36
|
/**
|
|
37
37
|
* Creates an instance of CloudAdapter.
|
|
38
|
-
* @param authConfig - The authentication configuration for securing communications
|
|
39
|
-
* @param authProvider - No longer used
|
|
38
|
+
* @param authConfig - The authentication configuration for securing communications.
|
|
39
|
+
* @param authProvider - No longer used.
|
|
40
|
+
* @param userTokenClient - No longer used.
|
|
40
41
|
*/
|
|
41
42
|
constructor(authConfig?: AuthConfiguration, authProvider?: AuthProvider, userTokenClient?: UserTokenClient);
|
|
42
43
|
/**
|
|
@@ -52,36 +53,53 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
52
53
|
/**
|
|
53
54
|
* Creates a connector client for a specific service URL and scope.
|
|
54
55
|
*
|
|
55
|
-
* @param serviceUrl - The URL of the service to connect to
|
|
56
|
-
* @param scope - The authentication scope to use
|
|
57
|
-
* @param
|
|
58
|
-
* @
|
|
56
|
+
* @param serviceUrl - The URL of the service to connect to.
|
|
57
|
+
* @param scope - The authentication scope to use.
|
|
58
|
+
* @param identity - The identity used to select the token provider.
|
|
59
|
+
* @param headers - Optional headers to propagate in the request.
|
|
60
|
+
* @returns A promise that resolves to a ConnectorClient instance.
|
|
59
61
|
* @protected
|
|
60
62
|
*/
|
|
61
63
|
protected createConnectorClient(serviceUrl: string, scope: string, identity: JwtPayload, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
64
|
+
/**
|
|
65
|
+
* Creates a connector client for a specific identity and activity.
|
|
66
|
+
*
|
|
67
|
+
* @param identity - The identity used to select the token provider.
|
|
68
|
+
* @param activity - The activity used to select the token provider.
|
|
69
|
+
* @param headers - Optional headers to propagate in the request.
|
|
70
|
+
* @returns A promise that resolves to a ConnectorClient instance.
|
|
71
|
+
* @protected
|
|
72
|
+
*/
|
|
62
73
|
protected createConnectorClientWithIdentity(identity: JwtPayload, activity: Activity, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
74
|
+
/**
|
|
75
|
+
* Creates the JwtPayload object with the provided appId.
|
|
76
|
+
* @param appId The bot's appId.
|
|
77
|
+
* @returns The JwtPayload object containing the appId as aud.
|
|
78
|
+
*/
|
|
63
79
|
static createIdentity(appId: string): JwtPayload;
|
|
64
80
|
/**
|
|
65
81
|
* Sets the connector client on the turn context.
|
|
66
82
|
*
|
|
67
|
-
* @param context - The current turn context
|
|
83
|
+
* @param context - The current turn context.
|
|
68
84
|
* @protected
|
|
69
85
|
*/
|
|
70
86
|
protected setConnectorClient(context: TurnContext, connectorClient?: ConnectorClient): void;
|
|
71
87
|
/**
|
|
72
88
|
* Creates a user token client for a specific service URL and scope.
|
|
73
89
|
*
|
|
74
|
-
* @param
|
|
75
|
-
* @param
|
|
90
|
+
* @param identity - The identity used to select the token provider.
|
|
91
|
+
* @param tokenServiceEndpoint - The endpoint to connect to.
|
|
92
|
+
* @param scope - The authentication scope to use.
|
|
93
|
+
* @param audience - No longer used.
|
|
76
94
|
* @param headers - Optional headers to propagate in the request
|
|
77
|
-
* @returns A promise that resolves to a
|
|
95
|
+
* @returns A promise that resolves to a UserTokenClient instance.
|
|
78
96
|
* @protected
|
|
79
97
|
*/
|
|
80
98
|
protected createUserTokenClient(identity: JwtPayload, tokenServiceEndpoint?: string, scope?: string, audience?: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
|
|
81
99
|
/**
|
|
82
100
|
* Sets the user token client on the turn context.
|
|
83
101
|
*
|
|
84
|
-
* @param context - The current turn context
|
|
102
|
+
* @param context - The current turn context.
|
|
85
103
|
* @protected
|
|
86
104
|
*/
|
|
87
105
|
protected setUserTokenClient(context: TurnContext, userTokenClient?: UserTokenClient): void;
|
|
@@ -90,6 +108,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
90
108
|
* Creates a TurnContext for the given activity and logic.
|
|
91
109
|
* @param activity - The activity to process.
|
|
92
110
|
* @param logic - The logic to execute.
|
|
111
|
+
* @param identity - The identity used for the new context.
|
|
93
112
|
* @returns The created TurnContext.
|
|
94
113
|
*/
|
|
95
114
|
createTurnContext(activity: Activity, logic: AgentHandler, identity?: JwtPayload): TurnContext;
|
|
@@ -125,8 +144,11 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
125
144
|
deleteActivity(context: TurnContext, reference: Partial<ConversationReference>): Promise<void>;
|
|
126
145
|
/**
|
|
127
146
|
* Continues a conversation.
|
|
147
|
+
* @param botAppIdOrIdentity - The bot identity to use when continuing the conversation. This can be either:
|
|
148
|
+
* a string containing the bot's App ID (botId) or a JwtPayload object containing identity claims (must include aud).
|
|
128
149
|
* @param reference - The conversation reference to continue.
|
|
129
150
|
* @param logic - The logic to execute.
|
|
151
|
+
* @param isResponse - No longer used.
|
|
130
152
|
* @returns A promise representing the completion of the continue operation.
|
|
131
153
|
*/
|
|
132
154
|
continueConversation(botAppIdOrIdentity: string | JwtPayload, reference: ConversationReference, logic: (revocableContext: TurnContext) => Promise<void>, isResponse?: Boolean): Promise<void>;
|
|
@@ -159,6 +181,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
159
181
|
/**
|
|
160
182
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
161
183
|
* Uploads an attachment.
|
|
184
|
+
* @param context - The context for the turn.
|
|
162
185
|
* @param conversationId - The conversation ID.
|
|
163
186
|
* @param attachmentData - The attachment data.
|
|
164
187
|
* @returns A promise representing the ResourceResponse for the uploaded attachment.
|
|
@@ -167,6 +190,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
167
190
|
/**
|
|
168
191
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
169
192
|
* Gets attachment information.
|
|
193
|
+
* @param context - The context for the turn.
|
|
170
194
|
* @param attachmentId - The attachment ID.
|
|
171
195
|
* @returns A promise representing the AttachmentInfo for the requested attachment.
|
|
172
196
|
*/
|
|
@@ -174,6 +198,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
174
198
|
/**
|
|
175
199
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
176
200
|
* Gets an attachment.
|
|
201
|
+
* @param context - The context for the turn.
|
|
177
202
|
* @param attachmentId - The attachment ID.
|
|
178
203
|
* @param viewId - The view ID.
|
|
179
204
|
* @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
|