@n8n/client-oauth2 1.16.1 → 1.17.0
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/build.tsbuildinfo +1 -1
- package/dist/code-flow.js +26 -2
- package/dist/code-flow.js.map +1 -1
- package/package.json +6 -6
package/dist/code-flow.js
CHANGED
|
@@ -38,6 +38,16 @@ const client_assertion_1 = require("@n8n/utils/client-assertion");
|
|
|
38
38
|
const qs = __importStar(require("querystring"));
|
|
39
39
|
const constants_1 = require("./constants");
|
|
40
40
|
const utils_1 = require("./utils");
|
|
41
|
+
const FLOW_OWNED_PARAMS = new Set([
|
|
42
|
+
'client_id',
|
|
43
|
+
'redirect_uri',
|
|
44
|
+
'response_type',
|
|
45
|
+
'state',
|
|
46
|
+
'scope',
|
|
47
|
+
'code_challenge',
|
|
48
|
+
'code_challenge_method',
|
|
49
|
+
]);
|
|
50
|
+
const REPEATABLE_PARAMS = new Set(['resource']);
|
|
41
51
|
class CodeFlow {
|
|
42
52
|
constructor(client) {
|
|
43
53
|
this.client = client;
|
|
@@ -56,8 +66,22 @@ class CodeFlow {
|
|
|
56
66
|
...(options.scopes ? { scope: options.scopes.join(options.scopesSeparator ?? ' ') } : {}),
|
|
57
67
|
};
|
|
58
68
|
for (const [key, value] of Object.entries(queryParams)) {
|
|
59
|
-
if (value
|
|
60
|
-
|
|
69
|
+
if (value === null || value === undefined)
|
|
70
|
+
continue;
|
|
71
|
+
if (REPEATABLE_PARAMS.has(key)) {
|
|
72
|
+
for (const entry of Array.isArray(value) ? value : [value]) {
|
|
73
|
+
url.searchParams.append(key, entry);
|
|
74
|
+
}
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
const param = Array.isArray(value) ? value.join(',') : value;
|
|
78
|
+
if (FLOW_OWNED_PARAMS.has(key)) {
|
|
79
|
+
if (param === '' && url.searchParams.has(key))
|
|
80
|
+
continue;
|
|
81
|
+
url.searchParams.set(key, param);
|
|
82
|
+
}
|
|
83
|
+
else if (!url.searchParams.has(key)) {
|
|
84
|
+
url.searchParams.append(key, param);
|
|
61
85
|
}
|
|
62
86
|
}
|
|
63
87
|
return url.toString();
|
package/dist/code-flow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-flow.js","sourceRoot":"","sources":["../src/code-flow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAA0F;AAC1F,MAAY,EAAE,wCAAoB;AAIlC,2CAAgE;AAChE,mCAAyE;
|
|
1
|
+
{"version":3,"file":"code-flow.js","sourceRoot":"","sources":["../src/code-flow.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/client-oauth2",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.17.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "src/index.ts",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"files": [
|
|
8
8
|
"dist/**/*",
|
|
9
|
-
"
|
|
10
|
-
"
|
|
9
|
+
"LICENSE.md",
|
|
10
|
+
"LICENSE_EE.md"
|
|
11
11
|
],
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"axios": "1.18.0",
|
|
14
|
-
"@n8n/backend-network": "1.
|
|
15
|
-
"@n8n/utils": "1.
|
|
14
|
+
"@n8n/backend-network": "1.9.0",
|
|
15
|
+
"@n8n/utils": "1.43.0"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@vitest/coverage-v8": "4.1.9",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"vitest-mock-extended": "^3.1.0",
|
|
24
24
|
"nock": "14.0.14",
|
|
25
25
|
"@n8n/typescript-config": "1.9.0",
|
|
26
|
-
"@n8n/vitest-config": "1.
|
|
26
|
+
"@n8n/vitest-config": "1.20.0"
|
|
27
27
|
},
|
|
28
28
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
29
29
|
"homepage": "https://n8n.io",
|