@microsoft/agents-hosting 1.1.0-alpha.58 → 1.1.0-alpha.78
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/activityWireCompat.d.ts +1 -1
- package/dist/src/activityWireCompat.js +3 -0
- package/dist/src/activityWireCompat.js.map +1 -1
- package/dist/src/app/agentApplication.d.ts +2 -2
- package/dist/src/app/agentApplication.js +1 -1
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/auth/authorization.d.ts +9 -1
- package/dist/src/app/auth/authorization.js +4 -4
- package/dist/src/app/auth/authorization.js.map +1 -1
- package/dist/src/app/auth/handlers/agenticAuthorization.d.ts +0 -4
- package/dist/src/app/auth/handlers/agenticAuthorization.js +1 -12
- package/dist/src/app/auth/handlers/agenticAuthorization.js.map +1 -1
- package/dist/src/app/index.d.ts +1 -0
- package/dist/src/app/index.js.map +1 -1
- package/dist/src/auth/authConfiguration.js +14 -23
- package/dist/src/auth/authConfiguration.js.map +1 -1
- package/dist/src/auth/connections.d.ts +5 -4
- package/dist/src/auth/msalConnectionManager.d.ts +6 -5
- package/dist/src/auth/msalConnectionManager.js +31 -7
- package/dist/src/auth/msalConnectionManager.js.map +1 -1
- package/dist/src/cloudAdapter.d.ts +3 -3
- package/dist/src/cloudAdapter.js +37 -39
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/connector-client/connectorClient.d.ts +6 -0
- package/dist/src/connector-client/connectorClient.js +11 -7
- package/dist/src/connector-client/connectorClient.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/userTokenClient.js +2 -6
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/package.json +4 -4
- package/src/activityWireCompat.ts +4 -1
- package/src/app/agentApplication.ts +3 -4
- package/src/app/auth/authorization.ts +11 -2
- package/src/app/auth/handlers/agenticAuthorization.ts +1 -13
- package/src/app/index.ts +1 -0
- package/src/auth/authConfiguration.ts +15 -28
- package/src/auth/connections.ts +5 -4
- package/src/auth/msalConnectionManager.ts +33 -8
- package/src/cloudAdapter.ts +28 -29
- package/src/connector-client/connectorClient.ts +11 -6
- package/src/oauth/customUserTokenAPI.ts +5 -0
- package/src/oauth/userTokenClient.ts +3 -7
package/dist/src/cloudAdapter.js
CHANGED
|
@@ -52,6 +52,7 @@ const statusCodes_1 = require("./statusCodes");
|
|
|
52
52
|
const activityWireCompat_1 = require("./activityWireCompat");
|
|
53
53
|
const oauth_1 = require("./oauth");
|
|
54
54
|
const headerPropagation_1 = require("./headerPropagation");
|
|
55
|
+
const customUserTokenAPI_1 = require("./oauth/customUserTokenAPI");
|
|
55
56
|
const logger = (0, logger_1.debug)('agents:cloud-adapter');
|
|
56
57
|
/**
|
|
57
58
|
* Adapter for handling agent interactions with various channels through cloud-based services.
|
|
@@ -107,37 +108,30 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
107
108
|
* @returns A promise that resolves to a ConnectorClient instance
|
|
108
109
|
* @protected
|
|
109
110
|
*/
|
|
110
|
-
async createConnectorClient(serviceUrl, scope,
|
|
111
|
+
async createConnectorClient(serviceUrl, scope, identity, headers) {
|
|
111
112
|
// get the correct token provider
|
|
112
|
-
const tokenProvider = this.connectionManager.getTokenProvider(
|
|
113
|
+
const tokenProvider = this.connectionManager.getTokenProvider(identity, serviceUrl);
|
|
113
114
|
const token = await tokenProvider.getAccessToken(scope);
|
|
114
115
|
return connectorClient_1.ConnectorClient.createClientWithToken(serviceUrl, token, headers);
|
|
115
116
|
}
|
|
116
|
-
async createConnectorClientWithIdentity(identity, activity,
|
|
117
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
118
|
-
|
|
119
|
-
if (Array.isArray(identity.aud)) {
|
|
120
|
-
audience = identity.aud[0];
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
audience = identity.aud;
|
|
124
|
-
}
|
|
125
|
-
if (!audience) {
|
|
117
|
+
async createConnectorClientWithIdentity(identity, activity, headers) {
|
|
118
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
119
|
+
if (!(identity === null || identity === void 0 ? void 0 : identity.aud)) {
|
|
126
120
|
// anonymous
|
|
127
121
|
return connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, null, headers);
|
|
128
122
|
}
|
|
129
123
|
let connectorClient;
|
|
130
|
-
const tokenProvider = this.connectionManager.
|
|
124
|
+
const tokenProvider = this.connectionManager.getTokenProviderFromActivity(identity, activity);
|
|
131
125
|
if (activity.isAgenticRequest()) {
|
|
132
126
|
logger.debug('Activity is from an agentic source, using special scope', activity.recipient);
|
|
133
|
-
if (((
|
|
127
|
+
if (((_a = activity.recipient) === null || _a === void 0 ? void 0 : _a.role) === agents_activity_1.RoleTypes.AgenticIdentity && activity.getAgenticInstanceId()) {
|
|
134
128
|
// get agentic instance token
|
|
135
|
-
const token = await tokenProvider.getAgenticInstanceToken((
|
|
129
|
+
const token = await tokenProvider.getAgenticInstanceToken((_b = activity.getAgenticInstanceId()) !== null && _b !== void 0 ? _b : '');
|
|
136
130
|
connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
|
|
137
131
|
}
|
|
138
|
-
else if (((
|
|
139
|
-
const scope = (
|
|
140
|
-
const token = await tokenProvider.getAgenticUserToken((
|
|
132
|
+
else if (((_c = activity.recipient) === null || _c === void 0 ? void 0 : _c.role) === agents_activity_1.RoleTypes.AgenticUser && activity.getAgenticInstanceId() && activity.getAgenticUser()) {
|
|
133
|
+
const scope = (_e = (_d = tokenProvider.connectionSettings) === null || _d === void 0 ? void 0 : _d.scope) !== null && _e !== void 0 ? _e : authConstants_1.ApxProductionScope;
|
|
134
|
+
const token = await tokenProvider.getAgenticUserToken((_f = activity.getAgenticInstanceId()) !== null && _f !== void 0 ? _f : '', (_g = activity.getAgenticUser()) !== null && _g !== void 0 ? _g : '', [scope]);
|
|
141
135
|
connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
|
|
142
136
|
}
|
|
143
137
|
else {
|
|
@@ -145,6 +139,9 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
145
139
|
}
|
|
146
140
|
}
|
|
147
141
|
else {
|
|
142
|
+
// ABS tokens will not have an azp/appid so use the botframework scope.
|
|
143
|
+
// Otherwise use the appId. This will happen when communicating back to another agent.
|
|
144
|
+
const scope = (_j = (_h = identity.azp) !== null && _h !== void 0 ? _h : identity.appid) !== null && _j !== void 0 ? _j : 'https://api.botframework.com';
|
|
148
145
|
const token = await tokenProvider.getAccessToken(scope);
|
|
149
146
|
connectorClient = connectorClient_1.ConnectorClient.createClientWithToken(activity.serviceUrl, token, headers);
|
|
150
147
|
}
|
|
@@ -173,9 +170,9 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
173
170
|
* @returns A promise that resolves to a ConnectorClient instance
|
|
174
171
|
* @protected
|
|
175
172
|
*/
|
|
176
|
-
async createUserTokenClient(tokenServiceEndpoint =
|
|
173
|
+
async createUserTokenClient(identity, tokenServiceEndpoint = (0, customUserTokenAPI_1.getTokenServiceEndpoint)(), scope = 'https://api.botframework.com', audience = 'https://api.botframework.com', headers) {
|
|
177
174
|
// get the correct token provider
|
|
178
|
-
const tokenProvider = this.connectionManager.getTokenProvider(
|
|
175
|
+
const tokenProvider = this.connectionManager.getTokenProvider(identity, tokenServiceEndpoint);
|
|
179
176
|
return oauth_1.UserTokenClient.createClientWithScope(tokenServiceEndpoint, tokenProvider, scope, headers);
|
|
180
177
|
}
|
|
181
178
|
/**
|
|
@@ -218,10 +215,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
218
215
|
for (const activity of activities) {
|
|
219
216
|
delete activity.id;
|
|
220
217
|
let response = { id: '' };
|
|
221
|
-
if (activity.type === agents_activity_1.ActivityTypes.
|
|
222
|
-
await setTimeout(() => { }, typeof activity.value === 'number' ? activity.value : 1000);
|
|
223
|
-
}
|
|
224
|
-
else if (activity.type === agents_activity_1.ActivityTypes.InvokeResponse) {
|
|
218
|
+
if (activity.type === agents_activity_1.ActivityTypes.InvokeResponse) {
|
|
225
219
|
context.turnState.set(activityHandler_1.INVOKE_RESPONSE_KEY, activity);
|
|
226
220
|
}
|
|
227
221
|
else if (activity.type === agents_activity_1.ActivityTypes.Trace && activity.channelId !== agents_activity_1.Channels.Emulator) {
|
|
@@ -253,7 +247,7 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
253
247
|
* @param headerPropagation - Optional function to handle header propagation.
|
|
254
248
|
*/
|
|
255
249
|
async process(request, res, logic, headerPropagation) {
|
|
256
|
-
var _a, _b
|
|
250
|
+
var _a, _b;
|
|
257
251
|
const headers = new headerPropagation_1.HeaderPropagation(request.headers);
|
|
258
252
|
if (headerPropagation && typeof headerPropagation === 'function') {
|
|
259
253
|
headerPropagation(headers);
|
|
@@ -280,14 +274,13 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
280
274
|
}
|
|
281
275
|
logger.debug('Received activity: ', activity);
|
|
282
276
|
const context = new turnContext_1.TurnContext(this, activity, request.user);
|
|
283
|
-
const scope = (_d = (_b = (_a = request.user) === null || _a === void 0 ? void 0 : _a.azp) !== null && _b !== void 0 ? _b : (_c = request.user) === null || _c === void 0 ? void 0 : _c.appid) !== null && _d !== void 0 ? _d : 'https://api.botframework.com';
|
|
284
277
|
// if Delivery Mode == ExpectReplies, we don't need a connector client.
|
|
285
278
|
if (this.resolveIfConnectorClientIsNeeded(activity)) {
|
|
286
|
-
const connectorClient = await this.createConnectorClientWithIdentity(request.user, activity,
|
|
279
|
+
const connectorClient = await this.createConnectorClientWithIdentity(request.user, activity, headers);
|
|
287
280
|
this.setConnectorClient(context, connectorClient);
|
|
288
281
|
}
|
|
289
282
|
if (!activity.isAgenticRequest()) {
|
|
290
|
-
const userTokenClient = await this.createUserTokenClient();
|
|
283
|
+
const userTokenClient = await this.createUserTokenClient(request.user);
|
|
291
284
|
this.setUserTokenClient(context, userTokenClient);
|
|
292
285
|
}
|
|
293
286
|
if ((activity === null || activity === void 0 ? void 0 : activity.type) === agents_activity_1.ActivityTypes.InvokeResponse ||
|
|
@@ -296,11 +289,11 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
296
289
|
await this.runMiddleware(context, logic);
|
|
297
290
|
const invokeResponse = this.processTurnResults(context);
|
|
298
291
|
logger.debug('Activity Response (invoke/expect replies): ', invokeResponse);
|
|
299
|
-
return end((
|
|
292
|
+
return end((_a = invokeResponse === null || invokeResponse === void 0 ? void 0 : invokeResponse.status) !== null && _a !== void 0 ? _a : statusCodes_1.StatusCodes.OK, JSON.stringify(invokeResponse === null || invokeResponse === void 0 ? void 0 : invokeResponse.body), true);
|
|
300
293
|
}
|
|
301
294
|
await this.runMiddleware(context, logic);
|
|
302
295
|
const invokeResponse = this.processTurnResults(context);
|
|
303
|
-
return end((
|
|
296
|
+
return end((_b = invokeResponse === null || invokeResponse === void 0 ? void 0 : invokeResponse.status) !== null && _b !== void 0 ? _b : statusCodes_1.StatusCodes.OK, invokeResponse === null || invokeResponse === void 0 ? void 0 : invokeResponse.body);
|
|
304
297
|
}
|
|
305
298
|
isValidChannelActivity(activity) {
|
|
306
299
|
var _a, _b;
|
|
@@ -359,21 +352,25 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
359
352
|
* @returns A promise representing the completion of the continue operation.
|
|
360
353
|
*/
|
|
361
354
|
async continueConversation(botAppIdOrIdentity, reference, logic, isResponse = false) {
|
|
362
|
-
var _a, _b;
|
|
363
355
|
if (!reference || !reference.serviceUrl || (reference.conversation == null) || !reference.conversation.id) {
|
|
364
|
-
throw new Error('Invalid conversation reference object');
|
|
356
|
+
throw new Error('continueConversation: Invalid conversation reference object');
|
|
357
|
+
}
|
|
358
|
+
if (!botAppIdOrIdentity) {
|
|
359
|
+
throw new TypeError('continueConversation: botAppIdOrIdentity is required');
|
|
365
360
|
}
|
|
366
361
|
const botAppId = typeof botAppIdOrIdentity === 'string' ? botAppIdOrIdentity : botAppIdOrIdentity.aud;
|
|
362
|
+
// Only having the botId will only work against ABS or Agentic. Proactive to other agents will
|
|
363
|
+
// not work with just botId. Use a JwtPayload with property aud (which is botId) and appid populated.
|
|
367
364
|
const identity = typeof botAppIdOrIdentity !== 'string'
|
|
368
365
|
? botAppIdOrIdentity
|
|
369
366
|
: CloudAdapter.createIdentity(botAppId);
|
|
370
|
-
const continuationActivity = agents_activity_1.Activity.getContinuationActivity(reference);
|
|
371
367
|
const context = new turnContext_1.TurnContext(this, agents_activity_1.Activity.getContinuationActivity(reference), identity);
|
|
372
|
-
const
|
|
373
|
-
const connectorClient = await this.createConnectorClientWithIdentity(identity, continuationActivity, scope);
|
|
368
|
+
const connectorClient = await this.createConnectorClientWithIdentity(identity, context.activity);
|
|
374
369
|
this.setConnectorClient(context, connectorClient);
|
|
375
|
-
|
|
376
|
-
|
|
370
|
+
if (!context.activity.isAgenticRequest()) {
|
|
371
|
+
const userTokenClient = await this.createUserTokenClient(identity);
|
|
372
|
+
this.setUserTokenClient(context, userTokenClient);
|
|
373
|
+
}
|
|
377
374
|
await this.runMiddleware(context, logic);
|
|
378
375
|
}
|
|
379
376
|
/**
|
|
@@ -447,8 +444,9 @@ class CloudAdapter extends baseAdapter_1.BaseAdapter {
|
|
|
447
444
|
throw new TypeError('`conversationParameters` must be defined');
|
|
448
445
|
if (!logic)
|
|
449
446
|
throw new TypeError('`logic` must be defined');
|
|
450
|
-
const
|
|
451
|
-
const
|
|
447
|
+
const identity = CloudAdapter.createIdentity(audience);
|
|
448
|
+
const restClient = await this.createConnectorClient(serviceUrl, audience, identity);
|
|
449
|
+
const userTokenClient = await this.createUserTokenClient(identity);
|
|
452
450
|
const createConversationResult = await restClient.createConversation(conversationParameters);
|
|
453
451
|
const createActivity = this.createCreateActivity(createConversationResult.id, channelId, serviceUrl, conversationParameters);
|
|
454
452
|
const context = new turnContext_1.TurnContext(this, createActivity, CloudAdapter.createIdentity(agentAppId));
|
|
@@ -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":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uDAAqE;AACrE,+CAA2C;AAC3C,+CAA2C;AAG3C,wEAAoE;AACpE,gEAAuF;AAEvF,wDAAyD;AACzD,wEAAoE;AACpE,gEAA2K;AAE3K,2CAA4B;AAC5B,8DAAyD;AACzD,+CAA2C;AAI3C,6DAAgE;AAChE,mCAAyC;AACzC,2DAAiH;AAEjH,mEAAoE;AACpE,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,sBAAsB,CAAC,CAAA;AAE5C;;;;;;;;GAQG;AACH,MAAa,YAAa,SAAQ,yBAAW;IAM3C;;;;OAIG;IACH,YAAa,UAA8B,EAAE,YAA2B,EAAE,eAAiC;QACzG,KAAK,EAAE,CAAA;QACP,UAAU,GAAG,IAAA,6CAAyB,EAAC,UAAU,CAAC,CAAA;QAClD,IAAI,CAAC,iBAAiB,GAAG,IAAI,6CAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACtF,CAAC;IAED;;;;;;;;OAQG;IACO,gCAAgC,CAAE,QAAkB;QAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAA;QACtD,CAAC;QAED,QAAQ,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC9B,KAAK,+BAAa,CAAC,aAAa;gBAC9B,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBACzB,MAAM,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAA;oBAC5E,OAAO,KAAK,CAAA;gBACd,CAAC;gBACD,MAAK;YACP;gBACE,MAAK;QACT,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;OAQG;IACO,KAAK,CAAC,qBAAqB,CACnC,UAAkB,EAClB,KAAa,EACb,QAAoB,EACpB,OAAqC;QAErC,iCAAiC;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAEnF,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACvD,OAAO,iCAAe,CAAC,qBAAqB,CAC1C,UAAU,EACV,KAAK,EACL,OAAO,CACR,CAAA;IACH,CAAC;IAES,KAAK,CAAC,iCAAiC,CAC/C,QAAoB,EACpB,QAAkB,EAClB,OAAqC;;QACrC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAA,EAAE,CAAC;YACnB,YAAY;YACZ,OAAO,iCAAe,CAAC,qBAAqB,CAC1C,QAAQ,CAAC,UAAW,EACpB,IAAK,EACL,OAAO,CACR,CAAA;QACH,CAAC;QAED,IAAI,eAAe,CAAA;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC7F,IAAI,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,yDAAyD,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;YAE3F,IAAI,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,MAAK,2BAAS,CAAC,eAAe,IAAI,QAAQ,CAAC,oBAAoB,EAAE,EAAE,CAAC;gBAC9F,6BAA6B;gBAC7B,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,uBAAuB,CAAC,MAAA,QAAQ,CAAC,oBAAoB,EAAE,mCAAI,EAAE,CAAC,CAAA;gBAChG,eAAe,GAAG,iCAAe,CAAC,qBAAqB,CACrD,QAAQ,CAAC,UAAW,EACpB,KAAK,EACL,OAAO,CACR,CAAA;YACH,CAAC;iBAAM,IAAI,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,MAAK,2BAAS,CAAC,WAAW,IAAI,QAAQ,CAAC,oBAAoB,EAAE,IAAI,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC9H,MAAM,KAAK,GAAG,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,KAAK,mCAAI,kCAAkB,CAAA;gBAC3E,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,MAAA,QAAQ,CAAC,oBAAoB,EAAE,mCAAI,EAAE,EAAE,MAAA,QAAQ,CAAC,cAAc,EAAE,mCAAI,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;gBAEtI,eAAe,GAAG,iCAAe,CAAC,qBAAqB,CACrD,QAAQ,CAAC,UAAW,EACpB,KAAK,EACL,OAAO,CACR,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;YACvE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,uFAAuF;YACvF,MAAM,KAAK,GAAG,MAAA,MAAA,QAAQ,CAAC,GAAG,mCAAI,QAAQ,CAAC,KAAK,mCAAI,8BAA8B,CAAA;YAC9E,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;YACvD,eAAe,GAAG,iCAAe,CAAC,qBAAqB,CACrD,QAAQ,CAAC,UAAW,EACpB,KAAK,EACL,OAAO,CACR,CAAA;QACH,CAAC;QAED,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,MAAM,CAAC,cAAc,CAAE,KAAa;QAClC,OAAO;YACL,GAAG,EAAE,KAAK;SACG,CAAA;IACjB,CAAC;IAED;;;;;OAKG;IACO,kBAAkB,CAC1B,OAAoB,EACpB,eAAiC;QAEjC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;IACjE,CAAC;IAED;;;;;;;;OAQG;IACO,KAAK,CAAC,qBAAqB,CACnC,QAAoB,EACpB,uBAA+B,IAAA,4CAAuB,GAAE,EACxD,QAAgB,8BAA8B,EAC9C,WAAmB,8BAA8B,EACjD,OAAqC;QAErC,iCAAiC;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAA;QAE7F,OAAO,uBAAe,CAAC,qBAAqB,CAC1C,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,OAAO,CACR,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACO,kBAAkB,CAC1B,OAAoB,EACpB,eAAiC;QAEjC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;IACjE,CAAC;IAED;;;;;;OAMG;IACH,iBAAiB,CAAE,QAAkB,EAAE,KAAmB,EAAE,QAAqB;QAC/E,OAAO,IAAI,yBAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAClD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAE,OAAoB,EAAE,UAAsB;;QAChE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;QAC/E,CAAC;QAED,MAAM,SAAS,GAAuB,EAAE,CAAA;QACxC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAClC,OAAO,QAAQ,CAAC,EAAE,CAAA;YAClB,IAAI,QAAQ,GAAqB,EAAE,EAAE,EAAE,EAAE,EAAE,CAAA;YAE3C,IAAI,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,cAAc,EAAE,CAAC;gBACnD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,qCAAmB,EAAE,QAAQ,CAAC,CAAA;YACtD,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,KAAK,IAAI,QAAQ,CAAC,SAAS,KAAK,0BAAQ,CAAC,QAAQ,EAAE,CAAC;gBAC7F,QAAQ;YACV,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;oBACzF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;gBAC5C,CAAC;gBAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACvB,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;gBACzI,CAAC;qBAAM,CAAC;oBACN,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;gBACxH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,QAAQ,GAAG,EAAE,EAAE,EAAE,MAAA,QAAQ,CAAC,EAAE,mCAAI,EAAE,EAAE,CAAA;YACtC,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAClB,OAAgB,EAChB,GAAa,EACb,KAA8C,EAC9C,iBAA+C;;QAC/C,MAAM,OAAO,GAAG,IAAI,qCAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtD,IAAI,iBAAiB,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;YACjE,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC1B,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAA;QACjD,CAAC;QAED,MAAM,GAAG,GAAG,CAAC,MAAmB,EAAE,IAAc,EAAE,kCAA2C,KAAK,EAAE,EAAE;YACpG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAClB,IAAI,+BAA+B,EAAE,CAAC;gBACpC,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;YACnD,CAAC;YACD,IAAI,IAAI,EAAE,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAChB,CAAC;YACD,GAAG,CAAC,GAAG,EAAE,CAAA;QACX,CAAC,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,SAAS,CAAC,mFAAmF,CAAC,CAAA;QAC1G,CAAC;QACD,MAAM,QAAQ,GAAG,IAAA,8CAAyB,EAAC,OAAO,CAAC,IAAK,CAAC,CAAA;QACzD,MAAM,QAAQ,GAAG,0BAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAC9C,MAAM,CAAC,IAAI,CAAC,0CAA0C,QAAQ,CAAC,IAAI,YAAY,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAA;QAEpG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,OAAO,GAAG,CAAC,yBAAW,CAAC,WAAW,CAAC,CAAA;QACrC,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAA;QAE7C,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAK,CAAC,CAAA;QAC9D,uEAAuE;QACvE,IAAI,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,IAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACtG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QACnD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACjC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAK,CAAC,CAAA;YACvE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QACnD,CAAC;QAED,IACE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,+BAAa,CAAC,cAAc;YAC/C,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,+BAAa,CAAC,MAAM;YACvC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,MAAK,+BAAa,CAAC,aAAa,EACtD,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YACxC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;YACvD,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,cAAc,CAAC,CAAA;YAC3E,OAAO,GAAG,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,mCAAI,yBAAW,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;QAClG,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACxC,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QACvD,OAAO,GAAG,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,mCAAI,yBAAW,CAAC,EAAE,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,CAAA;IAC5E,CAAC;IAEO,sBAAsB,CAAE,QAAkB;;QAChD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;YAC3C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;YAChD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,CAAA,MAAA,QAAQ,CAAC,YAAY,0CAAE,EAAE,KAAI,IAAI,IAAI,CAAA,MAAA,QAAQ,CAAC,YAAY,0CAAE,EAAE,MAAK,EAAE,EAAE,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;YAClD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAE,OAAoB,EAAE,QAAkB;QAC5D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACzG,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,cAAc,CAClF,QAAQ,CAAC,YAAY,CAAC,EAAE,EACxB,QAAQ,CAAC,EAAE,EACX,QAAQ,CACT,CAAA;QAED,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACtD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAE,OAAoB,EAAE,SAAyC;QACnF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;YACnI,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;QAC1D,CAAC;QAED,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;IACtH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,oBAAoB,CACxB,kBAAuC,EACvC,SAAgC,EAChC,KAAuD,EACvD,aAAsB,KAAK;QAC3B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;YAC1G,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAA;QAChF,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,SAAS,CAAC,sDAAsD,CAAC,CAAA;QAC7E,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAa,CAAA;QAE/G,+FAA+F;QAC/F,sGAAsG;QACtG,MAAM,QAAQ,GACV,OAAO,kBAAkB,KAAK,QAAQ;YACpC,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAE7C,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC,IAAI,EAAE,0BAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAA;QAC5F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;QAChG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QAEjD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACzC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAClE,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QACnD,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED;;;;MAIE;IACQ,kBAAkB,CAAE,OAAoB;QAChD,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAC3C,wHAAwH;QACxH,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,KAAK,+BAAa,CAAC,aAAa,EAAE,CAAC;YAClE,OAAO;gBACL,MAAM,EAAE,yBAAW,CAAC,EAAE;gBACtB,IAAI,EAAE;oBACJ,UAAU,EAAE,OAAO,CAAC,uBAAuB;iBAC5C;aACF,CAAA;QACH,CAAC;QAED,uFAAuF;QACvF,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,sBAAsB,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAW,qCAAmB,CAAC,CAAA;YACnF,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,OAAO,EAAE,MAAM,EAAE,yBAAW,CAAC,eAAe,EAAE,CAAA;YAChD,CAAC;YAED,OAAO,sBAAsB,CAAC,KAAuB,CAAA;QACvD,CAAC;QAED,qBAAqB;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED;;;;;;;OAOG;IACO,oBAAoB,CAC5B,qBAAyC,EACzC,SAAiB,EACjB,UAAkB,EAClB,sBAA8C;QAE9C,iEAAiE;QACjE,MAAM,QAAQ,GAAG,IAAI,0BAAQ,CAAC,+BAAa,CAAC,KAAK,CAAC,CAAA;QAElD,QAAQ,CAAC,IAAI,GAAG,oCAAkB,CAAC,kBAAkB,CAAA;QACrD,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAA;QAC9B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAA;QAChC,QAAQ,CAAC,EAAE,GAAG,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,IAAI,CAAC,EAAE,EAAE,CAAA;QAChD,QAAQ,CAAC,YAAY,GAAG;YACtB,gBAAgB,EAAE,SAAS;YAC3B,EAAE,EAAE,qBAAsB;YAC1B,OAAO,EAAE,sBAAsB,CAAC,OAAO;YACvC,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,sBAAsB,CAAC,QAAQ;SAC1C,CAAA;QACD,QAAQ,CAAC,WAAW,GAAG,sBAAsB,CAAC,WAAW,CAAA;QACzD,QAAQ,CAAC,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAA;QAEjD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,uBAAuB,CAC3B,UAAkB,EAClB,SAAiB,EACjB,UAAkB,EAClB,QAAgB,EAChB,sBAA8C,EAC9C,KAA8C;QAE9C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;YAClD,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAA;QAChE,CAAC;QACD,IAAI,CAAC,sBAAsB;YAAE,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAA;QAC5F,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAA;QAE1D,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACnF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QAClE,MAAM,wBAAwB,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAA;QAC5F,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAC9C,wBAAwB,CAAC,EAAE,EAC3B,SAAS,EACT,UAAU,EACV,sBAAsB,CACvB,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;QAC9F,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAC5C,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QACjD,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,gBAAgB,CAAE,OAAoB,EAAE,cAAsB,EAAE,cAA8B;QAClG,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;QAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;QAED,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAkB,IAAI,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;IAC/H,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB,CAAE,OAAoB,EAAE,YAAoB;QACjE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QAED,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAkB,IAAI,CAAC,kBAAkB,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA;IAC9G,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAE,OAAoB,EAAE,YAAoB,EAAE,MAAc;QAC7E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;QAED,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAkB,IAAI,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;IAClH,CAAC;CACF;AAxkBD,oCAwkBC"}
|
|
@@ -61,6 +61,12 @@ export declare class ConnectorClient {
|
|
|
61
61
|
* @returns The resource response.
|
|
62
62
|
*/
|
|
63
63
|
replyToActivity(conversationId: string, activityId: string, body: Activity): Promise<ResourceResponse>;
|
|
64
|
+
/**
|
|
65
|
+
* Trim the conversationId to a fixed length when creating the URL. This is applied only in specific API calls for agentic calls.
|
|
66
|
+
* @param conversationId The ID of the conversation to potentially truncate.
|
|
67
|
+
* @param activity The activity object used to determine if truncation is necessary.
|
|
68
|
+
* @returns The original or truncated conversationId, depending on the channel and activity role.
|
|
69
|
+
*/
|
|
64
70
|
private conditionallyTruncateConversationId;
|
|
65
71
|
/**
|
|
66
72
|
* Sends an activity to a conversation.
|
|
@@ -95,11 +95,6 @@ class ConnectorClient {
|
|
|
95
95
|
const axiosInstance = axios_1.default.create({
|
|
96
96
|
baseURL,
|
|
97
97
|
headers: headerPropagation.outgoing,
|
|
98
|
-
transformRequest: [
|
|
99
|
-
(data, headers) => {
|
|
100
|
-
return JSON.stringify((0, activityWireCompat_1.normalizeOutgoingActivity)(data));
|
|
101
|
-
}
|
|
102
|
-
]
|
|
103
98
|
});
|
|
104
99
|
if (token && token.length > 1) {
|
|
105
100
|
axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
|
|
@@ -140,7 +135,10 @@ class ConnectorClient {
|
|
|
140
135
|
* @returns The conversation resource response.
|
|
141
136
|
*/
|
|
142
137
|
async createConversation(body) {
|
|
143
|
-
const payload =
|
|
138
|
+
const payload = {
|
|
139
|
+
...body,
|
|
140
|
+
activity: (0, activityWireCompat_1.normalizeOutgoingActivity)(body.activity)
|
|
141
|
+
};
|
|
144
142
|
const config = {
|
|
145
143
|
method: 'post',
|
|
146
144
|
url: '/v3/conversations',
|
|
@@ -177,6 +175,12 @@ class ConnectorClient {
|
|
|
177
175
|
logger.info('Reply to conversation/activity: ', response.data.id, activityId);
|
|
178
176
|
return response.data;
|
|
179
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Trim the conversationId to a fixed length when creating the URL. This is applied only in specific API calls for agentic calls.
|
|
180
|
+
* @param conversationId The ID of the conversation to potentially truncate.
|
|
181
|
+
* @param activity The activity object used to determine if truncation is necessary.
|
|
182
|
+
* @returns The original or truncated conversationId, depending on the channel and activity role.
|
|
183
|
+
*/
|
|
180
184
|
conditionallyTruncateConversationId(conversationId, activity) {
|
|
181
185
|
var _a, _b;
|
|
182
186
|
if ((activity.channelIdChannel === agents_activity_1.Channels.Msteams || activity.channelIdChannel === agents_activity_1.Channels.Agents) &&
|
|
@@ -231,7 +235,7 @@ class ConnectorClient {
|
|
|
231
235
|
headers: {
|
|
232
236
|
'Content-Type': 'application/json'
|
|
233
237
|
},
|
|
234
|
-
data: body
|
|
238
|
+
data: (0, activityWireCompat_1.normalizeOutgoingActivity)(body)
|
|
235
239
|
};
|
|
236
240
|
const response = await this._axiosInstance(config);
|
|
237
241
|
return response.data;
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getTokenServiceEndpoint: () => string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getTokenServiceEndpoint = void 0;
|
|
4
|
+
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
5
|
+
// Licensed under the MIT License.
|
|
6
|
+
const getTokenServiceEndpoint = () => {
|
|
7
|
+
var _a;
|
|
8
|
+
return (_a = process.env.TOKEN_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : 'https://api.botframework.com';
|
|
9
|
+
};
|
|
10
|
+
exports.getTokenServiceEndpoint = getTokenServiceEndpoint;
|
|
11
|
+
//# sourceMappingURL=customUserTokenAPI.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"customUserTokenAPI.js","sourceRoot":"","sources":["../../../src/oauth/customUserTokenAPI.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAC5D,kCAAkC;AAC3B,MAAM,uBAAuB,GAAG,GAAW,EAAE;;IAClD,OAAO,MAAA,OAAO,CAAC,GAAG,CAAC,sBAAsB,mCAAI,8BAA8B,CAAA;AAC7E,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC"}
|
|
@@ -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 customUserTokenAPI_1 = require("./customUserTokenAPI");
|
|
14
15
|
const logger = (0, logger_1.debug)('agents:user-token-client');
|
|
15
16
|
/**
|
|
16
17
|
* Client for managing user tokens.
|
|
@@ -19,7 +20,7 @@ class UserTokenClient {
|
|
|
19
20
|
constructor(param) {
|
|
20
21
|
this.msAppId = '';
|
|
21
22
|
if (typeof param === 'string') {
|
|
22
|
-
const baseURL =
|
|
23
|
+
const baseURL = (0, customUserTokenAPI_1.getTokenServiceEndpoint)();
|
|
23
24
|
this.client = axios_1.default.create({
|
|
24
25
|
baseURL,
|
|
25
26
|
headers: {
|
|
@@ -95,11 +96,6 @@ class UserTokenClient {
|
|
|
95
96
|
'Content-Type': 'application/json', // Required by transformRequest
|
|
96
97
|
'User-Agent': (0, getProductInfo_1.getProductInfo)(),
|
|
97
98
|
},
|
|
98
|
-
transformRequest: [
|
|
99
|
-
(data, headers) => {
|
|
100
|
-
return JSON.stringify((0, activityWireCompat_1.normalizeOutgoingActivity)(data));
|
|
101
|
-
},
|
|
102
|
-
],
|
|
103
99
|
});
|
|
104
100
|
const token = await authProvider.getAccessToken(scope);
|
|
105
101
|
if (token.length > 1) {
|
|
@@ -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,
|
|
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;AAGlD,6DAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,0BAA0B,CAAC,CAAA;AAEhD;;GAEG;AACH,MAAa,eAAe;IAc1B,YAAa,KAA6B;QAZlC,YAAO,GAAW,EAAE,CAAA;QAa1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAA,4CAAuB,GAAE,CAAA;YACzC,IAAI,CAAC,MAAM,GAAG,eAAK,CAAC,MAAM,CAAC;gBACzB,OAAO;gBACP,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;oBAC1B,YAAY,EAAE,IAAA,+BAAc,GAAE;iBAC/B;aACF,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACrB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;YACrD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;YACvE,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE;gBACxB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,GAAG;gBACH,IAAI;gBACJ,MAAM;gBACN,MAAM;gBACN,OAAO,EAAE,YAAY;aACtB,CAAC,CAAA;YACF,OAAO,MAAM,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACnC,CAAC,MAAM,EAAE,EAAE;YACT,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;YACrE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;YACvE,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,EAAE,CAAA;YAC5D,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE;gBACzB,MAAM;gBACN,UAAU;gBACV,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,GAAG,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG;gBACvB,IAAI,EAAE,YAAY;gBAClB,MAAM,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM;gBAC7B,OAAO,EAAE,YAAY;aACtB,CAAC,CAAA;YACF,OAAO,MAAM,CAAA;QACf,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;YACxD,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,IAAI,EAAE,CAAA;YAClC,MAAM,YAAY,GAAG;gBACnB,IAAI;gBACJ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG;gBACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;gBAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;gBACvB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC;gBACjD,OAAO;gBACP,KAAK;aACN,CAAA;YACD,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAA;YAC9C,IAAI,YAAY,CAAC,GAAG,KAAK,yBAAyB,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;gBACrE,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACrC,CAAC;QACH,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAChC,OAAe,EACf,YAA0B,EAC1B,KAAa,EACb,OAAqC;QAErC,qCAAqC;QACrC,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;YACjC,OAAO;YACP,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB,EAAE,+BAA+B;gBACnE,YAAY,EAAE,IAAA,+BAAc,GAAE;aAC/B;SACF,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,MAAO,YAAkC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAC7E,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;QACzE,CAAC;QACD,OAAO,IAAI,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAAE,cAAsB,EAAE,kBAA0B,EAAE,MAAc,EAAE,IAAa;QACnG,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;QAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC7E,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,IAAqB,CAAA;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAE,MAAc,EAAE,cAAsB,EAAE,kBAA0B;QAC/E,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,CAAA;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC/E,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iBAAiB,CAAE,OAAe,EAAE,cAAsB,EAAE,YAAmC,EAAE,SAAiC;QACtI,MAAM,kBAAkB,GAAG;YACzB,cAAc;YACd,YAAY;YACZ,SAAS;YACT,OAAO;SACR,CAAA;QACD,MAAM,4BAA4B,GAAG,IAAA,gDAA2B,EAAC,kBAAkB,CAAC,CAAA;QACpF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC1F,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,CAAA;QACxB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QACtF,OAAO,QAAQ,CAAC,IAAsB,CAAA;IACxC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,kBAAkB,CAAE,MAAc,EAAE,cAAsB,EAAE,kBAA0B,EAAE,oBAA0C;QACtI,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,CAAA;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QACpG,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,IAAqB,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,wBAAwB,CAAE,MAAc,EAAE,cAAsB,EAAE,kBAA0B,EAAE,YAAmC,EAAE,SAAgC,EAAE,IAAY,EAAE,gBAAwB,EAAE,EAAE,SAAiB,EAAE;QACtO,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAChI,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,CAAA;QACxF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC7F,OAAO,QAAQ,CAAC,IAAqC,CAAA;IACvD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAE,MAAc,EAAE,kBAA0B,EAAE,UAAkB,IAAK;QACvF,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAA;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QACnF,OAAO,QAAQ,CAAC,IAAqB,CAAA;IACvC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAAE,MAAc,EAAE,cAAsB,EAAE,kBAA0B,EAAE,YAA6B;QACnH,MAAM,CAAC,SAAS,CAAC,GAAG,0BAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,CAAA;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAChG,OAAO,QAAQ,CAAC,IAAqC,CAAA;IACvD,CAAC;IAEM,eAAe,CAAE,KAAa;QACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;IACvE,CAAC;CACF;AA5OD,0CA4OC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@microsoft/agents-hosting",
|
|
4
|
-
"version": "1.1.0-alpha.
|
|
4
|
+
"version": "1.1.0-alpha.78",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"types": "dist/src/index.d.ts",
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
|
-
"@azure/msal-node": "^3.8.
|
|
24
|
-
"@microsoft/agents-activity": "1.1.0-alpha.
|
|
25
|
-
"axios": "^1.
|
|
23
|
+
"@azure/msal-node": "^3.8.1",
|
|
24
|
+
"@microsoft/agents-activity": "1.1.0-alpha.78",
|
|
25
|
+
"axios": "^1.13.1",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
28
28
|
"object-path": "^0.11.8"
|
|
@@ -24,7 +24,10 @@ export function normalizeIncomingActivity (payload: any): object {
|
|
|
24
24
|
* @param payload - The outgoing payload object to normalize.
|
|
25
25
|
* @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
|
|
26
26
|
*/
|
|
27
|
-
export function normalizeOutgoingActivity (payload: any): object {
|
|
27
|
+
export function normalizeOutgoingActivity (payload: any): object | undefined | null {
|
|
28
|
+
if (!payload) {
|
|
29
|
+
return payload
|
|
30
|
+
}
|
|
28
31
|
const modifiedPayload = JSON.parse(JSON.stringify(payload))
|
|
29
32
|
if (modifiedPayload && modifiedPayload['relatesTo'] && modifiedPayload['relatesTo']['agent']) {
|
|
30
33
|
const relatesTo = modifiedPayload['relatesTo']
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { Activity, ActivityTypes, ConversationReference } from '@microsoft/agents-activity'
|
|
7
|
-
import { BaseAdapter } from '../baseAdapter'
|
|
8
7
|
import { ResourceResponse } from '../connector-client'
|
|
9
8
|
import { debug } from '@microsoft/agents-activity/logger'
|
|
10
9
|
import { TurnContext } from '../turnContext'
|
|
@@ -20,7 +19,7 @@ import { RouteRank } from './routeRank'
|
|
|
20
19
|
import { RouteList } from './routeList'
|
|
21
20
|
import { TranscriptLoggerMiddleware } from '../transcript'
|
|
22
21
|
import { CloudAdapter } from '../cloudAdapter'
|
|
23
|
-
import { Authorization, AuthorizationManager } from './auth'
|
|
22
|
+
import { Authorization, UserAuthorization, AuthorizationManager } from './auth'
|
|
24
23
|
import { JwtPayload } from 'jsonwebtoken'
|
|
25
24
|
|
|
26
25
|
const logger = debug('agents:app')
|
|
@@ -128,7 +127,7 @@ export class AgentApplication<TState extends TurnState> {
|
|
|
128
127
|
|
|
129
128
|
if (this._options.authorization) {
|
|
130
129
|
this._authorizationManager = new AuthorizationManager(this, this._adapter.connectionManager)
|
|
131
|
-
this._authorization = new
|
|
130
|
+
this._authorization = new UserAuthorization(this._authorizationManager)
|
|
132
131
|
}
|
|
133
132
|
|
|
134
133
|
if (this._options.longRunningMessages && !this._adapter && !this._options.agentAppId) {
|
|
@@ -172,7 +171,7 @@ export class AgentApplication<TState extends TurnState> {
|
|
|
172
171
|
*
|
|
173
172
|
* @returns The adapter instance.
|
|
174
173
|
*/
|
|
175
|
-
public get adapter ():
|
|
174
|
+
public get adapter (): CloudAdapter {
|
|
176
175
|
return this._adapter!
|
|
177
176
|
}
|
|
178
177
|
|
|
@@ -12,6 +12,15 @@ import { AuthorizationHandlerTokenOptions } from './types'
|
|
|
12
12
|
|
|
13
13
|
const logger = debug('agents:authorization')
|
|
14
14
|
|
|
15
|
+
export interface Authorization {
|
|
16
|
+
getToken(context: TurnContext, authHandlerId: string): Promise<TokenResponse>
|
|
17
|
+
exchangeToken(context: TurnContext, scopes: string[], authHandlerId: string): Promise<TokenResponse>
|
|
18
|
+
exchangeToken(context: TurnContext, authHandlerId: string, options?: AuthorizationHandlerTokenOptions): Promise<TokenResponse>
|
|
19
|
+
signOut(context: TurnContext, state: TurnState, authHandlerId?: string): Promise<void>
|
|
20
|
+
onSignInSuccess(handler: (context: TurnContext, state: TurnState, authHandlerId?: string) => Promise<void>): void
|
|
21
|
+
onSignInFailure(handler: (context: TurnContext, state: TurnState, authHandlerId?: string, errorMessage?: string) => Promise<void>): void
|
|
22
|
+
}
|
|
23
|
+
|
|
15
24
|
/**
|
|
16
25
|
* Class responsible for managing authorization and OAuth flows.
|
|
17
26
|
* Handles multiple OAuth providers and manages the complete authentication lifecycle.
|
|
@@ -29,7 +38,7 @@ const logger = debug('agents:authorization')
|
|
|
29
38
|
* - Automatic configuration from environment variables
|
|
30
39
|
*
|
|
31
40
|
*/
|
|
32
|
-
export class Authorization {
|
|
41
|
+
export class UserAuthorization implements Authorization {
|
|
33
42
|
/**
|
|
34
43
|
* Creates a new instance of Authorization.
|
|
35
44
|
* @param manager The AuthorizationManager instance to manage handlers.
|
|
@@ -133,7 +142,7 @@ export class Authorization {
|
|
|
133
142
|
return this.exchangeToken(context, handlerId, { scopes: handlerScopes })
|
|
134
143
|
}
|
|
135
144
|
|
|
136
|
-
if (typeof authHandlerId === 'string' && typeof options
|
|
145
|
+
if (typeof authHandlerId === 'string' && typeof options !== 'string') {
|
|
137
146
|
const handler = this.getHandler(authHandlerId)
|
|
138
147
|
const { token } = await handler.token(context, options)
|
|
139
148
|
return { token }
|
|
@@ -109,8 +109,7 @@ export class AgenticAuthorization implements AuthorizationHandler {
|
|
|
109
109
|
if (this._options.altBlueprintConnectionName?.trim()) {
|
|
110
110
|
connection = this.settings.connections.getConnection(this._options.altBlueprintConnectionName)
|
|
111
111
|
} else {
|
|
112
|
-
|
|
113
|
-
connection = this.settings.connections.getTokenProvider(audience, context.activity.serviceUrl ?? '')
|
|
112
|
+
connection = this.settings.connections.getTokenProvider(context.identity, context.activity.serviceUrl ?? '')
|
|
114
113
|
}
|
|
115
114
|
|
|
116
115
|
const token = await connection.getAgenticUserToken(
|
|
@@ -168,17 +167,6 @@ export class AgenticAuthorization implements AuthorizationHandler {
|
|
|
168
167
|
return result?.() ?? { token: undefined }
|
|
169
168
|
}
|
|
170
169
|
|
|
171
|
-
/**
|
|
172
|
-
* Gets the audience from the turn context.
|
|
173
|
-
*/
|
|
174
|
-
private getAudience (context: TurnContext): string {
|
|
175
|
-
const { aud } = context.identity
|
|
176
|
-
if (!aud) {
|
|
177
|
-
throw new Error('No audience (aud) claim found in Activity.identity.')
|
|
178
|
-
}
|
|
179
|
-
return Array.isArray(aud) ? aud[0] : aud
|
|
180
|
-
}
|
|
181
|
-
|
|
182
170
|
/**
|
|
183
171
|
* Loads the OAuth scopes from the environment variables.
|
|
184
172
|
*/
|
package/src/app/index.ts
CHANGED
|
@@ -2,6 +2,7 @@ export * from './agentApplication'
|
|
|
2
2
|
export * from './agentApplicationBuilder'
|
|
3
3
|
export * from './agentApplicationOptions'
|
|
4
4
|
export * from './appRoute'
|
|
5
|
+
export { Authorization } from './auth/authorization'
|
|
5
6
|
export * from './routeHandler'
|
|
6
7
|
export * from './routeList'
|
|
7
8
|
export * from './routeRank'
|