@adobe/helix-html-pipeline 3.1.3 → 3.1.6
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/CHANGELOG.md +21 -0
- package/package.json +7 -7
- package/src/steps/set-x-surrogate-key-header.js +4 -5
- package/src/utils/auth.js +10 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
|
+
## [3.1.6](https://github.com/adobe/helix-html-pipeline/compare/v3.1.5...v3.1.6) (2022-08-05)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* make auth portable ([5e012a8](https://github.com/adobe/helix-html-pipeline/commit/5e012a8fc8b659127a6ff4b33fab421cd538179a))
|
|
7
|
+
|
|
8
|
+
## [3.1.5](https://github.com/adobe/helix-html-pipeline/compare/v3.1.4...v3.1.5) (2022-07-28)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **deps:** update dependency @adobe/helix-markdown-support to v3.1.8 ([3eee54b](https://github.com/adobe/helix-html-pipeline/commit/3eee54b2f05d131f79072432c7194b3fca3c9285))
|
|
14
|
+
|
|
15
|
+
## [3.1.4](https://github.com/adobe/helix-html-pipeline/compare/v3.1.3...v3.1.4) (2022-07-28)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* add metadata and head surrogate keys also on .plain ([#108](https://github.com/adobe/helix-html-pipeline/issues/108)) ([5a085ba](https://github.com/adobe/helix-html-pipeline/commit/5a085ba76dff85b0bc1610256737b06edee6dba7)), closes [#107](https://github.com/adobe/helix-html-pipeline/issues/107)
|
|
21
|
+
|
|
1
22
|
## [3.1.3](https://github.com/adobe/helix-html-pipeline/compare/v3.1.2...v3.1.3) (2022-07-12)
|
|
2
23
|
|
|
3
24
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adobe/helix-html-pipeline",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.6",
|
|
4
4
|
"description": "Helix HTML Pipeline",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"node": ">=16.x"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@adobe/helix-markdown-support": "3.1.
|
|
36
|
+
"@adobe/helix-markdown-support": "3.1.8",
|
|
37
37
|
"@adobe/helix-shared-utils": "2.0.11",
|
|
38
38
|
"cookie": "0.5.0",
|
|
39
39
|
"github-slugger": "1.4.0",
|
|
40
|
-
"hast-util-raw": "7.2.
|
|
40
|
+
"hast-util-raw": "7.2.2",
|
|
41
41
|
"hast-util-select": "5.0.2",
|
|
42
42
|
"hast-util-to-html": "8.0.3",
|
|
43
43
|
"hast-util-to-string": "2.0.0",
|
|
@@ -74,16 +74,16 @@
|
|
|
74
74
|
"@semantic-release/changelog": "6.0.1",
|
|
75
75
|
"@semantic-release/git": "10.0.1",
|
|
76
76
|
"@semantic-release/npm": "9.0.1",
|
|
77
|
-
"c8": "7.
|
|
78
|
-
"eslint": "8.
|
|
77
|
+
"c8": "7.12.0",
|
|
78
|
+
"eslint": "8.20.0",
|
|
79
79
|
"eslint-plugin-header": "3.1.1",
|
|
80
80
|
"eslint-plugin-import": "2.26.0",
|
|
81
|
-
"esmock": "1.
|
|
81
|
+
"esmock": "1.8.9",
|
|
82
82
|
"husky": "8.0.1",
|
|
83
83
|
"js-yaml": "4.1.0",
|
|
84
84
|
"jsdoc-to-markdown": "7.1.1",
|
|
85
85
|
"jsdom": "20.0.0",
|
|
86
|
-
"junit-report-builder": "3.0.
|
|
86
|
+
"junit-report-builder": "3.0.1",
|
|
87
87
|
"lint-staged": "13.0.3",
|
|
88
88
|
"mocha": "10.0.0",
|
|
89
89
|
"mocha-multi-reporters": "1.5.1",
|
|
@@ -20,16 +20,15 @@ import { computeSurrogateKey } from '@adobe/helix-shared-utils';
|
|
|
20
20
|
*/
|
|
21
21
|
export default async function setXSurrogateKeyHeader(state, req, res) {
|
|
22
22
|
const {
|
|
23
|
-
content, contentBusId,
|
|
23
|
+
content, contentBusId, owner, repo, ref,
|
|
24
24
|
} = state;
|
|
25
25
|
|
|
26
26
|
const keys = [];
|
|
27
27
|
if (content.sourceLocation) {
|
|
28
28
|
keys.push(await computeSurrogateKey(content.sourceLocation));
|
|
29
29
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
30
|
+
keys.push(`${contentBusId}_metadata`);
|
|
31
|
+
keys.push(`${ref}--${repo}--${owner}_head`);
|
|
32
|
+
|
|
34
33
|
res.headers.set('x-surrogate-key', keys.join(' '));
|
|
35
34
|
}
|
package/src/utils/auth.js
CHANGED
|
@@ -66,7 +66,14 @@ export async function decodeIdToken(state, idp, idToken, lenient = false) {
|
|
|
66
66
|
// export the public key
|
|
67
67
|
payload.pem = await exportSPKI(key);
|
|
68
68
|
// and encode it base64 url
|
|
69
|
-
|
|
69
|
+
/* c8 ignore next 3 */
|
|
70
|
+
if (typeof Buffer === 'undefined') {
|
|
71
|
+
// non-node runtime
|
|
72
|
+
payload.pem = btoa(String.fromCharCode(...new Uint8Array(payload.pem)));
|
|
73
|
+
} else {
|
|
74
|
+
// node runtime
|
|
75
|
+
payload.pem = Buffer.from(payload.pem, 'utf-8').toString('base64url');
|
|
76
|
+
}
|
|
70
77
|
payload.kid = protectedHeader.kid;
|
|
71
78
|
|
|
72
79
|
log.info(`[auth] decoded id_token${lenient ? ' (lenient)' : ''} from ${payload.iss} and validated payload.`);
|
|
@@ -265,7 +272,8 @@ export class AuthInfo {
|
|
|
265
272
|
grant_type: 'authorization_code',
|
|
266
273
|
redirect_uri: state.createExternalLocation(AUTH_REDIRECT_URL),
|
|
267
274
|
};
|
|
268
|
-
const
|
|
275
|
+
const { fetch } = state;
|
|
276
|
+
const ret = await fetch(url.href, {
|
|
269
277
|
method: 'POST',
|
|
270
278
|
body: new URLSearchParams(body).toString(),
|
|
271
279
|
headers: {
|