caccl-send-request 2.0.1 → 2.0.14
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/lib/index.d.ts +3 -0
- package/lib/index.js +15 -9
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +12 -2
package/lib/index.d.ts
CHANGED
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
* @param [opts.headers] headers to include in the request
|
|
10
10
|
* @param [opts.numRetries=0] number of times to retry the request if it
|
|
11
11
|
* fails
|
|
12
|
+
* @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
|
|
13
|
+
* send cross-domain credentials even if not in dev mode
|
|
12
14
|
* @returns { body, status, headers } on success
|
|
13
15
|
*/
|
|
14
16
|
declare const sendRequest: (opts: {
|
|
@@ -22,6 +24,7 @@ declare const sendRequest: (opts: {
|
|
|
22
24
|
[x: string]: any;
|
|
23
25
|
};
|
|
24
26
|
numRetries?: number;
|
|
27
|
+
sendCrossDomainCredentials?: boolean;
|
|
25
28
|
}) => Promise<{
|
|
26
29
|
body: any;
|
|
27
30
|
status: number;
|
package/lib/index.js
CHANGED
|
@@ -57,8 +57,8 @@ var qs_1 = __importDefault(require("qs"));
|
|
|
57
57
|
var caccl_error_1 = __importDefault(require("caccl-error"));
|
|
58
58
|
// Import shared types
|
|
59
59
|
var ErrorCode_1 = __importDefault(require("./ErrorCode"));
|
|
60
|
-
// Check if we
|
|
61
|
-
var
|
|
60
|
+
// Check if we're currently in developer mode
|
|
61
|
+
var thisIsDev = (process.env.NODE_ENV === 'development');
|
|
62
62
|
/**
|
|
63
63
|
* Sends and retries an http request
|
|
64
64
|
* @author Gabriel Abrams
|
|
@@ -70,13 +70,19 @@ var sendCrossDomainCredentials = (process.env.NODE_ENV === 'development');
|
|
|
70
70
|
* @param [opts.headers] headers to include in the request
|
|
71
71
|
* @param [opts.numRetries=0] number of times to retry the request if it
|
|
72
72
|
* fails
|
|
73
|
+
* @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
|
|
74
|
+
* send cross-domain credentials even if not in dev mode
|
|
73
75
|
* @returns { body, status, headers } on success
|
|
74
76
|
*/
|
|
75
77
|
var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
|
|
76
|
-
var numRetries, method, stringifiedParams, query, url, headers, data, response, err_1;
|
|
77
|
-
|
|
78
|
-
|
|
78
|
+
var sendCrossDomainCredentials, numRetries, method, stringifiedParams, query, url, headers, data, response, err_1;
|
|
79
|
+
var _a;
|
|
80
|
+
return __generator(this, function (_b) {
|
|
81
|
+
switch (_b.label) {
|
|
79
82
|
case 0:
|
|
83
|
+
sendCrossDomainCredentials = !!(opts.sendCrossDomainCredentials
|
|
84
|
+
|| thisIsDev
|
|
85
|
+
|| ((_a = opts.headers) === null || _a === void 0 ? void 0 : _a.credentials) === 'include');
|
|
80
86
|
numRetries = (opts.numRetries ? opts.numRetries : 0);
|
|
81
87
|
method = (opts.method || 'GET');
|
|
82
88
|
stringifiedParams = qs_1.default.stringify(opts.params || {}, {
|
|
@@ -103,9 +109,9 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
103
109
|
// JSON encode
|
|
104
110
|
data = opts.params;
|
|
105
111
|
}
|
|
106
|
-
|
|
112
|
+
_b.label = 1;
|
|
107
113
|
case 1:
|
|
108
|
-
|
|
114
|
+
_b.trys.push([1, 3, , 4]);
|
|
109
115
|
return [4 /*yield*/, (0, axios_1.default)({
|
|
110
116
|
method: method,
|
|
111
117
|
url: url,
|
|
@@ -114,7 +120,7 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
114
120
|
withCredentials: sendCrossDomainCredentials,
|
|
115
121
|
})];
|
|
116
122
|
case 2:
|
|
117
|
-
response =
|
|
123
|
+
response = _b.sent();
|
|
118
124
|
// Process response
|
|
119
125
|
return [2 /*return*/, {
|
|
120
126
|
body: response.data,
|
|
@@ -122,7 +128,7 @@ var sendRequest = function (opts) { return __awaiter(void 0, void 0, void 0, fun
|
|
|
122
128
|
headers: response.headers,
|
|
123
129
|
}];
|
|
124
130
|
case 3:
|
|
125
|
-
err_1 =
|
|
131
|
+
err_1 = _b.sent();
|
|
126
132
|
// Axios throws an error if the request status indicates an error
|
|
127
133
|
// sendRequest is supposed to resolve if the request went through, whether
|
|
128
134
|
// the status indicates an error or not.
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,gDAA0B;AAC1B,0CAAoB;AAEpB,0BAA0B;AAC1B,4DAAqC;AAErC,sBAAsB;AACtB,0DAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "caccl-send-request",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.14",
|
|
4
4
|
"description": "The default request sender used throughout the CACCL project.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"typescript": "^4.5.5"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"caccl-error": "^2.0.0",
|
|
41
40
|
"axios": "^0.21.4",
|
|
41
|
+
"caccl-error": "^2.0.14",
|
|
42
42
|
"qs": "^6.9.6"
|
|
43
43
|
}
|
|
44
44
|
}
|
package/src/index.ts
CHANGED
|
@@ -8,8 +8,8 @@ import CACCLError from 'caccl-error';
|
|
|
8
8
|
// Import shared types
|
|
9
9
|
import ErrorCode from './ErrorCode';
|
|
10
10
|
|
|
11
|
-
// Check if we
|
|
12
|
-
const
|
|
11
|
+
// Check if we're currently in developer mode
|
|
12
|
+
const thisIsDev = (process.env.NODE_ENV === 'development');
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* Sends and retries an http request
|
|
@@ -22,6 +22,8 @@ const sendCrossDomainCredentials = (process.env.NODE_ENV === 'development');
|
|
|
22
22
|
* @param [opts.headers] headers to include in the request
|
|
23
23
|
* @param [opts.numRetries=0] number of times to retry the request if it
|
|
24
24
|
* fails
|
|
25
|
+
* @param [opts.sendCrossDomainCredentials=true if in development mode] if true,
|
|
26
|
+
* send cross-domain credentials even if not in dev mode
|
|
25
27
|
* @returns { body, status, headers } on success
|
|
26
28
|
*/
|
|
27
29
|
const sendRequest = async (
|
|
@@ -32,12 +34,20 @@ const sendRequest = async (
|
|
|
32
34
|
params?: { [k in string]: any },
|
|
33
35
|
headers?: { [k in string]: any },
|
|
34
36
|
numRetries?: number,
|
|
37
|
+
sendCrossDomainCredentials?: boolean,
|
|
35
38
|
},
|
|
36
39
|
): Promise<{
|
|
37
40
|
body: any,
|
|
38
41
|
status: number,
|
|
39
42
|
headers: { [k in string]: any },
|
|
40
43
|
}> => {
|
|
44
|
+
// Check if we should be including credentials
|
|
45
|
+
const sendCrossDomainCredentials = !!(
|
|
46
|
+
opts.sendCrossDomainCredentials
|
|
47
|
+
|| thisIsDev
|
|
48
|
+
|| opts.headers?.credentials === 'include'
|
|
49
|
+
);
|
|
50
|
+
|
|
41
51
|
// Set max number of retries if not defined
|
|
42
52
|
const numRetries = (opts.numRetries ? opts.numRetries : 0);
|
|
43
53
|
|