@atproto/oauth-provider 0.22.4 → 0.22.7
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
CHANGED
|
@@ -1,5 +1,40 @@
|
|
|
1
1
|
# @atproto/oauth-provider
|
|
2
2
|
|
|
3
|
+
## 0.22.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#5488](https://github.com/bluesky-social/atproto/pull/5488) [`fe4087e`](https://github.com/bluesky-social/atproto/commit/fe4087ecb7a7cc53c7081c9f97d49121e5251c36) Thanks [@dependabot](https://github.com/apps/dependabot)! - Bump the dev-dependencies group across 1 directory with 30 updates
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`7a23156`](https://github.com/bluesky-social/atproto/commit/7a23156efa16433b83f90fd35e155c68b3a0253a), [`fe4087e`](https://github.com/bluesky-social/atproto/commit/fe4087ecb7a7cc53c7081c9f97d49121e5251c36), [`9c35046`](https://github.com/bluesky-social/atproto/commit/9c35046f17ac577fc64f8b5caccb8521d3b2584a), [`fe4087e`](https://github.com/bluesky-social/atproto/commit/fe4087ecb7a7cc53c7081c9f97d49121e5251c36)]:
|
|
10
|
+
- @atproto/lex-resolver@0.2.12
|
|
11
|
+
- @atproto/did@0.5.5
|
|
12
|
+
- @atproto/oauth-provider-ui@0.10.3
|
|
13
|
+
- @atproto/oauth-provider-api@0.8.3
|
|
14
|
+
- @atproto/common@0.8.3
|
|
15
|
+
- @atproto/oauth-scopes@0.5.12
|
|
16
|
+
- @atproto/oauth-types@0.7.6
|
|
17
|
+
|
|
18
|
+
## 0.22.6
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- Updated dependencies [[`ed0b7d3`](https://github.com/bluesky-social/atproto/commit/ed0b7d38811bb24952a3f1da988b02e39934d222)]:
|
|
23
|
+
- @atproto/syntax@0.7.6
|
|
24
|
+
- @atproto/lex-document@0.1.11
|
|
25
|
+
- @atproto/lex-resolver@0.2.11
|
|
26
|
+
- @atproto/oauth-provider-api@0.8.2
|
|
27
|
+
- @atproto/oauth-provider-ui@0.10.2
|
|
28
|
+
- @atproto/oauth-scopes@0.5.11
|
|
29
|
+
- @atproto/common@0.8.2
|
|
30
|
+
|
|
31
|
+
## 0.22.5
|
|
32
|
+
|
|
33
|
+
### Patch Changes
|
|
34
|
+
|
|
35
|
+
- Updated dependencies []:
|
|
36
|
+
- @atproto/lex-resolver@0.2.10
|
|
37
|
+
|
|
3
38
|
## 0.22.4
|
|
4
39
|
|
|
5
40
|
### Patch 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":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAChE,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,yBAAyB,CAAA;AAsBhC,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM;2BA0DxB,MAAM;;;;;EAqBrC"}
|
|
@@ -2,8 +2,9 @@ import { createReadStream } from 'node:fs';
|
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { Readable } from 'node:stream';
|
|
5
|
+
import { ASSETS_ENDPOINT_PREFIX } from '@atproto/oauth-provider-api';
|
|
5
6
|
import { validateFetchDest, validateFetchSite, writeStream, } from '../../lib/http/index.js';
|
|
6
|
-
const ASSETS_URL_PREFIX =
|
|
7
|
+
const ASSETS_URL_PREFIX = `${ASSETS_ENDPOINT_PREFIX}/`;
|
|
7
8
|
export function parseAssetsManifest(manifestPath) {
|
|
8
9
|
// Using `require` instead of `JSON.parse(readFileSync())` so that node's
|
|
9
10
|
// watch mode can pick up changes to the manifest file.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-manifest.js","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"assets-manifest.js","sourceRoot":"","sources":["../../../src/router/assets/assets-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAEL,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,GACZ,MAAM,yBAAyB,CAAA;AAoBhC,MAAM,iBAAiB,GAAG,GAAG,sBAAsB,GAAG,CAAA;AAEtD,MAAM,UAAU,mBAAmB,CAAC,YAAoB;IACtD,yEAAyE;IACzE,uDAAuD;IACvD,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAE9C,uDAAuD;IACvD,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,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM;YACnB,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,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,iBAAiB,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CAAA;YACnE,iBAAiB,CAAC,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,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YAC/B,WAAW,EAAE,KAAK,CAAC,IAAI;YACvB,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,CAAC,IAAI,KAAK,CAAC,wBAAwB,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACjE,CAAC;SACF,CAAC,CAAA;IACJ,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","sourcesContent":["import { createReadStream } from 'node:fs'\nimport { createRequire } from 'node:module'\nimport { join } from 'node:path'\nimport { Readable } from 'node:stream'\nimport { ASSETS_ENDPOINT_PREFIX } from '@atproto/oauth-provider-api'\nimport type { Manifest } from '@atproto-labs/rolldown-plugin-bundle-manifest'\nimport type { AssetRef } from '../../lib/html/build-document.js'\nimport {\n type Middleware,\n validateFetchDest,\n validateFetchSite,\n writeStream,\n} from '../../lib/http/index.js'\n\ntype Asset =\n | {\n type: 'asset'\n mime?: string\n sha256: string\n stream: () => Readable\n }\n | {\n type: 'chunk'\n mime: string\n sha256: string\n dynamicImports: string[]\n isDynamicEntry: boolean\n isEntry: boolean\n name: string\n stream: () => Readable\n }\n\nconst ASSETS_URL_PREFIX = `${ASSETS_ENDPOINT_PREFIX}/`\n\nexport function parseAssetsManifest(manifestPath: string) {\n // Using `require` instead of `JSON.parse(readFileSync())` so that node's\n // watch mode can pick up changes to the manifest file.\n const require = createRequire(import.meta.url)\n\n // eslint-disable-next-line import-x/no-dynamic-require\n const manifest = require(manifestPath) as Manifest\n\n const assets = new Map<string, Asset>(\n Object.entries(manifest).map(([filename, { data, ...item }]) => {\n const buffer = data ? Buffer.from(data, 'base64') : null\n const filepath = join(manifestPath, '..', filename)\n const stream = buffer\n ? () => Readable.from(buffer)\n : () => createReadStream(filepath)\n return [filename, { ...item, stream }]\n }),\n )\n\n const assetsMiddleware: Middleware = (req, res, next) => {\n if (req.method !== 'GET' && req.method !== 'HEAD') return next()\n if (!req.url?.startsWith(ASSETS_URL_PREFIX)) return next()\n\n const filename = decodeURIComponent(req.url.slice(ASSETS_URL_PREFIX.length))\n if (!filename) return next()\n\n const asset = assets.get(filename)\n if (!asset) return next()\n\n try {\n // Allow \"null\" (ie. no header) to allow loading assets outside of a\n // fetch context (not from a web page).\n validateFetchSite(req, [null, 'none', 'cross-site', 'same-origin'])\n validateFetchDest(req, [null, 'document', 'style', 'script'])\n } catch (err) {\n return next(err)\n }\n\n if (req.headers['if-none-match'] === asset.sha256) {\n return void res.writeHead(304).end()\n }\n\n res.setHeader('ETag', asset.sha256)\n res.setHeader('Cache-Control', 'public, max-age=31536000, immutable')\n\n writeStream(res, asset.stream(), {\n contentType: asset.mime,\n onError: (cause) => {\n next(new Error(`Error serving asset \"${filename}\"`, { cause }))\n },\n })\n }\n\n return {\n getAssets,\n assetsMiddleware,\n }\n\n function getAssets(entryName: string) {\n const scripts = getScripts(entryName)\n if (!scripts.length) return null\n const styles = getStyles(entryName)\n return { scripts, styles }\n }\n\n function getScripts(entryName: string) {\n return Array.from(assets)\n .filter(\n ([, asset]) =>\n asset.type === 'chunk' && asset.isEntry && asset.name === entryName,\n )\n .map(assetEntryUrl)\n }\n\n function getStyles(_entryName: string) {\n return Array.from(assets)\n .filter(([, asset]) => asset.mime === 'text/css')\n .map(assetEntryUrl)\n }\n}\n\nfunction assetEntryUrl([filename]: [string, Asset]): AssetRef {\n return { url: assetUrl(filename) }\n}\n\nfunction assetUrl(filename: string) {\n return `${ASSETS_URL_PREFIX}${encodeURIComponent(filename)}`\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atproto/oauth-provider",
|
|
3
|
-
"version": "0.22.
|
|
3
|
+
"version": "0.22.7",
|
|
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": [
|
|
@@ -76,21 +76,21 @@
|
|
|
76
76
|
"@atproto-labs/pipe": "^0.2.4",
|
|
77
77
|
"@atproto-labs/simple-store": "^0.5.1",
|
|
78
78
|
"@atproto-labs/simple-store-memory": "^0.2.6",
|
|
79
|
-
"@atproto/
|
|
80
|
-
"@atproto/
|
|
81
|
-
"@atproto/jwk-jose": "^0.2.4",
|
|
82
|
-
"@atproto/lex-document": "^0.1.10",
|
|
83
|
-
"@atproto/oauth-types": "^0.7.5",
|
|
84
|
-
"@atproto/lex-resolver": "^0.2.9",
|
|
85
|
-
"@atproto/oauth-provider-api": "0.8.1",
|
|
86
|
-
"@atproto/oauth-provider-ui": "0.10.1",
|
|
79
|
+
"@atproto/did": "^0.5.5",
|
|
80
|
+
"@atproto/common": "^0.8.3",
|
|
87
81
|
"@atproto/jwk": "^0.7.4",
|
|
88
|
-
"@atproto/
|
|
89
|
-
"@atproto/
|
|
82
|
+
"@atproto/jwk-jose": "^0.2.4",
|
|
83
|
+
"@atproto/lex-document": "^0.1.11",
|
|
84
|
+
"@atproto/oauth-types": "^0.7.6",
|
|
85
|
+
"@atproto/oauth-provider-api": "0.8.3",
|
|
86
|
+
"@atproto/lex-resolver": "^0.2.12",
|
|
87
|
+
"@atproto/oauth-provider-ui": "0.10.3",
|
|
88
|
+
"@atproto/oauth-scopes": "^0.5.12",
|
|
89
|
+
"@atproto/syntax": "^0.7.6"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@types/cookie": "^0.6.0",
|
|
93
|
-
"@types/forwarded": "0.1.
|
|
93
|
+
"@types/forwarded": "0.1.4",
|
|
94
94
|
"@types/http-errors": "^2.0.4",
|
|
95
95
|
"@types/send": "^0.17.4",
|
|
96
96
|
"vitest": "^4.1.10",
|