Skip to content

Commit cf3df10

Browse files
committed
chore: update yarn/deps
1 parent 79830e7 commit cf3df10

File tree

24 files changed

+3513
-1430
lines changed

24 files changed

+3513
-1430
lines changed

oada/.yarn/releases/yarn-4.4.0.cjs renamed to oada/.yarn/releases/yarn-4.5.0.cjs

Lines changed: 224 additions & 224 deletions
Large diffs are not rendered by default.

oada/.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ packageExtensions:
6464
peerDependencies:
6565
oauth2orize: "*"
6666

67-
yarnPath: .yarn/releases/yarn-4.4.0.cjs
67+
yarnPath: .yarn/releases/yarn-4.5.0.cjs

oada/eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default typescript.config(
8383
// 'plugin:github/typescript',
8484
'plugin:import/typescript',
8585
),
86-
...xoTypescript
86+
...xoTypescript,
8787
),
8888
],
8989
},

oada/libs/lib-arangodb/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
"@oada/types": "^4.0.0",
6262
"arangojs": "^9.0.0",
6363
"bcryptjs": "^2.4.3",
64-
"debug": "^4.3.6",
64+
"debug": "^4.3.7",
6565
"deep-equal": "^2.2.3",
6666
"flat": "^6.0.1",
6767
"json-ptr": "^3.1.1",
68-
"tslib": "2.6.3"
68+
"tslib": "2.7.0"
6969
},
7070
"devDependencies": {
7171
"@ava/typescript": "^5.0.0",
@@ -75,9 +75,9 @@
7575
"@types/deep-equal": "^1.0.4",
7676
"@types/flat": "^5.0.5",
7777
"@types/json-pointer": "^1.0.34",
78-
"@types/node": "^22.2.0",
78+
"@types/node": "^22.5.5",
7979
"ava": "6.1.3",
80-
"type-fest": "^4.24.0"
80+
"type-fest": "^4.26.1"
8181
},
8282
"volta": {
8383
"node": "22.5.1"

oada/libs/lib-config/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
"convict": "^6.2.4",
3838
"convict-format-with-moment": "^6.2.0",
3939
"convict-format-with-validator": "^6.2.0",
40-
"debug": "^4.3.6",
40+
"debug": "^4.3.7",
4141
"dotenv": "^16.4.5",
4242
"json5": "^2.2.3",
43-
"tslib": "2.6.3",
44-
"yaml": "^2.5.0"
43+
"tslib": "2.7.0",
44+
"yaml": "^2.5.1"
4545
},
4646
"devDependencies": {
4747
"@types/convict": "^6.1.6",

oada/libs/lib-kafka/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@
3737
"dependencies": {
3838
"@oada/lib-config": "workspace:^",
3939
"cls-rtracer": "^2.6.3",
40-
"debug": "^4.3.6",
40+
"debug": "^4.3.7",
4141
"eventemitter3": "^5.0.1",
4242
"kafkajs": "^2.2.4",
4343
"ksuid": "^3.0.0",
44-
"tslib": "2.6.3",
44+
"tslib": "2.7.0",
4545
"uuid": "^10.0.0"
4646
},
4747
"devDependencies": {
4848
"@ava/typescript": "^5.0.0",
4949
"@types/convict": "^6.1.6",
5050
"@types/debug": "^4.1.12",
51-
"@types/node": "^22.2.0",
51+
"@types/node": "^22.5.5",
5252
"@types/uuid": "^10.0.0",
5353
"ava": "6.1.3"
5454
},

oada/libs/lib-prom/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
"dependencies": {
3838
"@oada/lib-config": "workspace:^",
3939
"prom-client": "^15.1.3",
40-
"tslib": "2.6.3"
40+
"tslib": "2.7.0"
4141
},
4242
"devDependencies": {
4343
"@ava/typescript": "^5.0.0",
4444
"@types/convict": "^6.1.6",
45-
"@types/node": "^22.2.0",
45+
"@types/node": "^22.5.5",
4646
"@types/ws": "^8.5.12",
4747
"ava": "6.1.3",
48-
"fastify-plugin": "^4.5.1"
48+
"fastify-plugin": "^5.0.0"
4949
},
5050
"volta": {
5151
"node": "22.5.1"

oada/libs/models/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
"dependencies": {
3131
"@oada/types": "^4.0.0",
3232
"@qlever-llc/interface2class": "^1.1.0",
33-
"tslib": "2.6.3",
34-
"type-fest": "^4.24.0",
33+
"tslib": "2.7.0",
34+
"type-fest": "^4.26.1",
3535
"xksuid": "^0.0.4"
3636
},
3737
"volta": {
3838
"node": "22.5.1"
3939
},
4040
"devDependencies": {
41-
"@types/node": "^22.2.0",
42-
"jose": "^5.6.3"
41+
"@types/node": "^22.5.5",
42+
"jose": "^5.9.2"
4343
}
4444
}

oada/libs/pino-debug/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
"dependencies": {
2626
"cls-rtracer": "^2.6.3",
2727
"is-interactive": "^2.0.0",
28-
"pino": "^9.3.2",
28+
"pino": "^9.4.0",
2929
"pino-caller": "^3.4.0",
3030
"pino-debug": "^2.0.0",
3131
"pino-loki": "^2.3.0",
3232
"pino-pretty": "^11.2.2",
33-
"tslib": "2.6.3"
33+
"tslib": "2.7.0"
3434
},
3535
"devDependencies": {
3636
"@types/debug": "^4.1.12",
37-
"@types/node": "^22.2.0"
37+
"@types/node": "^22.5.5"
3838
},
3939
"peerDependencies": {
4040
"debug": "*"

oada/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,55 @@
1313
"g:pino-pretty": "pino-pretty"
1414
},
1515
"devDependencies": {
16-
"@commitlint/cli": "^19.4.0",
17-
"@commitlint/config-conventional": "^19.2.2",
16+
"@commitlint/cli": "^19.5.0",
17+
"@commitlint/config-conventional": "^19.5.0",
1818
"@eslint/compat": "^1.1.1",
19-
"@eslint/config-inspector": "^0.5.2",
19+
"@eslint/config-inspector": "^0.5.4",
2020
"@eslint/eslintrc": "^3.1.0",
21-
"@eslint/js": "^9.9.0",
21+
"@eslint/js": "^9.10.0",
2222
"@tsconfig/node20": "^20.1.4",
23-
"@types/eslint": "^9.6.0",
24-
"@types/mocha": "^10.0.7",
25-
"@types/node": "^22.2.0",
26-
"@typescript-eslint/eslint-plugin": "^8.0.1",
27-
"@typescript-eslint/parser": "^8.0.1",
23+
"@types/eslint": "^9.6.1",
24+
"@types/mocha": "^10.0.8",
25+
"@types/node": "^22.5.5",
26+
"@typescript-eslint/eslint-plugin": "^8.6.0",
27+
"@typescript-eslint/parser": "^8.6.0",
2828
"@yarnpkg/sdks": "^3.2.0",
2929
"browserslist": "^4.23.3",
3030
"c8": "^10.1.2",
31-
"eslint": "^9.9.0",
31+
"eslint": "^9.10.0",
3232
"eslint-config-prettier": "^9.1.0",
3333
"eslint-config-xo": "^0.46.0",
3434
"eslint-config-xo-typescript": "^6.0.0",
3535
"eslint-formatter-pretty": "^6.0.1",
3636
"eslint-import-resolver-node": "^0.3.9",
37-
"eslint-import-resolver-typescript": "^3.6.1",
37+
"eslint-import-resolver-typescript": "^3.6.3",
3838
"eslint-plugin-array-func": "^5.0.2",
3939
"eslint-plugin-ava": "^15.0.1",
4040
"eslint-plugin-escompat": "^3.11.1",
4141
"eslint-plugin-eslint-comments": "^3.2.0",
4242
"eslint-plugin-filenames": "^1.3.2",
43-
"eslint-plugin-github": "^5.0.1",
43+
"eslint-plugin-github": "^5.0.2",
4444
"eslint-plugin-i18n-text": "^1.0.1",
45-
"eslint-plugin-import": "^2.29.1",
46-
"eslint-plugin-n": "^17.10.2",
45+
"eslint-plugin-import": "^2.30.0",
46+
"eslint-plugin-n": "^17.10.3",
4747
"eslint-plugin-no-constructor-bind": "^2.0.4",
48-
"eslint-plugin-no-only-tests": "^3.1.0",
48+
"eslint-plugin-no-only-tests": "^3.3.0",
4949
"eslint-plugin-no-secrets": "^1.0.2",
5050
"eslint-plugin-notice": "^1.0.0",
5151
"eslint-plugin-optimize-regex": "^1.2.1",
5252
"eslint-plugin-prettier": "^5.2.1",
5353
"eslint-plugin-promise": "^7.1.0",
5454
"eslint-plugin-regexp": "^2.6.0",
5555
"eslint-plugin-security": "^3.0.1",
56-
"eslint-plugin-sonarjs": "^1.0.4",
56+
"eslint-plugin-sonarjs": "^2.0.2",
5757
"eslint-plugin-unicorn": "^55.0.0",
5858
"get-port": "^7.1.0",
5959
"prettier": "^3.3.3",
60-
"tslib": "2.6.3",
61-
"typescript": "5.5.4",
62-
"typescript-eslint": "^8.0.1",
60+
"tslib": "2.7.0",
61+
"typescript": "5.6.2",
62+
"typescript-eslint": "^8.6.0",
6363
"update-browserslist-db": "^1.1.0",
64-
"zx": "^8.1.4"
64+
"zx": "^8.1.7"
6565
},
6666
"dependencies": {
6767
"pino-pretty": "^11.2.2"
@@ -77,5 +77,5 @@
7777
"volta": {
7878
"node": "22.5.1"
7979
},
80-
"packageManager": "yarn@4.4.0"
80+
"packageManager": "yarn@4.5.0"
8181
}

oada/services/auth/package.json

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@
4949
},
5050
"homepage": "https://github.com/oada/oada-ref-auth-js",
5151
"dependencies": {
52-
"@fastify/accepts": "^4.3.0",
53-
"@fastify/cors": "^9.0.1",
54-
"@fastify/formbody": "^7.4.0",
55-
"@fastify/helmet": "^11.1.1",
56-
"@fastify/jwt": "^8.0.1",
57-
"@fastify/passport": "^2.5.0",
58-
"@fastify/rate-limit": "^9.1.0",
59-
"@fastify/request-context": "^5.1.0",
60-
"@fastify/secure-session": "^7.5.1",
61-
"@fastify/sensible": "^5.6.0",
62-
"@fastify/static": "^7.0.4",
63-
"@fastify/view": "^9.1.0",
52+
"@fastify/accepts": "^5.0.0",
53+
"@fastify/cors": "^10.0.0",
54+
"@fastify/formbody": "^8.0.0",
55+
"@fastify/helmet": "^12.0.0",
56+
"@fastify/jwt": "^9.0.0",
57+
"@fastify/passport": "^3.0.0",
58+
"@fastify/rate-limit": "^10.0.0",
59+
"@fastify/request-context": "^6.0.0",
60+
"@fastify/secure-session": "^8.0.0",
61+
"@fastify/sensible": "^6.0.0",
62+
"@fastify/static": "^8.0.0",
63+
"@fastify/view": "^10.0.0",
6464
"@oada/certs": "^4.1.1",
6565
"@oada/error": "^2.0.1",
6666
"@oada/formats": "^4.1.0",
@@ -78,19 +78,19 @@
7878
"bcryptjs": "^2.4.3",
7979
"chalk": "^5.3.0",
8080
"cmd-ts": "^0.13.0",
81-
"debug": "^4.3.6",
81+
"debug": "^4.3.7",
8282
"ejs": "^3.1.10",
8383
"es-main": "^1.3.0",
84-
"fastify": "^4.28.1",
84+
"fastify": "^5.0.0",
8585
"fastify-graceful-shutdown": "^4.0.1",
8686
"fastify-healthcheck": "^4.4.0",
8787
"ioredis": "^5.4.1",
88-
"jose": "^5.6.3",
88+
"jose": "^5.9.2",
8989
"oauth2orize": "^1.12.0",
9090
"oauth2orize-device-code": "^0.1.0",
9191
"oauth2orize-openid": "^0.4.1",
9292
"oauth2orize-pkce": "^0.1.2",
93-
"openid-client": "^5.6.5",
93+
"openid-client": "^5.7.0",
9494
"p-memoize": "^7.1.1",
9595
"passport": "^0.7.0",
9696
"passport-http-bearer": "^1.0.1",
@@ -102,12 +102,13 @@
102102
"qs": "^6.13.0",
103103
"random-id-base36": "^1.0.3",
104104
"serialize-error": "^11.0.3",
105-
"tslib": "2.6.3",
105+
"tslib": "2.7.0",
106106
"urijs": "^1.19.11",
107-
"uuid": "^10.0.0"
107+
"uuid": "^10.0.0",
108+
"yaml": "^2.5.1"
108109
},
109110
"devDependencies": {
110-
"@fastify/type-provider-json-schema-to-ts": "^3.0.0",
111+
"@fastify/type-provider-json-schema-to-ts": "^4.0.0",
111112
"@types/bcryptjs": "^2.4.6",
112113
"@types/debug": "^4.1.12",
113114
"@types/ejs": "^3.1.5",
@@ -120,12 +121,12 @@
120121
"@types/passport-oauth2-client-password": "^0.1.5",
121122
"@types/pem-jwk": "^2.0.2",
122123
"@types/qrcode-terminal": "^0.12.2",
123-
"@types/qs": "^6.9.15",
124+
"@types/qs": "^6.9.16",
124125
"@types/urijs": "^1.19.25",
125126
"@types/uuid": "^10.0.0",
126127
"c8": "^10.1.2",
127-
"json-schema-to-ts": "^3.1.0",
128-
"type-fest": "^4.24.0"
128+
"json-schema-to-ts": "^3.1.1",
129+
"type-fest": "^4.26.1"
129130
},
130131
"volta": {
131132
"node": "22.5.1"

oada/services/auth/src/cli/client.ts

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
import '@oada/pino-debug';
2121

22+
import { readFile } from 'node:fs/promises';
23+
2224
import {
2325
array,
2426
binary,
@@ -37,6 +39,7 @@ import { config } from '../config.js';
3739

3840
import type Metadata from '@oada/types/oauth-dyn-reg/metadata.js';
3941

42+
import YAML from 'yaml';
4043
import esMain from 'es-main';
4144

4245
export const cmd = command({
@@ -45,6 +48,11 @@ export const cmd = command({
4548
dataFile: positional({
4649
type: optional(File),
4750
}),
51+
yaml: option({
52+
long: 'yaml',
53+
short: 'y',
54+
type: optional(string),
55+
}),
4856
outFile: option({
4957
long: 'out-file',
5058
short: 'o',
@@ -54,6 +62,11 @@ export const cmd = command({
5462
long: 'issuer',
5563
type: config.get('oidc.issuer') ? optional(Url) : Url,
5664
}),
65+
name: option({
66+
long: 'name',
67+
short: 'n',
68+
type: optional(string),
69+
}),
5770
redirects: multioption({
5871
long: 'redirect',
5972
short: 'r',
@@ -63,20 +76,25 @@ export const cmd = command({
6376
},
6477
}),
6578
},
66-
async handler({ dataFile, redirects, iss, outFile }) {
79+
async handler({ dataFile, yaml, redirects, iss, name, outFile }) {
6780
const { Issuer, errors } = await import('openid-client');
6881
try {
6982
const issuer = await Issuer.discover(
7083
iss ? `${iss}` : `${config.get('oidc.issuer')}`,
7184
);
72-
const data = (
73-
dataFile ? await import(dataFile) : {}
74-
) as Partial<Metadata>;
85+
// eslint-disable-next-line security/detect-non-literal-fs-filename
86+
const f = dataFile
87+
? (YAML.parse(`${await readFile(dataFile)}`) as Partial<Metadata>)
88+
: undefined;
89+
const y = yaml ? (YAML.parse(yaml) as Partial<Metadata>) : undefined;
90+
const data = { ...f, ...y };
7591
const { metadata } = await issuer.Client.register({
92+
application_type: 'native',
93+
client_name: name,
7694
...data,
77-
redirect_uris: [...redirects, ...(data.redirect_uris ?? [])],
95+
redirect_uris: [...redirects, ...(data?.redirect_uris ?? [])],
7896
id_token_signed_response_alg: 'HS256',
79-
});
97+
} satisfies Partial<Metadata>);
8098

8199
const client = new issuer.Client({
82100
...metadata,
@@ -85,11 +103,11 @@ export const cmd = command({
85103
});
86104

87105
const out = { ...issuer.metadata, ...client };
88-
console.dir(out);
89-
90106
if (outFile) {
91107
const { writeFile } = await import('node:fs/promises');
92108
await writeFile(outFile, JSON.stringify(out, undefined, 2));
109+
} else {
110+
console.dir(out);
93111
}
94112
} catch (error: unknown) {
95113
if (error instanceof errors.OPError) {

0 commit comments

Comments
 (0)