@microsoft/agents-hosting 0.6.17-g5d9066ba37 → 0.6.21-g3c2261b2fc
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/agentApplication.js +7 -3
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/authorization.d.ts +2 -2
- package/dist/src/app/authorization.js +2 -2
- package/dist/src/app/authorization.js.map +1 -1
- package/dist/src/auth/jwt-middleware.js +3 -3
- package/dist/src/auth/jwt-middleware.js.map +1 -1
- package/dist/src/auth/msalTokenProvider.js +3 -3
- package/dist/src/auth/msalTokenProvider.js.map +1 -1
- package/dist/src/baseAdapter.d.ts +5 -0
- package/dist/src/baseAdapter.js +4 -0
- package/dist/src/baseAdapter.js.map +1 -1
- package/dist/src/cloudAdapter.d.ts +2 -1
- package/dist/src/cloudAdapter.js +6 -8
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/oauth/oAuthFlow.d.ts +2 -2
- package/dist/src/oauth/oAuthFlow.js +20 -12
- package/dist/src/oauth/oAuthFlow.js.map +1 -1
- package/dist/src/oauth/userTokenClient.d.ts +3 -2
- package/dist/src/oauth/userTokenClient.js +54 -48
- package/dist/src/oauth/userTokenClient.js.map +1 -1
- package/dist/src/storage/memoryStorage.js +3 -3
- package/dist/src/storage/memoryStorage.js.map +1 -1
- package/package.json +2 -2
- package/src/app/agentApplication.ts +5 -2
- package/src/app/authorization.ts +3 -3
- package/src/auth/jwt-middleware.ts +3 -3
- package/src/auth/msalTokenProvider.ts +3 -3
- package/src/baseAdapter.ts +6 -0
- package/src/cloudAdapter.ts +6 -10
- package/src/oauth/oAuthFlow.ts +18 -12
- package/src/oauth/userTokenClient.ts +55 -43
- package/src/storage/memoryStorage.ts +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oAuthFlow.js","sourceRoot":"","sources":["../../../src/oauth/oAuthFlow.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oAuthFlow.js","sourceRoot":"","sources":["../../../src/oauth/oAuthFlow.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,14 @@ import { AadResourceUrls, SignInResource, TokenExchangeRequest, TokenOrSinginRes
|
|
|
5
5
|
* Client for managing user tokens.
|
|
6
6
|
*/
|
|
7
7
|
export declare class UserTokenClient {
|
|
8
|
+
private msAppId;
|
|
8
9
|
client: AxiosInstance;
|
|
9
|
-
msAppId: string;
|
|
10
10
|
/**
|
|
11
11
|
* Creates a new instance of UserTokenClient.
|
|
12
12
|
* @param token The token to use for authentication.
|
|
13
13
|
* @param msAppId The Microsoft application ID.
|
|
14
14
|
*/
|
|
15
|
-
constructor(
|
|
15
|
+
constructor(msAppId: string);
|
|
16
16
|
/**
|
|
17
17
|
* Gets the user token.
|
|
18
18
|
* @param connectionName The connection name.
|
|
@@ -77,4 +77,5 @@ export declare class UserTokenClient {
|
|
|
77
77
|
* @returns A promise that resolves to the AAD tokens.
|
|
78
78
|
*/
|
|
79
79
|
getAadTokens(userId: string, connectionName: string, channelId: string, resourceUrls: AadResourceUrls): Promise<Record<string, TokenResponse>>;
|
|
80
|
+
updateAuthToken(token: string): void;
|
|
80
81
|
}
|
|
@@ -20,8 +20,8 @@ class UserTokenClient {
|
|
|
20
20
|
* @param token The token to use for authentication.
|
|
21
21
|
* @param msAppId The Microsoft application ID.
|
|
22
22
|
*/
|
|
23
|
-
constructor(
|
|
24
|
-
this.msAppId =
|
|
23
|
+
constructor(msAppId) {
|
|
24
|
+
this.msAppId = msAppId;
|
|
25
25
|
const baseURL = 'https://api.botframework.com';
|
|
26
26
|
const axiosInstance = axios_1.default.create({
|
|
27
27
|
baseURL,
|
|
@@ -30,7 +30,33 @@ class UserTokenClient {
|
|
|
30
30
|
'User-Agent': (0, getProductInfo_1.getProductInfo)(),
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
|
-
axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}
|
|
33
|
+
// axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`
|
|
34
|
+
axiosInstance.interceptors.response.use((config) => {
|
|
35
|
+
const { status, statusText, config: requestConfig } = config;
|
|
36
|
+
logger.debug('Response: ', {
|
|
37
|
+
status,
|
|
38
|
+
statusText,
|
|
39
|
+
host: axiosInstance.getUri(),
|
|
40
|
+
url: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.url,
|
|
41
|
+
data: config.config.data,
|
|
42
|
+
method: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.method,
|
|
43
|
+
});
|
|
44
|
+
return config;
|
|
45
|
+
}, (error) => {
|
|
46
|
+
const { code, status, message, stack, response } = error;
|
|
47
|
+
if (status !== 404) {
|
|
48
|
+
const errorDetails = {
|
|
49
|
+
code,
|
|
50
|
+
host: axiosInstance.getUri(),
|
|
51
|
+
url: error.config.url,
|
|
52
|
+
method: error.config.method,
|
|
53
|
+
data: error.config.data,
|
|
54
|
+
message: message + JSON.stringify(response === null || response === void 0 ? void 0 : response.data),
|
|
55
|
+
stack,
|
|
56
|
+
};
|
|
57
|
+
return Promise.reject(errorDetails);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
34
60
|
this.client = axiosInstance;
|
|
35
61
|
}
|
|
36
62
|
/**
|
|
@@ -42,18 +68,12 @@ class UserTokenClient {
|
|
|
42
68
|
* @returns A promise that resolves to the user token.
|
|
43
69
|
*/
|
|
44
70
|
async getUserToken(connectionName, channelId, userId, code) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const response = await this.client.get('/api/usertoken/GetToken', { params });
|
|
71
|
+
const params = { connectionName, channelId, userId, code };
|
|
72
|
+
const response = await this.client.get('/api/usertoken/GetToken', { params });
|
|
73
|
+
if (response === null || response === void 0 ? void 0 : response.data) {
|
|
49
74
|
return response.data;
|
|
50
75
|
}
|
|
51
|
-
|
|
52
|
-
if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== 404) {
|
|
53
|
-
logger.error(error);
|
|
54
|
-
}
|
|
55
|
-
return { token: undefined };
|
|
56
|
-
}
|
|
76
|
+
return { token: undefined };
|
|
57
77
|
}
|
|
58
78
|
/**
|
|
59
79
|
* Signs the user out.
|
|
@@ -63,15 +83,9 @@ class UserTokenClient {
|
|
|
63
83
|
* @returns A promise that resolves when the sign-out operation is complete.
|
|
64
84
|
*/
|
|
65
85
|
async signOut(userId, connectionName, channelId) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
if (response.status !== 200) {
|
|
70
|
-
throw new Error('Failed to sign out');
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
catch (error) {
|
|
74
|
-
logger.error(error);
|
|
86
|
+
const params = { userId, connectionName, channelId };
|
|
87
|
+
const response = await this.client.delete('/api/usertoken/SignOut', { params });
|
|
88
|
+
if (response.status !== 200) {
|
|
75
89
|
throw new Error('Failed to sign out');
|
|
76
90
|
}
|
|
77
91
|
}
|
|
@@ -83,23 +97,17 @@ class UserTokenClient {
|
|
|
83
97
|
* @returns A promise that resolves to the signing resource.
|
|
84
98
|
*/
|
|
85
99
|
async getSignInResource(msAppId, connectionName, conversation, relatesTo) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
return response.data;
|
|
98
|
-
}
|
|
99
|
-
catch (error) {
|
|
100
|
-
logger.error(error);
|
|
101
|
-
throw error;
|
|
102
|
-
}
|
|
100
|
+
const tokenExchangeState = {
|
|
101
|
+
connectionName,
|
|
102
|
+
conversation,
|
|
103
|
+
relatesTo,
|
|
104
|
+
msAppId
|
|
105
|
+
};
|
|
106
|
+
const tokenExchangeStateNormalized = (0, activityWireCompat_1.normalizeTokenExchangeState)(tokenExchangeState);
|
|
107
|
+
const state = Buffer.from(JSON.stringify(tokenExchangeStateNormalized)).toString('base64');
|
|
108
|
+
const params = { state };
|
|
109
|
+
const response = await this.client.get('/api/botsignin/GetSignInResource', { params });
|
|
110
|
+
return response.data;
|
|
103
111
|
}
|
|
104
112
|
/**
|
|
105
113
|
* Exchanges the token.
|
|
@@ -110,17 +118,12 @@ class UserTokenClient {
|
|
|
110
118
|
* @returns A promise that resolves to the exchanged token.
|
|
111
119
|
*/
|
|
112
120
|
async exchangeTokenAsync(userId, connectionName, channelId, tokenExchangeRequest) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
|
|
121
|
+
const params = { userId, connectionName, channelId };
|
|
122
|
+
const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
|
|
123
|
+
if (response === null || response === void 0 ? void 0 : response.data) {
|
|
117
124
|
return response.data;
|
|
118
125
|
}
|
|
119
|
-
|
|
120
|
-
logger.error(error);
|
|
121
|
-
if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) {
|
|
122
|
-
logger.error(error.response.data);
|
|
123
|
-
}
|
|
126
|
+
else {
|
|
124
127
|
return { token: undefined };
|
|
125
128
|
}
|
|
126
129
|
}
|
|
@@ -167,6 +170,9 @@ class UserTokenClient {
|
|
|
167
170
|
const response = await this.client.post('/api/usertoken/GetAadTokens', resourceUrls, { params });
|
|
168
171
|
return response.data;
|
|
169
172
|
}
|
|
173
|
+
updateAuthToken(token) {
|
|
174
|
+
this.client.defaults.headers.common.Authorization = `Bearer ${token}`;
|
|
175
|
+
}
|
|
170
176
|
}
|
|
171
177
|
exports.UserTokenClient = UserTokenClient;
|
|
172
178
|
//# 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;AAE5C,8DAAyD;AACzD,8DAAmE;AAEnE,sDAAkD;AAElD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,0BAA0B,CAAC,CAAA;AAEhD;;GAEG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"userTokenClient.js","sourceRoot":"","sources":["../../../src/oauth/userTokenClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ class MemoryStorage {
|
|
|
61
61
|
}
|
|
62
62
|
const data = {};
|
|
63
63
|
for (const key of keys) {
|
|
64
|
-
logger.
|
|
64
|
+
logger.debug(`Reading key: ${key}`);
|
|
65
65
|
const item = this.memory[key];
|
|
66
66
|
if (item) {
|
|
67
67
|
data[key] = JSON.parse(item);
|
|
@@ -86,7 +86,7 @@ class MemoryStorage {
|
|
|
86
86
|
throw new ReferenceError('Changes are required when writing.');
|
|
87
87
|
}
|
|
88
88
|
for (const [key, newItem] of Object.entries(changes)) {
|
|
89
|
-
logger.
|
|
89
|
+
logger.debug(`Writing key: ${key}`);
|
|
90
90
|
const oldItemStr = this.memory[key];
|
|
91
91
|
if (!oldItemStr || newItem.eTag === '*' || !newItem.eTag) {
|
|
92
92
|
this.saveItem(key, newItem);
|
|
@@ -109,7 +109,7 @@ class MemoryStorage {
|
|
|
109
109
|
* @returns A promise that resolves when the delete operation is complete
|
|
110
110
|
*/
|
|
111
111
|
async delete(keys) {
|
|
112
|
-
logger.
|
|
112
|
+
logger.debug(`Deleting keys: ${keys.join(', ')}`);
|
|
113
113
|
for (const key of keys) {
|
|
114
114
|
delete this.memory[key];
|
|
115
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoryStorage.js","sourceRoot":"","sources":["../../../src/storage/memoryStorage.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,8DAAyD;AAEzD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,uBAAuB,CAAC,CAAA;AAE7C;;;;;;;;;;;;;GAaG;AACH,MAAa,aAAa;IAOxB;;;;OAIG;IACH,YAAqB,SAAkC,EAAE;QAApC,WAAM,GAAN,MAAM,CAA8B;QAVzD;;WAEG;QACK,SAAI,GAAW,CAAC,CAAA;IAOqC,CAAC;IAE9D;;;;;;;OAOG;IACH,MAAM,CAAC,iBAAiB;QACtB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAA;QAC9C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAA;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,IAAI,CAAE,IAAc;QACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,cAAc,CAAC,iCAAiC,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,IAAI,GAAc,EAAE,CAAA;QAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"memoryStorage.js","sourceRoot":"","sources":["../../../src/storage/memoryStorage.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,8DAAyD;AAEzD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,uBAAuB,CAAC,CAAA;AAE7C;;;;;;;;;;;;;GAaG;AACH,MAAa,aAAa;IAOxB;;;;OAIG;IACH,YAAqB,SAAkC,EAAE;QAApC,WAAM,GAAN,MAAM,CAA8B;QAVzD;;WAEG;QACK,SAAI,GAAW,CAAC,CAAA;IAOqC,CAAC;IAE9D;;;;;;;OAOG;IACH,MAAM,CAAC,iBAAiB;QACtB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAA;QAC9C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAA;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,IAAI,CAAE,IAAc;QACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,cAAc,CAAC,iCAAiC,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,IAAI,GAAc,EAAE,CAAA;QAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAA;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC7B,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,KAAK,CAAE,OAAkB;QAC7B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,cAAc,CAAC,oCAAoC,CAAC,CAAA;QAChE,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAA;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACnC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;gBACtC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;oBAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;gBAC7B,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,yBAAyB,CAAC,CAAA;gBAC1E,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAE,IAAc;QAC1B,MAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAED;;;;;;;;;;;OAWG;IACK,QAAQ,CAAE,GAAW,EAAE,IAAa;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACzE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC1C,CAAC;CACF;AAnHD,sCAmHC"}
|
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.6.
|
|
4
|
+
"version": "0.6.21-g3c2261b2fc",
|
|
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.0",
|
|
23
23
|
"@azure/msal-node": "^3.6.0",
|
|
24
|
-
"@microsoft/agents-activity": "0.6.
|
|
24
|
+
"@microsoft/agents-activity": "0.6.21-g3c2261b2fc",
|
|
25
25
|
"axios": "^1.10.0",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
27
27
|
"jwks-rsa": "^3.2.0"
|
|
@@ -20,6 +20,7 @@ import { TurnState } from './turnState'
|
|
|
20
20
|
import { RouteRank } from './routeRank'
|
|
21
21
|
import { RouteList } from './routeList'
|
|
22
22
|
import { TranscriptLoggerMiddleware } from '../transcript'
|
|
23
|
+
import { CloudAdapter } from '../cloudAdapter'
|
|
23
24
|
|
|
24
25
|
const logger = debug('agents:app')
|
|
25
26
|
|
|
@@ -71,7 +72,7 @@ export class AgentApplication<TState extends TurnState> {
|
|
|
71
72
|
protected readonly _routes: RouteList<TState> = new RouteList<TState>()
|
|
72
73
|
protected readonly _beforeTurn: ApplicationEventHandler<TState>[] = []
|
|
73
74
|
protected readonly _afterTurn: ApplicationEventHandler<TState>[] = []
|
|
74
|
-
private readonly _adapter?:
|
|
75
|
+
private readonly _adapter?: CloudAdapter
|
|
75
76
|
private readonly _authorization?: Authorization
|
|
76
77
|
private _typingTimer: NodeJS.Timeout | undefined
|
|
77
78
|
protected readonly _extensions: AgentExtension<TState>[] = []
|
|
@@ -118,10 +119,12 @@ export class AgentApplication<TState extends TurnState> {
|
|
|
118
119
|
|
|
119
120
|
if (this._options.adapter) {
|
|
120
121
|
this._adapter = this._options.adapter
|
|
122
|
+
} else {
|
|
123
|
+
this._adapter = new CloudAdapter()
|
|
121
124
|
}
|
|
122
125
|
|
|
123
126
|
if (this._options.authorization) {
|
|
124
|
-
this._authorization = new Authorization(this._options.storage!, this._options.authorization)
|
|
127
|
+
this._authorization = new Authorization(this._options.storage!, this._options.authorization, this._adapter?.userTokenClient!)
|
|
125
128
|
}
|
|
126
129
|
|
|
127
130
|
if (this._options.longRunningMessages && !this._adapter && !this._options.agentAppId) {
|
package/src/app/authorization.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { TurnContext } from '../turnContext'
|
|
|
7
7
|
import { debug } from '@microsoft/agents-activity/logger'
|
|
8
8
|
import { TurnState } from './turnState'
|
|
9
9
|
import { Storage } from '../storage'
|
|
10
|
-
import { OAuthFlow, TokenResponse } from '../oauth'
|
|
10
|
+
import { OAuthFlow, TokenResponse, UserTokenClient } from '../oauth'
|
|
11
11
|
import { AuthConfiguration, loadAuthConfigFromEnv, MsalTokenProvider } from '../auth'
|
|
12
12
|
import jwt, { JwtPayload } from 'jsonwebtoken'
|
|
13
13
|
import { Activity } from '@microsoft/agents-activity'
|
|
@@ -116,7 +116,7 @@ export class Authorization {
|
|
|
116
116
|
* });
|
|
117
117
|
* ```
|
|
118
118
|
*/
|
|
119
|
-
constructor (private storage: Storage, authHandlers: AuthorizationHandlers) {
|
|
119
|
+
constructor (private storage: Storage, authHandlers: AuthorizationHandlers, userTokenClient: UserTokenClient) {
|
|
120
120
|
if (storage === undefined || storage === null) {
|
|
121
121
|
throw new Error('Storage is required for UserAuthorization')
|
|
122
122
|
}
|
|
@@ -133,7 +133,7 @@ export class Authorization {
|
|
|
133
133
|
currentAuthHandler.title = currentAuthHandler.title ?? process.env[ah + '_connectionTitle'] as string
|
|
134
134
|
currentAuthHandler.text = currentAuthHandler.text ?? process.env[ah + '_connectionText'] as string
|
|
135
135
|
currentAuthHandler.cnxPrefix = currentAuthHandler.cnxPrefix ?? process.env[ah + '_cnxPrefix'] as string
|
|
136
|
-
currentAuthHandler.flow = new OAuthFlow(this.storage, currentAuthHandler.name,
|
|
136
|
+
currentAuthHandler.flow = new OAuthFlow(this.storage, currentAuthHandler.name, userTokenClient, currentAuthHandler.title, currentAuthHandler.text)
|
|
137
137
|
}
|
|
138
138
|
logger.info('Authorization handlers configured with', Object.keys(this.authHandlers).length, 'handlers')
|
|
139
139
|
}
|
|
@@ -21,12 +21,12 @@ const logger = debug('agents:jwt-middleware')
|
|
|
21
21
|
const verifyToken = async (raw: string, config: AuthConfiguration): Promise<JwtPayload> => {
|
|
22
22
|
const getKey: GetPublicKeyOrSecret = (header: JwtHeader, callback: SignCallback) => {
|
|
23
23
|
const payload = jwt.decode(raw) as JwtPayload
|
|
24
|
-
logger.
|
|
24
|
+
logger.debug('jwt.decode ', JSON.stringify(payload))
|
|
25
25
|
const jwksUri: string = payload.iss === 'https://api.botframework.com'
|
|
26
26
|
? 'https://login.botframework.com/v1/.well-known/keys'
|
|
27
27
|
: `https://login.microsoftonline.com/${config.tenantId}/discovery/v2.0/keys`
|
|
28
28
|
|
|
29
|
-
logger.
|
|
29
|
+
logger.debug(`fetching keys from ${jwksUri}`)
|
|
30
30
|
const jwksClient: JwksClient = jwksRsa({ jwksUri })
|
|
31
31
|
|
|
32
32
|
jwksClient.getSigningKey(header.kid, (err: Error | null, key: SigningKey | undefined): void => {
|
|
@@ -71,7 +71,7 @@ const verifyToken = async (raw: string, config: AuthConfiguration): Promise<JwtP
|
|
|
71
71
|
export const authorizeJWT = (authConfig: AuthConfiguration) => {
|
|
72
72
|
return async function (req: Request, res: Response, next: NextFunction) {
|
|
73
73
|
let failed = false
|
|
74
|
-
logger.
|
|
74
|
+
logger.debug('authorizing jwt')
|
|
75
75
|
const authHeader = req.headers.authorization as string
|
|
76
76
|
if (authHeader) {
|
|
77
77
|
const token: string = authHeader.split(' ')[1] // Extract the token from the Bearer string
|
|
@@ -79,7 +79,7 @@ export class MsalTokenProvider implements AuthProvider {
|
|
|
79
79
|
logger.error(message)
|
|
80
80
|
return
|
|
81
81
|
case LogLevel.Info:
|
|
82
|
-
logger.
|
|
82
|
+
logger.debug(message)
|
|
83
83
|
return
|
|
84
84
|
case LogLevel.Warning:
|
|
85
85
|
if (!message.includes('Warning - No client info in response')) {
|
|
@@ -193,7 +193,7 @@ export class MsalTokenProvider implements AuthProvider {
|
|
|
193
193
|
system: this.sysOptions
|
|
194
194
|
})
|
|
195
195
|
const token = await cca.acquireTokenByClientCredential({ scopes })
|
|
196
|
-
logger.
|
|
196
|
+
logger.debug('got token using FIC client assertion')
|
|
197
197
|
return token?.accessToken as string
|
|
198
198
|
}
|
|
199
199
|
|
|
@@ -214,7 +214,7 @@ export class MsalTokenProvider implements AuthProvider {
|
|
|
214
214
|
resource: audience,
|
|
215
215
|
forceRefresh: true
|
|
216
216
|
})
|
|
217
|
-
logger.
|
|
217
|
+
logger.debug('got token for FIC')
|
|
218
218
|
return response.accessToken
|
|
219
219
|
}
|
|
220
220
|
}
|
package/src/baseAdapter.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { Activity, ConversationReference } from '@microsoft/agents-activity'
|
|
|
13
13
|
import { ResourceResponse } from './connector-client/resourceResponse'
|
|
14
14
|
import { AttachmentData } from './connector-client/attachmentData'
|
|
15
15
|
import { AttachmentInfo } from './connector-client/attachmentInfo'
|
|
16
|
+
import { UserTokenClient } from './oauth'
|
|
16
17
|
|
|
17
18
|
const logger = debug('agents:base-adapter')
|
|
18
19
|
|
|
@@ -73,6 +74,11 @@ export abstract class BaseAdapter {
|
|
|
73
74
|
*/
|
|
74
75
|
authProvider: AuthProvider = new MsalTokenProvider()
|
|
75
76
|
|
|
77
|
+
/**
|
|
78
|
+
* The user token client used for managing user tokens.
|
|
79
|
+
*/
|
|
80
|
+
userTokenClient: UserTokenClient | null = null
|
|
81
|
+
|
|
76
82
|
/**
|
|
77
83
|
* The authentication configuration for the adapter.
|
|
78
84
|
*/
|
package/src/cloudAdapter.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { TurnContext } from './turnContext'
|
|
|
9
9
|
import { Response } from 'express'
|
|
10
10
|
import { Request } from './auth/request'
|
|
11
11
|
import { ConnectorClient } from './connector-client/connectorClient'
|
|
12
|
-
import { AuthConfiguration } from './auth/authConfiguration'
|
|
12
|
+
import { AuthConfiguration, loadAuthConfigFromEnv } from './auth/authConfiguration'
|
|
13
13
|
import { AuthProvider } from './auth/authProvider'
|
|
14
14
|
import { Activity, ActivityEventNames, ActivityTypes, Channels, ConversationReference, DeliveryModes, ConversationParameters } from '@microsoft/agents-activity'
|
|
15
15
|
import { ResourceResponse } from './connector-client/resourceResponse'
|
|
@@ -21,6 +21,7 @@ import { InvokeResponse } from './invoke/invokeResponse'
|
|
|
21
21
|
import { AttachmentInfo } from './connector-client/attachmentInfo'
|
|
22
22
|
import { AttachmentData } from './connector-client/attachmentData'
|
|
23
23
|
import { normalizeIncomingActivity } from './activityWireCompat'
|
|
24
|
+
import { UserTokenClient } from './oauth'
|
|
24
25
|
|
|
25
26
|
const logger = debug('agents:cloud-adapter')
|
|
26
27
|
|
|
@@ -44,16 +45,11 @@ export class CloudAdapter extends BaseAdapter {
|
|
|
44
45
|
* @param authConfig - The authentication configuration for securing communications
|
|
45
46
|
* @param authProvider - Optional custom authentication provider. If not specified, a default MsalTokenProvider will be used
|
|
46
47
|
*/
|
|
47
|
-
constructor (authConfig
|
|
48
|
+
constructor (authConfig?: AuthConfiguration, authProvider?: AuthProvider, userTokenClient?: UserTokenClient) {
|
|
48
49
|
super()
|
|
49
|
-
|
|
50
|
-
this.
|
|
51
|
-
|
|
52
|
-
if (authProvider === undefined) {
|
|
53
|
-
this.authProvider = new MsalTokenProvider()
|
|
54
|
-
} else {
|
|
55
|
-
this.authProvider = authProvider
|
|
56
|
-
}
|
|
50
|
+
this.authConfig = authConfig ?? loadAuthConfigFromEnv()
|
|
51
|
+
this.authProvider = authProvider ?? new MsalTokenProvider()
|
|
52
|
+
this.userTokenClient = userTokenClient ?? new UserTokenClient(this.authConfig.clientId)
|
|
57
53
|
}
|
|
58
54
|
|
|
59
55
|
/**
|
package/src/oauth/oAuthFlow.ts
CHANGED
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
} from '../'
|
|
11
11
|
import { UserTokenClient } from './userTokenClient'
|
|
12
12
|
import { TokenExchangeRequest, TokenResponse } from './userTokenClient.types'
|
|
13
|
+
import jwt, { JwtPayload } from 'jsonwebtoken'
|
|
13
14
|
|
|
14
15
|
const logger = debug('agents:oauth-flow')
|
|
15
16
|
|
|
@@ -86,10 +87,10 @@ export class OAuthFlow {
|
|
|
86
87
|
* @param cardTitle Optional title for the OAuth card. Defaults to 'Sign in'.
|
|
87
88
|
* @param cardText Optional text for the OAuth card. Defaults to 'login'.
|
|
88
89
|
*/
|
|
89
|
-
constructor (private storage: Storage, absOauthConnectionName: string, tokenClient
|
|
90
|
+
constructor (private storage: Storage, absOauthConnectionName: string, tokenClient: UserTokenClient, cardTitle?: string, cardText?: string) {
|
|
90
91
|
this.state = { flowStarted: undefined, flowExpires: undefined, absOauthConnectionName }
|
|
91
92
|
this.absOauthConnectionName = absOauthConnectionName
|
|
92
|
-
this.userTokenClient = tokenClient
|
|
93
|
+
this.userTokenClient = tokenClient
|
|
93
94
|
this.cardTitle = cardTitle ?? this.cardTitle
|
|
94
95
|
this.cardText = cardText ?? this.cardText
|
|
95
96
|
}
|
|
@@ -101,7 +102,6 @@ export class OAuthFlow {
|
|
|
101
102
|
* @throws Will throw an error if the channelId or from properties are not set in the activity.
|
|
102
103
|
*/
|
|
103
104
|
public async getUserToken (context: TurnContext): Promise<TokenResponse> {
|
|
104
|
-
await this.initializeTokenClient(context)
|
|
105
105
|
const activity = context.activity
|
|
106
106
|
|
|
107
107
|
if (!activity.channelId || !activity.from || !activity.from.id) {
|
|
@@ -117,6 +117,7 @@ export class OAuthFlow {
|
|
|
117
117
|
}
|
|
118
118
|
|
|
119
119
|
logger.info('Get token from user token service')
|
|
120
|
+
await this.refreshToken(context)
|
|
120
121
|
const tokenResponse = await this.userTokenClient.getUserToken(this.absOauthConnectionName, activity.channelId, activity.from.id)
|
|
121
122
|
|
|
122
123
|
// Cache the token if it's valid (has a token value)
|
|
@@ -143,7 +144,7 @@ export class OAuthFlow {
|
|
|
143
144
|
throw new Error('connectionName is not set')
|
|
144
145
|
}
|
|
145
146
|
logger.info('Starting OAuth flow for connectionName:', this.absOauthConnectionName)
|
|
146
|
-
await this.
|
|
147
|
+
await this.refreshToken(context)
|
|
147
148
|
|
|
148
149
|
const act = context.activity
|
|
149
150
|
|
|
@@ -188,7 +189,7 @@ export class OAuthFlow {
|
|
|
188
189
|
*/
|
|
189
190
|
public async continueFlow (context: TurnContext): Promise<TokenResponse> {
|
|
190
191
|
this.state = await this.getFlowState(context)
|
|
191
|
-
await this.
|
|
192
|
+
await this.refreshToken(context)
|
|
192
193
|
if (this.state?.flowExpires !== 0 && Date.now() > this.state?.flowExpires!) {
|
|
193
194
|
logger.warn('Flow expired')
|
|
194
195
|
await context.sendActivity(MessageFactory.text('Sign-in session expired. Please try again.'))
|
|
@@ -287,7 +288,7 @@ export class OAuthFlow {
|
|
|
287
288
|
* @returns A promise that resolves when the sign-out operation is complete.
|
|
288
289
|
*/
|
|
289
290
|
public async signOut (context: TurnContext): Promise<void> {
|
|
290
|
-
await this.
|
|
291
|
+
await this.refreshToken(context)
|
|
291
292
|
|
|
292
293
|
// Clear cached token for this user
|
|
293
294
|
const activity = context.activity
|
|
@@ -325,18 +326,23 @@ export class OAuthFlow {
|
|
|
325
326
|
const key = this.getFlowStateKey(context)
|
|
326
327
|
await this.storage.write({ [key]: flowState })
|
|
327
328
|
this.state = flowState
|
|
328
|
-
logger.
|
|
329
|
+
logger.debug(`Flow state set: ${JSON.stringify(flowState)}`)
|
|
329
330
|
}
|
|
330
331
|
|
|
331
332
|
/**
|
|
332
333
|
* Initializes the user token client if not already initialized.
|
|
333
334
|
* @param context The turn context used to get authentication credentials.
|
|
334
335
|
*/
|
|
335
|
-
private async
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
const accessToken = await context.adapter.authProvider.getAccessToken(context.adapter.authConfig,
|
|
339
|
-
|
|
336
|
+
private async refreshToken (context: TurnContext) {
|
|
337
|
+
const cachedToken = this.tokenCache.get('__access_token__')
|
|
338
|
+
if (!cachedToken || Date.now() > cachedToken.expiresAt) {
|
|
339
|
+
const accessToken = await context.adapter.authProvider.getAccessToken(context.adapter.authConfig, 'https://api.botframework.com')
|
|
340
|
+
const decodedToken = jwt.decode(accessToken) as JwtPayload
|
|
341
|
+
this.tokenCache.set('__access_token__', {
|
|
342
|
+
token: { token: accessToken },
|
|
343
|
+
expiresAt: decodedToken?.exp ? decodedToken.exp * 1000 - 1000 : Date.now() + 10 * 60 * 1000
|
|
344
|
+
})
|
|
345
|
+
this.userTokenClient.updateAuthToken(accessToken)
|
|
340
346
|
}
|
|
341
347
|
}
|
|
342
348
|
|