@microsoft/agents-hosting 1.1.0-alpha.9.g154c2c8a32 → 1.1.1
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 +10 -6
- package/dist/src/activityWireCompat.d.ts +1 -1
- package/dist/src/activityWireCompat.js +11 -3
- package/dist/src/activityWireCompat.js.map +1 -1
- package/dist/src/agent-client/agentClient.js +7 -3
- package/dist/src/agent-client/agentClient.js.map +1 -1
- package/dist/src/agent-client/agentResponseHandler.js +6 -2
- package/dist/src/agent-client/agentResponseHandler.js.map +1 -1
- package/dist/src/app/agentApplication.d.ts +26 -11
- package/dist/src/app/agentApplication.js +90 -79
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/agentApplicationBuilder.d.ts +2 -2
- package/dist/src/app/agentApplicationBuilder.js.map +1 -1
- package/dist/src/app/agentApplicationOptions.d.ts +9 -2
- package/dist/src/app/appRoute.d.ts +7 -0
- package/dist/src/app/{authorization.d.ts → auth/authorization.d.ts} +41 -139
- package/dist/src/app/auth/authorization.js +188 -0
- package/dist/src/app/auth/authorization.js.map +1 -0
- package/dist/src/app/auth/authorizationManager.d.ts +71 -0
- package/dist/src/app/auth/authorizationManager.js +170 -0
- package/dist/src/app/auth/authorizationManager.js.map +1 -0
- package/dist/src/app/auth/handlerStorage.d.ts +36 -0
- package/dist/src/app/auth/handlerStorage.js +62 -0
- package/dist/src/app/auth/handlerStorage.js.map +1 -0
- package/dist/src/app/auth/handlers/agenticAuthorization.d.ts +93 -0
- package/dist/src/app/auth/handlers/agenticAuthorization.js +134 -0
- package/dist/src/app/auth/handlers/agenticAuthorization.js.map +1 -0
- package/dist/src/app/auth/handlers/azureBotAuthorization.d.ts +226 -0
- package/dist/src/app/auth/handlers/azureBotAuthorization.js +429 -0
- package/dist/src/app/auth/handlers/azureBotAuthorization.js.map +1 -0
- package/dist/src/app/auth/handlers/index.d.ts +2 -0
- package/dist/src/app/auth/handlers/index.js +19 -0
- package/dist/src/app/auth/handlers/index.js.map +1 -0
- package/dist/src/app/auth/index.d.ts +2 -0
- package/dist/src/app/auth/index.js +19 -0
- package/dist/src/app/auth/index.js.map +1 -0
- package/dist/src/app/auth/types.d.ts +104 -0
- package/dist/src/app/auth/types.js +24 -0
- package/dist/src/app/auth/types.js.map +1 -0
- package/dist/src/app/index.d.ts +3 -3
- package/dist/src/app/index.js +2 -3
- package/dist/src/app/index.js.map +1 -1
- package/dist/src/app/routeList.d.ts +1 -1
- package/dist/src/app/routeList.js +22 -5
- package/dist/src/app/routeList.js.map +1 -1
- package/dist/src/app/streaming/streamingResponse.js +2 -1
- package/dist/src/app/streaming/streamingResponse.js.map +1 -1
- package/dist/src/auth/MemoryCache.d.ts +16 -0
- package/dist/src/auth/MemoryCache.js +58 -0
- package/dist/src/auth/MemoryCache.js.map +1 -0
- package/dist/src/auth/authConfiguration.d.ts +44 -2
- package/dist/src/auth/authConfiguration.js +209 -53
- package/dist/src/auth/authConfiguration.js.map +1 -1
- package/dist/src/auth/authConstants.d.ts +11 -0
- package/dist/src/auth/authConstants.js +15 -0
- package/dist/src/auth/authConstants.js.map +1 -0
- package/dist/src/auth/authProvider.d.ts +26 -0
- package/dist/src/auth/connections.d.ts +41 -0
- package/dist/src/auth/connections.js +7 -0
- package/dist/src/auth/connections.js.map +1 -0
- package/dist/src/auth/index.d.ts +2 -0
- package/dist/src/auth/index.js +2 -0
- package/dist/src/auth/index.js.map +1 -1
- package/dist/src/auth/jwt-middleware.js +31 -18
- package/dist/src/auth/jwt-middleware.js.map +1 -1
- package/dist/src/auth/msalConnectionManager.d.ts +64 -0
- package/dist/src/auth/msalConnectionManager.js +148 -0
- package/dist/src/auth/msalConnectionManager.js.map +1 -0
- package/dist/src/auth/msalTokenProvider.d.ts +38 -0
- package/dist/src/auth/msalTokenProvider.js +186 -16
- package/dist/src/auth/msalTokenProvider.js.map +1 -1
- package/dist/src/baseAdapter.d.ts +10 -25
- package/dist/src/baseAdapter.js +2 -15
- package/dist/src/baseAdapter.js.map +1 -1
- package/dist/src/cards/cardFactory.d.ts +2 -1
- package/dist/src/cards/cardFactory.js +3 -2
- package/dist/src/cards/cardFactory.js.map +1 -1
- package/dist/src/cloudAdapter.d.ts +40 -23
- package/dist/src/cloudAdapter.js +143 -63
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/connector-client/connectorClient.d.ts +15 -0
- package/dist/src/connector-client/connectorClient.js +49 -15
- package/dist/src/connector-client/connectorClient.js.map +1 -1
- package/dist/src/index.d.ts +0 -1
- package/dist/src/index.js +0 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/oauth/customUserTokenAPI.d.ts +1 -0
- package/dist/src/oauth/customUserTokenAPI.js +11 -0
- package/dist/src/oauth/customUserTokenAPI.js.map +1 -0
- package/dist/src/oauth/index.d.ts +0 -1
- package/dist/src/oauth/index.js +0 -1
- package/dist/src/oauth/index.js.map +1 -1
- package/dist/src/oauth/userTokenClient.d.ts +30 -13
- package/dist/src/oauth/userTokenClient.js +62 -26
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/dist/src/oauth/userTokenClient.types.d.ts +19 -6
- package/dist/src/transcript/fileTranscriptLogger.d.ts +109 -0
- package/dist/src/transcript/fileTranscriptLogger.js +398 -0
- package/dist/src/transcript/fileTranscriptLogger.js.map +1 -0
- package/dist/src/turnContext.d.ts +7 -1
- package/dist/src/turnContext.js +11 -4
- package/dist/src/turnContext.js.map +1 -1
- package/package.json +10 -6
- package/src/activityWireCompat.ts +12 -4
- package/src/agent-client/agentClient.ts +9 -3
- package/src/agent-client/agentResponseHandler.ts +5 -2
- package/src/app/agentApplication.ts +95 -74
- package/src/app/agentApplicationBuilder.ts +2 -2
- package/src/app/agentApplicationOptions.ts +10 -2
- package/src/app/appRoute.ts +8 -0
- package/src/app/auth/authorization.ts +261 -0
- package/src/app/auth/authorizationManager.ts +213 -0
- package/src/app/auth/handlerStorage.ts +61 -0
- package/src/app/auth/handlers/agenticAuthorization.ts +183 -0
- package/src/app/auth/handlers/azureBotAuthorization.ts +606 -0
- package/src/app/auth/handlers/index.ts +2 -0
- package/src/app/auth/index.ts +2 -0
- package/src/app/auth/types.ts +111 -0
- package/src/app/index.ts +3 -3
- package/src/app/routeList.ts +24 -5
- package/src/app/streaming/streamingResponse.ts +2 -1
- package/src/auth/MemoryCache.ts +59 -0
- package/src/auth/authConfiguration.ts +245 -52
- package/src/auth/authConstants.ts +11 -0
- package/src/auth/authProvider.ts +34 -0
- package/src/auth/connections.ts +47 -0
- package/src/auth/index.ts +2 -0
- package/src/auth/jwt-middleware.ts +38 -21
- package/src/auth/msalConnectionManager.ts +175 -0
- package/src/auth/msalTokenProvider.ts +228 -9
- package/src/baseAdapter.ts +10 -29
- package/src/cards/cardFactory.ts +3 -2
- package/src/cloudAdapter.ts +207 -72
- package/src/connector-client/connectorClient.ts +59 -15
- package/src/index.ts +0 -1
- package/src/oauth/customUserTokenAPI.ts +5 -0
- package/src/oauth/index.ts +0 -1
- package/src/oauth/userTokenClient.ts +76 -22
- package/src/oauth/userTokenClient.types.ts +20 -8
- package/src/transcript/fileTranscriptLogger.ts +409 -0
- package/src/turnContext.ts +16 -5
- package/dist/src/app/authorization.js +0 -387
- package/dist/src/app/authorization.js.map +0 -1
- package/dist/src/claimsIdentity.d.ts +0 -35
- package/dist/src/claimsIdentity.js +0 -43
- package/dist/src/claimsIdentity.js.map +0 -1
- package/dist/src/oauth/oAuthFlow.d.ts +0 -119
- package/dist/src/oauth/oAuthFlow.js +0 -316
- package/dist/src/oauth/oAuthFlow.js.map +0 -1
- package/src/app/authorization.ts +0 -432
- package/src/claimsIdentity.ts +0 -47
- package/src/oauth/oAuthFlow.ts +0 -378
|
@@ -9,8 +9,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.MsalTokenProvider = void 0;
|
|
11
11
|
const msal_node_1 = require("@azure/msal-node");
|
|
12
|
+
const axios_1 = __importDefault(require("axios"));
|
|
12
13
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
13
14
|
const uuid_1 = require("uuid");
|
|
15
|
+
const MemoryCache_1 = require("./MemoryCache");
|
|
14
16
|
const fs_1 = __importDefault(require("fs"));
|
|
15
17
|
const crypto_1 = __importDefault(require("crypto"));
|
|
16
18
|
const audience = 'api://AzureADTokenExchange';
|
|
@@ -19,7 +21,7 @@ const logger = (0, logger_1.debug)('agents:msal');
|
|
|
19
21
|
* Provides tokens using MSAL.
|
|
20
22
|
*/
|
|
21
23
|
class MsalTokenProvider {
|
|
22
|
-
constructor() {
|
|
24
|
+
constructor(connectionSettings) {
|
|
23
25
|
this.sysOptions = {
|
|
24
26
|
loggerOptions: {
|
|
25
27
|
logLevel: msal_node_1.LogLevel.Trace,
|
|
@@ -46,32 +48,46 @@ class MsalTokenProvider {
|
|
|
46
48
|
piiLoggingEnabled: false
|
|
47
49
|
}
|
|
48
50
|
};
|
|
51
|
+
this._agenticTokenCache = new MemoryCache_1.MemoryCache();
|
|
52
|
+
this.connectionSettings = connectionSettings;
|
|
49
53
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
async getAccessToken(authConfigOrScope, scope) {
|
|
55
|
+
let authConfig;
|
|
56
|
+
let actualScope;
|
|
57
|
+
if (typeof authConfigOrScope === 'string') {
|
|
58
|
+
// Called as getAccessToken(scope)
|
|
59
|
+
if (!this.connectionSettings) {
|
|
60
|
+
throw new Error('Connection settings must be provided to constructor when calling getAccessToken(scope)');
|
|
61
|
+
}
|
|
62
|
+
authConfig = this.connectionSettings;
|
|
63
|
+
actualScope = authConfigOrScope;
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
// Called as getAccessToken(authConfig, scope)
|
|
67
|
+
authConfig = authConfigOrScope;
|
|
68
|
+
actualScope = scope;
|
|
69
|
+
}
|
|
57
70
|
if (!authConfig.clientId && process.env.NODE_ENV !== 'production') {
|
|
58
71
|
return '';
|
|
59
72
|
}
|
|
60
73
|
let token;
|
|
61
|
-
if (authConfig.
|
|
62
|
-
token = await this.
|
|
74
|
+
if (authConfig.WIDAssertionFile !== undefined) {
|
|
75
|
+
token = await this.acquireAccessTokenViaWID(authConfig, actualScope);
|
|
76
|
+
}
|
|
77
|
+
else if (authConfig.FICClientId !== undefined) {
|
|
78
|
+
token = await this.acquireAccessTokenViaFIC(authConfig, actualScope);
|
|
63
79
|
}
|
|
64
80
|
else if (authConfig.clientSecret !== undefined) {
|
|
65
|
-
token = await this.acquireAccessTokenViaSecret(authConfig,
|
|
81
|
+
token = await this.acquireAccessTokenViaSecret(authConfig, actualScope);
|
|
66
82
|
}
|
|
67
83
|
else if (authConfig.certPemFile !== undefined &&
|
|
68
84
|
authConfig.certKeyFile !== undefined) {
|
|
69
|
-
token = await this.acquireTokenWithCertificate(authConfig,
|
|
85
|
+
token = await this.acquireTokenWithCertificate(authConfig, actualScope);
|
|
70
86
|
}
|
|
71
87
|
else if (authConfig.clientSecret === undefined &&
|
|
72
88
|
authConfig.certPemFile === undefined &&
|
|
73
89
|
authConfig.certKeyFile === undefined) {
|
|
74
|
-
token = await this.acquireTokenWithUserAssignedIdentity(authConfig,
|
|
90
|
+
token = await this.acquireTokenWithUserAssignedIdentity(authConfig, actualScope);
|
|
75
91
|
}
|
|
76
92
|
else {
|
|
77
93
|
throw new Error('Invalid authConfig. ');
|
|
@@ -81,7 +97,25 @@ class MsalTokenProvider {
|
|
|
81
97
|
}
|
|
82
98
|
return token;
|
|
83
99
|
}
|
|
84
|
-
async acquireTokenOnBehalfOf(
|
|
100
|
+
async acquireTokenOnBehalfOf(authConfigOrScopes, scopesOrOboAssertion, oboAssertion) {
|
|
101
|
+
let authConfig;
|
|
102
|
+
let actualScopes;
|
|
103
|
+
let actualOboAssertion;
|
|
104
|
+
if (Array.isArray(authConfigOrScopes)) {
|
|
105
|
+
// Called as acquireTokenOnBehalfOf(scopes, oboAssertion)
|
|
106
|
+
if (!this.connectionSettings) {
|
|
107
|
+
throw new Error('Connection settings must be provided to constructor when calling acquireTokenOnBehalfOf(scopes, oboAssertion)');
|
|
108
|
+
}
|
|
109
|
+
authConfig = this.connectionSettings;
|
|
110
|
+
actualScopes = authConfigOrScopes;
|
|
111
|
+
actualOboAssertion = scopesOrOboAssertion;
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
// Called as acquireTokenOnBehalfOf(authConfig, scopes, oboAssertion)
|
|
115
|
+
authConfig = authConfigOrScopes;
|
|
116
|
+
actualScopes = scopesOrOboAssertion;
|
|
117
|
+
actualOboAssertion = oboAssertion;
|
|
118
|
+
}
|
|
85
119
|
const cca = new msal_node_1.ConfidentialClientApplication({
|
|
86
120
|
auth: {
|
|
87
121
|
clientId: authConfig.clientId,
|
|
@@ -91,11 +125,126 @@ class MsalTokenProvider {
|
|
|
91
125
|
system: this.sysOptions
|
|
92
126
|
});
|
|
93
127
|
const token = await cca.acquireTokenOnBehalfOf({
|
|
94
|
-
oboAssertion,
|
|
95
|
-
scopes
|
|
128
|
+
oboAssertion: actualOboAssertion,
|
|
129
|
+
scopes: actualScopes
|
|
96
130
|
});
|
|
97
131
|
return token === null || token === void 0 ? void 0 : token.accessToken;
|
|
98
132
|
}
|
|
133
|
+
async getAgenticInstanceToken(tenantId, agentAppInstanceId) {
|
|
134
|
+
logger.debug('Getting agentic instance token');
|
|
135
|
+
if (!this.connectionSettings) {
|
|
136
|
+
throw new Error('Connection settings must be provided when calling getAgenticInstanceToken');
|
|
137
|
+
}
|
|
138
|
+
const appToken = await this.getAgenticApplicationToken(tenantId, agentAppInstanceId);
|
|
139
|
+
const cca = new msal_node_1.ConfidentialClientApplication({
|
|
140
|
+
auth: {
|
|
141
|
+
clientId: agentAppInstanceId,
|
|
142
|
+
clientAssertion: appToken,
|
|
143
|
+
authority: this.resolveAuthority(tenantId),
|
|
144
|
+
},
|
|
145
|
+
system: this.sysOptions
|
|
146
|
+
});
|
|
147
|
+
const token = await cca.acquireTokenByClientCredential({
|
|
148
|
+
scopes: ['api://AzureAdTokenExchange/.default'],
|
|
149
|
+
correlationId: (0, uuid_1.v4)()
|
|
150
|
+
});
|
|
151
|
+
if (!(token === null || token === void 0 ? void 0 : token.accessToken)) {
|
|
152
|
+
throw new Error(`Failed to acquire instance token for agent instance: ${agentAppInstanceId}`);
|
|
153
|
+
}
|
|
154
|
+
return token.accessToken;
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* This method can optionally accept a tenant ID that overrides the tenant ID in the connection settings, if the connection settings authority contains "common".
|
|
158
|
+
* @param tenantId
|
|
159
|
+
* @returns
|
|
160
|
+
*/
|
|
161
|
+
resolveAuthority(tenantId) {
|
|
162
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
163
|
+
// if for some reason the agentic tenant ID is not in the message, fall back to the original configured auth settings
|
|
164
|
+
if (!tenantId) {
|
|
165
|
+
return ((_a = this.connectionSettings) === null || _a === void 0 ? void 0 : _a.authority) ? `${this.connectionSettings.authority}/${(_b = this.connectionSettings) === null || _b === void 0 ? void 0 : _b.tenantId}` : `https://login.microsoftonline.com/${((_c = this.connectionSettings) === null || _c === void 0 ? void 0 : _c.tenantId) || 'botframework.com'}`;
|
|
166
|
+
}
|
|
167
|
+
if (((_d = this.connectionSettings) === null || _d === void 0 ? void 0 : _d.tenantId) === 'common') {
|
|
168
|
+
return ((_e = this.connectionSettings) === null || _e === void 0 ? void 0 : _e.authority) ? `${this.connectionSettings.authority}/${tenantId}` : `https://login.microsoftonline.com/${tenantId}`;
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
return ((_f = this.connectionSettings) === null || _f === void 0 ? void 0 : _f.authority) ? `${this.connectionSettings.authority}/${(_g = this.connectionSettings) === null || _g === void 0 ? void 0 : _g.tenantId}` : `https://login.microsoftonline.com/${((_h = this.connectionSettings) === null || _h === void 0 ? void 0 : _h.tenantId) || 'botframework.com'}`;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
/**
|
|
175
|
+
* Does a direct HTTP call to acquire a token for agentic scenarios - do not use this directly!
|
|
176
|
+
* This method will be removed once MSAL is updated with the necessary features.
|
|
177
|
+
* (This is required in order to pass additional parameters into the auth call)
|
|
178
|
+
* @param tenantId
|
|
179
|
+
* @param clientId
|
|
180
|
+
* @param clientAssertion
|
|
181
|
+
* @param scopes
|
|
182
|
+
* @param tokenBodyParameters
|
|
183
|
+
* @returns
|
|
184
|
+
*/
|
|
185
|
+
async acquireTokenByForAgenticScenarios(tenantId, clientId, clientAssertion, scopes, tokenBodyParameters) {
|
|
186
|
+
if (!this.connectionSettings) {
|
|
187
|
+
throw new Error('Connection settings must be provided when calling getAgenticInstanceToken');
|
|
188
|
+
}
|
|
189
|
+
// Check cache first
|
|
190
|
+
const cacheKey = `${clientId}/${Object.keys(tokenBodyParameters).map(key => key !== 'user_federated_identity_credential' ? `${key}=${tokenBodyParameters[key]}` : '').join('&')}/${scopes.join(';')}`;
|
|
191
|
+
if (this._agenticTokenCache.get(cacheKey)) {
|
|
192
|
+
return this._agenticTokenCache.get(cacheKey);
|
|
193
|
+
}
|
|
194
|
+
const url = `${this.resolveAuthority(tenantId)}/oauth2/v2.0/token`;
|
|
195
|
+
const data = {
|
|
196
|
+
client_id: clientId,
|
|
197
|
+
scope: scopes.join(' '),
|
|
198
|
+
...tokenBodyParameters
|
|
199
|
+
};
|
|
200
|
+
if (clientAssertion) {
|
|
201
|
+
data.client_assertion_type = 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer';
|
|
202
|
+
data.client_assertion = clientAssertion;
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
data.client_secret = this.connectionSettings.clientSecret;
|
|
206
|
+
}
|
|
207
|
+
const token = await axios_1.default.post(url, data, {
|
|
208
|
+
headers: {
|
|
209
|
+
'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
|
|
210
|
+
}
|
|
211
|
+
}).catch((error) => {
|
|
212
|
+
logger.error('Error acquiring token: ', error.toJSON());
|
|
213
|
+
throw error;
|
|
214
|
+
});
|
|
215
|
+
// capture token, expire local cache 5 minutes early
|
|
216
|
+
this._agenticTokenCache.set(cacheKey, token.data.access_token, token.data.expires_in - 300);
|
|
217
|
+
return token.data.access_token;
|
|
218
|
+
}
|
|
219
|
+
async getAgenticUserToken(tenantId, agentAppInstanceId, agenticUserId, scopes) {
|
|
220
|
+
logger.debug('Getting agentic user token');
|
|
221
|
+
const agentToken = await this.getAgenticApplicationToken(tenantId, agentAppInstanceId);
|
|
222
|
+
const instanceToken = await this.getAgenticInstanceToken(tenantId, agentAppInstanceId);
|
|
223
|
+
const token = await this.acquireTokenByForAgenticScenarios(tenantId, agentToken, instanceToken, scopes, {
|
|
224
|
+
user_id: agenticUserId,
|
|
225
|
+
user_federated_identity_credential: instanceToken,
|
|
226
|
+
grant_type: 'user_fic',
|
|
227
|
+
});
|
|
228
|
+
if (!token) {
|
|
229
|
+
throw new Error(`Failed to acquire instance token for user token: ${agentAppInstanceId}`);
|
|
230
|
+
}
|
|
231
|
+
return token;
|
|
232
|
+
}
|
|
233
|
+
async getAgenticApplicationToken(tenantId, agentAppInstanceId) {
|
|
234
|
+
var _a;
|
|
235
|
+
if (!((_a = this.connectionSettings) === null || _a === void 0 ? void 0 : _a.clientId)) {
|
|
236
|
+
throw new Error('Connection settings must be provided when calling getAgenticApplicationToken');
|
|
237
|
+
}
|
|
238
|
+
logger.debug('Getting agentic application token');
|
|
239
|
+
const token = await this.acquireTokenByForAgenticScenarios(tenantId, this.connectionSettings.clientId, undefined, ['api://AzureAdTokenExchange/.default'], {
|
|
240
|
+
grant_type: 'client_credentials',
|
|
241
|
+
fmi_path: agentAppInstanceId,
|
|
242
|
+
});
|
|
243
|
+
if (!token) {
|
|
244
|
+
throw new Error(`Failed to acquire token for agent instance: ${agentAppInstanceId}`);
|
|
245
|
+
}
|
|
246
|
+
return token;
|
|
247
|
+
}
|
|
99
248
|
/**
|
|
100
249
|
* Acquires a token using a user-assigned identity.
|
|
101
250
|
* @param authConfig The authentication configuration.
|
|
@@ -191,6 +340,27 @@ class MsalTokenProvider {
|
|
|
191
340
|
logger.debug('got token using FIC client assertion');
|
|
192
341
|
return token === null || token === void 0 ? void 0 : token.accessToken;
|
|
193
342
|
}
|
|
343
|
+
/**
|
|
344
|
+
* Acquires a token using a Workload Identity client assertion.
|
|
345
|
+
* @param authConfig The authentication configuration.
|
|
346
|
+
* @param scope The scope for the token.
|
|
347
|
+
* @returns A promise that resolves to the access token.
|
|
348
|
+
*/
|
|
349
|
+
async acquireAccessTokenViaWID(authConfig, scope) {
|
|
350
|
+
const scopes = [`${scope}/.default`];
|
|
351
|
+
const clientAssertion = fs_1.default.readFileSync(authConfig.WIDAssertionFile, 'utf8');
|
|
352
|
+
const cca = new msal_node_1.ConfidentialClientApplication({
|
|
353
|
+
auth: {
|
|
354
|
+
clientId: authConfig.clientId,
|
|
355
|
+
authority: `https://login.microsoftonline.com/${authConfig.tenantId}`,
|
|
356
|
+
clientAssertion
|
|
357
|
+
},
|
|
358
|
+
system: this.sysOptions
|
|
359
|
+
});
|
|
360
|
+
const token = await cca.acquireTokenByClientCredential({ scopes });
|
|
361
|
+
logger.info('got token using WID client assertion');
|
|
362
|
+
return token === null || token === void 0 ? void 0 : token.accessToken;
|
|
363
|
+
}
|
|
194
364
|
/**
|
|
195
365
|
* Fetches an external token.
|
|
196
366
|
* @param FICClientId The FIC client ID.
|
|
@@ -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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"}
|
|
@@ -2,15 +2,13 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { AuthConfiguration } from './auth/authConfiguration';
|
|
6
|
-
import { AuthProvider } from './auth/authProvider';
|
|
7
5
|
import { Middleware, MiddlewareHandler, MiddlewareSet } from './middlewareSet';
|
|
8
6
|
import { TurnContext } from './turnContext';
|
|
9
7
|
import { Activity, ConversationReference } from '@microsoft/agents-activity';
|
|
10
8
|
import { ResourceResponse } from './connector-client/resourceResponse';
|
|
11
9
|
import { AttachmentData } from './connector-client/attachmentData';
|
|
12
10
|
import { AttachmentInfo } from './connector-client/attachmentInfo';
|
|
13
|
-
import {
|
|
11
|
+
import { JwtPayload } from 'jsonwebtoken';
|
|
14
12
|
/**
|
|
15
13
|
* Abstract base class for all adapters in the Agents framework.
|
|
16
14
|
*
|
|
@@ -32,30 +30,14 @@ export declare abstract class BaseAdapter {
|
|
|
32
30
|
*/
|
|
33
31
|
protected middleware: MiddlewareSet;
|
|
34
32
|
private turnError;
|
|
35
|
-
/**
|
|
36
|
-
* Symbol key used to store agent identity information in the TurnContext.
|
|
37
|
-
*/
|
|
38
|
-
readonly AgentIdentityKey: symbol;
|
|
39
33
|
/**
|
|
40
34
|
* Symbol key used to store connector client instances in the TurnContext.
|
|
41
35
|
*/
|
|
42
36
|
readonly ConnectorClientKey: symbol;
|
|
43
37
|
/**
|
|
44
|
-
* Symbol key used to store
|
|
45
|
-
*/
|
|
46
|
-
readonly OAuthScopeKey: symbol;
|
|
47
|
-
/**
|
|
48
|
-
* The authentication provider used for token management.
|
|
49
|
-
*/
|
|
50
|
-
authProvider: AuthProvider;
|
|
51
|
-
/**
|
|
52
|
-
* The user token client used for managing user tokens.
|
|
53
|
-
*/
|
|
54
|
-
userTokenClient: UserTokenClient | null;
|
|
55
|
-
/**
|
|
56
|
-
* The authentication configuration for the adapter.
|
|
38
|
+
* Symbol key used to store User Token Client instances in the TurnContext.
|
|
57
39
|
*/
|
|
58
|
-
|
|
40
|
+
readonly UserTokenClientKey: symbol;
|
|
59
41
|
/**
|
|
60
42
|
* Sends a set of activities to the conversation.
|
|
61
43
|
* @param context - The TurnContext for the current turn.
|
|
@@ -83,27 +65,30 @@ export declare abstract class BaseAdapter {
|
|
|
83
65
|
* @param logic - The logic to execute.
|
|
84
66
|
* @returns A promise representing the completion of the continue operation.
|
|
85
67
|
*/
|
|
86
|
-
abstract continueConversation(reference: Partial<ConversationReference>, logic: (revocableContext: TurnContext) => Promise<void>): Promise<void>;
|
|
68
|
+
abstract continueConversation(botAppIdOrIdentity: string | JwtPayload, reference: Partial<ConversationReference>, logic: (revocableContext: TurnContext) => Promise<void>): Promise<void>;
|
|
87
69
|
/**
|
|
70
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
88
71
|
* Uploads an attachment.
|
|
89
72
|
* @param conversationId - The conversation ID.
|
|
90
73
|
* @param attachmentData - The attachment data.
|
|
91
74
|
* @returns A promise representing the ResourceResponse for the uploaded attachment.
|
|
92
75
|
*/
|
|
93
|
-
abstract uploadAttachment(conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
|
|
76
|
+
abstract uploadAttachment(context: TurnContext, conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
|
|
94
77
|
/**
|
|
78
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
95
79
|
* Gets attachment information.
|
|
96
80
|
* @param attachmentId - The attachment ID.
|
|
97
81
|
* @returns A promise representing the AttachmentInfo for the requested attachment.
|
|
98
82
|
*/
|
|
99
|
-
abstract getAttachmentInfo(attachmentId: string): Promise<AttachmentInfo>;
|
|
83
|
+
abstract getAttachmentInfo(context: TurnContext, attachmentId: string): Promise<AttachmentInfo>;
|
|
100
84
|
/**
|
|
85
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
101
86
|
* Gets an attachment.
|
|
102
87
|
* @param attachmentId - The attachment ID.
|
|
103
88
|
* @param viewId - The view ID.
|
|
104
89
|
* @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
|
|
105
90
|
*/
|
|
106
|
-
abstract getAttachment(attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
|
|
91
|
+
abstract getAttachment(context: TurnContext, attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
|
|
107
92
|
/**
|
|
108
93
|
* Gets the error handler for the adapter.
|
|
109
94
|
* @returns The current error handler function.
|
package/dist/src/baseAdapter.js
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.BaseAdapter = void 0;
|
|
8
|
-
const msalTokenProvider_1 = require("./auth/msalTokenProvider");
|
|
9
8
|
const middlewareSet_1 = require("./middlewareSet");
|
|
10
9
|
const logger_1 = require("@microsoft/agents-activity/logger");
|
|
11
10
|
const logger = (0, logger_1.debug)('agents:base-adapter');
|
|
@@ -38,26 +37,14 @@ class BaseAdapter {
|
|
|
38
37
|
await context.sendActivity('The agent encountered an error or bug.');
|
|
39
38
|
await context.sendActivity('To continue to run this agent, please fix the source code.');
|
|
40
39
|
};
|
|
41
|
-
/**
|
|
42
|
-
* Symbol key used to store agent identity information in the TurnContext.
|
|
43
|
-
*/
|
|
44
|
-
this.AgentIdentityKey = Symbol('AgentIdentity');
|
|
45
40
|
/**
|
|
46
41
|
* Symbol key used to store connector client instances in the TurnContext.
|
|
47
42
|
*/
|
|
48
43
|
this.ConnectorClientKey = Symbol('ConnectorClient');
|
|
49
44
|
/**
|
|
50
|
-
* Symbol key used to store
|
|
51
|
-
*/
|
|
52
|
-
this.OAuthScopeKey = Symbol('OAuthScope');
|
|
53
|
-
/**
|
|
54
|
-
* The authentication provider used for token management.
|
|
55
|
-
*/
|
|
56
|
-
this.authProvider = new msalTokenProvider_1.MsalTokenProvider();
|
|
57
|
-
/**
|
|
58
|
-
* The user token client used for managing user tokens.
|
|
45
|
+
* Symbol key used to store User Token Client instances in the TurnContext.
|
|
59
46
|
*/
|
|
60
|
-
this.
|
|
47
|
+
this.UserTokenClientKey = Symbol('UserTokenClient');
|
|
61
48
|
}
|
|
62
49
|
/**
|
|
63
50
|
* Gets the error handler for the adapter.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../src/baseAdapter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;
|
|
1
|
+
{"version":3,"file":"baseAdapter.js","sourceRoot":"","sources":["../../src/baseAdapter.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mDAA8E;AAE9E,8DAAyD;AAOzD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,qBAAqB,CAAC,CAAA;AAE3C;;;;;;;;;;;;;;GAcG;AACH,MAAsB,WAAW;IAAjC;QACE;;WAEG;QACO,eAAU,GAAkB,IAAI,6BAAa,EAAE,CAAA;QAEjD,cAAS,GAA0D,KAAK,EAAE,OAAoB,EAAE,KAAY,EAAE,EAAE;YACtH,MAAM,CAAC,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;YAE1D,2EAA2E;YAC3E,MAAM,OAAO,CAAC,iBAAiB,CAC7B,mBAAmB,EACnB,GAAG,KAAK,EAAE,EACV,4CAA4C,EAC5C,WAAW,CACZ,CAAA;YAED,6BAA6B;YAC7B,MAAM,OAAO,CAAC,YAAY,CAAC,wCAAwC,CAAC,CAAA;YACpE,MAAM,OAAO,CAAC,YAAY,CAAC,4DAA4D,CAAC,CAAA;QAC1F,CAAC,CAAA;QAED;;WAEG;QACM,uBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAEvD;;WAEG;QACM,uBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;IA0JzD,CAAC;IA1FC;;;OAGG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW,CAAE,KAA4D;QAC3E,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;IACxB,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAE,GAAG,WAAkD;QACxD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAA;QAEnC,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;OAUG;IACK,aAAa,CACnB,MAAS,EACT,OAAyB;QAEzB,+CAA+C;QAC/C,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAClE,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,GAAS,EAAE;oBACjB,OAAO;gBACT,CAAC;aACF,CAAA;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,aAAa,CAC3B,OAAoB,EACpB,IAAsD;QAEtD,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3D,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAA;QAC1C,CAAC;QAED,4GAA4G;QAC5G,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE5C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QACnF,CAAC;QAAC,OAAO,GAAgB,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;oBACzB,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAAC,CAAA;gBACvD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,QAAQ,CAAC,MAAM,EAAE,CAAA;YACjB,kEAAkE;YAClE,2EAA2E;QAC7E,CAAC;IACH,CAAC;CACF;AAxLD,kCAwLC"}
|
|
@@ -104,9 +104,10 @@ export declare class CardFactory {
|
|
|
104
104
|
* @param title The title of the card.
|
|
105
105
|
* @param text The optional text for the card.
|
|
106
106
|
* @param signingResource The signing resource.
|
|
107
|
+
* @param enableSso The option to enable SSO when authenticating using AAD. Defaults to true.
|
|
107
108
|
* @returns The OAuth card attachment.
|
|
108
109
|
*/
|
|
109
|
-
static oauthCard(connectionName: string, title: string, text: string, signingResource: SignInResource): Attachment;
|
|
110
|
+
static oauthCard(connectionName: string, title: string, text: string, signingResource: SignInResource, enableSso?: boolean): Attachment;
|
|
110
111
|
/**
|
|
111
112
|
* Creates a sign-in card attachment.
|
|
112
113
|
* @param title The title of the card.
|
|
@@ -157,9 +157,10 @@ class CardFactory {
|
|
|
157
157
|
* @param title The title of the card.
|
|
158
158
|
* @param text The optional text for the card.
|
|
159
159
|
* @param signingResource The signing resource.
|
|
160
|
+
* @param enableSso The option to enable SSO when authenticating using AAD. Defaults to true.
|
|
160
161
|
* @returns The OAuth card attachment.
|
|
161
162
|
*/
|
|
162
|
-
static oauthCard(connectionName, title, text, signingResource) {
|
|
163
|
+
static oauthCard(connectionName, title, text, signingResource, enableSso = true) {
|
|
163
164
|
const card = {
|
|
164
165
|
buttons: [{
|
|
165
166
|
type: agents_activity_1.ActionTypes.Signin,
|
|
@@ -168,7 +169,7 @@ class CardFactory {
|
|
|
168
169
|
channelData: undefined
|
|
169
170
|
}],
|
|
170
171
|
connectionName,
|
|
171
|
-
tokenExchangeResource: signingResource.tokenExchangeResource,
|
|
172
|
+
tokenExchangeResource: enableSso ? signingResource.tokenExchangeResource : undefined,
|
|
172
173
|
tokenPostResource: signingResource.tokenPostResource,
|
|
173
174
|
};
|
|
174
175
|
if (text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cardFactory.js","sourceRoot":"","sources":["../../../src/cards/cardFactory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cardFactory.js","sourceRoot":"","sources":["../../../src/cards/cardFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ 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';
|
|
13
14
|
import { Activity, ConversationReference, ConversationParameters } from '@microsoft/agents-activity';
|
|
14
15
|
import { ResourceResponse } from './connector-client/resourceResponse';
|
|
15
16
|
import { InvokeResponse } from './invoke/invokeResponse';
|
|
@@ -17,25 +18,25 @@ import { AttachmentInfo } from './connector-client/attachmentInfo';
|
|
|
17
18
|
import { AttachmentData } from './connector-client/attachmentData';
|
|
18
19
|
import { UserTokenClient } from './oauth';
|
|
19
20
|
import { HeaderPropagationCollection, HeaderPropagationDefinition } from './headerPropagation';
|
|
21
|
+
import { JwtPayload } from 'jsonwebtoken';
|
|
20
22
|
/**
|
|
21
23
|
* Adapter for handling agent interactions with various channels through cloud-based services.
|
|
22
24
|
*
|
|
23
25
|
* @remarks
|
|
24
|
-
* CloudAdapter processes incoming HTTP requests from
|
|
26
|
+
* CloudAdapter processes incoming HTTP requests from Azure Bot Service channels,
|
|
25
27
|
* authenticates them, and generates outgoing responses. It manages the communication
|
|
26
28
|
* flow between agents and users across different channels, handling activities, attachments,
|
|
27
29
|
* and conversation continuations.
|
|
28
30
|
*/
|
|
29
31
|
export declare class CloudAdapter extends BaseAdapter {
|
|
30
32
|
/**
|
|
31
|
-
* Client for connecting to the Bot
|
|
33
|
+
* Client for connecting to the Azure Bot Service
|
|
32
34
|
*/
|
|
33
|
-
|
|
34
|
-
authConfig: AuthConfiguration;
|
|
35
|
+
connectionManager: MsalConnectionManager;
|
|
35
36
|
/**
|
|
36
37
|
* Creates an instance of CloudAdapter.
|
|
37
38
|
* @param authConfig - The authentication configuration for securing communications
|
|
38
|
-
* @param authProvider -
|
|
39
|
+
* @param authProvider - No longer used
|
|
39
40
|
*/
|
|
40
41
|
constructor(authConfig?: AuthConfiguration, authProvider?: AuthProvider, userTokenClient?: UserTokenClient);
|
|
41
42
|
/**
|
|
@@ -57,22 +58,41 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
57
58
|
* @returns A promise that resolves to a ConnectorClient instance
|
|
58
59
|
* @protected
|
|
59
60
|
*/
|
|
60
|
-
protected createConnectorClient(serviceUrl: string, scope: string, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
61
|
+
protected createConnectorClient(serviceUrl: string, scope: string, identity: JwtPayload, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
62
|
+
protected createConnectorClientWithIdentity(identity: JwtPayload, activity: Activity, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
63
|
+
static createIdentity(appId: string): JwtPayload;
|
|
61
64
|
/**
|
|
62
65
|
* Sets the connector client on the turn context.
|
|
63
66
|
*
|
|
64
67
|
* @param context - The current turn context
|
|
65
68
|
* @protected
|
|
66
69
|
*/
|
|
67
|
-
protected setConnectorClient(context: TurnContext): void;
|
|
70
|
+
protected setConnectorClient(context: TurnContext, connectorClient?: ConnectorClient): void;
|
|
68
71
|
/**
|
|
72
|
+
* Creates a user token client for a specific service URL and scope.
|
|
73
|
+
*
|
|
74
|
+
* @param serviceUrl - The URL of the service to connect to
|
|
75
|
+
* @param scope - The authentication scope to use
|
|
76
|
+
* @param headers - Optional headers to propagate in the request
|
|
77
|
+
* @returns A promise that resolves to a ConnectorClient instance
|
|
78
|
+
* @protected
|
|
79
|
+
*/
|
|
80
|
+
protected createUserTokenClient(identity: JwtPayload, tokenServiceEndpoint?: string, scope?: string, audience?: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
|
|
81
|
+
/**
|
|
82
|
+
* Sets the user token client on the turn context.
|
|
83
|
+
*
|
|
84
|
+
* @param context - The current turn context
|
|
85
|
+
* @protected
|
|
86
|
+
*/
|
|
87
|
+
protected setUserTokenClient(context: TurnContext, userTokenClient?: UserTokenClient): void;
|
|
88
|
+
/**
|
|
89
|
+
* @deprecated This function will not be supported in future versions. Create TurnContext directly.
|
|
69
90
|
* Creates a TurnContext for the given activity and logic.
|
|
70
91
|
* @param activity - The activity to process.
|
|
71
92
|
* @param logic - The logic to execute.
|
|
72
93
|
* @returns The created TurnContext.
|
|
73
94
|
*/
|
|
74
|
-
createTurnContext(activity: Activity, logic: AgentHandler): TurnContext;
|
|
75
|
-
createTurnContextWithScope(activity: Activity, logic: AgentHandler, scope: string): Promise<TurnContext>;
|
|
95
|
+
createTurnContext(activity: Activity, logic: AgentHandler, identity?: JwtPayload): TurnContext;
|
|
76
96
|
/**
|
|
77
97
|
* Sends multiple activities to the conversation.
|
|
78
98
|
* @param context - The TurnContext for the current turn.
|
|
@@ -80,12 +100,6 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
80
100
|
* @returns A promise representing the array of ResourceResponses for the sent activities.
|
|
81
101
|
*/
|
|
82
102
|
sendActivities(context: TurnContext, activities: Activity[]): Promise<ResourceResponse[]>;
|
|
83
|
-
/**
|
|
84
|
-
* Replies to an activity.
|
|
85
|
-
* @param activity - The activity to reply to.
|
|
86
|
-
* @returns A promise representing the ResourceResponse for the sent activity.
|
|
87
|
-
*/
|
|
88
|
-
replyToActivity(activity: Activity): Promise<ResourceResponse>;
|
|
89
103
|
/**
|
|
90
104
|
* Processes an incoming request and sends the response.
|
|
91
105
|
* @param request - The incoming request.
|
|
@@ -115,12 +129,12 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
115
129
|
* @param logic - The logic to execute.
|
|
116
130
|
* @returns A promise representing the completion of the continue operation.
|
|
117
131
|
*/
|
|
118
|
-
continueConversation(reference: ConversationReference, logic: (revocableContext: TurnContext) => Promise<void>, isResponse?: Boolean): Promise<void>;
|
|
132
|
+
continueConversation(botAppIdOrIdentity: string | JwtPayload, reference: ConversationReference, logic: (revocableContext: TurnContext) => Promise<void>, isResponse?: Boolean): Promise<void>;
|
|
119
133
|
/**
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
134
|
+
* Processes the turn results and returns an InvokeResponse if applicable.
|
|
135
|
+
* @param context - The TurnContext for the current turn.
|
|
136
|
+
* @returns The InvokeResponse if applicable, otherwise undefined.
|
|
137
|
+
*/
|
|
124
138
|
protected processTurnResults(context: TurnContext): InvokeResponse | undefined;
|
|
125
139
|
/**
|
|
126
140
|
* Creates an activity to represent the result of creating a conversation.
|
|
@@ -143,23 +157,26 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
143
157
|
*/
|
|
144
158
|
createConversationAsync(agentAppId: string, channelId: string, serviceUrl: string, audience: string, conversationParameters: ConversationParameters, logic: (context: TurnContext) => Promise<void>): Promise<void>;
|
|
145
159
|
/**
|
|
160
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
146
161
|
* Uploads an attachment.
|
|
147
162
|
* @param conversationId - The conversation ID.
|
|
148
163
|
* @param attachmentData - The attachment data.
|
|
149
164
|
* @returns A promise representing the ResourceResponse for the uploaded attachment.
|
|
150
165
|
*/
|
|
151
|
-
uploadAttachment(conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
|
|
166
|
+
uploadAttachment(context: TurnContext, conversationId: string, attachmentData: AttachmentData): Promise<ResourceResponse>;
|
|
152
167
|
/**
|
|
168
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
153
169
|
* Gets attachment information.
|
|
154
170
|
* @param attachmentId - The attachment ID.
|
|
155
171
|
* @returns A promise representing the AttachmentInfo for the requested attachment.
|
|
156
172
|
*/
|
|
157
|
-
getAttachmentInfo(attachmentId: string): Promise<AttachmentInfo>;
|
|
173
|
+
getAttachmentInfo(context: TurnContext, attachmentId: string): Promise<AttachmentInfo>;
|
|
158
174
|
/**
|
|
175
|
+
* @deprecated This function will not be supported in future versions. Use TurnContext.turnState.get<ConnectorClient>(CloudAdapter.ConnectorClientKey).
|
|
159
176
|
* Gets an attachment.
|
|
160
177
|
* @param attachmentId - The attachment ID.
|
|
161
178
|
* @param viewId - The view ID.
|
|
162
179
|
* @returns A promise representing the NodeJS.ReadableStream for the requested attachment.
|
|
163
180
|
*/
|
|
164
|
-
getAttachment(attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
|
|
181
|
+
getAttachment(context: TurnContext, attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
|
|
165
182
|
}
|