From 24d52eef3d26ac5ee1294b949490920765fca96f Mon Sep 17 00:00:00 2001 From: Abel Luck Date: Tue, 6 Jun 2023 11:46:35 +0000 Subject: [PATCH] WIP work on getting nextauth + graphql working --- apps/metamigo-api/src/server/manifest.ts | 9 +- apps/metamigo-cli/package.json | 2 +- apps/metamigo-frontend/lib/dataprovider.ts | 5 +- .../pages/api/auth/[...nextauth].ts | 5 +- .../pages/api/graphql/[[...path]].ts | 4 +- docker-compose.yml | 18 +- package-lock.json | 644 +++++++++++++++++- packages/metamigo-db/package.json | 2 +- 8 files changed, 668 insertions(+), 21 deletions(-) diff --git a/apps/metamigo-api/src/server/manifest.ts b/apps/metamigo-api/src/server/manifest.ts index a913641..66c9859 100644 --- a/apps/metamigo-api/src/server/manifest.ts +++ b/apps/metamigo-api/src/server/manifest.ts @@ -50,10 +50,11 @@ const build = async (config: IAppConfig): Promise => { route: { path: "/graphql", options: { - auth: { - strategies: ["nextauth-jwt"], - mode: "optional", - }, + auth: false, + // auth: { + // strategies: ["nextauth-jwt"], + // mode: "optional", + // }, }, }, pgConfig: config.postgraphile.authConnection, diff --git a/apps/metamigo-cli/package.json b/apps/metamigo-cli/package.json index fcbcef6..690fa11 100644 --- a/apps/metamigo-cli/package.json +++ b/apps/metamigo-cli/package.json @@ -19,7 +19,7 @@ "graphile-migrate": "^1.4.1", "graphile-worker": "^0.13.0", "node-jose": "^2.2.0", - "postgraphile": "4.13.0", + "postgraphile": "4.12.3", "graphql": "16.6.0" }, "devDependencies": { diff --git a/apps/metamigo-frontend/lib/dataprovider.ts b/apps/metamigo-frontend/lib/dataprovider.ts index d30d3ea..d77089d 100644 --- a/apps/metamigo-frontend/lib/dataprovider.ts +++ b/apps/metamigo-frontend/lib/dataprovider.ts @@ -8,8 +8,5 @@ export const metamigoDataProvider = async (client: any) => { {}, { introspection: { schema: schema.data.__schema } } ); - - const dataProvider = async (type: any, resource: any, params: any) => graphqlDataProvider(type, resource, params); - - return dataProvider; + return graphqlDataProvider; }; diff --git a/apps/metamigo-frontend/pages/api/auth/[...nextauth].ts b/apps/metamigo-frontend/pages/api/auth/[...nextauth].ts index e33fb01..5238aef 100644 --- a/apps/metamigo-frontend/pages/api/auth/[...nextauth].ts +++ b/apps/metamigo-frontend/pages/api/auth/[...nextauth].ts @@ -61,14 +61,11 @@ const nextAuthOptions = (config: IAppConfig, req: NextApiRequest) => { return { secret: nextAuth.secret, session: { - jwt: true, + strategy: "database", maxAge: 8 * 60 * 60, // 8 hours }, jwt: { secret: nextAuth.secret, - encryption: false, - signingKey: nextAuth.signingKey, - encryptionKey: nextAuth.encryptionKey, }, providers, adapter, diff --git a/apps/metamigo-frontend/pages/api/graphql/[[...path]].ts b/apps/metamigo-frontend/pages/api/graphql/[[...path]].ts index 251b34c..b2ddc6c 100644 --- a/apps/metamigo-frontend/pages/api/graphql/[[...path]].ts +++ b/apps/metamigo-frontend/pages/api/graphql/[[...path]].ts @@ -4,7 +4,7 @@ export default createProxyMiddleware({ target: process.env.NODE_ENV === "production" ? "http://metamigo-api:3001" - : "http://localhost:3001", + : "http://127.0.0.1:3001", changeOrigin: true, pathRewrite: { "^/graphql": "/graphql" }, xfwd: true, @@ -20,8 +20,6 @@ export default createProxyMiddleware({ let token = req.cookies["__Secure-next-auth.session-token"]; if (!token) token = req.cookies["next-auth.session-token"]; - // console.log(req.body); - // if (req.body.query) console.log(req.body.query); if (token) { proxyReq.setHeader("authorization", `Bearer ${token}`); proxyReq.removeHeader("cookie"); diff --git a/docker-compose.yml b/docker-compose.yml index dbdca61..58fc51d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,6 +50,7 @@ services: xpack.security.enabled: false <<: *common-global-variables build: ./docker/elasticsearch + image: registry.gitlab.com/digiresilience/link/link-stack/zammad-elasticsearch restart: ${RESTART} volumes: - elasticsearch-data:/usr/share/elasticsearch/data @@ -65,6 +66,7 @@ services: POSTGRESQL_USER: zammad POSTGRESQL_PASS: ${ZAMMAD_DATABASE_PASSWORD} build: ./docker/zammad + image: registry.gitlab.com/digiresilience/link/link-stack/zammad restart: on-failure volumes: - zammad-data:/opt/zammad @@ -73,6 +75,7 @@ services: container_name: zammad-memcached command: memcached -m 256M build: ./docker/memcached + image: registry.gitlab.com/digiresilience/link/link-stack/zammad-memcached restart: ${RESTART} environment: <<: *common-global-variables @@ -88,6 +91,7 @@ services: depends_on: - zammad-railsserver build: ./docker/zammad + image: registry.gitlab.com/digiresilience/link/link-stack/zammad restart: ${RESTART} environment: <<: *common-global-variables @@ -104,6 +108,7 @@ services: POSTGRES_USER: zammad POSTGRES_PASSWORD: ${ZAMMAD_DATABASE_PASSWORD} build: ./docker/postgresql + image: registry.gitlab.com/digiresilience/link/link-stack/postgresql restart: ${RESTART} ports: - 127.0.0.1:5432:5432 @@ -121,6 +126,7 @@ services: environment: <<: [*common-global-variables, *common-zammad-variables] build: ./docker/zammad + image: registry.gitlab.com/digiresilience/link/link-stack/zammad restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -128,6 +134,7 @@ services: zammad-redis: container_name: zammad-redis build: ./docker/redis + image: registry.gitlab.com/digiresilience/link/link-stack/zammad-redis restart: ${RESTART} environment: <<: *common-global-variables @@ -143,6 +150,7 @@ services: environment: <<: [*common-global-variables, *common-zammad-variables] build: ./docker/zammad + image: registry.gitlab.com/digiresilience/link/link-stack/zammad restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -158,6 +166,7 @@ services: environment: <<: [*common-global-variables, *common-zammad-variables] build: ./docker/zammad + image: registry.gitlab.com/digiresilience/link/link-stack/zammad restart: ${RESTART} volumes: - zammad-data:/opt/zammad @@ -165,6 +174,7 @@ services: metamigo-postgresql: build: ./docker/postgresql + image: registry.gitlab.com/digiresilience/link/link-stack/postgresql container_name: metamigo-postgresql restart: ${RESTART} volumes: @@ -182,6 +192,7 @@ services: build: context: . dockerfile: ./apps/metamigo-cli/Dockerfile + image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-cli container_name: metamigo-api restart: ${RESTART} command: [ "api" ] @@ -198,6 +209,7 @@ services: build: context: . dockerfile: ./apps/metamigo-frontend/Dockerfile + image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-frontend container_name: metamigo-frontend restart: ${RESTART} command: [ "frontend" ] @@ -213,7 +225,10 @@ services: VIRTUAL_PORT: 3000 metamigo-worker: - build: ./apps/metamigo-worker + build: + context: . + dockerfile: ./apps/metamigo-cli/Dockerfile + image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-cli container_name: metamigo-worker restart: ${RESTART} command: [ "worker" ] @@ -224,6 +239,7 @@ services: signald: container_name: signald build: ./docker/signald + image: registry.gitlab.com/digiresilience/link/link-stack/signald restart: ${RESTART} user: ${CURRENT_UID} volumes: diff --git a/package-lock.json b/package-lock.json index 9103273..fde9d86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "link-stack", "version": "2.0.0", - "license": "ISC", "workspaces": [ "apps/*", "packages/*" @@ -450,6 +449,7 @@ "license": "AGPL-3.0-or-later", "dependencies": { "@digiresilience/metamigo-api": "*", + "@digiresilience/metamigo-common": "*", "@digiresilience/metamigo-config": "*", "@digiresilience/metamigo-db": "*", "@digiresilience/metamigo-worker": "*", @@ -459,7 +459,7 @@ "graphile-worker": "^0.13.0", "graphql": "16.6.0", "node-jose": "^2.2.0", - "postgraphile": "4.13.0" + "postgraphile": "4.12.3" }, "bin": { "metamigo": "build/main/index.js" @@ -475,6 +475,310 @@ "typescript": "^5.0.4" } }, + "apps/metamigo-cli/node_modules/@types/jsonwebtoken": { + "version": "8.5.9", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz", + "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==", + "dependencies": { + "@types/node": "*" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.12.1.tgz", + "integrity": "sha512-Rd9QBtbyLJ425VUeHggFCvh3s3oKR58mUU6JYK0sQTRjYbxrE/eWDNAQZQLuWeemfSHvgS5W0EzppkHjkoiWiQ==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphile-build": "4.12.0", + "jsonwebtoken": "^8.5.1", + "lodash": ">=4 <5", + "lru-cache": ">=4 <5", + "pg-sql2": "4.12.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "pg": ">=6.1.0 <9" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg/node_modules/graphile-build": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.0.tgz", + "integrity": "sha512-P4urOvOf4C8uzuuCq8BjFb+qffQvWUnZamrEyRC/0BfKKPkZhQ/HYqe9M7JkwiH8uFekHaTXDBrdR+OPoZEdhw==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphql-parse-resolve-info": "4.12.0", + "iterall": "^1.2.2", + "lodash": ">=4 <5", + "lru-cache": "^5.0.0", + "pluralize": "^7.0.0", + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg/node_modules/graphile-build/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg/node_modules/graphql": { + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", + "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==", + "peer": true, + "engines": { + "node": ">= 10.x" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg/node_modules/graphql-parse-resolve-info": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", + "integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", + "dependencies": { + "debug": "^4.1.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "apps/metamigo-cli/node_modules/graphile-build-pg/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "apps/metamigo-cli/node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "apps/metamigo-cli/node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "apps/metamigo-cli/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "apps/metamigo-cli/node_modules/pg-sql2": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.12.1.tgz", + "integrity": "sha512-3N6i0EIBYc3uKpGGJntZA7HG2cyphC2R3d00kOoc0H7MxeAP+5dN1VfHJjj9vFGlrUy40Ttq8z3UkNtWR6ySAA==", + "dependencies": { + "@graphile/lru": "4.11.0", + "@types/pg": ">=6 <9", + "debug": ">=3 <5", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "pg": ">=6.1.0 <9" + } + }, + "apps/metamigo-cli/node_modules/pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "engines": { + "node": ">=4" + } + }, + "apps/metamigo-cli/node_modules/postgraphile": { + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.12.3.tgz", + "integrity": "sha512-hGeLxU9HROd+csQULgsGa6l5j459vrKJtQzztbLgkZZLJDvEo/bA4bYNTyP4+OWI8RkIuwu1cM8ds40InrnZ+g==", + "dependencies": { + "@graphile/lru": "4.11.0", + "@types/json5": "^0.0.30", + "@types/jsonwebtoken": "^8.3.2", + "@types/pg": ">=6 <9", + "@types/ws": "^7.4.0", + "body-parser": "^1.15.2", + "chalk": "^2.4.2", + "commander": "^2.19.0", + "debug": "^4.1.1", + "finalhandler": "^1.0.6", + "graphile-build": "4.12.0", + "graphile-build-pg": "4.12.1", + "graphile-utils": "^4.12.1", + "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0", + "graphql-ws": "^4.1.1", + "http-errors": "^1.5.1", + "iterall": "^1.0.2", + "json5": "^2.1.1", + "jsonwebtoken": "^8.0.0", + "parseurl": "^1.3.2", + "pg": ">=6.1.0 <9", + "pg-connection-string": "^2.0.0", + "pg-sql2": "4.12.1", + "postgraphile-core": "4.12.1", + "subscriptions-transport-ws": "^0.9.18", + "tslib": "^2.1.0", + "ws": "^7.4.2" + }, + "bin": { + "postgraphile": "cli.js" + }, + "engines": { + "node": ">=8.6" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/graphile-build": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.0.tgz", + "integrity": "sha512-P4urOvOf4C8uzuuCq8BjFb+qffQvWUnZamrEyRC/0BfKKPkZhQ/HYqe9M7JkwiH8uFekHaTXDBrdR+OPoZEdhw==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphql-parse-resolve-info": "4.12.0", + "iterall": "^1.2.2", + "lodash": ">=4 <5", + "lru-cache": "^5.0.0", + "pluralize": "^7.0.0", + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/graphile-utils": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.13.0.tgz", + "integrity": "sha512-6nzlCNeJB1qV9AaPyJ/iHU+CDfs8jxpcmQ47Fmrgmp8r5VwKdL/uDt0LW8IuXu2VZrbM1GGyZ8rQtcdVmQYZ+g==", + "dependencies": { + "debug": "^4.1.1", + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphile-build": "^4.5.0", + "graphile-build-pg": "^4.5.0" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/graphql": { + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", + "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==", + "engines": { + "node": ">= 10.x" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/graphql-parse-resolve-info": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", + "integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", + "dependencies": { + "debug": "^4.1.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/graphql-ws": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz", + "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "graphql": ">=0.11 <=15" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/postgraphile-core": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.12.1.tgz", + "integrity": "sha512-BukrJ3j+H4dtEaCCZOPjLZ6+DJnAYHPOvFpDC85w9T4xlpLFCx7/E8ZlZFm7z/P6f/s8SS8EpL7lazms6uB8FQ==", + "dependencies": { + "graphile-build": "4.12.0", + "graphile-build-pg": "4.12.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", + "pg": ">=6.1.0 <9" + } + }, + "apps/metamigo-cli/node_modules/postgraphile/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "apps/metamigo-cli/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + }, "apps/metamigo-frontend": { "name": "@digiresilience/metamigo-frontend", "version": "0.2.0", @@ -14680,11 +14984,41 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -22048,7 +22382,7 @@ "@graphile-contrib/pg-many-to-many": "^1.0.2", "graphile-migrate": "^1.4.1", "graphql": "16.6.0", - "postgraphile": "4.13.0" + "postgraphile": "4.12.3" }, "devDependencies": { "@babel/core": "7.21.8", @@ -22065,6 +22399,310 @@ "typescript": "^5.0.4" } }, + "packages/metamigo-db/node_modules/@types/jsonwebtoken": { + "version": "8.5.9", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz", + "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==", + "dependencies": { + "@types/node": "*" + } + }, + "packages/metamigo-db/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "packages/metamigo-db/node_modules/graphile-build-pg": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.12.1.tgz", + "integrity": "sha512-Rd9QBtbyLJ425VUeHggFCvh3s3oKR58mUU6JYK0sQTRjYbxrE/eWDNAQZQLuWeemfSHvgS5W0EzppkHjkoiWiQ==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphile-build": "4.12.0", + "jsonwebtoken": "^8.5.1", + "lodash": ">=4 <5", + "lru-cache": ">=4 <5", + "pg-sql2": "4.12.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "pg": ">=6.1.0 <9" + } + }, + "packages/metamigo-db/node_modules/graphile-build-pg/node_modules/graphile-build": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.0.tgz", + "integrity": "sha512-P4urOvOf4C8uzuuCq8BjFb+qffQvWUnZamrEyRC/0BfKKPkZhQ/HYqe9M7JkwiH8uFekHaTXDBrdR+OPoZEdhw==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphql-parse-resolve-info": "4.12.0", + "iterall": "^1.2.2", + "lodash": ">=4 <5", + "lru-cache": "^5.0.0", + "pluralize": "^7.0.0", + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "packages/metamigo-db/node_modules/graphile-build-pg/node_modules/graphile-build/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "packages/metamigo-db/node_modules/graphile-build-pg/node_modules/graphql": { + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", + "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==", + "peer": true, + "engines": { + "node": ">= 10.x" + } + }, + "packages/metamigo-db/node_modules/graphile-build-pg/node_modules/graphql-parse-resolve-info": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", + "integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", + "dependencies": { + "debug": "^4.1.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "packages/metamigo-db/node_modules/graphile-build-pg/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "packages/metamigo-db/node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "packages/metamigo-db/node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "packages/metamigo-db/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "packages/metamigo-db/node_modules/pg-sql2": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.12.1.tgz", + "integrity": "sha512-3N6i0EIBYc3uKpGGJntZA7HG2cyphC2R3d00kOoc0H7MxeAP+5dN1VfHJjj9vFGlrUy40Ttq8z3UkNtWR6ySAA==", + "dependencies": { + "@graphile/lru": "4.11.0", + "@types/pg": ">=6 <9", + "debug": ">=3 <5", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "pg": ">=6.1.0 <9" + } + }, + "packages/metamigo-db/node_modules/pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "engines": { + "node": ">=4" + } + }, + "packages/metamigo-db/node_modules/postgraphile": { + "version": "4.12.3", + "resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.12.3.tgz", + "integrity": "sha512-hGeLxU9HROd+csQULgsGa6l5j459vrKJtQzztbLgkZZLJDvEo/bA4bYNTyP4+OWI8RkIuwu1cM8ds40InrnZ+g==", + "dependencies": { + "@graphile/lru": "4.11.0", + "@types/json5": "^0.0.30", + "@types/jsonwebtoken": "^8.3.2", + "@types/pg": ">=6 <9", + "@types/ws": "^7.4.0", + "body-parser": "^1.15.2", + "chalk": "^2.4.2", + "commander": "^2.19.0", + "debug": "^4.1.1", + "finalhandler": "^1.0.6", + "graphile-build": "4.12.0", + "graphile-build-pg": "4.12.1", + "graphile-utils": "^4.12.1", + "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0", + "graphql-ws": "^4.1.1", + "http-errors": "^1.5.1", + "iterall": "^1.0.2", + "json5": "^2.1.1", + "jsonwebtoken": "^8.0.0", + "parseurl": "^1.3.2", + "pg": ">=6.1.0 <9", + "pg-connection-string": "^2.0.0", + "pg-sql2": "4.12.1", + "postgraphile-core": "4.12.1", + "subscriptions-transport-ws": "^0.9.18", + "tslib": "^2.1.0", + "ws": "^7.4.2" + }, + "bin": { + "postgraphile": "cli.js" + }, + "engines": { + "node": ">=8.6" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/graphile-build": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.0.tgz", + "integrity": "sha512-P4urOvOf4C8uzuuCq8BjFb+qffQvWUnZamrEyRC/0BfKKPkZhQ/HYqe9M7JkwiH8uFekHaTXDBrdR+OPoZEdhw==", + "dependencies": { + "@graphile/lru": "4.11.0", + "chalk": "^2.4.2", + "debug": "^4.1.1", + "graphql-parse-resolve-info": "4.12.0", + "iterall": "^1.2.2", + "lodash": ">=4 <5", + "lru-cache": "^5.0.0", + "pluralize": "^7.0.0", + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/graphile-utils": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.13.0.tgz", + "integrity": "sha512-6nzlCNeJB1qV9AaPyJ/iHU+CDfs8jxpcmQ47Fmrgmp8r5VwKdL/uDt0LW8IuXu2VZrbM1GGyZ8rQtcdVmQYZ+g==", + "dependencies": { + "debug": "^4.1.1", + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphile-build": "^4.5.0", + "graphile-build-pg": "^4.5.0" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/graphql": { + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz", + "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==", + "engines": { + "node": ">= 10.x" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/graphql-parse-resolve-info": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", + "integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", + "dependencies": { + "debug": "^4.1.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/graphql-ws": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz", + "integrity": "sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "graphql": ">=0.11 <=15" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/postgraphile-core": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.12.1.tgz", + "integrity": "sha512-BukrJ3j+H4dtEaCCZOPjLZ6+DJnAYHPOvFpDC85w9T4xlpLFCx7/E8ZlZFm7z/P6f/s8SS8EpL7lazms6uB8FQ==", + "dependencies": { + "graphile-build": "4.12.0", + "graphile-build-pg": "4.12.1", + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=8.6" + }, + "peerDependencies": { + "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", + "pg": ">=6.1.0 <9" + } + }, + "packages/metamigo-db/node_modules/postgraphile/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "packages/metamigo-db/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + }, "packages/montar": { "name": "@digiresilience/montar", "version": "0.1.7", diff --git a/packages/metamigo-db/package.json b/packages/metamigo-db/package.json index 16368c4..0e9f060 100644 --- a/packages/metamigo-db/package.json +++ b/packages/metamigo-db/package.json @@ -12,7 +12,7 @@ "@graphile-contrib/pg-many-to-many": "^1.0.2", "graphile-migrate": "^1.4.1", "graphql": "16.6.0", - "postgraphile": "4.13.0" + "postgraphile": "4.12.3" }, "devDependencies": { "@babel/core": "7.21.8",