@atproto/oauth-provider 0.7.0 → 0.7.2
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 +19 -0
- package/dist/router/assets/assets-manifest.d.ts.map +1 -1
- package/dist/router/assets/assets-manifest.js.map +1 -1
- package/dist/router/assets/send-authorization-page.d.ts.map +1 -1
- package/dist/router/assets/send-authorization-page.js +1 -6
- package/dist/router/assets/send-authorization-page.js.map +1 -1
- package/package.json +7 -13
- package/src/router/assets/assets-manifest.ts +17 -10
- package/src/router/assets/send-authorization-page.ts +1 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @atproto/oauth-provider
|
|
2
2
|
|
|
3
|
+
## 0.7.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#3755](https://github.com/bluesky-social/atproto/pull/3755) [`96de2acb3`](https://github.com/bluesky-social/atproto/commit/96de2acb301683effe4313cb93d7747f87a73b5e) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Use more secure COEP header when hCaptcha is enabled
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`0f3899dd5`](https://github.com/bluesky-social/atproto/commit/0f3899dd52d0094c29222c65e2636217f9a8ece4)]:
|
|
10
|
+
- @atproto/oauth-provider-frontend@0.1.2
|
|
11
|
+
|
|
12
|
+
## 0.7.1
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#3754](https://github.com/bluesky-social/atproto/pull/3754) [`1e461eab0`](https://github.com/bluesky-social/atproto/commit/1e461eab033f728f537db554b3072b7eda7e5e8f) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove "dependency" on `rollup-plugin-bundle-manifest`
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [[`1e461eab0`](https://github.com/bluesky-social/atproto/commit/1e461eab033f728f537db554b3072b7eda7e5e8f), [`1e461eab0`](https://github.com/bluesky-social/atproto/commit/1e461eab033f728f537db554b3072b7eda7e5e8f)]:
|
|
19
|
+
- @atproto/oauth-provider-frontend@0.1.1
|
|
20
|
+
- @atproto/oauth-provider-ui@0.1.1
|
|
21
|
+
|
|
3
22
|
## 0.7.0
|
|
4
23
|
|
|
5
24
|
### Minor Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-manifest.d.ts","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assets-manifest.d.ts","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,yBAAyB,CAAA;AAuBhC,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM;2BAoDxB,MAAM;;;;;EAqBrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-manifest.js","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"assets-manifest.js","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":";;AAiCA,kDAyEC;AA1GD,qCAA0C;AAC1C,yCAAgC;AAChC,6CAAsC;AAGtC,sDAKgC;AAqBhC,MAAM,iBAAiB,GAAG,mCAAmC,CAAA;AAE7D,SAAgB,mBAAmB,CAAC,YAAoB;IACtD,yEAAyE;IACzE,uDAAuD;IAEvD,2BAA2B;IAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAa,CAAA;IAElD,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACxD,MAAM,QAAQ,GAAG,IAAA,gBAAI,EAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM;YACnB,CAAC,CAAC,GAAG,EAAE,CAAC,sBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,0BAAgB,EAAC,QAAQ,CAAC,CAAA;QACpC,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;IACxC,CAAC,CAAC,CACH,CAAA;IAED,MAAM,gBAAgB,GAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtD,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,IAAI,EAAE,CAAA;QAChE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC;YAAE,OAAO,IAAI,EAAE,CAAA;QAE1D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;QAC5E,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,EAAE,CAAA;QAE5B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,EAAE,CAAA;QAEzB,IAAI,CAAC;YACH,oEAAoE;YACpE,uCAAuC;YACvC,IAAA,4BAAiB,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAA;YACnE,IAAA,4BAAiB,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YAClD,OAAO,KAAK,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QACtC,CAAC;QAED,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACnC,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,qCAAqC,CAAC,CAAA;QAErE,IAAA,sBAAW,EAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IAC/D,CAAC,CAAA;IAED,OAAO;QACL,SAAS;QACT,gBAAgB;KACjB,CAAA;IAED,SAAS,SAAS,CAAC,SAAiB;QAClC,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;QACrC,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,OAAO,IAAI,CAAA;QAChC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;QACnC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;IAC5B,CAAC;IAED,SAAS,UAAU,CAAC,SAAiB;QACnC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;aACtB,MAAM,CACL,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACZ,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CACtE;aACA,GAAG,CAAC,aAAa,CAAC,CAAA;IACvB,CAAC;IAED,SAAS,SAAS,CAAC,UAAkB;QACnC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;aACtB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC;aAChD,GAAG,CAAC,aAAa,CAAC,CAAA;IACvB,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,CAAC,QAAQ,CAAkB;IAChD,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;AACpC,CAAC;AAED,SAAS,QAAQ,CAAC,QAAgB;IAChC,OAAO,GAAG,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAA;AAC9D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-authorization-page.d.ts","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAMpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,qDAAqD,CAAA;AAItG,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"send-authorization-page.d.ts","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAGhE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAMpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,qDAAqD,CAAA;AAItG,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,IAWjE,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,MAAM,gCAAgC,KACrC,OAAO,CAAC,IAAI,CAAC,CA6BjB"}
|
|
@@ -16,11 +16,6 @@ function sendAuthorizePageFactory(customization) {
|
|
|
16
16
|
const customizationCss = (0, index_js_2.cssCode)((0, build_customization_css_js_1.buildCustomizationCss)(customization));
|
|
17
17
|
const { scripts, styles } = (0, assets_js_1.getAssets)('authorization-page');
|
|
18
18
|
const csp = (0, index_js_1.mergeCsp)(assets_js_1.SPA_CSP, customization?.hcaptcha ? assets_js_1.HCAPTCHA_CSP : undefined);
|
|
19
|
-
const coep = customization?.hcaptcha
|
|
20
|
-
? // https://github.com/hCaptcha/react-hcaptcha/issues/259
|
|
21
|
-
// @TODO Remove the use of `unsafeNone` once the issue above is resolved
|
|
22
|
-
security_headers_js_1.CrossOriginEmbedderPolicy.unsafeNone
|
|
23
|
-
: security_headers_js_1.CrossOriginEmbedderPolicy.credentialless;
|
|
24
19
|
return async function sendAuthorizePage(req, res, data) {
|
|
25
20
|
await (0, csrf_js_1.setupCsrfToken)(req, res);
|
|
26
21
|
const script = (0, hydration_data_js_1.declareHydrationData)({
|
|
@@ -40,7 +35,7 @@ function sendAuthorizePageFactory(customization) {
|
|
|
40
35
|
meta: [{ name: 'robots', content: 'noindex' }],
|
|
41
36
|
body: (0, index_js_2.html) `<div id="root"></div>`,
|
|
42
37
|
csp,
|
|
43
|
-
coep,
|
|
38
|
+
coep: security_headers_js_1.CrossOriginEmbedderPolicy.credentialless,
|
|
44
39
|
scripts: [script, ...scripts],
|
|
45
40
|
styles: [...styles, customizationCss],
|
|
46
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-authorization-page.js","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"send-authorization-page.js","sourceRoot":"","sources":["../../../src/router/assets/send-authorization-page.ts"],"names":[],"mappings":";;AAaA,4DA2CC;AAvDD,+FAAsF;AACtF,iGAAwF;AAExF,qDAAiD;AACjD,wEAAuE;AACvE,sDAAuD;AACvD,4EAA8E;AAC9E,iEAAwD;AAExD,2CAA6E;AAC7E,uCAA0C;AAE1C,SAAgB,wBAAwB,CAAC,aAA4B;IACnE,wBAAwB;IACxB,MAAM,iBAAiB,GAAG,IAAA,oDAAsB,EAAC,aAAa,CAAC,CAAA;IAC/D,MAAM,gBAAgB,GAAG,IAAA,kBAAO,EAAC,IAAA,kDAAqB,EAAC,aAAa,CAAC,CAAC,CAAA;IACtE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAS,EAAC,oBAAoB,CAAC,CAAA;IAC3D,MAAM,GAAG,GAAG,IAAA,mBAAQ,EAClB,mBAAO,EACP,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,SAAS,CACnD,CAAA;IAED,OAAO,KAAK,UAAU,iBAAiB,CACrC,GAAoB,EACpB,GAAmB,EACnB,IAAsC;QAEtC,MAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAE9B,MAAM,MAAM,GAAG,IAAA,wCAAoB,EAAsC;YACvE,mBAAmB,EAAE,iBAAiB;YACtC,eAAe,EAAE;gBACf,UAAU,EAAE,IAAI,CAAC,GAAG;gBAEpB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gBACxB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;gBACpC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS;gBAEzC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAE/B,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;gBACrC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;aACtC;YACD,UAAU,EAAE,IAAI,CAAC,QAAQ;SAC1B,CAAC,CAAA;QAEF,OAAO,IAAA,8BAAW,EAAC,GAAG,EAAE;YACtB,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;YAC9C,IAAI,EAAE,IAAA,eAAI,EAAA,uBAAuB;YACjC,GAAG;YACH,IAAI,EAAE,+CAAyB,CAAC,cAAc;YAC9C,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC;YAC7B,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,gBAAgB,CAAC;SACtC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atproto/oauth-provider",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
|
|
6
6
|
"keywords": [
|
|
@@ -43,10 +43,8 @@
|
|
|
43
43
|
"jose": "^5.2.0",
|
|
44
44
|
"psl": "^1.9.0",
|
|
45
45
|
"zod": "^3.23.8",
|
|
46
|
-
"@atproto-labs/fetch": "0.2.2",
|
|
47
46
|
"@atproto-labs/fetch-node": "0.1.8",
|
|
48
47
|
"@atproto-labs/pipe": "0.1.0",
|
|
49
|
-
"@atproto-labs/rollup-plugin-bundle-manifest": "0.2.0",
|
|
50
48
|
"@atproto-labs/simple-store": "0.1.2",
|
|
51
49
|
"@atproto-labs/simple-store-memory": "0.1.2",
|
|
52
50
|
"@atproto/common": "^0.4.10",
|
|
@@ -54,22 +52,18 @@
|
|
|
54
52
|
"@atproto/jwk-jose": "0.1.6",
|
|
55
53
|
"@atproto/oauth-types": "0.2.5",
|
|
56
54
|
"@atproto/oauth-provider-api": "0.1.0",
|
|
57
|
-
"@atproto/oauth-provider-frontend": "0.1.
|
|
58
|
-
"@atproto/oauth-provider-ui": "0.1.
|
|
59
|
-
"@atproto/syntax": "0.4.0"
|
|
55
|
+
"@atproto/oauth-provider-frontend": "0.1.2",
|
|
56
|
+
"@atproto/oauth-provider-ui": "0.1.1",
|
|
57
|
+
"@atproto/syntax": "0.4.0",
|
|
58
|
+
"@atproto-labs/fetch": "0.2.2"
|
|
60
59
|
},
|
|
61
60
|
"devDependencies": {
|
|
62
61
|
"@types/cookie": "^0.6.0",
|
|
63
62
|
"@types/forwarded": "0.1.3",
|
|
64
63
|
"@types/http-errors": "^2.0.4",
|
|
65
64
|
"@types/psl": "1.1.3",
|
|
66
|
-
"@types/send": "^0.17.4"
|
|
67
|
-
|
|
68
|
-
"postcss": {
|
|
69
|
-
"plugins": {
|
|
70
|
-
"tailwindcss": {},
|
|
71
|
-
"autoprefixer": {}
|
|
72
|
-
}
|
|
65
|
+
"@types/send": "^0.17.4",
|
|
66
|
+
"@atproto-labs/rollup-plugin-bundle-manifest": "0.2.0"
|
|
73
67
|
},
|
|
74
68
|
"scripts": {
|
|
75
69
|
"build": "tsc --build tsconfig.build.json"
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { createReadStream } from 'node:fs'
|
|
2
2
|
import { join } from 'node:path'
|
|
3
3
|
import { Readable } from 'node:stream'
|
|
4
|
-
import type {
|
|
5
|
-
Manifest,
|
|
6
|
-
ManifestItem,
|
|
7
|
-
} from '@atproto-labs/rollup-plugin-bundle-manifest'
|
|
4
|
+
import type { Manifest } from '@atproto-labs/rollup-plugin-bundle-manifest'
|
|
8
5
|
import { AssetRef } from '../../lib/html/build-document.js'
|
|
9
6
|
import {
|
|
10
7
|
Middleware,
|
|
@@ -12,15 +9,25 @@ import {
|
|
|
12
9
|
validateFetchSite,
|
|
13
10
|
writeStream,
|
|
14
11
|
} from '../../lib/http/index.js'
|
|
15
|
-
import { Simplify } from '../../lib/util/type.js'
|
|
16
12
|
|
|
17
|
-
type Asset =
|
|
18
|
-
|
|
19
|
-
|
|
13
|
+
type Asset =
|
|
14
|
+
| {
|
|
15
|
+
type: 'asset'
|
|
16
|
+
mime?: string
|
|
17
|
+
sha256: string
|
|
18
|
+
stream: () => Readable
|
|
19
|
+
}
|
|
20
|
+
| {
|
|
21
|
+
type: 'chunk'
|
|
22
|
+
mime: string
|
|
23
|
+
sha256: string
|
|
24
|
+
dynamicImports: string[]
|
|
25
|
+
isDynamicEntry: boolean
|
|
26
|
+
isEntry: boolean
|
|
27
|
+
isImplicitEntry: boolean
|
|
28
|
+
name: string
|
|
20
29
|
stream: () => Readable
|
|
21
30
|
}
|
|
22
|
-
>
|
|
23
|
-
}[ManifestItem['type']]
|
|
24
31
|
|
|
25
32
|
const ASSETS_URL_PREFIX = '/@atproto/oauth-provider/~assets/'
|
|
26
33
|
|
|
@@ -20,11 +20,6 @@ export function sendAuthorizePageFactory(customization: Customization) {
|
|
|
20
20
|
SPA_CSP,
|
|
21
21
|
customization?.hcaptcha ? HCAPTCHA_CSP : undefined,
|
|
22
22
|
)
|
|
23
|
-
const coep = customization?.hcaptcha
|
|
24
|
-
? // https://github.com/hCaptcha/react-hcaptcha/issues/259
|
|
25
|
-
// @TODO Remove the use of `unsafeNone` once the issue above is resolved
|
|
26
|
-
CrossOriginEmbedderPolicy.unsafeNone
|
|
27
|
-
: CrossOriginEmbedderPolicy.credentialless
|
|
28
23
|
|
|
29
24
|
return async function sendAuthorizePage(
|
|
30
25
|
req: IncomingMessage,
|
|
@@ -54,7 +49,7 @@ export function sendAuthorizePageFactory(customization: Customization) {
|
|
|
54
49
|
meta: [{ name: 'robots', content: 'noindex' }],
|
|
55
50
|
body: html`<div id="root"></div>`,
|
|
56
51
|
csp,
|
|
57
|
-
coep,
|
|
52
|
+
coep: CrossOriginEmbedderPolicy.credentialless,
|
|
58
53
|
scripts: [script, ...scripts],
|
|
59
54
|
styles: [...styles, customizationCss],
|
|
60
55
|
})
|