@microsoft/agents-hosting 1.2.2 → 1.3.0-beta.10.gf7fc2bf267
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 +2 -2
- package/dist/src/agent-client/agentResponseHandler.js.map +1 -1
- package/dist/src/app/teamsAttachmentDownloader.d.ts +7 -2
- package/dist/src/app/teamsAttachmentDownloader.js +10 -4
- package/dist/src/app/teamsAttachmentDownloader.js.map +1 -1
- package/dist/src/cloudAdapter.js +1 -1
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/connector-client/connectorClient.js +9 -2
- package/dist/src/connector-client/connectorClient.js.map +1 -1
- package/dist/src/oauth/userTokenClient.js +18 -11
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/package.json +2 -2
- package/src/agent-client/agentResponseHandler.ts +3 -3
- package/src/app/teamsAttachmentDownloader.ts +8 -3
- package/src/cloudAdapter.ts +1 -1
- package/src/connector-client/connectorClient.ts +8 -2
- package/src/oauth/userTokenClient.ts +20 -12
package/dist/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.
|
|
4
|
+
"version": "1.3.0-beta.10.gf7fc2bf267",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.4",
|
|
24
|
-
"@microsoft/agents-activity": "1.
|
|
24
|
+
"@microsoft/agents-activity": "1.3.0-beta.10.gf7fc2bf267",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.3",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentResponseHandler.js","sourceRoot":"","sources":["../../../src/agent-client/agentResponseHandler.ts"],"names":[],"mappings":";;;AAAA,gEAA2F;AAE3F,kDAA8C;AAE9C,gDAA4C;AAC5C,+BAAyB;AACzB,8DAAiE;AACjE,8DAAyD;AAGzD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,qBAAqB,CAAC,CAAA;AAM3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACI,MAAM,2BAA2B,GAAG,CAAC,GAAgB,EAAE,OAAqB,EAAE,KAAsB,EAAE,iBAAoC,EAAE,EAAE;IACnJ,GAAG,CAAC,IAAI,CAAC,4EAA4E,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAA;AAC3I,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC;AAED,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,OAAwB,EAAE,iBAAoC,EAAE,EAAE,CAAC,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;;IACtJ,MAAM,QAAQ,GAAG,IAAA,8CAAyB,EAAC,GAAG,CAAC,IAAK,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAG,0BAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAE9C,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAA;IAE7C,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAA;IACnE,MAAM,KAAK,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,kBAAkB,0CAAE,QAAQ,mCAAI,EAAE,CAAA;IAE5D,MAAM,aAAa,GAAG,IAAI,yBAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,2BAAY,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5F,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,cAAc,CAA6B,GAAG,CAAC,MAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"agentResponseHandler.js","sourceRoot":"","sources":["../../../src/agent-client/agentResponseHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,9 @@ import { InputFile, InputFileDownloader } from './inputFileDownloader';
|
|
|
6
6
|
import { TurnContext } from '../turnContext';
|
|
7
7
|
import { TurnState } from './turnState';
|
|
8
8
|
/**
|
|
9
|
-
* Downloads attachments from Teams using the bots access token.
|
|
9
|
+
* Downloads attachments from Teams and M365 using the bots access token.
|
|
10
10
|
*/
|
|
11
|
-
export declare class
|
|
11
|
+
export declare class M365AttachmentDownloader<TState extends TurnState = TurnState> implements InputFileDownloader<TState> {
|
|
12
12
|
private _httpClient;
|
|
13
13
|
private _stateKey;
|
|
14
14
|
constructor(stateKey?: string);
|
|
@@ -34,3 +34,8 @@ export declare class TeamsAttachmentDownloader<TState extends TurnState = TurnSt
|
|
|
34
34
|
*/
|
|
35
35
|
downloadAndStoreFiles(context: TurnContext, state: TState): Promise<void>;
|
|
36
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* @deprecated Use {@link M365AttachmentDownloader} from @microsoft/agents-hosting instead.
|
|
39
|
+
*/
|
|
40
|
+
export declare class TeamsAttachmentDownloader extends M365AttachmentDownloader {
|
|
41
|
+
}
|
|
@@ -7,16 +7,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
8
|
};
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.TeamsAttachmentDownloader = void 0;
|
|
10
|
+
exports.TeamsAttachmentDownloader = exports.M365AttachmentDownloader = void 0;
|
|
11
11
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
12
12
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
13
13
|
const axios_1 = __importDefault(require("axios"));
|
|
14
14
|
const zod_1 = require("zod");
|
|
15
|
-
const logger = (0, logger_1.debug)('agents:
|
|
15
|
+
const logger = (0, logger_1.debug)('agents:M365AttachmentDownloader');
|
|
16
16
|
/**
|
|
17
|
-
* Downloads attachments from Teams using the bots access token.
|
|
17
|
+
* Downloads attachments from Teams and M365 using the bots access token.
|
|
18
18
|
*/
|
|
19
|
-
class
|
|
19
|
+
class M365AttachmentDownloader {
|
|
20
20
|
constructor(stateKey = 'inputFiles') {
|
|
21
21
|
this._httpClient = axios_1.default.create();
|
|
22
22
|
this._stateKey = stateKey;
|
|
@@ -99,5 +99,11 @@ class TeamsAttachmentDownloader {
|
|
|
99
99
|
state.setValue(this._stateKey, files);
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
|
+
exports.M365AttachmentDownloader = M365AttachmentDownloader;
|
|
103
|
+
/**
|
|
104
|
+
* @deprecated Use {@link M365AttachmentDownloader} from @microsoft/agents-hosting instead.
|
|
105
|
+
*/
|
|
106
|
+
class TeamsAttachmentDownloader extends M365AttachmentDownloader {
|
|
107
|
+
}
|
|
102
108
|
exports.TeamsAttachmentDownloader = TeamsAttachmentDownloader;
|
|
103
109
|
//# sourceMappingURL=teamsAttachmentDownloader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teamsAttachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/teamsAttachmentDownloader.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,gEAAiE;AACjE,8DAAyD;AAKzD,kDAA4C;AAC5C,6BAAuB;AAEvB,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"teamsAttachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/teamsAttachmentDownloader.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,gEAAiE;AACjE,8DAAyD;AAKzD,kDAA4C;AAC5C,6BAAuB;AAEvB,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,iCAAiC,CAAC,CAAA;AAEvD;;GAEG;AACH,MAAa,wBAAwB;IAInC,YAAoB,WAAmB,YAAY;QACjD,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,MAAM,EAAE,CAAA;QACjC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;IAC3B,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,aAAa,CAAE,OAAoB;;QAC9C,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,KAAK,0BAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,KAAK,0BAAQ,CAAC,WAAW,EAAE,CAAC;YAC3G,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC5B,CAAC;QACD,8BAA8B;QAC9B,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,QAAQ,CAAC,WAAW,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;QACxH,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC5B,CAAC;QAED,MAAM,eAAe,GAAqB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAkB,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACpH,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAA;QAElF,MAAM,KAAK,GAAgB,EAAE,CAAA;QAC7B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAChD,IAAI,IAAI,EAAE,CAAC;gBACT,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,YAAY,CAAE,UAAsB;QAChD,IAAI,SAAgC,CAAA;QAEpC,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;gBACjE,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;gBACpF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAA;gBAEzF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;gBACpD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,0BAA0B,CAAA;gBAClF,SAAS,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,CAAA;YACzE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,wCAAwC,KAAK,EAAE,CAAC,CAAA;gBAC7D,OAAO,SAAS,CAAA;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;gBAC1C,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,YAAY,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzF,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAA;gBAC/D,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,SAAS,GAAG;gBACV,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAsB,CAAC;gBACvD,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,UAAU,EAAE,UAAU,CAAC,UAAU;aAClC,CAAA;QACH,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,qBAAqB,CAAE,OAAoB,EAAE,KAAa;QACrE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAC/C,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IACvC,CAAC;CACF;AA1FD,4DA0FC;AAED;;GAEG;AACH,MAAa,yBAA0B,SAAQ,wBAAwB;CAAG;AAA1E,8DAA0E"}
|
package/dist/src/cloudAdapter.js
CHANGED
|
@@ -306,7 +306,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
306
306
|
this.setConnectorClient(context, connectorClient);
|
|
307
307
|
}
|
|
308
308
|
if (!activity.isAgenticRequest()) {
|
|
309
|
-
const userTokenClient = await this.createUserTokenClient(request.user);
|
|
309
|
+
const userTokenClient = await this.createUserTokenClient(request.user, undefined, undefined, undefined, headers);
|
|
310
310
|
this.setUserTokenClient(context, userTokenClient);
|
|
311
311
|
}
|
|
312
312
|
if ((activity === null || activity === void 0 ? void 0 : activity.type) === agents_activity_1.ActivityTypes.InvokeResponse ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudAdapter.js","sourceRoot":"","sources":["../../src/cloudAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cloudAdapter.js","sourceRoot":"","sources":["../../src/cloudAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,8 +87,15 @@ class ConnectorClient {
|
|
|
87
87
|
* @returns A new instance of ConnectorClient.
|
|
88
88
|
*/
|
|
89
89
|
static createClientWithToken(baseURL, token, headers) {
|
|
90
|
-
const headerPropagation = headers !== null && headers !== void 0 ? headers : new headerPropagation_1.HeaderPropagation({
|
|
91
|
-
headerPropagation.
|
|
90
|
+
const headerPropagation = headers !== null && headers !== void 0 ? headers : new headerPropagation_1.HeaderPropagation({});
|
|
91
|
+
const userAgent = headerPropagation.outgoing['user-agent'];
|
|
92
|
+
const productInfo = (0, getProductInfo_1.getProductInfo)();
|
|
93
|
+
if (!userAgent) {
|
|
94
|
+
headerPropagation.add({ 'User-Agent': productInfo });
|
|
95
|
+
}
|
|
96
|
+
else if (!userAgent.includes(productInfo)) {
|
|
97
|
+
headerPropagation.concat({ 'User-Agent': productInfo });
|
|
98
|
+
}
|
|
92
99
|
headerPropagation.override({
|
|
93
100
|
Accept: 'application/json',
|
|
94
101
|
'Content-Type': 'application/json', // Required by transformRequest
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorClient.js","sourceRoot":"","sources":["../../../src/connector-client/connectorClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connectorClient.js","sourceRoot":"","sources":["../../../src/connector-client/connectorClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const agents_activity_1 = require("@microsoft/agents-activity");
|
|
|
11
11
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
12
12
|
const activityWireCompat_1 = require("../activityWireCompat");
|
|
13
13
|
const getProductInfo_1 = require("../getProductInfo");
|
|
14
|
+
const headerPropagation_1 = require("../headerPropagation");
|
|
14
15
|
const customUserTokenAPI_1 = require("./customUserTokenAPI");
|
|
15
16
|
const logger = (0, logger_1.debug)('agents:user-token-client');
|
|
16
17
|
/**
|
|
@@ -88,20 +89,26 @@ class UserTokenClient {
|
|
|
88
89
|
* @returns A new instance of ConnectorClient.
|
|
89
90
|
*/
|
|
90
91
|
static async createClientWithScope(baseURL, authProvider, scope, headers) {
|
|
91
|
-
|
|
92
|
+
const headerPropagation = headers !== null && headers !== void 0 ? headers : new headerPropagation_1.HeaderPropagation({});
|
|
93
|
+
const userAgent = headerPropagation.outgoing['user-agent'];
|
|
94
|
+
const productInfo = (0, getProductInfo_1.getProductInfo)();
|
|
95
|
+
if (!userAgent) {
|
|
96
|
+
headerPropagation.add({ 'User-Agent': productInfo });
|
|
97
|
+
}
|
|
98
|
+
else if (!userAgent.includes(productInfo)) {
|
|
99
|
+
headerPropagation.concat({ 'User-Agent': productInfo });
|
|
100
|
+
}
|
|
101
|
+
headerPropagation.override({
|
|
102
|
+
Accept: 'application/json',
|
|
103
|
+
'Content-Type': 'application/json', // Required by transformRequest
|
|
104
|
+
});
|
|
92
105
|
const axiosInstance = axios_1.default.create({
|
|
93
106
|
baseURL,
|
|
94
|
-
headers:
|
|
95
|
-
Accept: 'application/json',
|
|
96
|
-
'Content-Type': 'application/json', // Required by transformRequest
|
|
97
|
-
'User-Agent': (0, getProductInfo_1.getProductInfo)(),
|
|
98
|
-
},
|
|
107
|
+
headers: headerPropagation.outgoing,
|
|
99
108
|
});
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
|
|
104
|
-
}
|
|
109
|
+
const token = await (authProvider === null || authProvider === void 0 ? void 0 : authProvider.getAccessToken(scope));
|
|
110
|
+
if (token && token.length > 1) {
|
|
111
|
+
axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
|
|
105
112
|
}
|
|
106
113
|
return new UserTokenClient(axiosInstance);
|
|
107
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":";AAAA,4DAA4D;AAC5D,kCAAkC;;;;;;AAElC,kDAA4C;AAC5C,gEAA4E;AAC5E,8DAAyD;AACzD,8DAAmE;AAEnE,sDAAkD;
|
|
1
|
+
{"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.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.
|
|
4
|
+
"version": "1.3.0-beta.10.gf7fc2bf267",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.4",
|
|
24
|
-
"@microsoft/agents-activity": "1.
|
|
24
|
+
"@microsoft/agents-activity": "1.3.0-beta.10.gf7fc2bf267",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.3",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -62,14 +62,14 @@ const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler, convers
|
|
|
62
62
|
const appId = connection?.connectionSettings?.clientId ?? ''
|
|
63
63
|
|
|
64
64
|
const myTurnContext = new TurnContext(adapter, activity, CloudAdapter.createIdentity(appId))
|
|
65
|
-
const conversationDataAccessor = conversationState.createProperty<ConversationReferenceState>(req.params!.conversationId)
|
|
66
|
-
const conversationRefState = await conversationDataAccessor.get(myTurnContext, undefined, { channelId: activity.channelId!, conversationId: req.params!.conversationId })
|
|
65
|
+
const conversationDataAccessor = conversationState.createProperty<ConversationReferenceState>(req.params!.conversationId as string)
|
|
66
|
+
const conversationRefState = await conversationDataAccessor.get(myTurnContext, undefined, { channelId: activity.channelId!, conversationId: req.params!.conversationId as string })
|
|
67
67
|
|
|
68
68
|
const conversationRef = JSON.stringify(conversationRefState.conversationReference)
|
|
69
69
|
console.log('conversationRef', conversationRef)
|
|
70
70
|
const callback = async (turnContext: TurnContext) => {
|
|
71
71
|
activity.applyConversationReference(conversationRefState.conversationReference)
|
|
72
|
-
turnContext.activity.id = req.params!.activityId
|
|
72
|
+
turnContext.activity.id = req.params!.activityId as string
|
|
73
73
|
|
|
74
74
|
let response
|
|
75
75
|
if (activity.type === ActivityTypes.EndOfConversation) {
|
|
@@ -12,12 +12,12 @@ import { TurnState } from './turnState'
|
|
|
12
12
|
import axios, { AxiosInstance } from 'axios'
|
|
13
13
|
import { z } from 'zod'
|
|
14
14
|
|
|
15
|
-
const logger = debug('agents:
|
|
15
|
+
const logger = debug('agents:M365AttachmentDownloader')
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
|
-
* Downloads attachments from Teams using the bots access token.
|
|
18
|
+
* Downloads attachments from Teams and M365 using the bots access token.
|
|
19
19
|
*/
|
|
20
|
-
export class
|
|
20
|
+
export class M365AttachmentDownloader<TState extends TurnState = TurnState> implements InputFileDownloader<TState> {
|
|
21
21
|
private _httpClient: AxiosInstance
|
|
22
22
|
private _stateKey: string
|
|
23
23
|
|
|
@@ -108,3 +108,8 @@ export class TeamsAttachmentDownloader<TState extends TurnState = TurnState> imp
|
|
|
108
108
|
state.setValue(this._stateKey, files)
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
+
|
|
112
|
+
/**
|
|
113
|
+
* @deprecated Use {@link M365AttachmentDownloader} from @microsoft/agents-hosting instead.
|
|
114
|
+
*/
|
|
115
|
+
export class TeamsAttachmentDownloader extends M365AttachmentDownloader {}
|
package/src/cloudAdapter.ts
CHANGED
|
@@ -361,7 +361,7 @@ export class CloudAdapter extends BaseAdapter {
|
|
|
361
361
|
}
|
|
362
362
|
|
|
363
363
|
if (!activity.isAgenticRequest()) {
|
|
364
|
-
const userTokenClient = await this.createUserTokenClient(request.user
|
|
364
|
+
const userTokenClient = await this.createUserTokenClient(request.user!, undefined, undefined, undefined, headers)
|
|
365
365
|
this.setUserTokenClient(context, userTokenClient)
|
|
366
366
|
}
|
|
367
367
|
|
|
@@ -108,8 +108,14 @@ export class ConnectorClient {
|
|
|
108
108
|
token: string,
|
|
109
109
|
headers?: HeaderPropagationCollection
|
|
110
110
|
): ConnectorClient {
|
|
111
|
-
const headerPropagation = headers ?? new HeaderPropagation({
|
|
112
|
-
headerPropagation.
|
|
111
|
+
const headerPropagation = headers ?? new HeaderPropagation({})
|
|
112
|
+
const userAgent = headerPropagation.outgoing['user-agent']
|
|
113
|
+
const productInfo = getProductInfo()
|
|
114
|
+
if (!userAgent) {
|
|
115
|
+
headerPropagation.add({ 'User-Agent': productInfo })
|
|
116
|
+
} else if (!userAgent.includes(productInfo)) {
|
|
117
|
+
headerPropagation.concat({ 'User-Agent': productInfo })
|
|
118
|
+
}
|
|
113
119
|
headerPropagation.override({
|
|
114
120
|
Accept: 'application/json',
|
|
115
121
|
'Content-Type': 'application/json', // Required by transformRequest
|
|
@@ -8,7 +8,7 @@ import { normalizeTokenExchangeState } from '../activityWireCompat'
|
|
|
8
8
|
import { AadResourceUrls, SignInResource, TokenExchangeRequest, TokenOrSinginResourceResponse, TokenResponse, TokenStatus } from './userTokenClient.types'
|
|
9
9
|
import { getProductInfo } from '../getProductInfo'
|
|
10
10
|
import { AuthProvider } from '../auth'
|
|
11
|
-
import { HeaderPropagationCollection } from '../headerPropagation'
|
|
11
|
+
import { HeaderPropagation, HeaderPropagationCollection } from '../headerPropagation'
|
|
12
12
|
import { getTokenServiceEndpoint } from './customUserTokenAPI'
|
|
13
13
|
|
|
14
14
|
const logger = debug('agents:user-token-client')
|
|
@@ -109,21 +109,29 @@ export class UserTokenClient {
|
|
|
109
109
|
scope: string,
|
|
110
110
|
headers?: HeaderPropagationCollection
|
|
111
111
|
): Promise<UserTokenClient> {
|
|
112
|
-
|
|
112
|
+
const headerPropagation = headers ?? new HeaderPropagation({})
|
|
113
|
+
const userAgent = headerPropagation.outgoing['user-agent']
|
|
114
|
+
const productInfo = getProductInfo()
|
|
115
|
+
if (!userAgent) {
|
|
116
|
+
headerPropagation.add({ 'User-Agent': productInfo })
|
|
117
|
+
} else if (!userAgent.includes(productInfo)) {
|
|
118
|
+
headerPropagation.concat({ 'User-Agent': productInfo })
|
|
119
|
+
}
|
|
120
|
+
headerPropagation.override({
|
|
121
|
+
Accept: 'application/json',
|
|
122
|
+
'Content-Type': 'application/json', // Required by transformRequest
|
|
123
|
+
})
|
|
124
|
+
|
|
113
125
|
const axiosInstance = axios.create({
|
|
114
126
|
baseURL,
|
|
115
|
-
headers:
|
|
116
|
-
Accept: 'application/json',
|
|
117
|
-
'Content-Type': 'application/json', // Required by transformRequest
|
|
118
|
-
'User-Agent': getProductInfo(),
|
|
119
|
-
},
|
|
127
|
+
headers: headerPropagation.outgoing,
|
|
120
128
|
})
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
129
|
+
|
|
130
|
+
const token = await authProvider?.getAccessToken(scope)
|
|
131
|
+
if (token && token.length > 1) {
|
|
132
|
+
axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`
|
|
126
133
|
}
|
|
134
|
+
|
|
127
135
|
return new UserTokenClient(axiosInstance)
|
|
128
136
|
}
|
|
129
137
|
|