@microsoft/agents-hosting 1.1.0-alpha.58 → 1.1.0-alpha.75
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.map +1 -1
- package/dist/src/app/auth/authorization.js +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/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 +2 -2
- package/dist/src/cloudAdapter.js +19 -27
- 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 +1 -2
- package/src/app/auth/authorization.ts +1 -1
- package/src/app/auth/handlers/agenticAuthorization.ts +1 -13
- 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 +14 -21
- package/src/connector-client/connectorClient.ts +11 -6
- package/src/oauth/customUserTokenAPI.ts +5 -0
- package/src/oauth/userTokenClient.ts +3 -7
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.1.0-alpha.
|
|
4
|
+
"version": "1.1.0-alpha.75",
|
|
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.75",
|
|
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"
|
|
@@ -15,5 +15,5 @@ export declare function normalizeIncomingActivity(payload: any): object;
|
|
|
15
15
|
* @param payload - The outgoing payload object to normalize.
|
|
16
16
|
* @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
|
|
17
17
|
*/
|
|
18
|
-
export declare function normalizeOutgoingActivity(payload: any): object;
|
|
18
|
+
export declare function normalizeOutgoingActivity(payload: any): object | undefined | null;
|
|
19
19
|
export declare function normalizeTokenExchangeState(payload: any): object;
|
|
@@ -29,6 +29,9 @@ function normalizeIncomingActivity(payload) {
|
|
|
29
29
|
* @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
|
|
30
30
|
*/
|
|
31
31
|
function normalizeOutgoingActivity(payload) {
|
|
32
|
+
if (!payload) {
|
|
33
|
+
return payload;
|
|
34
|
+
}
|
|
32
35
|
const modifiedPayload = JSON.parse(JSON.stringify(payload));
|
|
33
36
|
if (modifiedPayload && modifiedPayload['relatesTo'] && modifiedPayload['relatesTo']['agent']) {
|
|
34
37
|
const relatesTo = modifiedPayload['relatesTo'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityWireCompat.js","sourceRoot":"","sources":["../../src/activityWireCompat.ts"],"names":[],"mappings":";;AAQA,8DAQC;AAUD,
|
|
1
|
+
{"version":3,"file":"activityWireCompat.js","sourceRoot":"","sources":["../../src/activityWireCompat.ts"],"names":[],"mappings":";;AAQA,8DAQC;AAUD,8DAgBC;AAED,kEAQC;AApDD;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CAAE,OAAY;IACrD,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QACtC,MAAM,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;QAC3B,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;QACvB,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CAAE,OAAY;IACrD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3D,IAAI,eAAe,IAAI,eAAe,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7F,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;QAC9C,MAAM,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;QAC7B,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;QACzB,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;IACvB,CAAC;IACD,IAAI,eAAe,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QACrD,eAAe,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAA;QACvE,OAAO,eAAe,CAAC,YAAY,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,eAAe,CAAA;AACxB,CAAC;AAED,SAAgB,2BAA2B,CAAE,OAAY;IACvD,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAChE,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5C,MAAM,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QAChC,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;QAC5B,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { Activity, ConversationReference } from '@microsoft/agents-activity';
|
|
6
|
-
import { BaseAdapter } from '../baseAdapter';
|
|
7
6
|
import { ResourceResponse } from '../connector-client';
|
|
8
7
|
import { TurnContext } from '../turnContext';
|
|
9
8
|
import { AdaptiveCardsActions } from './adaptiveCards';
|
|
@@ -16,6 +15,7 @@ import { TurnEvents } from './turnEvents';
|
|
|
16
15
|
import { TurnState } from './turnState';
|
|
17
16
|
import { RouteRank } from './routeRank';
|
|
18
17
|
import { RouteList } from './routeList';
|
|
18
|
+
import { CloudAdapter } from '../cloudAdapter';
|
|
19
19
|
import { Authorization } from './auth';
|
|
20
20
|
import { JwtPayload } from 'jsonwebtoken';
|
|
21
21
|
/**
|
|
@@ -116,7 +116,7 @@ export declare class AgentApplication<TState extends TurnState> {
|
|
|
116
116
|
*
|
|
117
117
|
* @returns The adapter instance.
|
|
118
118
|
*/
|
|
119
|
-
get adapter():
|
|
119
|
+
get adapter(): CloudAdapter;
|
|
120
120
|
/**
|
|
121
121
|
* Gets the adaptive cards actions handler for the application.
|
|
122
122
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentApplication.js","sourceRoot":"","sources":["../../../src/app/agentApplication.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAA2F;AAG3F,8DAAyD;AACzD,gDAA4C;AAC5C,mDAAsD;AAOtD,2CAAuC;AACvC,2CAAuC;AACvC,2CAAuC;AACvC,8CAA0D;AAC1D,kDAA8C;AAC9C,iCAA4D;AAG5D,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;AAElC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AAW/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAa,gBAAgB;IAY3B;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,YAAoB,OAAkD;;QArCnD,YAAO,GAAsB,IAAI,qBAAS,EAAU,CAAA;QACpD,gBAAW,GAAsC,EAAE,CAAA;QACnD,eAAU,GAAsC,EAAE,CAAA;QAKlD,gBAAW,GAA6B,EAAE,CAAA;QA+B3D,IAAI,CAAC,QAAQ,GAAG;YACd,GAAG,OAAO;YACV,gBAAgB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,KAAI,CAAC,GAAG,EAAE,CAAC,IAAI,qBAAS,EAAY,CAAC;YAChF,gBAAgB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK;YAC5F,mBAAmB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,MAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK;YACrG,sBAAsB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB,MAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI;YAC7G,gBAAgB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,KAAI,SAAS;SACzD,CAAA;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,oCAAoB,CAAS,IAAI,CAAC,CAAA;QAE5D,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAA;QACvC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,EAAE,CAAA;QACpC,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;YAChC,IAAI,CAAC,qBAAqB,GAAG,IAAI,2BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;YAC5F,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAa,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACrE,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YACrF,MAAM,IAAI,KAAK,CAAC,2GAA2G,CAAC,CAAA;QAC9H,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,wGAAwG,CAAC,CAAA;YAC3H,CAAC;iBAAM,CAAC;gBACN,MAAA,IAAI,CAAC,QAAQ,0CAAE,GAAG,CAAC,IAAI,uCAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAA;YACpF,CAAC;QACH,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvE,CAAC;IAED;;;;;OAKG;IACH,IAAW,aAAa;QACtB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,yGAAyG,CAAC,CAAA;QAC5H,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAED;;;;OAIG;IACH,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED;;;;OAIG;IACH,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAS,CAAA;IACvB,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACI,OAAO,CAAE,OAA8D;QAC5E,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,OAAO,CAAA;QACrC,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACI,QAAQ,CAAE,QAAuB,EAAE,OAA6B,EAAE,gBAAyB,KAAK,EAAE,OAAe,qBAAS,CAAC,WAAW,EAAE,eAAyB,EAAE,EAAE,iBAA0B,KAAK;QACzM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAA;QAC3F,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,UAAU,CACf,IAA2E,EAC3E,OAA+D,EAC/D,eAAyB,EAAE,EAC3B,OAAkB,qBAAS,CAAC,WAAW,EACvC,iBAA0B,KAAK;QAE/B,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;YAC/D,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACI,oBAAoB,CACzB,KAA+B,EAC/B,OAA+D,EAC/D,eAAyB,EAAE,EAC3B,OAAkB,qBAAS,CAAC,WAAW,EACvC,iBAA0B,KAAK;QAE/B,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACL,oCAAoC,KAAK,OAAO,OAAO,OAAO,yCAAyC,CAChH,CAAA;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,EAAE,cAAc,CAAC,CAAA;QAC7E,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAA;QAC3E,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,yBAAyB,CACvC,kBAAuC,EACvC,8BAAmE,EACnE,KAA8C;QAE9C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,6GAA6G,CAC9G,CAAA;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,4IAA4I,CAAC,CAAA;QAC3J,CAAC;QAED,IAAI,SAAgC,CAAA;QAEpC,IAAI,UAAU,IAAI,8BAA8B,EAAE,CAAC;YACjD,SAAS,GAAG,8BAA8B,CAAC,QAAQ,CAAC,wBAAwB,EAAE,CAAA;QAChF,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,8BAA8B,CAAA;QAC5C,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAChF,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACI,SAAS,CACd,OAA8E,EAC9E,OAA+D,EAC/D,eAAyB,EAAE,EAC3B,OAAkB,qBAAS,CAAC,WAAW,EACvC,iBAA0B,KAAK;QAE/B,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;YAC9D,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACI,eAAe,CAAE,OAA+E;QACrG,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,yGAAyG,CAC1G,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACI,eAAe,CAAE,OAA+E;QACrG,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,yGAAyG,CAC1G,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,sBAAsB,CAC3B,OAA+D,EAC/D,OAAkB,qBAAS,CAAC,WAAW,EACvC,iBAA0B,KAAK;QAC/B,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAoB,EAAoB,EAAE;YAChE,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,eAAe;gBACvD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;gBAC1C,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;QACrF,CAAC,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,cAAc,CAAC,CAAA;QACjE,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,wBAAwB,CAC7B,OAA+D,EAC/D,OAAkB,qBAAS,CAAC,WAAW,EACvC,iBAA0B,KAAK;QAC/B,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAoB,EAAoB,EAAE;YAChE,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,eAAe;gBACvD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;gBAC5C,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;QACrF,CAAC,CAAA;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;QACxE,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,KAAK,CAAC,GAAG,CAAE,WAAuB;QACvC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;IACrC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACI,KAAK,CAAC,WAAW,CAAE,WAAwB;QAChD,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,MAAM,EAAE,CAAC;YACvD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAG,CAAC,CAAA;QAC3E,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;;YACpE,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;oBACnC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;gBAChC,CAAC;gBAED,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,OAAO,EAAE,CAAC;oBAC5F,OAAO,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAA;gBAC3C,CAAC;gBAED,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,OAAO,EAAE,CAAC;oBACvF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAA;gBACtC,CAAC;gBAED,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;gBACnD,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAA;gBAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;gBAElC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAA,MAAM,CAAA,MAAA,IAAI,CAAC,qBAAqB,0CAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAC,QAAQ,EAAC,EAAE;;oBACzF,4FAA4F;oBAC5F,sDAAsD;oBACtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,yBAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;oBACnG,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,mCAAI,EAAE,CAAA;gBAClC,CAAC,CAAC,CAAA,mCAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAA,CAAC,2CAA2C;gBAEtE,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBAClC,OAAO,KAAK,CAAA;gBACd,CAAC;gBAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;gBAE1C,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;oBACvE,OAAO,KAAK,CAAA;gBACd,CAAC;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC9D,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;oBAC9E,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;oBACtE,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBAClC,OAAO,KAAK,CAAA;gBACd,CAAC;gBAED,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;gBAEnC,IAAI,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClE,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;gBACpC,CAAC;gBAED,OAAO,IAAI,CAAA;YACb,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACjB,MAAM,GAAG,CAAA;YACX,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,eAAe,EAAE,CAAA;YACxB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ,CAAE,OAAoB;QAC1C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,KAAK,CAAC,qBAAqB,CAChC,kBAAuC,EACvC,OAA4C,EAC5C,cAAiC,EACjC,KAAc,EACd,SAAkB;QAElB,IAAI,QAAsC,CAAA;QAC1C,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9E,QAAQ,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACrE,CAAC,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,gBAAgB,CAAE,OAAoB;QAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1E,IAAI,YAAY,GAAG,IAAI,CAAA;YACvB,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;;gBAC3D,IAAI,YAAY,EAAE,CAAC;oBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC3C,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,+BAAa,CAAC,OAAO,KAAI,MAAA,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,0CAAE,UAAU,CAAA,EAAE,CAAC;4BAC1F,IAAI,CAAC,eAAe,EAAE,CAAA;4BACtB,YAAY,GAAG,KAAK,CAAA;4BACpB,MAAM,QAAQ,CAAA;4BACd,MAAK;wBACP,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,IAAI,EAAE,CAAA;YACf,CAAC,CAAC,CAAA;YAEF,IAAI,QAAQ,GAAiB,OAAO,CAAC,OAAO,EAAE,CAAA;YAC9C,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;gBAC3B,IAAI,CAAC;oBACH,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,0BAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,+BAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;oBACpF,MAAM,QAAQ,CAAA;gBAChB,CAAC;gBAAC,OAAO,GAAQ,EAAE,CAAC;oBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACjB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;oBAC7B,YAAY,GAAG,KAAK,CAAA;oBACpB,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;gBAC9B,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAA;gBAC/D,CAAC;YACH,CAAC,CAAA;YACD,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACI,iBAAiB,CAAoC,SAAY,EAAE,KAAuB;QAC/F,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QACjD,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,KAAK,CAAC,SAAS,CAAC,CAAA;IAClB,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,eAAe;QACpB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAC/B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;QAC/B,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACI,MAAM,CACX,KAAgC,EAChC,OAAkE;QAElE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrD,QAAQ,CAAC,EAAE,CAAC;gBACV,KAAK,YAAY;oBACf,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC9B,MAAK;gBACP,KAAK,WAAW;oBACd,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC7B,MAAK;gBACP;oBACE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC9B,MAAK;YACT,CAAC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,iBAAiB,CAC/B,OAAoB,EACpB,KAAa,EACb,QAA2C;QAE3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAC3D,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;OAMG;IACO,oBAAoB,CAC5B,OAAoB,EACpB,OAAmD;QAEnD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,+BAAa,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;YACzF,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9C,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;oBACtE,IAAI,CAAC;wBACH,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;4BAClC,GAAG,CAAC,QAAgB,CAAC,GAAG,CAAC,GAAI,OAAO,CAAC,QAAgB,CAAC,GAAG,CAAC,CAAA;wBAC7D,CAAC;wBAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;wBACjC,OAAO,CAAC,MAAM,CAAC,CAAA;oBACjB,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;wBACjB,MAAM,CAAC,GAAG,CAAC,CAAA;oBACb,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,OAAO,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,sBAAsB,CAAE,IAAqC,EAAE,iBAA0B,KAAK;QACpG,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAA;QACb,CAAC;aAAM,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC,OAAoB,EAAE,EAAE;;gBAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI;oBAC5C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAClH,CAAC,CAAC,KAAK,CAAC,CAAA;YACZ,CAAC,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,iBAAiB,EAAE,CAAA;YACpD,OAAO,CAAC,OAAoB,EAAE,EAAE;;gBAC9B,OAAO,OAAO,CAAC,OAAO,CACpB,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI;oBACrB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBACxI,CAAC,CAAC,KAAK,CACV,CAAA;YACH,CAAC,CAAA;QACH,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,gCAAgC,CAAE,KAA+B,EAAE,iBAA0B,KAAK;QACxG,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,cAAc;gBACjB,OAAO,CAAC,OAAoB,EAAoB,EAAE;;oBAChD,OAAO,OAAO,CAAC,OAAO,CACpB,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;wBAC5E,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,MAAK,+BAAa,CAAC,kBAAkB;wBAC9C,KAAK,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,YAAY,CAAC;wBAC9C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CACvD,CAAA;gBACH,CAAC,CAAA;YACH,KAAK,gBAAgB;gBACnB,OAAO,CAAC,OAAoB,EAAoB,EAAE;;oBAChD,OAAO,OAAO,CAAC,OAAO,CACpB,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;wBAC5E,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,MAAK,+BAAa,CAAC,kBAAkB;wBAC9C,KAAK,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,cAAc,CAAC;wBAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CACzD,CAAA;gBACH,CAAC,CAAA;YACH;gBACE,OAAO,CAAC,OAAoB,EAAoB,EAAE;;oBAChD,OAAO,OAAO,CAAC,OAAO,CACpB,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;wBAC5E,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,MAAK,+BAAa,CAAC,kBAAkB;wBAC9C,CAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,WAAW,0CAAE,SAAS,MAAK,KAAK,CAClE,CAAA;gBACH,CAAC,CAAA;QACL,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,qBAAqB,CAAE,OAAwC,EAAE,iBAA0B,KAAK;QACtG,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;YAClC,OAAO,OAAO,CAAA;QAChB,CAAC;aAAM,IAAI,OAAO,YAAY,MAAM,EAAE,CAAC;YACrC,OAAO,CAAC,OAAoB,EAAE,EAAE;;gBAC9B,IAAI,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,MAAK,+BAAa,CAAC,OAAO;oBACnD,OAAO,CAAC,QAAQ,CAAC,IAAI;oBACrB,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC/E,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;gBAC7D,CAAC;qBAAM,CAAC;oBACN,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,iBAAiB,EAAE,CAAA;YAChD,OAAO,CAAC,OAAoB,EAAE,EAAE;;gBAC9B,IAAI,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,IAAI,MAAK,+BAAa,CAAC,OAAO;oBACnD,OAAO,CAAC,QAAQ,CAAC,IAAI;oBACvB,CAAC,CAAC,cAAc,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC7E,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAA;gBACzE,CAAC;qBAAM,CAAC;oBACN,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC,CAAA;QACH,CAAC;IACH,CAAC;CACF;AAl8BD,4CAk8BC"}
|
|
1
|
+
{"version":3,"file":"agentApplication.js","sourceRoot":"","sources":["../../../src/app/agentApplication.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ class Authorization {
|
|
|
71
71
|
const [handlerId, handlerScopes] = [options, authHandlerId];
|
|
72
72
|
return this.exchangeToken(context, handlerId, { scopes: handlerScopes });
|
|
73
73
|
}
|
|
74
|
-
if (typeof authHandlerId === 'string' && typeof options
|
|
74
|
+
if (typeof authHandlerId === 'string' && typeof options !== 'string') {
|
|
75
75
|
const handler = this.getHandler(authHandlerId);
|
|
76
76
|
const { token } = await handler.token(context, options);
|
|
77
77
|
return { token };
|
|
@@ -86,10 +86,6 @@ export declare class AgenticAuthorization implements AuthorizationHandler {
|
|
|
86
86
|
* Gets the authorization context from the turn state.
|
|
87
87
|
*/
|
|
88
88
|
private getContext;
|
|
89
|
-
/**
|
|
90
|
-
* Gets the audience from the turn context.
|
|
91
|
-
*/
|
|
92
|
-
private getAudience;
|
|
93
89
|
/**
|
|
94
90
|
* Loads the OAuth scopes from the environment variables.
|
|
95
91
|
*/
|
|
@@ -70,8 +70,7 @@ class AgenticAuthorization {
|
|
|
70
70
|
connection = this.settings.connections.getConnection(this._options.altBlueprintConnectionName);
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
|
-
|
|
74
|
-
connection = this.settings.connections.getTokenProvider(audience, (_b = context.activity.serviceUrl) !== null && _b !== void 0 ? _b : '');
|
|
73
|
+
connection = this.settings.connections.getTokenProvider(context.identity, (_b = context.activity.serviceUrl) !== null && _b !== void 0 ? _b : '');
|
|
75
74
|
}
|
|
76
75
|
const token = await connection.getAgenticUserToken((_c = context.activity.getAgenticInstanceId()) !== null && _c !== void 0 ? _c : '', (_d = context.activity.getAgenticUser()) !== null && _d !== void 0 ? _d : '', (options === null || options === void 0 ? void 0 : options.scopes) || this._options.scopes);
|
|
77
76
|
this.setContext(context, { token });
|
|
@@ -117,16 +116,6 @@ class AgenticAuthorization {
|
|
|
117
116
|
const result = context.turnState.get(this._key);
|
|
118
117
|
return (_a = result === null || result === void 0 ? void 0 : result()) !== null && _a !== void 0 ? _a : { token: undefined };
|
|
119
118
|
}
|
|
120
|
-
/**
|
|
121
|
-
* Gets the audience from the turn context.
|
|
122
|
-
*/
|
|
123
|
-
getAudience(context) {
|
|
124
|
-
const { aud } = context.identity;
|
|
125
|
-
if (!aud) {
|
|
126
|
-
throw new Error('No audience (aud) claim found in Activity.identity.');
|
|
127
|
-
}
|
|
128
|
-
return Array.isArray(aud) ? aud[0] : aud;
|
|
129
|
-
}
|
|
130
119
|
/**
|
|
131
120
|
* Loads the OAuth scopes from the environment variables.
|
|
132
121
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenticAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/agenticAuthorization.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAAkD;AAElD,oCAA2I;AAI3I,MAAM,MAAM,GAAG,IAAA,uBAAK,EAAC,8BAA8B,CAAC,CAAA;AA+BpD;;GAEG;AACH,MAAa,oBAAoB;IAK/B;;;;;OAKG;IACH,YAA6B,EAAU,EAAE,OAAoC,EAAU,QAAsC;QAAhG,OAAE,GAAF,EAAE,CAAQ;QAAgD,aAAQ,GAAR,QAAQ,CAA8B;
|
|
1
|
+
{"version":3,"file":"agenticAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/agenticAuthorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,34 +139,25 @@ const loadPrevAuthConfigFromEnv = () => {
|
|
|
139
139
|
exports.loadPrevAuthConfigFromEnv = loadPrevAuthConfigFromEnv;
|
|
140
140
|
function loadConnectionsMapFromEnv() {
|
|
141
141
|
const envVars = process.env;
|
|
142
|
-
const
|
|
142
|
+
const connectionsObj = {};
|
|
143
143
|
const connectionsMap = [];
|
|
144
|
+
const CONNECTIONS_PREFIX = 'connections__';
|
|
145
|
+
const CONNECTIONS_MAP_PREFIX = 'connectionsMap__';
|
|
144
146
|
for (const [key, value] of Object.entries(envVars)) {
|
|
145
|
-
if (key.startsWith(
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if (!config) {
|
|
152
|
-
config = {};
|
|
153
|
-
connections.set(connectionName, config);
|
|
154
|
-
}
|
|
155
|
-
object_path_1.default.set(config, propertyPath, value);
|
|
156
|
-
}
|
|
147
|
+
if (key.startsWith(CONNECTIONS_PREFIX)) {
|
|
148
|
+
// Convert to dot notation
|
|
149
|
+
let path = key.substring(CONNECTIONS_PREFIX.length).replace(/__/g, '.');
|
|
150
|
+
// Remove ".settings." from the path
|
|
151
|
+
path = path.replace('.settings.', '.');
|
|
152
|
+
object_path_1.default.set(connectionsObj, path, value);
|
|
157
153
|
}
|
|
158
|
-
else if (key.startsWith(
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
const index = parseInt(parts[1], 10);
|
|
162
|
-
const property = parts[2];
|
|
163
|
-
if (!connectionsMap[index]) {
|
|
164
|
-
connectionsMap[index] = { serviceUrl: '', connection: '' };
|
|
165
|
-
}
|
|
166
|
-
connectionsMap[index][property] = value;
|
|
167
|
-
}
|
|
154
|
+
else if (key.startsWith(CONNECTIONS_MAP_PREFIX)) {
|
|
155
|
+
const path = key.substring(CONNECTIONS_MAP_PREFIX.length).replace(/__/g, '.');
|
|
156
|
+
object_path_1.default.set(connectionsMap, path, value);
|
|
168
157
|
}
|
|
169
158
|
}
|
|
159
|
+
// Convert connectionsObj to Map<string, AuthConfiguration>
|
|
160
|
+
const connections = new Map(Object.entries(connectionsObj));
|
|
170
161
|
if (connections.size === 0) {
|
|
171
162
|
logger.warn('No connections found in configuration.');
|
|
172
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authConfiguration.js","sourceRoot":"","sources":["../../../src/auth/authConfiguration.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;
|
|
1
|
+
{"version":3,"file":"authConfiguration.js","sourceRoot":"","sources":["../../../src/auth/authConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
import { Activity } from '@microsoft/agents-activity';
|
|
6
6
|
import { AuthConfiguration } from './authConfiguration';
|
|
7
7
|
import { AuthProvider } from './authProvider';
|
|
8
|
+
import { JwtPayload } from 'jsonwebtoken';
|
|
8
9
|
export interface Connections {
|
|
9
10
|
/**
|
|
10
11
|
* Get the OAuth connection for the agent.
|
|
@@ -20,18 +21,18 @@ export interface Connections {
|
|
|
20
21
|
getDefaultConnection: () => AuthProvider;
|
|
21
22
|
/**
|
|
22
23
|
* Get the OAuth token provider for the agent.
|
|
23
|
-
* @param
|
|
24
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
24
25
|
* @param serviceUrl - The service url.
|
|
25
26
|
* @returns An AuthProvider instance.
|
|
26
27
|
*/
|
|
27
|
-
getTokenProvider: (
|
|
28
|
+
getTokenProvider: (identity: JwtPayload, serviceUrl: string) => AuthProvider;
|
|
28
29
|
/**
|
|
29
30
|
* Get the OAuth token provider for the agent.
|
|
30
|
-
* @param
|
|
31
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
31
32
|
* @param activity - The activity.
|
|
32
33
|
* @returns An AuthProvider instance.
|
|
33
34
|
*/
|
|
34
|
-
getTokenProviderFromActivity: (
|
|
35
|
+
getTokenProviderFromActivity: (identity: JwtPayload, activity: Activity) => AuthProvider;
|
|
35
36
|
/**
|
|
36
37
|
* Get the default connection configuration for the agent.
|
|
37
38
|
* @returns An Auth Configuration.
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Activity } from '@microsoft/agents-activity';
|
|
6
6
|
import { AuthConfiguration } from './authConfiguration';
|
|
7
|
-
import { AuthProvider } from './authProvider';
|
|
8
7
|
import { Connections } from './connections';
|
|
9
8
|
import { MsalTokenProvider } from './msalTokenProvider';
|
|
9
|
+
import { JwtPayload } from 'jsonwebtoken';
|
|
10
10
|
export interface ConnectionMapItem {
|
|
11
11
|
audience?: string;
|
|
12
12
|
serviceUrl: string;
|
|
@@ -32,7 +32,7 @@ export declare class MsalConnectionManager implements Connections {
|
|
|
32
32
|
/**
|
|
33
33
|
* Finds a connection based on a map.
|
|
34
34
|
*
|
|
35
|
-
* @param
|
|
35
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
36
36
|
* @param serviceUrl The service URL.
|
|
37
37
|
* @returns The TokenProvider for the connection.
|
|
38
38
|
*
|
|
@@ -47,17 +47,18 @@ export declare class MsalConnectionManager implements Connections {
|
|
|
47
47
|
* ServiceUrl is: A regex to match with, or "*" for any serviceUrl value.
|
|
48
48
|
* Connection is: A name in the 'Connections' list.
|
|
49
49
|
*/
|
|
50
|
-
getTokenProvider(
|
|
50
|
+
getTokenProvider(identity: JwtPayload, serviceUrl: string): MsalTokenProvider;
|
|
51
51
|
/**
|
|
52
52
|
* Finds a connection based on an activity's blueprint.
|
|
53
|
-
* @param
|
|
53
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
54
54
|
* @param activity The activity.
|
|
55
55
|
* @returns The TokenProvider for the connection.
|
|
56
56
|
*/
|
|
57
|
-
getTokenProviderFromActivity(
|
|
57
|
+
getTokenProviderFromActivity(identity: JwtPayload, activity: Activity): MsalTokenProvider;
|
|
58
58
|
/**
|
|
59
59
|
* Get the default connection configuration for the agent.
|
|
60
60
|
* @returns The default connection configuration for the agent.
|
|
61
61
|
*/
|
|
62
62
|
getDefaultConnectionConfiguration(): AuthConfiguration;
|
|
63
|
+
private applyConnectionDefaults;
|
|
63
64
|
}
|
|
@@ -31,7 +31,7 @@ class MsalConnectionManager {
|
|
|
31
31
|
if (!conn) {
|
|
32
32
|
throw new Error(`Connection not found: ${connectionName}`);
|
|
33
33
|
}
|
|
34
|
-
return conn;
|
|
34
|
+
return this.applyConnectionDefaults(conn);
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Get the default OAuth connection for the agent.
|
|
@@ -47,12 +47,13 @@ class MsalConnectionManager {
|
|
|
47
47
|
return this.getConnection(item.connection);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
const conn = this._connections.values().next().value;
|
|
51
|
+
return this.applyConnectionDefaults(conn);
|
|
51
52
|
}
|
|
52
53
|
/**
|
|
53
54
|
* Finds a connection based on a map.
|
|
54
55
|
*
|
|
55
|
-
* @param
|
|
56
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
56
57
|
* @param serviceUrl The service URL.
|
|
57
58
|
* @returns The TokenProvider for the connection.
|
|
58
59
|
*
|
|
@@ -67,7 +68,17 @@ class MsalConnectionManager {
|
|
|
67
68
|
* ServiceUrl is: A regex to match with, or "*" for any serviceUrl value.
|
|
68
69
|
* Connection is: A name in the 'Connections' list.
|
|
69
70
|
*/
|
|
70
|
-
getTokenProvider(
|
|
71
|
+
getTokenProvider(identity, serviceUrl) {
|
|
72
|
+
if (!identity) {
|
|
73
|
+
throw new Error('Identity is required to get the token provider.');
|
|
74
|
+
}
|
|
75
|
+
let audience;
|
|
76
|
+
if (Array.isArray(identity === null || identity === void 0 ? void 0 : identity.aud)) {
|
|
77
|
+
audience = identity.aud[0];
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
audience = identity.aud;
|
|
81
|
+
}
|
|
71
82
|
if (!audience || !serviceUrl)
|
|
72
83
|
throw new Error('Audience and Service URL are required to get the token provider.');
|
|
73
84
|
if (this._connectionsMap.length === 0) {
|
|
@@ -93,13 +104,13 @@ class MsalConnectionManager {
|
|
|
93
104
|
}
|
|
94
105
|
/**
|
|
95
106
|
* Finds a connection based on an activity's blueprint.
|
|
96
|
-
* @param
|
|
107
|
+
* @param identity - The identity. Usually TurnContext.identity.
|
|
97
108
|
* @param activity The activity.
|
|
98
109
|
* @returns The TokenProvider for the connection.
|
|
99
110
|
*/
|
|
100
|
-
getTokenProviderFromActivity(
|
|
111
|
+
getTokenProviderFromActivity(identity, activity) {
|
|
101
112
|
var _a, _b, _c, _d;
|
|
102
|
-
let connection = this.getTokenProvider(
|
|
113
|
+
let connection = this.getTokenProvider(identity, activity.serviceUrl || '');
|
|
103
114
|
// This is for the case where the Agentic BlueprintId is not the same as the AppId
|
|
104
115
|
if (connection &&
|
|
105
116
|
(((_a = activity.recipient) === null || _a === void 0 ? void 0 : _a.role) === agents_activity_1.RoleTypes.AgenticIdentity ||
|
|
@@ -118,6 +129,19 @@ class MsalConnectionManager {
|
|
|
118
129
|
getDefaultConnectionConfiguration() {
|
|
119
130
|
return this._serviceConnectionConfiguration;
|
|
120
131
|
}
|
|
132
|
+
applyConnectionDefaults(conn) {
|
|
133
|
+
var _a, _b;
|
|
134
|
+
var _c, _d;
|
|
135
|
+
if (conn.connectionSettings) {
|
|
136
|
+
(_a = (_c = conn.connectionSettings).authority) !== null && _a !== void 0 ? _a : (_c.authority = 'https://login.microsoftonline.com');
|
|
137
|
+
(_b = (_d = conn.connectionSettings).issuers) !== null && _b !== void 0 ? _b : (_d.issuers = [
|
|
138
|
+
'https://api.botframework.com',
|
|
139
|
+
`https://sts.windows.net/${conn.connectionSettings.tenantId}/`,
|
|
140
|
+
`${conn.connectionSettings.authority}/${conn.connectionSettings.tenantId}/v2.0`
|
|
141
|
+
]);
|
|
142
|
+
}
|
|
143
|
+
return conn;
|
|
144
|
+
}
|
|
121
145
|
}
|
|
122
146
|
exports.MsalConnectionManager = MsalConnectionManager;
|
|
123
147
|
MsalConnectionManager.DEFAULT_CONNECTION = 'serviceConnection';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msalConnectionManager.js","sourceRoot":"","sources":["../../../src/auth/msalConnectionManager.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAAgE;
|
|
1
|
+
{"version":3,"file":"msalConnectionManager.js","sourceRoot":"","sources":["../../../src/auth/msalConnectionManager.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAAgE;AAGhE,2DAAuD;AASvD,MAAa,qBAAqB;IAMhC,YACE,4BAA4D,IAAI,GAAG,EAAE,EACrE,iBAAsC,EAAE,EACxC,gBAAmC,EAAE;QACrC,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;QAC7B,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;QACxG,IAAI,CAAC,+BAA+B,GAAG,EAAE,CAAA;QAEzC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,WAAW,IAAI,IAAI,GAAG,EAAE,CAAC,CAAA;QAErI,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC;YACjD,oDAAoD;YACpD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,qCAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;YAC1D,IAAI,IAAI,KAAK,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;gBACtD,IAAI,CAAC,+BAA+B,GAAG,MAAM,CAAA;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAE,cAAsB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,cAAc,EAAE,CAAC,CAAA;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,oBAAoB;QAClB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F,CAAC;QAED,yCAAyC;QACzC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5C,CAAC;QACH,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAA0B,CAAA;QAEzE,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,gBAAgB,CAAE,QAAoB,EAAE,UAAkB;QACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACpE,CAAC;QAED,IAAI,QAAQ,CAAA;QACZ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,EAAE,CAAC;YACjC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAC5B,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAA;QACzB,CAAC;QAED,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;QAEjH,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAA;QACpC,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACxC,IAAI,aAAa,GAAG,IAAI,CAAA;YAExB,qDAAqD;YACrD,IAAI,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBAC9B,aAAa,GAAG,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAA;YAC5C,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,IAAI,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBAC5C,CAAC;gBAED,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;gBAC9C,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,oBAAoB,UAAU,EAAE,CAAC,CAAA;IAChG,CAAC;IAED;;;;;OAKG;IACH,4BAA4B,CAAE,QAAoB,EAAE,QAAkB;;QACpE,IAAI,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,CAAA;QAE3E,kFAAkF;QAClF,IAAI,UAAU;YACZ,CAAC,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,MAAK,2BAAS,CAAC,eAAe;gBACrD,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,IAAI,MAAK,2BAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YACxD,IAAI,CAAA,MAAA,UAAU,CAAC,kBAAkB,0CAAE,0BAA0B;gBACzD,UAAU,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3E,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,MAAA,UAAU,CAAC,kBAAkB,0CAAE,0BAAoC,CAAC,CAAA;YACtG,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED;;;OAGG;IACH,iCAAiC;QAC/B,OAAO,IAAI,CAAC,+BAA+B,CAAA;IAC7C,CAAC;IAEO,uBAAuB,CAAE,IAAuB;;;QACtD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,YAAA,IAAI,CAAC,kBAAkB,EAAC,SAAS,uCAAT,SAAS,GAAK,mCAAmC,EAAA;YACzE,YAAA,IAAI,CAAC,kBAAkB,EAAC,OAAO,uCAAP,OAAO,GAAK;gBAClC,8BAA8B;gBAC9B,2BAA2B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,GAAG;gBAC9D,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAAC,QAAQ,OAAO;aAChF,EAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;;AA5JH,sDA6JC;AAzJyB,wCAAkB,GAAG,mBAAmB,CAAA"}
|
|
@@ -58,7 +58,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
58
58
|
* @returns A promise that resolves to a ConnectorClient instance
|
|
59
59
|
* @protected
|
|
60
60
|
*/
|
|
61
|
-
protected createConnectorClient(serviceUrl: string, scope: string,
|
|
61
|
+
protected createConnectorClient(serviceUrl: string, scope: string, identity: JwtPayload, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
62
62
|
protected createConnectorClientWithIdentity(identity: JwtPayload, activity: Activity, scope: string, headers?: HeaderPropagationCollection): Promise<ConnectorClient>;
|
|
63
63
|
static createIdentity(appId: string): JwtPayload;
|
|
64
64
|
/**
|
|
@@ -77,7 +77,7 @@ export declare class CloudAdapter extends BaseAdapter {
|
|
|
77
77
|
* @returns A promise that resolves to a ConnectorClient instance
|
|
78
78
|
* @protected
|
|
79
79
|
*/
|
|
80
|
-
protected createUserTokenClient(tokenServiceEndpoint?: string, scope?: string, audience?: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
|
|
80
|
+
protected createUserTokenClient(identity: JwtPayload, tokenServiceEndpoint?: string, scope?: string, audience?: string, headers?: HeaderPropagationCollection): Promise<UserTokenClient>;
|
|
81
81
|
/**
|
|
82
82
|
* Sets the user token client on the turn context.
|
|
83
83
|
*
|