@microsoft/agents-hosting 1.1.4-geb1c05c291 → 1.2.0-alpha.18.g3c104e426a
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/authProvider.d.ts +7 -1
- package/dist/src/auth/msalTokenProvider.js +4 -1
- 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/authProvider.ts +8 -1
- package/src/auth/msalTokenProvider.ts +5 -1
- 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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"}
|
|
@@ -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
|
|
@@ -204,6 +204,9 @@ class MsalTokenProvider {
|
|
|
204
204
|
else {
|
|
205
205
|
data.client_secret = this.connectionSettings.clientSecret;
|
|
206
206
|
}
|
|
207
|
+
if (data.grant_type !== 'user_fic') {
|
|
208
|
+
data.client_info = '2';
|
|
209
|
+
}
|
|
207
210
|
const token = await axios_1.default.post(url, data, {
|
|
208
211
|
headers: {
|
|
209
212
|
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
|
|
@@ -220,7 +223,7 @@ class MsalTokenProvider {
|
|
|
220
223
|
logger.debug('Getting agentic user token');
|
|
221
224
|
const agentToken = await this.getAgenticApplicationToken(tenantId, agentAppInstanceId);
|
|
222
225
|
const instanceToken = await this.getAgenticInstanceToken(tenantId, agentAppInstanceId);
|
|
223
|
-
const token = await this.acquireTokenByForAgenticScenarios(tenantId,
|
|
226
|
+
const token = await this.acquireTokenByForAgenticScenarios(tenantId, agentAppInstanceId, agentToken, scopes, {
|
|
224
227
|
user_id: agenticUserId,
|
|
225
228
|
user_federated_identity_credential: instanceToken,
|
|
226
229
|
grant_type: 'user_fic',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msalTokenProvider.js","sourceRoot":"","sources":["../../../src/auth/msalTokenProvider.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,gDAAyH;AACzH,kDAAyB;AAGzB,8DAAyD;AACzD,+BAAyB;AACzB,+CAA2C;AAE3C,4CAAmB;AACnB,oDAA2B;AAE3B,MAAM,QAAQ,GAAG,4BAA4B,CAAA;AAC7C,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;AAEnC;;GAEG;AACH,MAAa,iBAAiB;IAI5B,YAAa,kBAAsC;QAgPlC,eAAU,GAAsB;YAC/C,aAAa,EAAE;gBACb,QAAQ,EAAE,oBAAQ,CAAC,KAAK;gBACxB,cAAc,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;oBAC9C,IAAI,WAAW,EAAE,CAAC;wBAChB,OAAM;oBACR,CAAC;oBACD,QAAQ,KAAK,EAAE,CAAC;wBACd,KAAK,oBAAQ,CAAC,KAAK;4BACjB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;4BACrB,OAAM;wBACR,KAAK,oBAAQ,CAAC,IAAI;4BAChB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;4BACrB,OAAM;wBACR,KAAK,oBAAQ,CAAC,OAAO;4BACnB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE,CAAC;gCAC9D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;4BACtB,CAAC;4BACD,OAAM;wBACR,KAAK,oBAAQ,CAAC,OAAO;4BACnB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;oBACzB,CAAC;gBACH,CAAC;gBACD,iBAAiB,EAAE,KAAK;aACzB;SACF,CAAA;QAxQC,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAW,EAAU,CAAA;QACnD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;IAC9C,CAAC;IAgBM,KAAK,CAAC,cAAc,CAAE,iBAA6C,EAAE,KAAc;QACxF,IAAI,UAA6B,CAAA;QACjC,IAAI,WAAmB,CAAA;QAEvB,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE,CAAC;YAC5C,kCAAkC;YAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAA;YAC3G,CAAC;YACD,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAA;YACpC,WAAW,GAAG,iBAAiB,CAAA;QACjC,CAAC;aAAM,CAAC;YACR,8CAA8C;YAC5C,UAAU,GAAG,iBAAiB,CAAA;YAC9B,WAAW,GAAG,KAAe,CAAA;QAC/B,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YAClE,OAAO,EAAE,CAAA;QACX,CAAC;QACD,IAAI,KAAK,CAAA;QACT,IAAI,UAAU,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAC9C,KAAK,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACtE,CAAC;aAAM,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAChD,KAAK,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACtE,CAAC;aAAM,IAAI,UAAU,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACjD,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACzE,CAAC;aAAM,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS;YAC7C,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACvC,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACzE,CAAC;aAAM,IAAI,UAAU,CAAC,YAAY,KAAK,SAAS;YAC9C,UAAU,CAAC,WAAW,KAAK,SAAS;YACpC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACvC,KAAK,GAAG,MAAM,IAAI,CAAC,oCAAoC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QAClF,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzC,CAAC;QACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC5C,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAKM,KAAK,CAAC,sBAAsB,CACjC,kBAAgD,EAChD,oBAAwC,EACxC,YAAqB;QAErB,IAAI,UAA6B,CAAA;QACjC,IAAI,YAAsB,CAAA;QAC1B,IAAI,kBAA0B,CAAA;QAE9B,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,yDAAyD;YACvD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAA;YAClI,CAAC;YACD,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAA;YACpC,YAAY,GAAG,kBAAkB,CAAA;YACjC,kBAAkB,GAAG,oBAA8B,CAAA;QACrD,CAAC;aAAM,CAAC;YACR,qEAAqE;YACnE,UAAU,GAAG,kBAAkB,CAAA;YAC/B,YAAY,GAAG,oBAAgC,CAAA;YAC/C,kBAAkB,GAAG,YAAa,CAAA;QACpC,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,UAAU,CAAC,QAAkB;gBACvC,SAAS,EAAE,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,IAAI,kBAAkB,EAAE;gBACjF,YAAY,EAAE,UAAU,CAAC,YAAY;aACtC;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,sBAAsB,CAAC;YAC7C,YAAY,EAAE,kBAAkB;YAChC,MAAM,EAAE,YAAY;SACrB,CAAC,CAAA;QACF,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAqB,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAE,QAAgB,EAAE,kBAA0B;QAChF,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAA;QAC9F,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QACpF,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,kBAAkB;gBAC5B,eAAe,EAAE,QAAQ;gBACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;aAC3C;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC;YACrD,MAAM,EAAE,CAAC,qCAAqC,CAAC;YAC/C,aAAa,EAAE,IAAA,SAAE,GAAE;SACpB,CAAC,CAAA;QAEF,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAA,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,wDAAwD,kBAAkB,EAAE,CAAC,CAAA;QAC/F,CAAC;QAED,OAAO,KAAK,CAAC,WAAW,CAAA;IAC1B,CAAC;IAED;;;;OAIG;IACK,gBAAgB,CAAE,QAAiB;;QACzC,qHAAqH;QACrH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,SAAS,EAAC,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,IAAI,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,qCAAqC,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,KAAI,kBAAkB,EAAE,CAAA;QAC1N,CAAC;QAED,IAAI,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,MAAK,QAAQ,EAAE,CAAC;YACnD,OAAO,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,SAAS,EAAC,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,qCAAqC,QAAQ,EAAE,CAAA;QAClJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,SAAS,EAAC,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,IAAI,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,qCAAqC,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,KAAI,kBAAkB,EAAE,CAAA;QAC1N,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,iCAAiC,CAAE,QAAgB,EAAE,QAAgB,EAAE,eAAmC,EAAE,MAAgB,EAAE,mBAA2C;QACrL,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAA;QAC9F,CAAC;QAED,oBAAoB;QACpB,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,oCAAoC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;QACrM,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAW,CAAA;QACxD,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,oBAAoB,CAAA;QAElE,MAAM,IAAI,GAA2B;YACnC,SAAS,EAAE,QAAQ;YACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACvB,GAAG,mBAAmB;SACvB,CAAA;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,qBAAqB,GAAG,wDAAwD,CAAA;YACrF,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAA;QACzC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAA;QAC3D,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,eAAK,CAAC,IAAI,CAC5B,GAAG,EACH,IAAI,EACJ;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,iDAAiD;aAClE;SACF,CACF,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;YACvD,MAAM,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;QAEF,oDAAoD;QACpD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,CAAA;QAC3F,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAA;IAChC,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAE,QAAgB,EAAE,kBAA0B,EAAE,aAAqB,EAAE,MAAgB;QACrH,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC1C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QACtF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QAEtF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE;YACtG,OAAO,EAAE,aAAa;YACtB,kCAAkC,EAAE,aAAa;YACjD,UAAU,EAAE,UAAU;SACvB,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,oDAAoD,kBAAkB,EAAE,CAAC,CAAA;QAC3F,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAE,QAAgB,EAAE,kBAA0B;;QACnF,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,CAAA,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAA;QACjG,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,qCAAqC,CAAC,EAAE;YACzJ,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,+CAA+C,kBAAkB,EAAE,CAAC,CAAA;QACtF,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IA6BD;;;;;OAKG;IACK,KAAK,CAAC,oCAAoC,CAAE,UAA6B,EAAE,KAAa;QAC9F,MAAM,GAAG,GAAG,IAAI,sCAA0B,CAAC;YACzC,uBAAuB,EAAE;gBACvB,oBAAoB,EAAE,UAAU,CAAC,QAAQ,IAAI,EAAE;aAChD;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC;YACnC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAA;QACF,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAA;IAC3B,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,2BAA2B,CAAE,UAA6B,EAAE,KAAa;QACrF,MAAM,gBAAgB,GAAG,YAAE,CAAC,YAAY,CAAC,UAAU,CAAC,WAAqB,CAAC,CAAA;QAE1E,MAAM,gBAAgB,GAAG,gBAAM,CAAC,gBAAgB,CAAC;YAC/C,GAAG,EAAE,gBAAgB;YACrB,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACzC,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,OAAO;SACd,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,IAAI,gBAAM,CAAC,eAAe,CAAC,YAAE,CAAC,YAAY,CAAC,UAAU,CAAC,WAAqB,CAAC,CAAC,CAAA;QAElG,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,EAAE;gBACnC,SAAS,EAAE,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,IAAI,kBAAkB,EAAE;gBACjF,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAoB;oBAChC,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC;oBACxD,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAqB,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE;iBACxE;aACF;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC;YACrD,MAAM,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC;YAC7B,aAAa,EAAE,IAAA,SAAE,GAAE;SACpB,CAAC,CAAA;QACF,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAqB,CAAA;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,2BAA2B,CAAE,UAA6B,EAAE,KAAa;QACrF,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,UAAU,CAAC,QAAkB;gBACvC,SAAS,EAAE,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,IAAI,kBAAkB,EAAE;gBACjF,YAAY,EAAE,UAAU,CAAC,YAAY;aACtC;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC;YACrD,MAAM,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC;YAC7B,aAAa,EAAE,IAAA,SAAE,GAAE;SACpB,CAAC,CAAA;QACF,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAqB,CAAA;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,wBAAwB,CAAE,UAA6B,EAAE,KAAa;QAClF,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,WAAW,CAAC,CAAA;QACpC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,WAAqB,CAAC,CAAA;QACvF,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,UAAU,CAAC,QAAkB;gBACvC,SAAS,EAAE,GAAG,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,EAAE;gBAC3D,eAAe;aAChB;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAClE,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACpD,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAqB,CAAA;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,wBAAwB,CAAE,UAA6B,EAAE,KAAa;QAClF,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,WAAW,CAAC,CAAA;QACpC,MAAM,eAAe,GAAG,YAAE,CAAC,YAAY,CAAC,UAAU,CAAC,gBAA0B,EAAE,MAAM,CAAC,CAAA;QACtF,MAAM,GAAG,GAAG,IAAI,yCAA6B,CAAC;YAC5C,IAAI,EAAE;gBACJ,QAAQ,EAAE,UAAU,CAAC,QAAkB;gBACvC,SAAS,EAAE,qCAAqC,UAAU,CAAC,QAAQ,EAAE;gBACrE,eAAe;aAChB;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAClE,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAA;QACnD,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAqB,CAAA;IACrC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,kBAAkB,CAAE,WAAmB;QACnD,MAAM,8BAA8B,GAAG,IAAI,sCAA0B,CAAC;YACpE,uBAAuB,EAAE;gBACvB,oBAAoB,EAAE,WAAW;aAClC;YACD,MAAM,EAAE,IAAI,CAAC,UAAU;SACxB,CACA,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,8BAA8B,CAAC,YAAY,CAAC;YACjE,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QACF,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;QACjC,OAAO,QAAQ,CAAC,WAAW,CAAA;IAC7B,CAAC;CACF;AAhaD,8CAgaC"}
|
|
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.
|
package/dist/src/cloudAdapter.js
CHANGED
|
@@ -46,6 +46,7 @@ const authConfiguration_1 = require("./auth/authConfiguration");
|
|
|
46
46
|
const authConstants_1 = require("./auth/authConstants");
|
|
47
47
|
const msalConnectionManager_1 = require("./auth/msalConnectionManager");
|
|
48
48
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
49
|
+
const errorHelper_1 = require("./errorHelper");
|
|
49
50
|
const uuid = __importStar(require("uuid"));
|
|
50
51
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
51
52
|
const statusCodes_1 = require("./statusCodes");
|
|
@@ -66,8 +67,9 @@ const logger = (0, logger_1.debug)('agents:cloud-adapter');
|
|
|
66
67
|
class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
67
68
|
/**
|
|
68
69
|
* Creates an instance of CloudAdapter.
|
|
69
|
-
* @param authConfig - The authentication configuration for securing communications
|
|
70
|
-
* @param authProvider - No longer used
|
|
70
|
+
* @param authConfig - The authentication configuration for securing communications.
|
|
71
|
+
* @param authProvider - No longer used.
|
|
72
|
+
* @param userTokenClient - No longer used.
|
|
71
73
|
*/
|
|
72
74
|
constructor(authConfig, authProvider, userTokenClient) {
|
|
73
75
|
super();
|
|
@@ -102,10 +104,11 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
102
104
|
/**
|
|
103
105
|
* Creates a connector client for a specific service URL and scope.
|
|
104
106
|
*
|
|
105
|
-
* @param serviceUrl - The URL of the service to connect to
|
|
106
|
-
* @param scope - The authentication scope to use
|
|
107
|
-
* @param
|
|
108
|
-
* @
|
|
107
|
+
* @param serviceUrl - The URL of the service to connect to.
|
|
108
|
+
* @param scope - The authentication scope to use.
|
|
109
|
+
* @param identity - The identity used to select the token provider.
|
|
110
|
+
* @param headers - Optional headers to propagate in the request.
|
|
111
|
+
* @returns A promise that resolves to a ConnectorClient instance.
|
|
109
112
|
* @protected
|
|
110
113
|
*/
|
|
111
114
|
async createConnectorClient(serviceUrl, scope, identity, headers) {
|
|
@@ -114,6 +117,15 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
114
117
|
const token = await tokenProvider.getAccessToken(scope);
|
|
115
118
|
return connectorClient_1.ConnectorClient.createClientWithToken(serviceUrl, token, headers);
|
|
116
119
|
}
|
|
120
|
+
/**
|
|
121
|
+
* Creates a connector client for a specific identity and activity.
|
|
122
|
+
*
|
|
123
|
+
* @param identity - The identity used to select the token provider.
|
|
124
|
+
* @param activity - The activity used to select the token provider.
|
|
125
|
+
* @param headers - Optional headers to propagate in the request.
|
|
126
|
+
* @returns A promise that resolves to a ConnectorClient instance.
|
|
127
|
+
* @protected
|
|
128
|
+
*/
|
|
117
129
|
async createConnectorClientWithIdentity(identity, activity, headers) {
|
|
118
130
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
119
131
|
if (!(identity === null || identity === void 0 ? void 0 : identity.aud)) {
|
|
@@ -149,6 +161,11 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
149
161
|
}
|
|
150
162
|
return connectorClient;
|
|
151
163
|
}
|
|
164
|
+
/**
|
|
165
|
+
* Creates the JwtPayload object with the provided appId.
|
|
166
|
+
* @param appId The bot's appId.
|
|
167
|
+
* @returns The JwtPayload object containing the appId as aud.
|
|
168
|
+
*/
|
|
152
169
|
static createIdentity(appId) {
|
|
153
170
|
return {
|
|
154
171
|
aud: appId
|
|
@@ -157,7 +174,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
157
174
|
/**
|
|
158
175
|
* Sets the connector client on the turn context.
|
|
159
176
|
*
|
|
160
|
-
* @param context - The current turn context
|
|
177
|
+
* @param context - The current turn context.
|
|
161
178
|
* @protected
|
|
162
179
|
*/
|
|
163
180
|
setConnectorClient(context, connectorClient) {
|
|
@@ -166,10 +183,12 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
166
183
|
/**
|
|
167
184
|
* Creates a user token client for a specific service URL and scope.
|
|
168
185
|
*
|
|
169
|
-
* @param
|
|
170
|
-
* @param
|
|
186
|
+
* @param identity - The identity used to select the token provider.
|
|
187
|
+
* @param tokenServiceEndpoint - The endpoint to connect to.
|
|
188
|
+
* @param scope - The authentication scope to use.
|
|
189
|
+
* @param audience - No longer used.
|
|
171
190
|
* @param headers - Optional headers to propagate in the request
|
|
172
|
-
* @returns A promise that resolves to a
|
|
191
|
+
* @returns A promise that resolves to a UserTokenClient instance.
|
|
173
192
|
* @protected
|
|
174
193
|
*/
|
|
175
194
|
async createUserTokenClient(identity, tokenServiceEndpoint = (0, customUserTokenAPI_1.getTokenServiceEndpoint)(), scope = 'https://api.botframework.com', audience = 'https://api.botframework.com', headers) {
|
|
@@ -184,7 +203,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
184
203
|
/**
|
|
185
204
|
* Sets the user token client on the turn context.
|
|
186
205
|
*
|
|
187
|
-
* @param context - The current turn context
|
|
206
|
+
* @param context - The current turn context.
|
|
188
207
|
* @protected
|
|
189
208
|
*/
|
|
190
209
|
setUserTokenClient(context, userTokenClient) {
|
|
@@ -195,6 +214,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
195
214
|
* Creates a TurnContext for the given activity and logic.
|
|
196
215
|
* @param activity - The activity to process.
|
|
197
216
|
* @param logic - The logic to execute.
|
|
217
|
+
* @param identity - The identity used for the new context.
|
|
198
218
|
* @returns The created TurnContext.
|
|
199
219
|
*/
|
|
200
220
|
createTurnContext(activity, logic, identity) {
|
|
@@ -209,13 +229,13 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
209
229
|
async sendActivities(context, activities) {
|
|
210
230
|
var _a;
|
|
211
231
|
if (!context) {
|
|
212
|
-
throw
|
|
232
|
+
throw agents_activity_1.ExceptionHelper.generateException(TypeError, errorHelper_1.Errors.ContextParameterRequired);
|
|
213
233
|
}
|
|
214
234
|
if (!activities) {
|
|
215
|
-
throw
|
|
235
|
+
throw agents_activity_1.ExceptionHelper.generateException(TypeError, errorHelper_1.Errors.ActivitiesParameterRequired);
|
|
216
236
|
}
|
|
217
237
|
if (activities.length === 0) {
|
|
218
|
-
throw
|
|
238
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.EmptyActivitiesArray);
|
|
219
239
|
}
|
|
220
240
|
const responses = [];
|
|
221
241
|
for (const activity of activities) {
|
|
@@ -229,7 +249,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
229
249
|
}
|
|
230
250
|
else {
|
|
231
251
|
if (!activity.serviceUrl || (activity.conversation == null) || !activity.conversation.id) {
|
|
232
|
-
throw
|
|
252
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.InvalidActivityObject);
|
|
233
253
|
}
|
|
234
254
|
if (activity.replyToId) {
|
|
235
255
|
response = await context.turnState.get(this.ConnectorClientKey).replyToActivity(activity.conversation.id, activity.replyToId, activity);
|
|
@@ -331,7 +351,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
331
351
|
throw new TypeError('`activity` parameter required');
|
|
332
352
|
}
|
|
333
353
|
if (!activity.serviceUrl || (activity.conversation == null) || !activity.conversation.id || !activity.id) {
|
|
334
|
-
throw
|
|
354
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.InvalidActivityObject);
|
|
335
355
|
}
|
|
336
356
|
const response = await context.turnState.get(this.ConnectorClientKey).updateActivity(activity.conversation.id, activity.id, activity);
|
|
337
357
|
return response.id ? { id: response.id } : undefined;
|
|
@@ -347,19 +367,22 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
347
367
|
throw new TypeError('`context` parameter required');
|
|
348
368
|
}
|
|
349
369
|
if (!reference || !reference.serviceUrl || (reference.conversation == null) || !reference.conversation.id || !reference.activityId) {
|
|
350
|
-
throw
|
|
370
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.InvalidConversationReference);
|
|
351
371
|
}
|
|
352
372
|
await context.turnState.get(this.ConnectorClientKey).deleteActivity(reference.conversation.id, reference.activityId);
|
|
353
373
|
}
|
|
354
374
|
/**
|
|
355
375
|
* Continues a conversation.
|
|
376
|
+
* @param botAppIdOrIdentity - The bot identity to use when continuing the conversation. This can be either:
|
|
377
|
+
* a string containing the bot's App ID (botId) or a JwtPayload object containing identity claims (must include aud).
|
|
356
378
|
* @param reference - The conversation reference to continue.
|
|
357
379
|
* @param logic - The logic to execute.
|
|
380
|
+
* @param isResponse - No longer used.
|
|
358
381
|
* @returns A promise representing the completion of the continue operation.
|
|
359
382
|
*/
|
|
360
383
|
async continueConversation(botAppIdOrIdentity, reference, logic, isResponse = false) {
|
|
361
384
|
if (!reference || !reference.serviceUrl || (reference.conversation == null) || !reference.conversation.id) {
|
|
362
|
-
throw
|
|
385
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ContinueConversationInvalidReference);
|
|
363
386
|
}
|
|
364
387
|
if (!botAppIdOrIdentity) {
|
|
365
388
|
throw new TypeError('continueConversation: botAppIdOrIdentity is required');
|
|
@@ -463,53 +486,56 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
463
486
|
/**
|
|
464
487
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
465
488
|
* Uploads an attachment.
|
|
489
|
+
* @param context - The context for the turn.
|
|
466
490
|
* @param conversationId - The conversation ID.
|
|
467
491
|
* @param attachmentData - The attachment data.
|
|
468
492
|
* @returns A promise representing the ResourceResponse for the uploaded attachment.
|
|
469
493
|
*/
|
|
470
494
|
async uploadAttachment(context, conversationId, attachmentData) {
|
|
471
495
|
if (context === undefined) {
|
|
472
|
-
throw
|
|
496
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ContextRequired);
|
|
473
497
|
}
|
|
474
498
|
if (conversationId === undefined) {
|
|
475
|
-
throw
|
|
499
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ConversationIdRequired);
|
|
476
500
|
}
|
|
477
501
|
if (attachmentData === undefined) {
|
|
478
|
-
throw
|
|
502
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AttachmentDataRequired);
|
|
479
503
|
}
|
|
480
504
|
return await context.turnState.get(this.ConnectorClientKey).uploadAttachment(conversationId, attachmentData);
|
|
481
505
|
}
|
|
482
506
|
/**
|
|
483
507
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
484
508
|
* Gets attachment information.
|
|
509
|
+
* @param context - The context for the turn.
|
|
485
510
|
* @param attachmentId - The attachment ID.
|
|
486
511
|
* @returns A promise representing the AttachmentInfo for the requested attachment.
|
|
487
512
|
*/
|
|
488
513
|
async getAttachmentInfo(context, attachmentId) {
|
|
489
514
|
if (context === undefined) {
|
|
490
|
-
throw
|
|
515
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ContextRequired);
|
|
491
516
|
}
|
|
492
517
|
if (attachmentId === undefined) {
|
|
493
|
-
throw
|
|
518
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AttachmentIdRequired);
|
|
494
519
|
}
|
|
495
520
|
return await context.turnState.get(this.ConnectorClientKey).getAttachmentInfo(attachmentId);
|
|
496
521
|
}
|
|
497
522
|
/**
|
|
498
523
|
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
499
524
|
* Gets an attachment.
|
|
525
|
+
* @param context - The context for the turn.
|
|
500
526
|
* @param attachmentId - The attachment ID.
|
|
501
527
|
* @param viewId - The view ID.
|
|
502
528
|
* @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
|
|
503
529
|
*/
|
|
504
530
|
async getAttachment(context, attachmentId, viewId) {
|
|
505
531
|
if (context === undefined) {
|
|
506
|
-
throw
|
|
532
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ContextRequired);
|
|
507
533
|
}
|
|
508
534
|
if (attachmentId === undefined) {
|
|
509
|
-
throw
|
|
535
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AttachmentIdRequired);
|
|
510
536
|
}
|
|
511
537
|
if (viewId === undefined) {
|
|
512
|
-
throw
|
|
538
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ViewIdRequired);
|
|
513
539
|
}
|
|
514
540
|
return await context.turnState.get(this.ConnectorClientKey).getAttachment(attachmentId, viewId);
|
|
515
541
|
}
|