Bump tough-cookie and @azure/ms-rest-js (#1763)
* Bump tough-cookie and @azure/ms-rest-js Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) and [@azure/ms-rest-js](https://github.com/Azure/ms-rest-js). These dependencies needed to be updated together. Updates `tough-cookie` from 4.0.0 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.0.0...v4.1.3) Updates `@azure/ms-rest-js` from 2.6.2 to 2.7.0 - [Changelog](https://github.com/Azure/ms-rest-js/blob/master/Changelog.md) - [Commits](https://github.com/Azure/ms-rest-js/commits) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: "@azure/ms-rest-js" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
parent
85c77f1dfc
commit
8f80d7761c
65 changed files with 4194 additions and 4573 deletions
105
node_modules/@azure/ms-rest-js/es/lib/nodeFetchHttpClient.js
generated
vendored
105
node_modules/@azure/ms-rest-js/es/lib/nodeFetchHttpClient.js
generated
vendored
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
// Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
import { __awaiter, __extends, __generator } from "tslib";
|
||||
import * as tough from "tough-cookie";
|
||||
import * as http from "http";
|
||||
import * as https from "https";
|
||||
import node_fetch from "node-fetch";
|
||||
|
|
@ -10,9 +9,7 @@ import { createProxyAgent } from "./proxyAgent";
|
|||
var NodeFetchHttpClient = /** @class */ (function (_super) {
|
||||
__extends(NodeFetchHttpClient, _super);
|
||||
function NodeFetchHttpClient() {
|
||||
var _this = _super !== null && _super.apply(this, arguments) || this;
|
||||
_this.cookieJar = new tough.CookieJar(undefined, { looseMode: true });
|
||||
return _this;
|
||||
return _super !== null && _super.apply(this, arguments) || this;
|
||||
}
|
||||
NodeFetchHttpClient.prototype.fetch = function (input, init) {
|
||||
return __awaiter(this, void 0, void 0, function () {
|
||||
|
|
@ -23,83 +20,43 @@ var NodeFetchHttpClient = /** @class */ (function (_super) {
|
|||
};
|
||||
NodeFetchHttpClient.prototype.prepareRequest = function (httpRequest) {
|
||||
return __awaiter(this, void 0, void 0, function () {
|
||||
var requestInit, cookieString, _a, httpAgent, httpsAgent, tunnel, options, agent;
|
||||
var _this = this;
|
||||
var requestInit, _a, httpAgent, httpsAgent, tunnel, options, agent;
|
||||
return __generator(this, function (_b) {
|
||||
switch (_b.label) {
|
||||
case 0:
|
||||
requestInit = {};
|
||||
if (!(this.cookieJar && !httpRequest.headers.get("Cookie"))) return [3 /*break*/, 2];
|
||||
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
||||
_this.cookieJar.getCookieString(httpRequest.url, function (err, cookie) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
else {
|
||||
resolve(cookie);
|
||||
}
|
||||
});
|
||||
})];
|
||||
case 1:
|
||||
cookieString = _b.sent();
|
||||
httpRequest.headers.set("Cookie", cookieString);
|
||||
_b.label = 2;
|
||||
case 2:
|
||||
if (httpRequest.agentSettings) {
|
||||
_a = httpRequest.agentSettings, httpAgent = _a.http, httpsAgent = _a.https;
|
||||
if (httpsAgent && httpRequest.url.startsWith("https")) {
|
||||
requestInit.agent = httpsAgent;
|
||||
}
|
||||
else if (httpAgent) {
|
||||
requestInit.agent = httpAgent;
|
||||
}
|
||||
}
|
||||
else if (httpRequest.proxySettings) {
|
||||
tunnel = createProxyAgent(httpRequest.url, httpRequest.proxySettings, httpRequest.headers);
|
||||
requestInit.agent = tunnel.agent;
|
||||
}
|
||||
if (httpRequest.keepAlive === true) {
|
||||
if (requestInit.agent) {
|
||||
requestInit.agent.keepAlive = true;
|
||||
}
|
||||
else {
|
||||
options = { keepAlive: true };
|
||||
agent = httpRequest.url.startsWith("https")
|
||||
? new https.Agent(options)
|
||||
: new http.Agent(options);
|
||||
requestInit.agent = agent;
|
||||
}
|
||||
}
|
||||
return [2 /*return*/, requestInit];
|
||||
requestInit = {};
|
||||
if (httpRequest.agentSettings) {
|
||||
_a = httpRequest.agentSettings, httpAgent = _a.http, httpsAgent = _a.https;
|
||||
if (httpsAgent && httpRequest.url.startsWith("https")) {
|
||||
requestInit.agent = httpsAgent;
|
||||
}
|
||||
else if (httpAgent) {
|
||||
requestInit.agent = httpAgent;
|
||||
}
|
||||
}
|
||||
else if (httpRequest.proxySettings) {
|
||||
tunnel = createProxyAgent(httpRequest.url, httpRequest.proxySettings, httpRequest.headers);
|
||||
requestInit.agent = tunnel.agent;
|
||||
}
|
||||
if (httpRequest.keepAlive === true) {
|
||||
if (requestInit.agent) {
|
||||
requestInit.agent.keepAlive = true;
|
||||
}
|
||||
else {
|
||||
options = { keepAlive: true };
|
||||
agent = httpRequest.url.startsWith("https")
|
||||
? new https.Agent(options)
|
||||
: new http.Agent(options);
|
||||
requestInit.agent = agent;
|
||||
}
|
||||
}
|
||||
return [2 /*return*/, requestInit];
|
||||
});
|
||||
});
|
||||
};
|
||||
NodeFetchHttpClient.prototype.processRequest = function (operationResponse) {
|
||||
NodeFetchHttpClient.prototype.processRequest = function (_operationResponse) {
|
||||
return __awaiter(this, void 0, void 0, function () {
|
||||
var setCookieHeader_1;
|
||||
var _this = this;
|
||||
return __generator(this, function (_a) {
|
||||
switch (_a.label) {
|
||||
case 0:
|
||||
if (!this.cookieJar) return [3 /*break*/, 2];
|
||||
setCookieHeader_1 = operationResponse.headers.get("Set-Cookie");
|
||||
if (!(setCookieHeader_1 != undefined)) return [3 /*break*/, 2];
|
||||
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
||||
_this.cookieJar.setCookie(setCookieHeader_1, operationResponse.request.url, { ignoreError: true }, function (err) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
else {
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
})];
|
||||
case 1:
|
||||
_a.sent();
|
||||
_a.label = 2;
|
||||
case 2: return [2 /*return*/];
|
||||
}
|
||||
/* no_op */
|
||||
return [2 /*return*/];
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue