@microsoft/agents-hosting 1.5.2 → 1.5.3
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
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.5.
|
|
4
|
+
"version": "1.5.3",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "1.10.1",
|
|
23
23
|
"@azure/msal-node": "5.0.6",
|
|
24
|
-
"@microsoft/agents-activity": "1.5.
|
|
25
|
-
"@microsoft/agents-telemetry": "1.5.
|
|
24
|
+
"@microsoft/agents-activity": "1.5.3",
|
|
25
|
+
"@microsoft/agents-telemetry": "1.5.3",
|
|
26
26
|
"axios": "1.15.0",
|
|
27
27
|
"jsonwebtoken": "9.0.3",
|
|
28
28
|
"jwks-rsa": "4.0.1",
|
|
@@ -232,7 +232,7 @@ class AzureBotAuthorization {
|
|
|
232
232
|
const { activity } = context;
|
|
233
233
|
const userTokenClient = await this.getUserTokenClient(context);
|
|
234
234
|
// Using getTokenOrSignInResource instead of getUserToken to avoid HTTP 404 errors.
|
|
235
|
-
const { tokenResponse } = await userTokenClient.getTokenOrSignInResource((_a = activity.from) === null || _a === void 0 ? void 0 : _a.id, this.options.azureBotOAuthConnectionName, activity.channelId, activity.getConversationReference(), activity.relatesTo, '');
|
|
235
|
+
const { tokenResponse } = await userTokenClient.getTokenOrSignInResource((_a = activity.from) === null || _a === void 0 ? void 0 : _a.id, this.options.azureBotOAuthConnectionName, activity.channelId, activity.getConversationReference({ forceBaseChannel: true }), activity.relatesTo, '');
|
|
236
236
|
return tokenResponse === null || tokenResponse === void 0 ? void 0 : tokenResponse.token;
|
|
237
237
|
}
|
|
238
238
|
return token;
|
|
@@ -291,7 +291,7 @@ class AzureBotAuthorization {
|
|
|
291
291
|
var _a;
|
|
292
292
|
const { activity } = context;
|
|
293
293
|
const userTokenClient = await this.getUserTokenClient(context);
|
|
294
|
-
const { tokenResponse, signInResource } = await userTokenClient.getTokenOrSignInResource((_a = activity.from) === null || _a === void 0 ? void 0 : _a.id, this.options.azureBotOAuthConnectionName, activity.channelId, activity.getConversationReference(), activity.relatesTo, code !== null && code !== void 0 ? code : '');
|
|
294
|
+
const { tokenResponse, signInResource } = await userTokenClient.getTokenOrSignInResource((_a = activity.from) === null || _a === void 0 ? void 0 : _a.id, this.options.azureBotOAuthConnectionName, activity.channelId, activity.getConversationReference({ forceBaseChannel: true }), activity.relatesTo, code !== null && code !== void 0 ? code : '');
|
|
295
295
|
if (!tokenResponse && active && code) {
|
|
296
296
|
reason.message = 'Invalid code entered. Restarting sign-in flow';
|
|
297
297
|
logger.warn(this.prefix(reason.message), activity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureBotAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/azureBotAuthorization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"azureBotAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/azureBotAuthorization.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.5.
|
|
4
|
+
"version": "1.5.3",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "1.10.1",
|
|
23
23
|
"@azure/msal-node": "5.0.6",
|
|
24
|
-
"@microsoft/agents-activity": "1.5.
|
|
25
|
-
"@microsoft/agents-telemetry": "1.5.
|
|
24
|
+
"@microsoft/agents-activity": "1.5.3",
|
|
25
|
+
"@microsoft/agents-telemetry": "1.5.3",
|
|
26
26
|
"axios": "1.15.0",
|
|
27
27
|
"jsonwebtoken": "9.0.3",
|
|
28
28
|
"jwks-rsa": "4.0.1",
|
|
@@ -334,7 +334,7 @@ export class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
334
334
|
const { activity } = context
|
|
335
335
|
const userTokenClient = await this.getUserTokenClient(context)
|
|
336
336
|
// Using getTokenOrSignInResource instead of getUserToken to avoid HTTP 404 errors.
|
|
337
|
-
const { tokenResponse } = await userTokenClient.getTokenOrSignInResource(activity.from?.id!, this.options.azureBotOAuthConnectionName!, activity.channelId!, activity.getConversationReference(), activity.relatesTo!, '')
|
|
337
|
+
const { tokenResponse } = await userTokenClient.getTokenOrSignInResource(activity.from?.id!, this.options.azureBotOAuthConnectionName!, activity.channelId!, activity.getConversationReference({ forceBaseChannel: true }), activity.relatesTo!, '')
|
|
338
338
|
return tokenResponse?.token
|
|
339
339
|
}
|
|
340
340
|
|
|
@@ -399,7 +399,7 @@ export class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
399
399
|
const { activity } = context
|
|
400
400
|
|
|
401
401
|
const userTokenClient = await this.getUserTokenClient(context)
|
|
402
|
-
const { tokenResponse, signInResource } = await userTokenClient.getTokenOrSignInResource(activity.from?.id!, this.options.azureBotOAuthConnectionName!, activity.channelId!, activity.getConversationReference(), activity.relatesTo!, code ?? '')
|
|
402
|
+
const { tokenResponse, signInResource } = await userTokenClient.getTokenOrSignInResource(activity.from?.id!, this.options.azureBotOAuthConnectionName!, activity.channelId!, activity.getConversationReference({ forceBaseChannel: true }), activity.relatesTo!, code ?? '')
|
|
403
403
|
|
|
404
404
|
if (!tokenResponse && active && code) {
|
|
405
405
|
reason.message = 'Invalid code entered. Restarting sign-in flow'
|