snyk-broker 5.17.6 → 5.17.7
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/lib/hybrid-sdk/client/auth/errors.js +15 -0
- package/dist/lib/hybrid-sdk/client/auth/errors.js.map +1 -0
- package/dist/lib/hybrid-sdk/client/auth/oauth.js +96 -68
- package/dist/lib/hybrid-sdk/client/auth/oauth.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/config/remoteConfig.js +8 -2
- package/dist/lib/hybrid-sdk/client/config/remoteConfig.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js +7 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/manager.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/dispatcher/client/api.js +12 -5
- package/dist/lib/hybrid-sdk/client/dispatcher/client/api.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socket.js +56 -38
- package/dist/lib/hybrid-sdk/client/socket.js.map +1 -1
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js +2 -2
- package/dist/lib/hybrid-sdk/http/downstream-post-stream-to-server.js.map +1 -1
- package/dist/package.json +2 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AuthRenewalError = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Thrown when auth renewal returns a non-2XX status.
|
|
6
|
+
*/
|
|
7
|
+
class AuthRenewalError extends Error {
|
|
8
|
+
constructor(statusCode) {
|
|
9
|
+
super(`Auth renewal failed with status ${statusCode}`);
|
|
10
|
+
this.statusCode = statusCode;
|
|
11
|
+
Object.setPrototypeOf(this, AuthRenewalError.prototype);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.AuthRenewalError = AuthRenewalError;
|
|
15
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/auth/errors.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAA4B,UAAkB;QAC5C,KAAK,CAAC,mCAAmC,UAAU,EAAE,CAAC,CAAC;QAD7B,eAAU,GAAV,UAAU,CAAQ;QAE5C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AALD,4CAKC"}
|
|
@@ -1,79 +1,107 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
3
|
+
exports.invalidateToken = exports.getAccessToken = exports.getCachedAccessToken = exports.initOAuthClient = exports.isOAuthClientInitialized = void 0;
|
|
4
|
+
const simple_oauth2_1 = require("simple-oauth2");
|
|
5
5
|
const logger_1 = require("../../../logs/logger");
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
6
|
+
const DEFAULT_EXPIRY_THRESHOLD_SECONDS = 60;
|
|
7
|
+
let client = null;
|
|
8
|
+
let token = null;
|
|
9
|
+
let metrics;
|
|
10
|
+
let thresholdSeconds = DEFAULT_EXPIRY_THRESHOLD_SECONDS;
|
|
11
|
+
let inFlightRefresh = null;
|
|
12
|
+
function isOAuthClientInitialized() {
|
|
13
|
+
return client !== null;
|
|
14
|
+
}
|
|
15
|
+
exports.isOAuthClientInitialized = isOAuthClientInitialized;
|
|
16
|
+
function initOAuthClient(opts) {
|
|
17
|
+
const config = {
|
|
18
|
+
client: { id: opts.clientId, secret: opts.clientSecret },
|
|
19
|
+
auth: {
|
|
20
|
+
tokenHost: opts.apiHostname,
|
|
21
|
+
tokenPath: '/oauth2/token',
|
|
22
|
+
},
|
|
23
|
+
options: {
|
|
24
|
+
authorizationMethod: 'body',
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
client = new simple_oauth2_1.ClientCredentials(config);
|
|
28
|
+
metrics = opts.metricsClient;
|
|
29
|
+
thresholdSeconds =
|
|
30
|
+
opts.expiryThresholdSeconds ?? DEFAULT_EXPIRY_THRESHOLD_SECONDS;
|
|
31
|
+
token = null;
|
|
32
|
+
inFlightRefresh = null;
|
|
33
|
+
}
|
|
34
|
+
exports.initOAuthClient = initOAuthClient;
|
|
35
|
+
function refreshToken() {
|
|
36
|
+
if (!client) {
|
|
37
|
+
return Promise.reject(new Error('OAuth client not initialized. Call initOAuthClient() first.'));
|
|
38
|
+
}
|
|
39
|
+
if (inFlightRefresh) {
|
|
40
|
+
return inFlightRefresh;
|
|
41
|
+
}
|
|
42
|
+
const activeClient = client;
|
|
43
|
+
inFlightRefresh = (async () => {
|
|
44
|
+
try {
|
|
45
|
+
token = await activeClient.getToken({});
|
|
46
|
+
logger_1.log.debug({}, 'Refreshed oauth access token');
|
|
47
|
+
return token;
|
|
33
48
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
42
|
-
|
|
49
|
+
catch (err) {
|
|
50
|
+
metrics?.recordJwtRefreshFailure();
|
|
51
|
+
logger_1.log.error({ err }, 'Unable to retrieve JWT');
|
|
52
|
+
throw err;
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
inFlightRefresh = null;
|
|
56
|
+
}
|
|
57
|
+
})();
|
|
58
|
+
return inFlightRefresh;
|
|
59
|
+
}
|
|
60
|
+
async function ensureToken() {
|
|
61
|
+
if (!client) {
|
|
62
|
+
throw new Error('OAuth client not initialized. Call initOAuthClient() first.');
|
|
43
63
|
}
|
|
44
|
-
|
|
45
|
-
|
|
64
|
+
if (token && !token.expired(thresholdSeconds)) {
|
|
65
|
+
return token;
|
|
46
66
|
}
|
|
67
|
+
return refreshToken();
|
|
47
68
|
}
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
69
|
+
function formatAccessToken(accessToken) {
|
|
70
|
+
const raw = accessToken.token;
|
|
71
|
+
return `${raw.token_type} ${raw.access_token}`;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Returns a cached token synchronously. Triggers a background refresh when the
|
|
75
|
+
* cached token is within the expiry threshold (or absent/expired) so that
|
|
76
|
+
* subsequent sync reads see a fresh token. When the token is within the
|
|
77
|
+
* threshold but not yet expired, the still-valid token is returned for the
|
|
78
|
+
* current caller — better than returning undefined and forcing an unauth'd
|
|
79
|
+
* request.
|
|
80
|
+
*/
|
|
81
|
+
function getCachedAccessToken() {
|
|
82
|
+
if (!client) {
|
|
83
|
+
return undefined;
|
|
63
84
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
85
|
+
if (!token || token.expired(0)) {
|
|
86
|
+
void refreshToken().catch(() => {
|
|
87
|
+
/* failure already logged and recorded in refreshToken */
|
|
88
|
+
});
|
|
89
|
+
return undefined;
|
|
67
90
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
if (newJwt) {
|
|
73
|
-
setTimeout(async () => {
|
|
74
|
-
refreshJwt(clientConfig, clientId, clientSecret, metricsClient);
|
|
75
|
-
}, clientConfig.AUTH_EXPIRATION_OVERRIDE ?? (newJwt.expiresIn - 60) * 1000);
|
|
91
|
+
if (token.expired(thresholdSeconds)) {
|
|
92
|
+
void refreshToken().catch(() => {
|
|
93
|
+
/* failure already logged and recorded in refreshToken */
|
|
94
|
+
});
|
|
76
95
|
}
|
|
77
|
-
|
|
78
|
-
|
|
96
|
+
return formatAccessToken(token);
|
|
97
|
+
}
|
|
98
|
+
exports.getCachedAccessToken = getCachedAccessToken;
|
|
99
|
+
async function getAccessToken() {
|
|
100
|
+
return formatAccessToken(await ensureToken());
|
|
101
|
+
}
|
|
102
|
+
exports.getAccessToken = getAccessToken;
|
|
103
|
+
function invalidateToken() {
|
|
104
|
+
token = null;
|
|
105
|
+
}
|
|
106
|
+
exports.invalidateToken = invalidateToken;
|
|
79
107
|
//# sourceMappingURL=oauth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/auth/oauth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/auth/oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,13 +22,19 @@ const retrieveConnectionsForDeployment = async (clientOpts, universalFilePath) =
|
|
|
22
22
|
url: `${clientOpts.config.API_BASE_URL}/hidden/brokers/deployments/${deploymentId}/connections?version=${apiVersion}`,
|
|
23
23
|
headers: {
|
|
24
24
|
'Content-Type': 'application/vnd.api+json',
|
|
25
|
-
Authorization:
|
|
25
|
+
Authorization: await (0, oauth_1.getAccessToken)(),
|
|
26
26
|
'x-broker-client-id': `${clientOpts.config.brokerClientId}`,
|
|
27
27
|
'x-broker-client-version': `${version_1.default}`,
|
|
28
28
|
},
|
|
29
29
|
method: 'GET',
|
|
30
30
|
};
|
|
31
|
-
|
|
31
|
+
let connectionsResponse = await (0, request_1.makeRequestToDownstream)(request);
|
|
32
|
+
if (connectionsResponse.statusCode === 401) {
|
|
33
|
+
logger_1.log.warn({}, 'Remote config retrieval returned 401; invalidating cached token and retrying once.');
|
|
34
|
+
(0, oauth_1.invalidateToken)();
|
|
35
|
+
request.headers['Authorization'] = await (0, oauth_1.getAccessToken)();
|
|
36
|
+
connectionsResponse = await (0, request_1.makeRequestToDownstream)(request);
|
|
37
|
+
}
|
|
32
38
|
if (connectionsResponse.statusCode != 200) {
|
|
33
39
|
if (connectionsResponse.statusCode == 404) {
|
|
34
40
|
throw new Error(`No deployment found. You must create a deployment first.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remoteConfig.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/config/remoteConfig.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA6D;AAC7D,gDAA6D;AAE7D,kDAAiD;AAEjD,4DAAyD;AACzD,yEAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"remoteConfig.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/config/remoteConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,13 @@ const manageWebsocketConnections = async (clientOpts, globalIdentifyingMetadata)
|
|
|
39
39
|
}));
|
|
40
40
|
await (0, configHelpers_1.reloadConfig)(clientOpts);
|
|
41
41
|
}
|
|
42
|
-
|
|
42
|
+
(0, oauth_1.initOAuthClient)({
|
|
43
|
+
apiHostname: clientOpts.config.apiHostname,
|
|
44
|
+
clientId: clientOpts.config.brokerClientConfiguration.common.oauth.clientId,
|
|
45
|
+
clientSecret: clientOpts.config.brokerClientConfiguration.common.oauth.clientSecret,
|
|
46
|
+
metricsClient: clientOpts.metricsClient,
|
|
47
|
+
});
|
|
48
|
+
await (0, oauth_1.getAccessToken)();
|
|
43
49
|
await (0, remoteConfig_1.retrieveConnectionsForDeployment)(clientOpts, `${(0, config_1.findProjectRoot)(__dirname)}/config.universal.json`);
|
|
44
50
|
(0, validator_1.validateUniversalConnectionsRemoteConfig)(`${(0, config_1.findProjectRoot)(__dirname)}/config.universal.json`);
|
|
45
51
|
(0, signals_1.handleTerminationSignal)(cleanup_1.cleanUpUniversalFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/manager.ts"],"names":[],"mappings":";;;AAEA,iDAAqD;AACrD,yDAA0E;AAC1E,uDAA6D;AAC7D,wDAAqE;AACrE,8CAAwD;AACxD,2CAAuE;AACvE,2BAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,11 @@ class HttpDispatcherServiceClient {
|
|
|
14
14
|
const path = `${config.DISPATCHER_URL_PREFIX}/${params.hashedBrokerToken}/connections/${params.brokerClientId}`;
|
|
15
15
|
const url = new URL(path, this.baseUrl);
|
|
16
16
|
url.searchParams.append('version', this.version);
|
|
17
|
-
const headers = {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
const headers = {
|
|
18
|
+
'Content-type': 'application/vnd.api+json',
|
|
19
|
+
};
|
|
20
|
+
if ((0, oauth_1.isOAuthClientInitialized)()) {
|
|
21
|
+
headers['Authorization'] = await (0, oauth_1.getAccessToken)();
|
|
21
22
|
}
|
|
22
23
|
const req = {
|
|
23
24
|
url: url.toString(),
|
|
@@ -32,7 +33,13 @@ class HttpDispatcherServiceClient {
|
|
|
32
33
|
},
|
|
33
34
|
}),
|
|
34
35
|
};
|
|
35
|
-
|
|
36
|
+
let response = await (0, request_1.makeRequestToDownstream)(req);
|
|
37
|
+
if (response.statusCode === 401 && (0, oauth_1.isOAuthClientInitialized)()) {
|
|
38
|
+
logger_1.log.debug({}, 'Dispatcher createConnection returned 401; invalidating cached token and retrying once.');
|
|
39
|
+
(0, oauth_1.invalidateToken)();
|
|
40
|
+
req.headers['Authorization'] = await (0, oauth_1.getAccessToken)();
|
|
41
|
+
response = await (0, request_1.makeRequestToDownstream)(req);
|
|
42
|
+
}
|
|
36
43
|
const apiResponse = JSON.parse(response.body).data;
|
|
37
44
|
if (!apiResponse?.attributes) {
|
|
38
45
|
logger_1.log.trace({ apiResponse }, 'Unexpected Connection Allocation Server response');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,mDAAgE;AAChE,oDAAwD;AAOxD,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../../lib/hybrid-sdk/client/dispatcher/client/api.ts"],"names":[],"mappings":";;;AAAA,mDAAgE;AAChE,oDAAwD;AAOxD,4CAI0B;AAG1B,MAAa,2BAA2B;IAItC,YAAY,OAAe;QAHV,YAAO,GAAG,yBAAyB,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAqC,EACrC,IAAiC,EACjC,MAAM;QAEN,IAAI;YACF,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,qBAAqB,IAAI,MAAM,CAAC,iBAAiB,gBAAgB,MAAM,CAAC,cAAc,EAAE,CAAC;YAChH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACxC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,OAAO,GAA2B;gBACtC,cAAc,EAAE,0BAA0B;aAC3C,CAAC;YACF,IAAI,IAAA,gCAAwB,GAAE,EAAE;gBAC9B,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAA,sBAAc,GAAE,CAAC;aACnD;YACD,MAAM,GAAG,GAA8B;gBACrC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;gBACnB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,IAAI,EAAE;wBACJ,UAAU,EAAE;4BACV,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;4BAC7C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;yBACtD;qBACF;iBACF,CAAC;aACH,CAAC;YACF,IAAI,QAAQ,GAAG,MAAM,IAAA,iCAAuB,EAAC,GAAG,CAAC,CAAC;YAClD,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,IAAI,IAAA,gCAAwB,GAAE,EAAE;gBAC7D,YAAM,CAAC,KAAK,CACV,EAAE,EACF,wFAAwF,CACzF,CAAC;gBACF,IAAA,uBAAe,GAAE,CAAC;gBAClB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAA,sBAAc,GAAE,CAAC;gBACtD,QAAQ,GAAG,MAAM,IAAA,iCAAuB,EAAC,GAAG,CAAC,CAAC;aAC/C;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;YACnD,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE;gBAC5B,YAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,kDAAkD,CACnD,CAAC;gBACF,MAAM,IAAI,KAAK,CACb,sDAAsD,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,IAAI,EAAE,CAC9F,CAAC;aACH;YACD,0EAA0E;YAC1E,iEAAiE;YACjE,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChE,YAAM,CAAC,KAAK,CACV,EAAE,aAAa,EAAE,WAAW,EAAE,EAC9B,+BAA+B,CAChC,CAAC;YAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;YAClD,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,GAAG,EAAE;YACZ,YAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,sCAAsC,CAAC,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAC;SAChE;IACH,CAAC;CACF;AAvED,kEAuEC"}
|
|
@@ -25,13 +25,10 @@ const dispatcher_1 = require("./dispatcher");
|
|
|
25
25
|
const filterSelection_1 = require("./utils/filterSelection");
|
|
26
26
|
const notificationHandler_1 = require("./socketHandlers/notificationHandler");
|
|
27
27
|
const brokerServerConnection_1 = require("./auth/brokerServerConnection");
|
|
28
|
+
const errors_1 = require("./auth/errors");
|
|
28
29
|
const version_1 = __importDefault(require("../common/utils/version"));
|
|
29
30
|
const utils_1 = require("../http/utils");
|
|
30
31
|
const serviceHandler_1 = require("./socketHandlers/serviceHandler");
|
|
31
|
-
const getAuthExpirationTimeout = (config) => {
|
|
32
|
-
return (config.AUTH_EXPIRATION_OVERRIDE ??
|
|
33
|
-
((0, oauth_1.getAuthConfig)().accessToken?.expiresIn - 60) * 1000);
|
|
34
|
-
};
|
|
35
32
|
/**
|
|
36
33
|
* Creates a pair of WebSocket connections (primary and secondary) for the given connection key.
|
|
37
34
|
* Each logical connection is represented by two sockets so they can be managed as a pair
|
|
@@ -127,8 +124,11 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
127
124
|
'x-broker-client-version': version_1.default,
|
|
128
125
|
'snyk-request-id': requestId,
|
|
129
126
|
};
|
|
130
|
-
if ((0, oauth_1.
|
|
131
|
-
|
|
127
|
+
if ((0, oauth_1.isOAuthClientInitialized)() && clientOpts.config.UNIVERSAL_BROKER_GA) {
|
|
128
|
+
const authorization = (0, oauth_1.getCachedAccessToken)();
|
|
129
|
+
if (authorization) {
|
|
130
|
+
headers.Authorization = authorization;
|
|
131
|
+
}
|
|
132
132
|
}
|
|
133
133
|
return headers;
|
|
134
134
|
};
|
|
@@ -150,51 +150,69 @@ const createWebSocket = (clientOpts, originalIdentifyingMetadata, role, metricsC
|
|
|
150
150
|
websocket.serverId = serverId || '';
|
|
151
151
|
websocket.clientConfig = identifyingMetadata.clientConfig;
|
|
152
152
|
websocket.role = identifyingMetadata.role;
|
|
153
|
-
if ((0, oauth_1.
|
|
153
|
+
if ((0, oauth_1.isOAuthClientInitialized)() && clientOpts.config.UNIVERSAL_BROKER_GA) {
|
|
154
154
|
// The access token is not sent when making requests over the websocket, so we must re-validate
|
|
155
155
|
// the token periodically to keep the connection alive. Connections that do not re-validate the
|
|
156
156
|
// access token will be marked as stale and closed by the server.
|
|
157
|
+
const renewalIntervalMs = clientOpts.config.AUTH_EXPIRATION_OVERRIDE ?? 10 * 60 * 1000;
|
|
157
158
|
const timeoutHandler = async () => {
|
|
158
159
|
const commonLogFields = {
|
|
159
160
|
connection: (0, token_1.maskToken)(identifyingMetadata.identifier),
|
|
160
161
|
role: identifyingMetadata.role,
|
|
161
162
|
};
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
163
|
+
try {
|
|
164
|
+
const renewOnce = async () => (0, brokerServerConnection_1.renewBrokerServerConnection)({
|
|
165
|
+
connectionIdentifier: identifyingMetadata.identifier,
|
|
166
|
+
brokerClientId: identifyingMetadata.clientId,
|
|
167
|
+
authorization: await (0, oauth_1.getAccessToken)(),
|
|
168
|
+
role: identifyingMetadata.role,
|
|
169
|
+
serverId: serverId,
|
|
170
|
+
}, clientOpts.config);
|
|
171
|
+
logger_1.log.debug(commonLogFields, 'Renewing auth.');
|
|
172
|
+
let renewResponse = await renewOnce();
|
|
173
|
+
if (renewResponse.statusCode === 401) {
|
|
174
|
+
logger_1.log.debug(commonLogFields, 'Auth renewal returned 401; invalidating cached token and retrying once.');
|
|
175
|
+
(0, oauth_1.invalidateToken)();
|
|
176
|
+
renewResponse = await renewOnce();
|
|
177
|
+
}
|
|
178
|
+
const statusCode = renewResponse.statusCode ?? 0;
|
|
179
|
+
const statusClass = Math.floor(statusCode / 100);
|
|
180
|
+
if (statusClass !== 2) {
|
|
181
|
+
throw new errors_1.AuthRenewalError(statusCode);
|
|
182
|
+
}
|
|
183
|
+
logger_1.log.debug(commonLogFields, 'Auth renewed.');
|
|
184
|
+
// Re-read extraHeaders after renewal: the 401-retry path may have
|
|
185
|
+
// invalidated and refreshed the cached token, and the next reconnect
|
|
186
|
+
// needs to pick that up via the synchronous cache read.
|
|
187
|
+
websocket.transport.extraHeaders = buildExtraHeaders(currentRequestId);
|
|
188
|
+
}
|
|
189
|
+
catch (err) {
|
|
190
|
+
if (err instanceof errors_1.AuthRenewalError) {
|
|
191
|
+
if (err.statusCode >= 400 && err.statusCode < 500) {
|
|
192
|
+
logger_1.log.fatal({ ...commonLogFields, responseCode: err.statusCode }, 'Failed to renew connection due to a client error. Exiting...');
|
|
193
|
+
metricsClient.recordAuthRenewalFailure(err.statusCode);
|
|
194
|
+
metricsClient.recordProcessExit('auth_4xx');
|
|
195
|
+
await metricsClient.forceFlush().catch((flushErr) => {
|
|
196
|
+
logger_1.log.warn({ ...commonLogFields, err: flushErr }, 'Failed to flush metrics before exit');
|
|
197
|
+
});
|
|
198
|
+
process.exit(1);
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
189
201
|
logger_1.log.warn({
|
|
190
202
|
...commonLogFields,
|
|
191
|
-
responseCode:
|
|
203
|
+
responseCode: err.statusCode,
|
|
192
204
|
}, 'Failed to renew connection.');
|
|
193
|
-
metricsClient.recordAuthRenewalFailure(
|
|
205
|
+
metricsClient.recordAuthRenewalFailure(err.statusCode);
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
logger_1.log.warn({ ...commonLogFields, err }, 'Failed to renew connection.');
|
|
209
|
+
metricsClient.recordAuthRenewalFailure(0);
|
|
210
|
+
}
|
|
211
|
+
finally {
|
|
212
|
+
websocket.timeoutHandlerId = setTimeout(timeoutHandler, renewalIntervalMs);
|
|
194
213
|
}
|
|
195
|
-
websocket.timeoutHandlerId = setTimeout(timeoutHandler, getAuthExpirationTimeout(clientOpts.config));
|
|
196
214
|
};
|
|
197
|
-
websocket.timeoutHandlerId = setTimeout(timeoutHandler,
|
|
215
|
+
websocket.timeoutHandlerId = setTimeout(timeoutHandler, renewalIntervalMs);
|
|
198
216
|
}
|
|
199
217
|
websocket.on('incoming::error', (e) => {
|
|
200
218
|
websocket.emit('error', { type: e.type, description: e.description });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/socket.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;AAE5D,oDAA4B;AAC5B,+BAAkC;AAClC,8CAAkD;AAClD,oEAA2C;AAC3C,wEAG2C;AAC3C,sEAAmE;AACnE,gEAA6D;AAC7D,8DAA2D;AAC3D,gEAA6D;AAC7D,2CAAgF;AAChF,oEAAiE;AACjE,gEAA6D;AAC7D,gDAAiE;AAGjE,iDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/socket.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;AAE5D,oDAA4B;AAC5B,+BAAkC;AAClC,8CAAkD;AAClD,oEAA2C;AAC3C,wEAG2C;AAC3C,sEAAmE;AACnE,gEAA6D;AAC7D,8DAA2D;AAC3D,gEAA6D;AAC7D,2CAAgF;AAChF,oEAAiE;AACjE,gEAA6D;AAC7D,gDAAiE;AAGjE,iDAAkD;AAClD,wCAKsB;AACtB,uCAA+C;AAC/C,6CAA2C;AAC3C,6DAA8D;AAC9D,8EAA2E;AAC3E,0EAA4E;AAC5E,0CAAiD;AACjD,sEAA8C;AAC9C,yCAAqD;AACrD,oEAAiE;AAEjE;;;;;;;;;;GAUG;AACI,MAAM,8BAA8B,GAAG,KAAK,EACjD,UAA4B,EAC5B,yBAA8C,EAC9C,aAAa,EACb,gBAAwB,IAAI,oBAAU,EAAE,EACa,EAAE;IACvD,MAAM,yBAAyB,GAAG,eAAe,CAAC,yBAAyB,CAAC,CAAC;IAC7E,yBAAyB,CAAC,YAAY,GAAG,aAAa,CAAC;IACvD,yBAAyB,CAAC,EAAE;QAC1B,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAC7D,yBAAyB,CAAC,UAAU;QAClC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;IAClE,yBAAyB,CAAC,UAAU;QAClC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC;IACxE,MAAM,eAAe,GACnB,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC;IAEzD,yBAAyB,CAAC,wBAAwB,GAAG,IAAA,qCAAmB,EACtE,eAAe,EACf,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,aAAa,EAAE,CAAC,CAClD,CAAC;IAEF,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,sCAAsC,yBAAyB,CAAC,YAAY,sBAAsB,CACnG,CAAC;KACH;IACD,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,UAAU,CAAC,MAAM,CAAC,sBAAsB,IAAI,MAAM,EAAE;QACtD,QAAQ,GAAG,MAAM,IAAA,wBAAW,EAC1B,UAAU,CAAC,MAAM,EACjB,yBAAyB,CAAC,UAAU,EACpC,yBAAyB,CAAC,QAAQ,CACnC,CAAC;KACH;IACD,IAAI,QAAQ,KAAK,IAAI,EAAE;QACrB,IAAI,UAAU,CAAC,MAAM,CAAC,sBAAsB,IAAI,MAAM,EAAE;YACtD,YAAM,CAAC,IAAI,CAAC,EAAE,EAAE,qDAAqD,CAAC,CAAC;SACxE;QACD,QAAQ,GAAG,EAAE,CAAC;KACf;SAAM;QACL,YAAM,CAAC,IAAI,CACT;YACE,UAAU,EAAE,IAAA,iBAAS,EAAC,yBAAyB,CAAC,UAAU,CAAC;YAC3D,QAAQ,EAAE,QAAQ;SACnB,EACD,qBAAqB,CACtB,CAAC;QACF,UAAU,CAAC,MAAM,CAAC,WAAW,CAC3B,GAAG,yBAAyB,CAAC,YAAY,EAAE,CAC5C,CAAC,QAAQ,GAAG,QAAQ,CAAC;KACvB;IACD,yBAAyB,CAAC,QAAQ;QAChC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,yBAAyB,CAAC,YAAY,EAAE,CAAC;aACvE,QAAQ,IAAI,EAAE,CAAC;IAEpB,OAAO;QACL,IAAA,uBAAe,EACb,UAAU,EACV,yBAAyB,EACzB,aAAI,CAAC,OAAO,EACZ,aAAa,CACd;QACD,IAAA,uBAAe,EACb,UAAU,EACV,yBAAyB,EACzB,aAAI,CAAC,SAAS,EACd,aAAa,CACd;KACF,CAAC;AACJ,CAAC,CAAC;AAtEW,QAAA,8BAA8B,kCAsEzC;AAEK,MAAM,eAAe,GAAG,CAC7B,UAA4B,EAC5B,2BAAgD,EAChD,IAAW,EACX,gBAAwB,IAAI,oBAAU,EAAE,EACnB,EAAE;IACvB,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,2BAA2B,CAAC,CAAC;IAC3E,mBAAmB,CAAC,IAAI,GAAG,IAAI,IAAI,aAAI,CAAC,OAAO,CAAC;IAChD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrD,mBAAmB,CAAC,UAAU;QAC5B,mBAAmB,CAAC,UAAU,IAAI,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;IACtE,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE;QACnC,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;KACH;IACD,MAAM,MAAM,GAAG,gBAAM,CAAC,YAAY,CAAC;QACjC,WAAW,EAAE,WAAW;QACxB,MAAM,EAAE,OAAO;QACf,MAAM,EAAE;YACN,OAAO,EAAE,wBAAa;SACvB;QACD,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,sBAAsB;YAChD,CAAC,CAAC,WAAW,mBAAmB,CAAC,UAAU,EAAE;YAC7C,CAAC,CAAC,WAAW,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE;KACnD,CAAC,CAAC;IAEH,IAAI,sBAAsB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,QAAQ,GACZ,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,CAAC;IACjE,sBAAsB,GAAG,IAAA,4BAAoB,EAC3C,sBAAsB,EACtB,QAAQ,EACR,IAAI,IAAI,aAAI,CAAC,OAAO,CACrB,CAAC;IAEF,cAAc,CAAC,MAAM,CAAC,wBAAwB;QAC5C,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IAEpC,0EAA0E;IAC1E,+CAA+C;IAC/C,MAAM,cAAc,GAAG;QACrB,SAAS,EAAE;YACT,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI;SACpB;QACD,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,KAAK;QACjE,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,KAAK;QAChE,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,KAAK;KACvE,CAAC;IAEF,IAAI,gBAAgB,GAAG,IAAA,SAAI,GAAE,CAAC;IAC9B,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAA0B,EAAE;QACtE,MAAM,OAAO,GAA2B;YACtC,yBAAyB,EAAE,mBAAmB,CAAC,QAAQ;YACvD,2BAA2B,EAAE,mBAAmB,CAAC,IAAI;YACrD,yBAAyB,EAAE,iBAAO;YAClC,iBAAiB,EAAE,SAAS;SAC7B,CAAC;QACF,IAAI,IAAA,gCAAwB,GAAE,IAAI,UAAU,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACvE,MAAM,aAAa,GAAG,IAAA,4BAAoB,GAAE,CAAC;YAC7C,IAAI,aAAa,EAAE;gBACjB,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;aACvC;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IACF,cAAc,CAAC,WAAW,CAAC,GAAG;QAC5B,YAAY,EAAE,iBAAiB,CAAC,gBAAgB,CAAC;KAClD,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,MAAM,CAC1B,cAAc,CAAC,MAAM,CAAC,wBAAwB,EAC9C,cAAc,CACmB,CAAC;IACpC,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC;IAC5B,SAAS,CAAC,UAAU,GAAG,QAAQ,CAAC;IAChC,IAAI,cAAc,CAAC,MAAM,CAAC,sBAAsB,EAAE;QAChD,SAAS,CAAC,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAAC;QACtD,SAAS,CAAC,wBAAwB;YAChC,mBAAmB,CAAC,wBAAwB,IAAI,EAAE,CAAC;QACrD,SAAS,CAAC,YAAY,GAAG,mBAAmB,CAAC,YAAY,IAAI,EAAE,CAAC;KACjE;SAAM;QACL,SAAS,CAAC,UAAU,GAAG,IAAA,iBAAS,EAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;KAClE;IACD,SAAS,CAAC,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IACpC,SAAS,CAAC,YAAY,GAAG,mBAAmB,CAAC,YAAY,CAAC;IAC1D,SAAS,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC;IAE1C,IAAI,IAAA,gCAAwB,GAAE,IAAI,UAAU,CAAC,MAAM,CAAC,mBAAmB,EAAE;QACvE,+FAA+F;QAC/F,+FAA+F;QAC/F,iEAAiE;QACjE,MAAM,iBAAiB,GACrB,UAAU,CAAC,MAAM,CAAC,wBAAwB,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAE/D,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;YAChC,MAAM,eAAe,GAAG;gBACtB,UAAU,EAAE,IAAA,iBAAS,EAAC,mBAAmB,CAAC,UAAU,CAAC;gBACrD,IAAI,EAAE,mBAAmB,CAAC,IAAI;aAC/B,CAAC;YAEF,IAAI;gBACF,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAC3B,IAAA,oDAA2B,EACzB;oBACE,oBAAoB,EAAE,mBAAmB,CAAC,UAAW;oBACrD,cAAc,EAAE,mBAAmB,CAAC,QAAQ;oBAC5C,aAAa,EAAE,MAAM,IAAA,sBAAc,GAAE;oBACrC,IAAI,EAAE,mBAAmB,CAAC,IAAI;oBAC9B,QAAQ,EAAE,QAAQ;iBACnB,EACD,UAAU,CAAC,MAAM,CAClB,CAAC;gBAEJ,YAAM,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;gBAChD,IAAI,aAAa,GAAG,MAAM,SAAS,EAAE,CAAC;gBAEtC,IAAI,aAAa,CAAC,UAAU,KAAK,GAAG,EAAE;oBACpC,YAAM,CAAC,KAAK,CACV,eAAe,EACf,yEAAyE,CAC1E,CAAC;oBACF,IAAA,uBAAe,GAAE,CAAC;oBAClB,aAAa,GAAG,MAAM,SAAS,EAAE,CAAC;iBACnC;gBAED,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,IAAI,CAAC,CAAC;gBACjD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC;gBACjD,IAAI,WAAW,KAAK,CAAC,EAAE;oBACrB,MAAM,IAAI,yBAAgB,CAAC,UAAU,CAAC,CAAC;iBACxC;gBAED,YAAM,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;gBAC/C,kEAAkE;gBAClE,qEAAqE;gBACrE,wDAAwD;gBACxD,SAAS,CAAC,SAAS,CAAC,YAAY,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;aACxE;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,yBAAgB,EAAE;oBACnC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE;wBACjD,YAAM,CAAC,KAAK,CACV,EAAE,GAAG,eAAe,EAAE,YAAY,EAAE,GAAG,CAAC,UAAU,EAAE,EACpD,8DAA8D,CAC/D,CAAC;wBACF,aAAa,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBACvD,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;wBAC5C,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE;4BAClD,YAAM,CAAC,IAAI,CACT,EAAE,GAAG,eAAe,EAAE,GAAG,EAAE,QAAQ,EAAE,EACrC,qCAAqC,CACtC,CAAC;wBACJ,CAAC,CAAC,CAAC;wBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAChB,OAAO;qBACR;oBACD,YAAM,CAAC,IAAI,CACT;wBACE,GAAG,eAAe;wBAClB,YAAY,EAAE,GAAG,CAAC,UAAU;qBAC7B,EACD,6BAA6B,CAC9B,CAAC;oBACF,aAAa,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBACvD,OAAO;iBACR;gBAED,YAAM,CAAC,IAAI,CAAC,EAAE,GAAG,eAAe,EAAE,GAAG,EAAE,EAAE,6BAA6B,CAAC,CAAC;gBACxE,aAAa,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;aAC3C;oBAAS;gBACR,SAAS,CAAC,gBAAgB,GAAG,UAAU,CACrC,cAAc,EACd,iBAAiB,CAClB,CAAC;aACH;QACH,CAAC,CAAC;QAEF,SAAS,CAAC,gBAAgB,GAAG,UAAU,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;KAC5E;IAED,SAAS,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE;QACpC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,YAAM,CAAC,IAAI,CACT;QACE,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,wBAAwB;QACnD,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,gBAAgB;KAC5B,EACD,gDAAgD,IAAI,GAAG,CACxD,CAAC;IACF,IAAA,+BAAwB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAEpD,mBAAmB;IACnB,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CACtC,IAAA,iCAAe,EAAC,UAAU,EAAE,SAAS,CAAC,CACvC,CAAC;IAEF,SAAS,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3C,aAAa,CAAC,kBAAkB,CAAC,cAAc,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC3E,aAAa,CAAC,eAAe,EAAE,CAAC;QAEhC,gBAAgB,GAAG,IAAA,SAAI,GAAE,CAAC;QAC1B,SAAS,CAAC,SAAS,CAAC,YAAY,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QACvE,IAAA,4CAAyB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACpC,aAAa,CAAC,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACrE,aAAa,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QACxD,aAAa,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACvC,YAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,qCAAqC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,IAAA,yCAAsB,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,EAAE,CACV,OAAO,EACP,IAAA,2BAAY,EACV,cAAc,CAAC,MAAM,CAAC,sBAAsB;QAC1C,CAAC,CAAC,mBAAmB,CAAC,UAAU;QAChC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CACtC,CACF,CAAC;IACF,wBAAwB;IACxB,SAAS,CAAC,EAAE,CACV,SAAS,EACT,IAAA,+BAAc,EACZ,cAAc,CAAC,MAAM,CAAC,sBAAsB;QAC1C,CAAC,CAAC,mBAAmB,CAAC,UAAU;QAChC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CACtC,CACF,CAAC;IACF,SAAS,CAAC,EAAE,CAAC,cAAc,EAAE,yCAAmB,CAAC,CAAC;IAClD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,2BAAY,CAAC,CAAC;IAEpC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CACxB,IAAA,yBAAW,EAAC,SAAS,EAAE,cAAc,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAC3E,CAAC;IAEF,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,+BAAc,CAAC,CAAC;IAExC,SAAS,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,IAAY,EAAE,EAAE;QAC9C,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACzB,IAAA,2BAAY,EAAC,SAAS,EAAE,cAAc,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AA5PW,QAAA,eAAe,mBA4P1B"}
|
|
@@ -281,8 +281,8 @@ _BrokerServerPostResponseHandler_buffer = new WeakMap(), _BrokerServerPostRespon
|
|
|
281
281
|
method: options.method,
|
|
282
282
|
url: brokerServerPostRequestUrl,
|
|
283
283
|
});
|
|
284
|
-
if (
|
|
285
|
-
options.headers['authorization'] = (0, oauth_1.
|
|
284
|
+
if (__classPrivateFieldGet(this, _BrokerServerPostResponseHandler_config, "f").universalBrokerGa && (0, oauth_1.isOAuthClientInitialized)()) {
|
|
285
|
+
options.headers['authorization'] = await (0, oauth_1.getAccessToken)();
|
|
286
286
|
}
|
|
287
287
|
const retryErrors = [];
|
|
288
288
|
for (let attempt = 0; attempt <= CONNECTION_MAX_RETRIES; attempt++) {
|