@microsoft/agents-hosting 0.5.1-g2e246ff274 → 0.5.12-g2d752e9b13
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/src/app/adaptiveCards/adaptiveCardsActions.js +4 -4
- package/dist/src/app/adaptiveCards/adaptiveCardsActions.js.map +1 -1
- package/dist/src/app/agentApplication.js +1 -1
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/oauth/authorization.d.ts +1 -0
- package/dist/src/app/oauth/authorization.js +3 -4
- package/dist/src/app/oauth/authorization.js.map +1 -1
- package/dist/src/app/streaming/citation.d.ts +25 -0
- package/dist/src/app/streaming/citation.js +7 -0
- package/dist/src/app/streaming/citation.js.map +1 -0
- package/dist/src/app/streaming/citationUtil.d.ts +31 -0
- package/dist/src/app/streaming/citationUtil.js +70 -0
- package/dist/src/app/streaming/citationUtil.js.map +1 -0
- package/dist/src/app/streaming/streamingResponse.d.ts +140 -0
- package/dist/src/app/streaming/streamingResponse.js +333 -0
- package/dist/src/app/streaming/streamingResponse.js.map +1 -0
- package/dist/src/cards/cardFactory.d.ts +2 -2
- package/dist/src/cards/cardFactory.js.map +1 -1
- package/dist/src/oauth/index.d.ts +1 -4
- package/dist/src/oauth/index.js +1 -4
- package/dist/src/oauth/index.js.map +1 -1
- package/dist/src/oauth/oAuthFlow.d.ts +9 -10
- package/dist/src/oauth/oAuthFlow.js +35 -38
- package/dist/src/oauth/oAuthFlow.js.map +1 -1
- package/dist/src/oauth/userTokenClient.d.ts +37 -7
- package/dist/src/oauth/userTokenClient.js +56 -15
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/dist/src/oauth/userTokenClient.types.d.ts +147 -0
- package/dist/src/oauth/{signingResource.js → userTokenClient.types.js} +1 -1
- package/dist/src/oauth/userTokenClient.types.js.map +1 -0
- package/dist/src/turnContext.d.ts +3 -0
- package/dist/src/turnContext.js +5 -0
- package/dist/src/turnContext.js.map +1 -1
- package/package.json +3 -3
- package/src/app/adaptiveCards/adaptiveCardsActions.ts +4 -4
- package/src/app/agentApplication.ts +1 -1
- package/src/app/oauth/authorization.ts +6 -8
- package/src/app/streaming/citation.ts +29 -0
- package/src/app/streaming/citationUtil.ts +76 -0
- package/src/app/streaming/streamingResponse.ts +407 -0
- package/src/cards/cardFactory.ts +2 -3
- package/src/oauth/index.ts +1 -4
- package/src/oauth/oAuthFlow.ts +39 -45
- package/src/oauth/userTokenClient.ts +62 -19
- package/src/oauth/userTokenClient.types.ts +173 -0
- package/src/turnContext.ts +7 -1
- package/dist/src/oauth/oAuthCard.d.ts +0 -27
- package/dist/src/oauth/oAuthCard.js +0 -5
- package/dist/src/oauth/oAuthCard.js.map +0 -1
- package/dist/src/oauth/signingResource.d.ts +0 -43
- package/dist/src/oauth/signingResource.js.map +0 -1
- package/dist/src/oauth/tokenExchangeRequest.d.ts +0 -17
- package/dist/src/oauth/tokenExchangeRequest.js +0 -5
- package/dist/src/oauth/tokenExchangeRequest.js.map +0 -1
- package/dist/src/oauth/tokenResponse.d.ts +0 -29
- package/dist/src/oauth/tokenResponse.js +0 -25
- package/dist/src/oauth/tokenResponse.js.map +0 -1
- package/src/oauth/oAuthCard.ts +0 -30
- package/src/oauth/signingResource.ts +0 -48
- package/src/oauth/tokenExchangeRequest.ts +0 -20
- package/src/oauth/tokenResponse.ts +0 -43
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oAuthFlow.js","sourceRoot":"","sources":["../../../src/oauth/oAuthFlow.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAC5D,kCAAkC;AAClC,wCAAmC;AACnC,gEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"oAuthFlow.js","sourceRoot":"","sources":["../../../src/oauth/oAuthFlow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { AxiosInstance } from 'axios';
|
|
2
|
-
import { SigningResource } from './signingResource';
|
|
3
2
|
import { ConversationReference } from '@microsoft/agents-activity';
|
|
4
|
-
import { TokenExchangeRequest } from './
|
|
5
|
-
import { TokenResponse } from './tokenResponse';
|
|
3
|
+
import { AadResourceUrls, SignInResource, TokenExchangeRequest, TokenOrSinginResourceResponse, TokenResponse, TokenStatus } from './userTokenClient.types';
|
|
6
4
|
/**
|
|
7
5
|
* Client for managing user tokens.
|
|
8
6
|
*/
|
|
9
7
|
export declare class UserTokenClient {
|
|
10
8
|
client: AxiosInstance;
|
|
9
|
+
msAppId: string;
|
|
11
10
|
/**
|
|
12
11
|
* Creates a new instance of UserTokenClient.
|
|
13
12
|
* @param token The token to use for authentication.
|
|
13
|
+
* @param msAppId The Microsoft application ID.
|
|
14
14
|
*/
|
|
15
|
-
constructor(token: string);
|
|
15
|
+
constructor(token: string, appId: string);
|
|
16
16
|
/**
|
|
17
17
|
* Gets the user token.
|
|
18
18
|
* @param connectionName The connection name.
|
|
@@ -32,12 +32,12 @@ export declare class UserTokenClient {
|
|
|
32
32
|
signOut(userId: string, connectionName: string, channelId: string): Promise<void>;
|
|
33
33
|
/**
|
|
34
34
|
* Gets the sign-in resource.
|
|
35
|
-
* @param
|
|
36
|
-
* @param
|
|
35
|
+
* @param msAppId The application ID.
|
|
36
|
+
* @param connectionName The connection name.
|
|
37
37
|
* @param activity The activity.
|
|
38
38
|
* @returns A promise that resolves to the signing resource.
|
|
39
39
|
*/
|
|
40
|
-
getSignInResource(
|
|
40
|
+
getSignInResource(msAppId: string, connectionName: string, conversation: ConversationReference, relatesTo?: ConversationReference): Promise<SignInResource>;
|
|
41
41
|
/**
|
|
42
42
|
* Exchanges the token.
|
|
43
43
|
* @param userId The user ID.
|
|
@@ -47,4 +47,34 @@ export declare class UserTokenClient {
|
|
|
47
47
|
* @returns A promise that resolves to the exchanged token.
|
|
48
48
|
*/
|
|
49
49
|
exchangeTokenAsync(userId: string, connectionName: string, channelId: string, tokenExchangeRequest: TokenExchangeRequest): Promise<TokenResponse>;
|
|
50
|
+
/**
|
|
51
|
+
* Gets the token or sign-in resource.
|
|
52
|
+
* @param userId The user ID.
|
|
53
|
+
* @param connectionName The connection name.
|
|
54
|
+
* @param channelId The channel ID.
|
|
55
|
+
* @param conversation The conversation reference.
|
|
56
|
+
* @param relatesTo The related conversation reference.
|
|
57
|
+
* @param code The code.
|
|
58
|
+
* @param finalRedirect The final redirect URL.
|
|
59
|
+
* @param fwdUrl The forward URL.
|
|
60
|
+
* @returns A promise that resolves to the token or sign-in resource response.
|
|
61
|
+
*/
|
|
62
|
+
getTokenOrSignInResource(userId: string, connectionName: string, channelId: string, conversation: ConversationReference, relatesTo: ConversationReference, code: string, finalRedirect?: string, fwdUrl?: string): Promise<TokenOrSinginResourceResponse>;
|
|
63
|
+
/**
|
|
64
|
+
* Gets the token status.
|
|
65
|
+
* @param userId The user ID.
|
|
66
|
+
* @param channelId The channel ID.
|
|
67
|
+
* @param include The optional include parameter.
|
|
68
|
+
* @returns A promise that resolves to the token status.
|
|
69
|
+
*/
|
|
70
|
+
getTokenStatus(userId: string, channelId: string, include?: string): Promise<TokenStatus[]>;
|
|
71
|
+
/**
|
|
72
|
+
* Gets the AAD tokens.
|
|
73
|
+
* @param userId The user ID.
|
|
74
|
+
* @param connectionName The connection name.
|
|
75
|
+
* @param channelId The channel ID.
|
|
76
|
+
* @param resourceUrls The resource URLs.
|
|
77
|
+
* @returns A promise that resolves to the AAD tokens.
|
|
78
|
+
*/
|
|
79
|
+
getAadTokens(userId: string, connectionName: string, channelId: string, resourceUrls: AadResourceUrls): Promise<Record<string, TokenResponse>>;
|
|
50
80
|
}
|
|
@@ -9,7 +9,6 @@ exports.UserTokenClient = void 0;
|
|
|
9
9
|
const axios_1 = __importDefault(require("axios"));
|
|
10
10
|
const logger_1 = require("../logger");
|
|
11
11
|
const activityWireCompat_1 = require("../activityWireCompat");
|
|
12
|
-
const tokenResponse_1 = require("./tokenResponse");
|
|
13
12
|
const getProductInfo_1 = require("../getProductInfo");
|
|
14
13
|
const logger = (0, logger_1.debug)('agents:user-token-client');
|
|
15
14
|
/**
|
|
@@ -19,8 +18,10 @@ class UserTokenClient {
|
|
|
19
18
|
/**
|
|
20
19
|
* Creates a new instance of UserTokenClient.
|
|
21
20
|
* @param token The token to use for authentication.
|
|
21
|
+
* @param msAppId The Microsoft application ID.
|
|
22
22
|
*/
|
|
23
|
-
constructor(token) {
|
|
23
|
+
constructor(token, appId) {
|
|
24
|
+
this.msAppId = appId;
|
|
24
25
|
const baseURL = 'https://api.botframework.com';
|
|
25
26
|
const axiosInstance = axios_1.default.create({
|
|
26
27
|
baseURL,
|
|
@@ -45,16 +46,13 @@ class UserTokenClient {
|
|
|
45
46
|
try {
|
|
46
47
|
const params = { connectionName, channelId, userId, code };
|
|
47
48
|
const response = await this.client.get('/api/usertoken/GetToken', { params });
|
|
48
|
-
return
|
|
49
|
+
return response.data;
|
|
49
50
|
}
|
|
50
51
|
catch (error) {
|
|
51
52
|
if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== 404) {
|
|
52
53
|
logger.error(error);
|
|
53
54
|
}
|
|
54
|
-
return {
|
|
55
|
-
status: tokenResponse_1.TokenRequestStatus.Failed,
|
|
56
|
-
token: undefined
|
|
57
|
-
};
|
|
55
|
+
return { token: undefined };
|
|
58
56
|
}
|
|
59
57
|
}
|
|
60
58
|
/**
|
|
@@ -79,18 +77,18 @@ class UserTokenClient {
|
|
|
79
77
|
}
|
|
80
78
|
/**
|
|
81
79
|
* Gets the sign-in resource.
|
|
82
|
-
* @param
|
|
83
|
-
* @param
|
|
80
|
+
* @param msAppId The application ID.
|
|
81
|
+
* @param connectionName The connection name.
|
|
84
82
|
* @param activity The activity.
|
|
85
83
|
* @returns A promise that resolves to the signing resource.
|
|
86
84
|
*/
|
|
87
|
-
async getSignInResource(
|
|
85
|
+
async getSignInResource(msAppId, connectionName, conversation, relatesTo) {
|
|
88
86
|
try {
|
|
89
87
|
const tokenExchangeState = {
|
|
90
|
-
connectionName
|
|
91
|
-
conversation
|
|
88
|
+
connectionName,
|
|
89
|
+
conversation,
|
|
92
90
|
relatesTo,
|
|
93
|
-
msAppId
|
|
91
|
+
msAppId
|
|
94
92
|
};
|
|
95
93
|
const tokenExchangeStateNormalized = (0, activityWireCompat_1.normalizeTokenExchangeState)(tokenExchangeState);
|
|
96
94
|
const state = Buffer.from(JSON.stringify(tokenExchangeStateNormalized)).toString('base64');
|
|
@@ -115,13 +113,56 @@ class UserTokenClient {
|
|
|
115
113
|
try {
|
|
116
114
|
const params = { userId, connectionName, channelId };
|
|
117
115
|
const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
|
|
118
|
-
return
|
|
116
|
+
return response.data;
|
|
119
117
|
}
|
|
120
118
|
catch (error) {
|
|
121
119
|
logger.error(error);
|
|
122
|
-
return {
|
|
120
|
+
return { token: undefined };
|
|
123
121
|
}
|
|
124
122
|
}
|
|
123
|
+
/**
|
|
124
|
+
* Gets the token or sign-in resource.
|
|
125
|
+
* @param userId The user ID.
|
|
126
|
+
* @param connectionName The connection name.
|
|
127
|
+
* @param channelId The channel ID.
|
|
128
|
+
* @param conversation The conversation reference.
|
|
129
|
+
* @param relatesTo The related conversation reference.
|
|
130
|
+
* @param code The code.
|
|
131
|
+
* @param finalRedirect The final redirect URL.
|
|
132
|
+
* @param fwdUrl The forward URL.
|
|
133
|
+
* @returns A promise that resolves to the token or sign-in resource response.
|
|
134
|
+
*/
|
|
135
|
+
async getTokenOrSignInResource(userId, connectionName, channelId, conversation, relatesTo, code, finalRedirect = '', fwdUrl = '') {
|
|
136
|
+
const state = Buffer.from(JSON.stringify({ conversation, relatesTo, connectionName, msAppId: this.msAppId })).toString('base64');
|
|
137
|
+
const params = { userId, connectionName, channelId, state, code, finalRedirect, fwdUrl };
|
|
138
|
+
const response = await this.client.get('/api/usertoken/GetTokenOrSignInResource', { params });
|
|
139
|
+
return response.data;
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Gets the token status.
|
|
143
|
+
* @param userId The user ID.
|
|
144
|
+
* @param channelId The channel ID.
|
|
145
|
+
* @param include The optional include parameter.
|
|
146
|
+
* @returns A promise that resolves to the token status.
|
|
147
|
+
*/
|
|
148
|
+
async getTokenStatus(userId, channelId, include = null) {
|
|
149
|
+
const params = { userId, channelId, include };
|
|
150
|
+
const response = await this.client.get('/api/usertoken/GetTokenStatus', { params });
|
|
151
|
+
return response.data;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Gets the AAD tokens.
|
|
155
|
+
* @param userId The user ID.
|
|
156
|
+
* @param connectionName The connection name.
|
|
157
|
+
* @param channelId The channel ID.
|
|
158
|
+
* @param resourceUrls The resource URLs.
|
|
159
|
+
* @returns A promise that resolves to the AAD tokens.
|
|
160
|
+
*/
|
|
161
|
+
async getAadTokens(userId, connectionName, channelId, resourceUrls) {
|
|
162
|
+
const params = { userId, connectionName, channelId };
|
|
163
|
+
const response = await this.client.post('/api/usertoken/GetAadTokens', resourceUrls, { params });
|
|
164
|
+
return response.data;
|
|
165
|
+
}
|
|
125
166
|
}
|
|
126
167
|
exports.UserTokenClient = UserTokenClient;
|
|
127
168
|
//# sourceMappingURL=userTokenClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":";AAAA,4DAA4D;AAC5D,kCAAkC;;;;;;AAElC,kDAA4C;
|
|
1
|
+
{"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { CardAction } from '@microsoft/agents-activity';
|
|
2
|
+
/**
|
|
3
|
+
* Represents the response containing OAuth token information.
|
|
4
|
+
* This interface encapsulates all data related to an OAuth token response.
|
|
5
|
+
*/
|
|
6
|
+
export interface TokenResponse {
|
|
7
|
+
/**
|
|
8
|
+
* The OAuth token string, or undefined if no token is available.
|
|
9
|
+
*/
|
|
10
|
+
token: string | undefined;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Represents a request for exchanging tokens.
|
|
14
|
+
* This interface defines the structure of a token exchange request, including the URI, token, and ID.
|
|
15
|
+
*/
|
|
16
|
+
export interface TokenExchangeRequest {
|
|
17
|
+
/**
|
|
18
|
+
* The URI for the token exchange request.
|
|
19
|
+
*/
|
|
20
|
+
uri?: string;
|
|
21
|
+
/**
|
|
22
|
+
* The token to be exchanged.
|
|
23
|
+
*/
|
|
24
|
+
token?: string;
|
|
25
|
+
/**
|
|
26
|
+
* The ID associated with the token exchange request.
|
|
27
|
+
*/
|
|
28
|
+
id?: string;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Represents a resource for exchanging tokens.
|
|
32
|
+
* This interface defines the structure of a token exchange resource, including its ID, URI, and provider ID.
|
|
33
|
+
*/
|
|
34
|
+
export interface TokenExchangeResource {
|
|
35
|
+
/**
|
|
36
|
+
* The ID of the token exchange resource.
|
|
37
|
+
*/
|
|
38
|
+
id?: string;
|
|
39
|
+
/**
|
|
40
|
+
* The URI of the token exchange resource.
|
|
41
|
+
*/
|
|
42
|
+
uri?: string;
|
|
43
|
+
/**
|
|
44
|
+
* The provider ID for the token exchange resource.
|
|
45
|
+
*/
|
|
46
|
+
providerId?: string;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Represents a resource for posting tokens.
|
|
50
|
+
* This interface defines the structure of a token post resource, including its SAS URL.
|
|
51
|
+
*/
|
|
52
|
+
export interface TokenPostResource {
|
|
53
|
+
/**
|
|
54
|
+
* The SAS URL for the token post resource.
|
|
55
|
+
*/
|
|
56
|
+
sasUrl?: string;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Represents a resource for signing in.
|
|
60
|
+
* This interface defines the structure of a sign-in resource, including the sign-in link, token exchange resource, and token post resource.
|
|
61
|
+
*/
|
|
62
|
+
export interface SignInResource {
|
|
63
|
+
/**
|
|
64
|
+
* The link for signing in.
|
|
65
|
+
*/
|
|
66
|
+
signInLink: string;
|
|
67
|
+
/**
|
|
68
|
+
* The resource for token exchange.
|
|
69
|
+
*/
|
|
70
|
+
tokenExchangeResource: TokenExchangeResource;
|
|
71
|
+
/**
|
|
72
|
+
* The resource for token post.
|
|
73
|
+
*/
|
|
74
|
+
tokenPostResource: TokenPostResource;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Represents an OAuth card.
|
|
78
|
+
* This interface defines the structure of an OAuth card, including its buttons, connection name, text, and associated resources.
|
|
79
|
+
*/
|
|
80
|
+
export interface OAuthCard {
|
|
81
|
+
/**
|
|
82
|
+
* The buttons associated with the OAuth card.
|
|
83
|
+
*/
|
|
84
|
+
buttons: CardAction[];
|
|
85
|
+
/**
|
|
86
|
+
* The connection name for the OAuth card.
|
|
87
|
+
*/
|
|
88
|
+
connectionName: string;
|
|
89
|
+
/**
|
|
90
|
+
* The text content of the OAuth card.
|
|
91
|
+
*/
|
|
92
|
+
text: string;
|
|
93
|
+
/**
|
|
94
|
+
* The token exchange resource for the OAuth card.
|
|
95
|
+
*/
|
|
96
|
+
tokenExchangeResource: TokenExchangeResource;
|
|
97
|
+
/**
|
|
98
|
+
* The token post resource for the OAuth card.
|
|
99
|
+
*/
|
|
100
|
+
tokenPostResource: TokenPostResource;
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Represents a response containing either a token or a sign-in resource.
|
|
104
|
+
* This interface defines the structure of a response that includes a token response and a sign-in resource.
|
|
105
|
+
*/
|
|
106
|
+
export interface TokenOrSinginResourceResponse {
|
|
107
|
+
/**
|
|
108
|
+
* The token response containing OAuth token information.
|
|
109
|
+
*/
|
|
110
|
+
tokenResponse: TokenResponse;
|
|
111
|
+
/**
|
|
112
|
+
* The sign-in resource containing sign-in and token exchange information.
|
|
113
|
+
*/
|
|
114
|
+
signInResource: SignInResource;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Represents the status of a token.
|
|
118
|
+
* This interface defines the structure of a token status, including channel ID, connection name, and other metadata.
|
|
119
|
+
*/
|
|
120
|
+
export interface TokenStatus {
|
|
121
|
+
/**
|
|
122
|
+
* The ID of the channel associated with the token.
|
|
123
|
+
*/
|
|
124
|
+
channelId: string;
|
|
125
|
+
/**
|
|
126
|
+
* The connection name associated with the token.
|
|
127
|
+
*/
|
|
128
|
+
connectionName: string;
|
|
129
|
+
/**
|
|
130
|
+
* Indicates whether a token is available.
|
|
131
|
+
*/
|
|
132
|
+
hasToken: boolean;
|
|
133
|
+
/**
|
|
134
|
+
* The display name of the service provider.
|
|
135
|
+
*/
|
|
136
|
+
serviceProviderDisplayName: string;
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Represents a collection of Azure Active Directory (AAD) resource URLs.
|
|
140
|
+
* This interface defines the structure of a collection of resource URLs.
|
|
141
|
+
*/
|
|
142
|
+
export interface AadResourceUrls {
|
|
143
|
+
/**
|
|
144
|
+
* An array of resource URLs.
|
|
145
|
+
*/
|
|
146
|
+
resourceUrls: string[];
|
|
147
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userTokenClient.types.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.types.ts"],"names":[],"mappings":";AAAA,4DAA4D;AAC5D,kCAAkC"}
|
|
@@ -4,6 +4,7 @@ import { ResourceResponse } from './connector-client/resourceResponse';
|
|
|
4
4
|
import { TurnContextStateCollection } from './turnContextStateCollection';
|
|
5
5
|
import { AttachmentInfo } from './connector-client/attachmentInfo';
|
|
6
6
|
import { AttachmentData } from './connector-client/attachmentData';
|
|
7
|
+
import { StreamingResponse } from './app/streaming/streamingResponse';
|
|
7
8
|
/**
|
|
8
9
|
* Defines a handler for processing and sending activities.
|
|
9
10
|
* Used for middleware that needs to intercept or modify activities being sent.
|
|
@@ -66,6 +67,7 @@ export declare class TurnContext {
|
|
|
66
67
|
private readonly _onDeleteActivity;
|
|
67
68
|
private readonly _turn;
|
|
68
69
|
private readonly _locale;
|
|
70
|
+
private readonly _streamingResponse;
|
|
69
71
|
/**
|
|
70
72
|
* Initializes a new instance of the TurnContext class.
|
|
71
73
|
*
|
|
@@ -229,6 +231,7 @@ export declare class TurnContext {
|
|
|
229
231
|
* the processing of the current turn.
|
|
230
232
|
*/
|
|
231
233
|
get turnState(): TurnContextStateCollection;
|
|
234
|
+
get streamingResponse(): StreamingResponse;
|
|
232
235
|
/**
|
|
233
236
|
* Emits events to registered middleware handlers.
|
|
234
237
|
*
|
package/dist/src/turnContext.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.TurnContext = exports.AgentCallbackHandlerKey = void 0;
|
|
|
5
5
|
const activityHandler_1 = require("./activityHandler");
|
|
6
6
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
7
7
|
const turnContextStateCollection_1 = require("./turnContextStateCollection");
|
|
8
|
+
const streamingResponse_1 = require("./app/streaming/streamingResponse");
|
|
8
9
|
/**
|
|
9
10
|
* Key for the agent callback handler in TurnState collection.
|
|
10
11
|
*/
|
|
@@ -48,6 +49,7 @@ class TurnContext {
|
|
|
48
49
|
this._adapter = adapterOrContext;
|
|
49
50
|
this._activity = request;
|
|
50
51
|
}
|
|
52
|
+
this._streamingResponse = new streamingResponse_1.StreamingResponse(this);
|
|
51
53
|
}
|
|
52
54
|
/**
|
|
53
55
|
* Sends a trace activity for debugging purposes.
|
|
@@ -327,6 +329,9 @@ class TurnContext {
|
|
|
327
329
|
get turnState() {
|
|
328
330
|
return this._turnState;
|
|
329
331
|
}
|
|
332
|
+
get streamingResponse() {
|
|
333
|
+
return this._streamingResponse;
|
|
334
|
+
}
|
|
330
335
|
/**
|
|
331
336
|
* Emits events to registered middleware handlers.
|
|
332
337
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turnContext.js","sourceRoot":"","sources":["../../src/turnContext.ts"],"names":[],"mappings":";;;AAAA,oGAAoG;AACpG,uDAAuD;AAEvD,gEAAsH;AAEtH,6EAAyE;
|
|
1
|
+
{"version":3,"file":"turnContext.js","sourceRoot":"","sources":["../../src/turnContext.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": "0.5.
|
|
4
|
+
"version": "0.5.12-g2d752e9b13",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"main": "dist/src/index.js",
|
|
20
20
|
"types": "dist/src/index.d.ts",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@azure/msal-node": "^3.
|
|
23
|
-
"@microsoft/agents-activity": "0.5.
|
|
22
|
+
"@azure/msal-node": "^3.6.0",
|
|
23
|
+
"@microsoft/agents-activity": "0.5.12-g2d752e9b13",
|
|
24
24
|
"axios": "^1.9.0",
|
|
25
25
|
"debug": "^4.3.7",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
@@ -219,10 +219,10 @@ export class AdaptiveCardsActions<TState extends TurnState> {
|
|
|
219
219
|
}
|
|
220
220
|
}
|
|
221
221
|
|
|
222
|
-
await context.sendActivity({
|
|
222
|
+
await context.sendActivity(Activity.fromObject({
|
|
223
223
|
value: { body: response, status: 200 } as InvokeResponse,
|
|
224
224
|
type: ActivityTypes.InvokeResponse
|
|
225
|
-
}
|
|
225
|
+
}))
|
|
226
226
|
}
|
|
227
227
|
},
|
|
228
228
|
true
|
|
@@ -313,8 +313,8 @@ function createSearchSelector (dataset: string | RegExp | RouteSelector): RouteS
|
|
|
313
313
|
}
|
|
314
314
|
|
|
315
315
|
async function sendInvokeResponse (context: TurnContext, response: AdaptiveCardInvokeResponse) {
|
|
316
|
-
await context.sendActivity({
|
|
316
|
+
await context.sendActivity(Activity.fromObject({
|
|
317
317
|
value: { body: response, status: 200 } as InvokeResponse,
|
|
318
318
|
type: ActivityTypes.InvokeResponse
|
|
319
|
-
}
|
|
319
|
+
}))
|
|
320
320
|
}
|
|
@@ -741,7 +741,7 @@ export class AgentApplication<TState extends TurnState> {
|
|
|
741
741
|
const k = keyword.toString().toLocaleLowerCase()
|
|
742
742
|
return (context: TurnContext) => {
|
|
743
743
|
if (context?.activity?.type === ActivityTypes.Message && context.activity.text) {
|
|
744
|
-
return Promise.resolve(context.activity.text.toLocaleLowerCase()
|
|
744
|
+
return Promise.resolve(context.activity.text.toLocaleLowerCase() === k)
|
|
745
745
|
} else {
|
|
746
746
|
return Promise.resolve(false)
|
|
747
747
|
}
|
|
@@ -7,8 +7,7 @@ import { TurnContext } from '../../turnContext'
|
|
|
7
7
|
import { debug } from '../../logger'
|
|
8
8
|
import { TurnState } from '../turnState'
|
|
9
9
|
import { Storage } from '../../storage'
|
|
10
|
-
import { OAuthFlow,
|
|
11
|
-
import { UserState } from '../../state'
|
|
10
|
+
import { OAuthFlow, TokenResponse } from '../../oauth'
|
|
12
11
|
|
|
13
12
|
const logger = debug('agents:authorization')
|
|
14
13
|
|
|
@@ -48,11 +47,10 @@ export class Authorization {
|
|
|
48
47
|
* @param {AuthorizationHandlers} authHandlers - Configuration for OAuth providers
|
|
49
48
|
* @throws {Error} If storage is null/undefined or no auth handlers are provided
|
|
50
49
|
*/
|
|
51
|
-
constructor (storage: Storage, authHandlers: AuthorizationHandlers) {
|
|
50
|
+
constructor (private storage: Storage, authHandlers: AuthorizationHandlers) {
|
|
52
51
|
if (storage === undefined || storage === null) {
|
|
53
52
|
throw new Error('Storage is required for UserAuthorization')
|
|
54
53
|
}
|
|
55
|
-
const userState = new UserState(storage)
|
|
56
54
|
if (authHandlers === undefined || Object.keys(authHandlers).length === 0) {
|
|
57
55
|
throw new Error('The authorization does not have any auth handlers')
|
|
58
56
|
}
|
|
@@ -66,7 +64,7 @@ export class Authorization {
|
|
|
66
64
|
currentAuthHandler.title = currentAuthHandler.title ?? process.env[ah + '_connectionTitle'] as string
|
|
67
65
|
currentAuthHandler.text = currentAuthHandler.text ?? process.env[ah + '_connectionText'] as string
|
|
68
66
|
currentAuthHandler.auto = currentAuthHandler.auto ?? process.env[ah + '_connectionAuto'] === 'true'
|
|
69
|
-
currentAuthHandler.flow = new OAuthFlow(
|
|
67
|
+
currentAuthHandler.flow = new OAuthFlow(this.storage, currentAuthHandler.name, null!, currentAuthHandler.title, currentAuthHandler.text)
|
|
70
68
|
}
|
|
71
69
|
logger.info('Authorization handlers configured with', this._authHandlers.length, 'handlers')
|
|
72
70
|
}
|
|
@@ -93,18 +91,18 @@ export class Authorization {
|
|
|
93
91
|
public async beginOrContinueFlow (context: TurnContext, state: TurnState, authHandlerId?: string) : Promise<TokenResponse> {
|
|
94
92
|
logger.info('beginOrContinueFlow for authHandlerId:', authHandlerId)
|
|
95
93
|
const flow = this.resolverHandler(authHandlerId).flow!
|
|
96
|
-
let tokenResponse: TokenResponse
|
|
94
|
+
let tokenResponse: TokenResponse | undefined
|
|
97
95
|
if (flow.state!.flowStarted === false) {
|
|
98
96
|
tokenResponse = await flow.beginFlow(context)
|
|
99
97
|
} else {
|
|
100
98
|
tokenResponse = await flow.continueFlow(context)
|
|
101
|
-
if (tokenResponse
|
|
99
|
+
if (tokenResponse && tokenResponse.token) {
|
|
102
100
|
if (this._signInHandler) {
|
|
103
101
|
await this._signInHandler(context, state, authHandlerId)
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
104
|
}
|
|
107
|
-
return tokenResponse
|
|
105
|
+
return tokenResponse!
|
|
108
106
|
}
|
|
109
107
|
|
|
110
108
|
/**
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Citations returned by the model.
|
|
8
|
+
*/
|
|
9
|
+
export interface Citation {
|
|
10
|
+
/**
|
|
11
|
+
* The content of the citation.
|
|
12
|
+
*/
|
|
13
|
+
content: string;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* The title of the citation.
|
|
17
|
+
*/
|
|
18
|
+
title: string | null;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* The URL of the citation.
|
|
22
|
+
*/
|
|
23
|
+
url: string | null;
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* The filepath of the document.
|
|
27
|
+
*/
|
|
28
|
+
filepath: string | null;
|
|
29
|
+
}
|