@microsoft/agents-hosting 1.1.4-g8d884129e7 → 1.1.4-geb1c05c291
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +2 -2
- package/dist/src/app/auth/handlers/agenticAuthorization.d.ts +4 -0
- package/dist/src/app/auth/handlers/agenticAuthorization.js +12 -7
- package/dist/src/app/auth/handlers/agenticAuthorization.js.map +1 -1
- package/dist/src/auth/msalTokenProvider.js +2 -5
- package/dist/src/auth/msalTokenProvider.js.map +1 -1
- package/package.json +2 -2
- package/src/app/auth/handlers/agenticAuthorization.ts +13 -7
- package/src/auth/msalTokenProvider.ts +2 -5
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.4-
|
|
4
|
+
"version": "1.1.4-geb1c05c291",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.2",
|
|
24
|
-
"@microsoft/agents-activity": "1.1.4-
|
|
24
|
+
"@microsoft/agents-activity": "1.1.4-geb1c05c291",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -80,10 +80,14 @@ export declare class AgenticAuthorization implements AuthorizationHandler {
|
|
|
80
80
|
private _key;
|
|
81
81
|
/**
|
|
82
82
|
* Sets the authorization context in the turn state.
|
|
83
|
+
* @param context The turn context in which to set the authorization data.
|
|
84
|
+
* @param scopes The OAuth scopes associated with the authorization context.
|
|
85
|
+
* @param data The token response to store in the turn state.
|
|
83
86
|
*/
|
|
84
87
|
private setContext;
|
|
85
88
|
/**
|
|
86
89
|
* Gets the authorization context from the turn state.
|
|
90
|
+
* @param scopes The OAuth scopes for which the context is being retrieved.
|
|
87
91
|
*/
|
|
88
92
|
private getContext;
|
|
89
93
|
/**
|
|
@@ -60,7 +60,8 @@ class AgenticAuthorization {
|
|
|
60
60
|
async token(context, options) {
|
|
61
61
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
62
62
|
try {
|
|
63
|
-
const
|
|
63
|
+
const scopes = (options === null || options === void 0 ? void 0 : options.scopes) || this._options.scopes;
|
|
64
|
+
const tokenResponse = this.getContext(context, scopes);
|
|
64
65
|
if (tokenResponse.token) {
|
|
65
66
|
logger.debug(this.prefix('Using cached Agentic user token'));
|
|
66
67
|
return tokenResponse;
|
|
@@ -72,8 +73,8 @@ class AgenticAuthorization {
|
|
|
72
73
|
else {
|
|
73
74
|
connection = this.settings.connections.getTokenProvider(context.identity, (_b = context.activity.serviceUrl) !== null && _b !== void 0 ? _b : '');
|
|
74
75
|
}
|
|
75
|
-
const token = await connection.getAgenticUserToken((_c = context.activity.getAgenticTenantId()) !== null && _c !== void 0 ? _c : '', (_d = context.activity.getAgenticInstanceId()) !== null && _d !== void 0 ? _d : '', (_e = context.activity.getAgenticUser()) !== null && _e !== void 0 ? _e : '',
|
|
76
|
-
this.setContext(context, { token });
|
|
76
|
+
const token = await connection.getAgenticUserToken((_c = context.activity.getAgenticTenantId()) !== null && _c !== void 0 ? _c : '', (_d = context.activity.getAgenticInstanceId()) !== null && _d !== void 0 ? _d : '', (_e = context.activity.getAgenticUser()) !== null && _e !== void 0 ? _e : '', scopes);
|
|
77
|
+
this.setContext(context, scopes, { token });
|
|
77
78
|
(_f = this._onSuccess) === null || _f === void 0 ? void 0 : _f.call(this, context);
|
|
78
79
|
return { token };
|
|
79
80
|
}
|
|
@@ -104,16 +105,20 @@ class AgenticAuthorization {
|
|
|
104
105
|
}
|
|
105
106
|
/**
|
|
106
107
|
* Sets the authorization context in the turn state.
|
|
108
|
+
* @param context The turn context in which to set the authorization data.
|
|
109
|
+
* @param scopes The OAuth scopes associated with the authorization context.
|
|
110
|
+
* @param data The token response to store in the turn state.
|
|
107
111
|
*/
|
|
108
|
-
setContext(context, data) {
|
|
109
|
-
return context.turnState.set(this._key
|
|
112
|
+
setContext(context, scopes, data) {
|
|
113
|
+
return context.turnState.set(`${this._key}:${scopes.join(';')}`, () => data);
|
|
110
114
|
}
|
|
111
115
|
/**
|
|
112
116
|
* Gets the authorization context from the turn state.
|
|
117
|
+
* @param scopes The OAuth scopes for which the context is being retrieved.
|
|
113
118
|
*/
|
|
114
|
-
getContext(context) {
|
|
119
|
+
getContext(context, scopes) {
|
|
115
120
|
var _a;
|
|
116
|
-
const result = context.turnState.get(this._key);
|
|
121
|
+
const result = context.turnState.get(`${this._key}:${scopes.join(';')}`);
|
|
117
122
|
return (_a = result === null || result === void 0 ? void 0 : result()) !== null && _a !== void 0 ? _a : { token: undefined };
|
|
118
123
|
}
|
|
119
124
|
/**
|
|
@@ -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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"}
|
|
@@ -236,11 +236,8 @@ class MsalTokenProvider {
|
|
|
236
236
|
throw new Error('Connection settings must be provided when calling getAgenticApplicationToken');
|
|
237
237
|
}
|
|
238
238
|
logger.debug('Getting agentic application token');
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
clientAssertion = await this.fetchExternalToken(this.connectionSettings.FICClientId);
|
|
242
|
-
}
|
|
243
|
-
const token = await this.acquireTokenByForAgenticScenarios(tenantId, this.connectionSettings.clientId, clientAssertion, ['api://AzureAdTokenExchange/.default'], { grant_type: 'client_credentials',
|
|
239
|
+
const token = await this.acquireTokenByForAgenticScenarios(tenantId, this.connectionSettings.clientId, undefined, ['api://AzureAdTokenExchange/.default'], {
|
|
240
|
+
grant_type: 'client_credentials',
|
|
244
241
|
fmi_path: agentAppInstanceId,
|
|
245
242
|
});
|
|
246
243
|
if (!token) {
|
|
@@ -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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"}
|
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.4-
|
|
4
|
+
"version": "1.1.4-geb1c05c291",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.2",
|
|
24
|
-
"@microsoft/agents-activity": "1.1.4-
|
|
24
|
+
"@microsoft/agents-activity": "1.1.4-geb1c05c291",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -98,7 +98,9 @@ export class AgenticAuthorization implements AuthorizationHandler {
|
|
|
98
98
|
*/
|
|
99
99
|
async token (context: TurnContext, options?: AuthorizationHandlerTokenOptions): Promise<TokenResponse> {
|
|
100
100
|
try {
|
|
101
|
-
const
|
|
101
|
+
const scopes = options?.scopes || this._options.scopes!
|
|
102
|
+
|
|
103
|
+
const tokenResponse = this.getContext(context, scopes)
|
|
102
104
|
if (tokenResponse.token) {
|
|
103
105
|
logger.debug(this.prefix('Using cached Agentic user token'))
|
|
104
106
|
return tokenResponse
|
|
@@ -116,10 +118,10 @@ export class AgenticAuthorization implements AuthorizationHandler {
|
|
|
116
118
|
context.activity.getAgenticTenantId() ?? '',
|
|
117
119
|
context.activity.getAgenticInstanceId() ?? '',
|
|
118
120
|
context.activity.getAgenticUser() ?? '',
|
|
119
|
-
|
|
121
|
+
scopes
|
|
120
122
|
)
|
|
121
123
|
|
|
122
|
-
this.setContext(context, { token })
|
|
124
|
+
this.setContext(context, scopes, { token })
|
|
123
125
|
this._onSuccess?.(context)
|
|
124
126
|
return { token }
|
|
125
127
|
} catch (error) {
|
|
@@ -155,16 +157,20 @@ export class AgenticAuthorization implements AuthorizationHandler {
|
|
|
155
157
|
|
|
156
158
|
/**
|
|
157
159
|
* Sets the authorization context in the turn state.
|
|
160
|
+
* @param context The turn context in which to set the authorization data.
|
|
161
|
+
* @param scopes The OAuth scopes associated with the authorization context.
|
|
162
|
+
* @param data The token response to store in the turn state.
|
|
158
163
|
*/
|
|
159
|
-
private setContext (context: TurnContext, data: TokenResponse) {
|
|
160
|
-
return context.turnState.set(this._key
|
|
164
|
+
private setContext (context: TurnContext, scopes: string[], data: TokenResponse) {
|
|
165
|
+
return context.turnState.set(`${this._key}:${scopes.join(';')}`, () => data)
|
|
161
166
|
}
|
|
162
167
|
|
|
163
168
|
/**
|
|
164
169
|
* Gets the authorization context from the turn state.
|
|
170
|
+
* @param scopes The OAuth scopes for which the context is being retrieved.
|
|
165
171
|
*/
|
|
166
|
-
private getContext (context: TurnContext): TokenResponse {
|
|
167
|
-
const result = context.turnState.get(this._key)
|
|
172
|
+
private getContext (context: TurnContext, scopes: string[]): TokenResponse {
|
|
173
|
+
const result = context.turnState.get(`${this._key}:${scopes.join(';')}`)
|
|
168
174
|
return result?.() ?? { token: undefined }
|
|
169
175
|
}
|
|
170
176
|
|
|
@@ -252,11 +252,8 @@ export class MsalTokenProvider implements AuthProvider {
|
|
|
252
252
|
throw new Error('Connection settings must be provided when calling getAgenticApplicationToken')
|
|
253
253
|
}
|
|
254
254
|
logger.debug('Getting agentic application token')
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
clientAssertion = await this.fetchExternalToken(this.connectionSettings.FICClientId as string)
|
|
258
|
-
}
|
|
259
|
-
const token = await this.acquireTokenByForAgenticScenarios(tenantId, this.connectionSettings.clientId, clientAssertion, ['api://AzureAdTokenExchange/.default'], { grant_type: 'client_credentials',
|
|
255
|
+
const token = await this.acquireTokenByForAgenticScenarios(tenantId, this.connectionSettings.clientId, undefined, ['api://AzureAdTokenExchange/.default'], {
|
|
256
|
+
grant_type: 'client_credentials',
|
|
260
257
|
fmi_path: agentAppInstanceId,
|
|
261
258
|
})
|
|
262
259
|
|