Skip to content

Commit

Permalink
chore: update yarn/deps
Browse files Browse the repository at this point in the history
  • Loading branch information
awlayton committed Sep 18, 2024
1 parent 79830e7 commit cf3df10
Show file tree
Hide file tree
Showing 24 changed files with 3,513 additions and 1,430 deletions.
448 changes: 224 additions & 224 deletions oada/.yarn/releases/yarn-4.4.0.cjs → oada/.yarn/releases/yarn-4.5.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion oada/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ packageExtensions:
peerDependencies:
oauth2orize: "*"

yarnPath: .yarn/releases/yarn-4.4.0.cjs
yarnPath: .yarn/releases/yarn-4.5.0.cjs
2 changes: 1 addition & 1 deletion oada/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default typescript.config(
// 'plugin:github/typescript',
'plugin:import/typescript',
),
...xoTypescript
...xoTypescript,
),
],
},
Expand Down
8 changes: 4 additions & 4 deletions oada/libs/lib-arangodb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
"@oada/types": "^4.0.0",
"arangojs": "^9.0.0",
"bcryptjs": "^2.4.3",
"debug": "^4.3.6",
"debug": "^4.3.7",
"deep-equal": "^2.2.3",
"flat": "^6.0.1",
"json-ptr": "^3.1.1",
"tslib": "2.6.3"
"tslib": "2.7.0"
},
"devDependencies": {
"@ava/typescript": "^5.0.0",
Expand All @@ -75,9 +75,9 @@
"@types/deep-equal": "^1.0.4",
"@types/flat": "^5.0.5",
"@types/json-pointer": "^1.0.34",
"@types/node": "^22.2.0",
"@types/node": "^22.5.5",
"ava": "6.1.3",
"type-fest": "^4.24.0"
"type-fest": "^4.26.1"
},
"volta": {
"node": "22.5.1"
Expand Down
6 changes: 3 additions & 3 deletions oada/libs/lib-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"convict": "^6.2.4",
"convict-format-with-moment": "^6.2.0",
"convict-format-with-validator": "^6.2.0",
"debug": "^4.3.6",
"debug": "^4.3.7",
"dotenv": "^16.4.5",
"json5": "^2.2.3",
"tslib": "2.6.3",
"yaml": "^2.5.0"
"tslib": "2.7.0",
"yaml": "^2.5.1"
},
"devDependencies": {
"@types/convict": "^6.1.6",
Expand Down
6 changes: 3 additions & 3 deletions oada/libs/lib-kafka/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
"dependencies": {
"@oada/lib-config": "workspace:^",
"cls-rtracer": "^2.6.3",
"debug": "^4.3.6",
"debug": "^4.3.7",
"eventemitter3": "^5.0.1",
"kafkajs": "^2.2.4",
"ksuid": "^3.0.0",
"tslib": "2.6.3",
"tslib": "2.7.0",
"uuid": "^10.0.0"
},
"devDependencies": {
"@ava/typescript": "^5.0.0",
"@types/convict": "^6.1.6",
"@types/debug": "^4.1.12",
"@types/node": "^22.2.0",
"@types/node": "^22.5.5",
"@types/uuid": "^10.0.0",
"ava": "6.1.3"
},
Expand Down
6 changes: 3 additions & 3 deletions oada/libs/lib-prom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
"dependencies": {
"@oada/lib-config": "workspace:^",
"prom-client": "^15.1.3",
"tslib": "2.6.3"
"tslib": "2.7.0"
},
"devDependencies": {
"@ava/typescript": "^5.0.0",
"@types/convict": "^6.1.6",
"@types/node": "^22.2.0",
"@types/node": "^22.5.5",
"@types/ws": "^8.5.12",
"ava": "6.1.3",
"fastify-plugin": "^4.5.1"
"fastify-plugin": "^5.0.0"
},
"volta": {
"node": "22.5.1"
Expand Down
8 changes: 4 additions & 4 deletions oada/libs/models/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
"dependencies": {
"@oada/types": "^4.0.0",
"@qlever-llc/interface2class": "^1.1.0",
"tslib": "2.6.3",
"type-fest": "^4.24.0",
"tslib": "2.7.0",
"type-fest": "^4.26.1",
"xksuid": "^0.0.4"
},
"volta": {
"node": "22.5.1"
},
"devDependencies": {
"@types/node": "^22.2.0",
"jose": "^5.6.3"
"@types/node": "^22.5.5",
"jose": "^5.9.2"
}
}
6 changes: 3 additions & 3 deletions oada/libs/pino-debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
"dependencies": {
"cls-rtracer": "^2.6.3",
"is-interactive": "^2.0.0",
"pino": "^9.3.2",
"pino": "^9.4.0",
"pino-caller": "^3.4.0",
"pino-debug": "^2.0.0",
"pino-loki": "^2.3.0",
"pino-pretty": "^11.2.2",
"tslib": "2.6.3"
"tslib": "2.7.0"
},
"devDependencies": {
"@types/debug": "^4.1.12",
"@types/node": "^22.2.0"
"@types/node": "^22.5.5"
},
"peerDependencies": {
"debug": "*"
Expand Down
42 changes: 21 additions & 21 deletions oada/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,55 @@
"g:pino-pretty": "pino-pretty"
},
"devDependencies": {
"@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@eslint/compat": "^1.1.1",
"@eslint/config-inspector": "^0.5.2",
"@eslint/config-inspector": "^0.5.4",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.9.0",
"@eslint/js": "^9.10.0",
"@tsconfig/node20": "^20.1.4",
"@types/eslint": "^9.6.0",
"@types/mocha": "^10.0.7",
"@types/node": "^22.2.0",
"@typescript-eslint/eslint-plugin": "^8.0.1",
"@typescript-eslint/parser": "^8.0.1",
"@types/eslint": "^9.6.1",
"@types/mocha": "^10.0.8",
"@types/node": "^22.5.5",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@yarnpkg/sdks": "^3.2.0",
"browserslist": "^4.23.3",
"c8": "^10.1.2",
"eslint": "^9.9.0",
"eslint": "^9.10.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-xo": "^0.46.0",
"eslint-config-xo-typescript": "^6.0.0",
"eslint-formatter-pretty": "^6.0.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-array-func": "^5.0.2",
"eslint-plugin-ava": "^15.0.1",
"eslint-plugin-escompat": "^3.11.1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-github": "^5.0.1",
"eslint-plugin-github": "^5.0.2",
"eslint-plugin-i18n-text": "^1.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^17.10.2",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-n": "^17.10.3",
"eslint-plugin-no-constructor-bind": "^2.0.4",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-no-secrets": "^1.0.2",
"eslint-plugin-notice": "^1.0.0",
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-sonarjs": "^1.0.4",
"eslint-plugin-sonarjs": "^2.0.2",
"eslint-plugin-unicorn": "^55.0.0",
"get-port": "^7.1.0",
"prettier": "^3.3.3",
"tslib": "2.6.3",
"typescript": "5.5.4",
"typescript-eslint": "^8.0.1",
"tslib": "2.7.0",
"typescript": "5.6.2",
"typescript-eslint": "^8.6.0",
"update-browserslist-db": "^1.1.0",
"zx": "^8.1.4"
"zx": "^8.1.7"
},
"dependencies": {
"pino-pretty": "^11.2.2"
Expand All @@ -77,5 +77,5 @@
"volta": {
"node": "22.5.1"
},
"packageManager": "yarn@4.4.0"
"packageManager": "yarn@4.5.0"
}
45 changes: 23 additions & 22 deletions oada/services/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@
},
"homepage": "https://github.com/oada/oada-ref-auth-js",
"dependencies": {
"@fastify/accepts": "^4.3.0",
"@fastify/cors": "^9.0.1",
"@fastify/formbody": "^7.4.0",
"@fastify/helmet": "^11.1.1",
"@fastify/jwt": "^8.0.1",
"@fastify/passport": "^2.5.0",
"@fastify/rate-limit": "^9.1.0",
"@fastify/request-context": "^5.1.0",
"@fastify/secure-session": "^7.5.1",
"@fastify/sensible": "^5.6.0",
"@fastify/static": "^7.0.4",
"@fastify/view": "^9.1.0",
"@fastify/accepts": "^5.0.0",
"@fastify/cors": "^10.0.0",
"@fastify/formbody": "^8.0.0",
"@fastify/helmet": "^12.0.0",
"@fastify/jwt": "^9.0.0",
"@fastify/passport": "^3.0.0",
"@fastify/rate-limit": "^10.0.0",
"@fastify/request-context": "^6.0.0",
"@fastify/secure-session": "^8.0.0",
"@fastify/sensible": "^6.0.0",
"@fastify/static": "^8.0.0",
"@fastify/view": "^10.0.0",
"@oada/certs": "^4.1.1",
"@oada/error": "^2.0.1",
"@oada/formats": "^4.1.0",
Expand All @@ -78,19 +78,19 @@
"bcryptjs": "^2.4.3",
"chalk": "^5.3.0",
"cmd-ts": "^0.13.0",
"debug": "^4.3.6",
"debug": "^4.3.7",
"ejs": "^3.1.10",
"es-main": "^1.3.0",
"fastify": "^4.28.1",
"fastify": "^5.0.0",
"fastify-graceful-shutdown": "^4.0.1",
"fastify-healthcheck": "^4.4.0",
"ioredis": "^5.4.1",
"jose": "^5.6.3",
"jose": "^5.9.2",
"oauth2orize": "^1.12.0",
"oauth2orize-device-code": "^0.1.0",
"oauth2orize-openid": "^0.4.1",
"oauth2orize-pkce": "^0.1.2",
"openid-client": "^5.6.5",
"openid-client": "^5.7.0",
"p-memoize": "^7.1.1",
"passport": "^0.7.0",
"passport-http-bearer": "^1.0.1",
Expand All @@ -102,12 +102,13 @@
"qs": "^6.13.0",
"random-id-base36": "^1.0.3",
"serialize-error": "^11.0.3",
"tslib": "2.6.3",
"tslib": "2.7.0",
"urijs": "^1.19.11",
"uuid": "^10.0.0"
"uuid": "^10.0.0",
"yaml": "^2.5.1"
},
"devDependencies": {
"@fastify/type-provider-json-schema-to-ts": "^3.0.0",
"@fastify/type-provider-json-schema-to-ts": "^4.0.0",
"@types/bcryptjs": "^2.4.6",
"@types/debug": "^4.1.12",
"@types/ejs": "^3.1.5",
Expand All @@ -120,12 +121,12 @@
"@types/passport-oauth2-client-password": "^0.1.5",
"@types/pem-jwk": "^2.0.2",
"@types/qrcode-terminal": "^0.12.2",
"@types/qs": "^6.9.15",
"@types/qs": "^6.9.16",
"@types/urijs": "^1.19.25",
"@types/uuid": "^10.0.0",
"c8": "^10.1.2",
"json-schema-to-ts": "^3.1.0",
"type-fest": "^4.24.0"
"json-schema-to-ts": "^3.1.1",
"type-fest": "^4.26.1"
},
"volta": {
"node": "22.5.1"
Expand Down
34 changes: 26 additions & 8 deletions oada/services/auth/src/cli/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

import '@oada/pino-debug';

import { readFile } from 'node:fs/promises';

import {
array,
binary,
Expand All @@ -37,6 +39,7 @@ import { config } from '../config.js';

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

import YAML from 'yaml';
import esMain from 'es-main';

export const cmd = command({
Expand All @@ -45,6 +48,11 @@ export const cmd = command({
dataFile: positional({
type: optional(File),
}),
yaml: option({
long: 'yaml',
short: 'y',
type: optional(string),
}),
outFile: option({
long: 'out-file',
short: 'o',
Expand All @@ -54,6 +62,11 @@ export const cmd = command({
long: 'issuer',
type: config.get('oidc.issuer') ? optional(Url) : Url,
}),
name: option({
long: 'name',
short: 'n',
type: optional(string),
}),
redirects: multioption({
long: 'redirect',
short: 'r',
Expand All @@ -63,20 +76,25 @@ export const cmd = command({
},
}),
},
async handler({ dataFile, redirects, iss, outFile }) {
async handler({ dataFile, yaml, redirects, iss, name, outFile }) {
const { Issuer, errors } = await import('openid-client');
try {
const issuer = await Issuer.discover(
iss ? `${iss}` : `${config.get('oidc.issuer')}`,
);
const data = (
dataFile ? await import(dataFile) : {}
) as Partial<Metadata>;
// eslint-disable-next-line security/detect-non-literal-fs-filename
const f = dataFile
? (YAML.parse(`${await readFile(dataFile)}`) as Partial<Metadata>)
: undefined;
const y = yaml ? (YAML.parse(yaml) as Partial<Metadata>) : undefined;
const data = { ...f, ...y };
const { metadata } = await issuer.Client.register({
application_type: 'native',
client_name: name,
...data,
redirect_uris: [...redirects, ...(data.redirect_uris ?? [])],
redirect_uris: [...redirects, ...(data?.redirect_uris ?? [])],
id_token_signed_response_alg: 'HS256',
});
} satisfies Partial<Metadata>);

const client = new issuer.Client({
...metadata,
Expand All @@ -85,11 +103,11 @@ export const cmd = command({
});

const out = { ...issuer.metadata, ...client };
console.dir(out);

if (outFile) {
const { writeFile } = await import('node:fs/promises');
await writeFile(outFile, JSON.stringify(out, undefined, 2));
} else {
console.dir(out);
}
} catch (error: unknown) {
if (error instanceof errors.OPError) {
Expand Down
Loading

0 comments on commit cf3df10

Please sign in to comment.