Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12,795 changes: 6,176 additions & 6,619 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions packages/acs-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
"dependencies": {
"@restorecommerce/grpc-client": "^2.3.2",
"@restorecommerce/kafka-client": "^1.4.2",
"@restorecommerce/logger": "^1.4.2",
"@restorecommerce/rc-grpc-clients": "^5.2.2",
"@restorecommerce/service-config": "^1.2.2",
"node-eval": "^2.0.0",
"@restorecommerce/grpc-client": "2.3.2",
"@restorecommerce/kafka-client": "1.4.2",
"@restorecommerce/logger": "1.4.2",
"@restorecommerce/rc-grpc-clients": "5.2.2",
"@restorecommerce/service-config": "1.2.2",
"node-eval": "2.0.0",
"redis": "4.7.0",
"remeda": "^2.39.0"
"remeda": "2.39.0"
},
"devDependencies": {
"@alenon/grpc-mock-server": "^3.2.9",
"@restorecommerce/dev": "^0.3.1",
"@restorecommerce/protos": "^6.16.1",
"@alenon/grpc-mock-server": "3.2.9",
"@restorecommerce/dev": "0.3.1",
"@restorecommerce/protos": "6.16.1",
"@types/redis": "4.0.2",
"cross-env": "^10.1.0",
"nice-grpc": "^2.1.16",
"nodemon": "^3.1.14",
"npm-run-all": "^4.1.5",
"rimraf": "^6.1.3",
"should": "^13.2.3"
"cross-env": "10.1.0",
"nice-grpc": "2.1.16",
"nodemon": "3.1.14",
"npm-run-all": "4.1.5",
"rimraf": "6.1.3",
"should": "13.2.3"
},
"scripts": {
"build:tsc": "tsc -p ./tsconfig.lib.json",
Expand Down
27 changes: 18 additions & 9 deletions packages/acs-client/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ import {
import { Effect } from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/rule.js';
import { isEmptyish, isIncludedIn, isNullish } from "remeda";

export type FilterParamKey = {
scopingEntity?: string,
value: string
};

export const handleError = (err: string | Error | any): any => {
let error;
if (typeof err == 'string') {
Expand Down Expand Up @@ -282,15 +287,19 @@ const buildQueryFromTarget = (
scopingUpdated = true;
} else if (database && database === 'postgres' && effect == Effect.PERMIT) {
query['filters'] = [];
const filterKeyMapArray = cfg?.get('authorization:filterParamKey');
let filterParamKey;
if (Array.isArray(filterKeyMapArray)) {
filterParamKey = filterKeyMapArray?.find((obj) => obj?.scopingEntity === scopingAttribute?.value)?.value;
}
if (!filterParamKey) {
// default filter Paramkey for PostgresDB
filterParamKey = 'orgKey';
}
let filterParamKey = cfg?.get('authorization:filterParamKey');
if (Array.isArray(filterParamKey)) {
filterParamKey = filterParamKey?.find(
(obj) => obj?.scopingEntity === scopingAttribute?.value
)?.value;
}
else if (typeof filterParamKey === 'object') {
filterParamKey = Array.from<FilterParamKey>(Object.values(filterParamKey))?.find(
(obj: any) => obj?.scopingEntity === scopingAttribute?.value
)?.value;
}
// default filter Paramkey for PostgresDB
filterParamKey ??= 'orgKey';
logger?.debug('Filter paramter key for Postgres DB', { filterParamKey });
for (const eachScope of userTotalScope) {
query['filters'].push({ field: filterParamKey, operation: 'eq', value: eachScope });
Expand Down
54 changes: 27 additions & 27 deletions packages/chassis-srv/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,38 @@
],
"type": "module",
"dependencies": {
"@restorecommerce/grpc-client": "^2.3.2",
"@restorecommerce/kafka-client": "^1.4.2",
"@restorecommerce/logger": "^1.4.2",
"@restorecommerce/rc-grpc-clients": "^5.2.2",
"@restorecommerce/service-config": "^1.2.2",
"abort-controller-x": "^0.5.0",
"@restorecommerce/grpc-client": "2.3.2",
"@restorecommerce/kafka-client": "1.4.2",
"@restorecommerce/logger": "1.4.2",
"@restorecommerce/rc-grpc-clients": "5.2.2",
"@restorecommerce/service-config": "1.2.2",
"abort-controller-x": "0.5.0",
"arangojs": "9.1.0",
"async": "3.2.6",
"async-retry": "^1.3.3",
"cache-manager": "^7.2.8",
"cls-hooked": "^4.2.2",
"cls-rtracer": "^2.6.4",
"google-protobuf": "^4.0.2",
"kafkajs": "^2.2.4",
"keyv": "^5.6.0",
"long": "^5.3.2",
"lru-cache": "^11.5.1",
"nice-grpc": "^2.1.16",
"nice-grpc-server-reflection": "^3.0.5",
"protobufjs": "^8.6.3",
"async-retry": "1.3.3",
"cache-manager": "7.2.8",
"cls-hooked": "4.2.2",
"cls-rtracer": "2.6.4",
"google-protobuf": "4.0.2",
"kafkajs": "2.2.4",
"keyv": "5.6.0",
"long": "5.3.2",
"lru-cache": "11.5.1",
"nice-grpc": "2.1.16",
"nice-grpc-server-reflection": "3.0.5",
"protobufjs": "8.6.3",
"redis": "4.7.0",
"remeda": "^2.39.0"
"remeda": "2.39.0"
},
"devDependencies": {
"@restorecommerce/dev": "^0.3.1",
"@types/async": "^3.2.25",
"@types/async-retry": "^1.4.9",
"cross-env": "^10.1.0",
"npm-run-all": "^4.1.5",
"rimraf": "^6.1.3",
"rxjs": "^7.8.2",
"should": "^13.2.3"
"@restorecommerce/dev": "0.3.1",
"@types/async": "3.2.25",
"@types/async-retry": "1.4.9",
"cross-env": "10.1.0",
"npm-run-all": "4.1.5",
"rimraf": "6.1.3",
"rxjs": "7.8.2",
"should": "13.2.3"
},
"scripts": {
"lint": "eslint src",
Expand Down
12 changes: 6 additions & 6 deletions packages/cluster-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"service"
],
"dependencies": {
"forever-monitor": "^3.0.3",
"recluster": "^1.0.0"
"forever-monitor": "3.0.3",
"recluster": "1.0.0"
},
"devDependencies": {
"@restorecommerce/dev": "^0.3.1",
"@vitest/coverage-v8": "^4.1.8",
"is-generator": "^1.0.3",
"should": "^13.2.3"
"@restorecommerce/dev": "0.3.1",
"@vitest/coverage-v8": "4.1.8",
"is-generator": "1.0.3",
"should": "13.2.3"
},
"scripts": {
"test": "vitest run --dangerouslyIgnoreUnhandledErrors",
Expand Down
2 changes: 2 additions & 0 deletions packages/dev/.ncurc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reject:
- "vite"
3 changes: 1 addition & 2 deletions packages/dev/esbuild.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ const config = {
sourcemap: 'linked',
plugins: [commonifierPlugin],
target: 'es2025',
tsconfig: './tsconfig.build.json',
external: ['@platformatic'],
tsconfig: './tsconfig.build.json'
};

export default config;
25 changes: 14 additions & 11 deletions packages/dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,28 @@
"dependencies": {
"@eslint/js": "^10.0.1",
"@stylistic/eslint-plugin": "^5.10.0",
"@types/node": "^25.9.3",
"@types/node": "^26.1.2",
"@typescript-eslint/eslint-plugin": "^8.61.0",
"@typescript-eslint/parser": "^8.61.0",
"@vitest/coverage-v8": "^4.1.9",
"esbuild": "^0.25.11",
"eslint": "^10.5.0",
"@vitest/coverage-v8": "^4.1.10",
"commitizen": "^4.3.2",
"esbuild": "^0.28.1",
"eslint": "^10.8.0",
"eslint-plugin-file-extension-in-import-ts": "^2.1.1",
"eslint-plugin-prefer-arrow-functions": "^3.9.1",
"eslint-plugin-unicorn": "^66.0.0",
"eslint-plugin-prefer-arrow-functions": "^3.10.1",
"eslint-plugin-unicorn": "^73.0.0",
"ts-node": "^10.9.2",
"typescript": "^6.0.3",
"typescript-eslint": "^8.61.0",
"typescript-eslint": "^8.63.0",
"vite": "7.3.5",
"vitest": "^4.1.9"
"vitest": "^4.1.10"
},
"peerDependencies": {
"@types/node": "^25.9.3",
"typescript": "^6.0.3",
"vite": "7.3.5"

"commitizen": "^4.3.2",
"esbuild": "^0.28.1",
"eslint": "^10.6.0",
"vitest": "^4.1.9"
},
"overrides": {
"vite": "7.3.5"
Expand Down
1 change: 1 addition & 0 deletions packages/dev/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default defineConfig({
enabled: true,
provider: 'v8',
reporter: ['text', 'lcovonly'],
excludeAfterRemap: true,
},
reporters: [
'verbose',
Expand Down
140 changes: 70 additions & 70 deletions packages/facade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,83 +17,83 @@
],
"type": "module",
"dependencies": {
"@apollo/gateway": "^2.14.1",
"@apollo/server": "^5.5.1",
"@apollo/subgraph": "^2.14.1",
"@as-integrations/koa": "^1.1.1",
"@cloudnative/health": "^2.1.2",
"@graphql-tools/schema": "^10.0.33",
"@grpc/grpc-js": "^1.14.4",
"@grpc/proto-loader": "^0.8.1",
"@koa/cors": "^5.0.0",
"@restorecommerce/grpc-client": "^2.3.2",
"@restorecommerce/kafka-client": "^1.4.2",
"@restorecommerce/logger": "^1.4.2",
"@restorecommerce/rc-grpc-clients": "^5.2.2",
"@restorecommerce/service-config": "^1.2.2",
"@types/debug": "^4.1.13",
"co": "^4.6.0",
"debug": "^4.4.3",
"graphql": "^16.14.2",
"graphql-upload": "^17.0.0",
"graphql-ws": "^6.0.8",
"handlebars": "^4.7.9",
"into-stream": "^9.1.0",
"koa": "^3.2.1",
"koa-body": "^8.0.0",
"koa-bodyparser": "^4.4.1",
"koa-compose": "^4.1.0",
"koa-helmet": "^9.0.0",
"koa-mount": "^4.2.0",
"koa-router": "^14.0.0",
"koa-websocket": "^7.0.0",
"lodash": "^4.18.1",
"lru-cache": "^11.5.1",
"nanoid": "^5.1.11",
"nice-grpc": "^2.1.16",
"oauth": "^0.10.2",
"oidc-provider": "^9.8.4",
"@apollo/gateway": "2.14.1",
"@apollo/server": "5.5.1",
"@apollo/subgraph": "2.14.1",
"@as-integrations/koa": "1.1.1",
"@cloudnative/health": "2.1.2",
"@graphql-tools/schema": "10.0.33",
"@grpc/grpc-js": "1.14.4",
"@grpc/proto-loader": "0.8.1",
"@koa/cors": "5.0.0",
"@restorecommerce/grpc-client": "2.3.2",
"@restorecommerce/kafka-client": "1.4.2",
"@restorecommerce/logger": "1.4.2",
"@restorecommerce/rc-grpc-clients": "5.2.2",
"@restorecommerce/service-config": "1.2.2",
"@types/debug": "4.1.13",
"co": "4.6.0",
"debug": "4.4.3",
"graphql": "16.14.2",
"graphql-upload": "17.0.0",
"graphql-ws": "6.0.8",
"handlebars": "4.7.9",
"into-stream": "9.1.0",
"koa": "3.2.1",
"koa-body": "8.0.0",
"koa-bodyparser": "4.4.1",
"koa-compose": "4.1.0",
"koa-helmet": "9.0.0",
"koa-mount": "4.2.0",
"koa-router": "14.0.0",
"koa-websocket": "7.0.0",
"lodash": "4.18.1",
"lru-cache": "11.5.1",
"nanoid": "5.1.11",
"nice-grpc": "2.1.16",
"oauth": "0.10.2",
"oidc-provider": "9.8.4",
"redis": "4.7.0",
"request-ip": "^3.3.0",
"rxjs": "^7.8.2",
"ts-proto-descriptors": "^2.1.0",
"ua-parser-js": "^2.0.10",
"ws": "^8.21.0"
"request-ip": "3.3.0",
"rxjs": "7.8.2",
"ts-proto-descriptors": "2.1.0",
"ua-parser-js": "2.0.10",
"ws": "8.21.0"
},
"devDependencies": {
"@alenon/grpc-mock-server": "^3.2.9",
"@graphql-codegen/core": "^6.1.0",
"@graphql-codegen/typescript": "^6.0.2",
"@graphql-codegen/typescript-resolvers": "^6.0.2",
"@restorecommerce/dev": "^0.3.1",
"@restorecommerce/protos": "^6.16.1",
"@types/array.prototype.flat": "^1.2.5",
"@types/co": "^4.6.6",
"@types/ejs": "^3.1.5",
"@alenon/grpc-mock-server": "3.2.9",
"@graphql-codegen/core": "6.1.0",
"@graphql-codegen/typescript": "6.0.2",
"@graphql-codegen/typescript-resolvers": "6.0.2",
"@restorecommerce/dev": "0.3.1",
"@restorecommerce/protos": "6.16.1",
"@types/array.prototype.flat": "1.2.5",
"@types/co": "4.6.6",
"@types/ejs": "3.1.5",
"@types/express": "5.0.6",
"@types/express-serve-static-core": "5.1.1",
"@types/graphql-upload": "^17.0.0",
"@types/koa": "^3.0.3",
"@types/koa-bodyparser": "^4.3.13",
"@types/koa-helmet": "^6.1.0",
"@types/koa-mount": "^4.0.5",
"@types/koa-router": "^7.4.9",
"@types/koa-websocket": "^5.0.11",
"@types/koa__cors": "^5.0.1",
"@types/lodash": "^4.17.24",
"@types/lru-cache": "^7.10.10",
"@types/oauth": "^0.9.6",
"@types/oidc-provider": "^9.5.0",
"@types/graphql-upload": "17.0.0",
"@types/koa": "3.0.3",
"@types/koa-bodyparser": "4.3.13",
"@types/koa-helmet": "6.1.0",
"@types/koa-mount": "4.0.5",
"@types/koa-router": "7.4.9",
"@types/koa-websocket": "5.0.11",
"@types/koa__cors": "5.0.1",
"@types/lodash": "4.17.24",
"@types/lru-cache": "7.10.10",
"@types/oauth": "0.9.6",
"@types/oidc-provider": "9.5.0",
"@types/redis": "4.0.2",
"@types/request-ip": "^0.0.41",
"@types/supertest": "^7.2.0",
"@types/useragent": "^2.3.4",
"@types/ws": "^8.18.1",
"npm-run-all": "^4.1.5",
"@types/request-ip": "0.0.41",
"@types/supertest": "7.2.0",
"@types/useragent": "2.3.4",
"@types/ws": "8.18.1",
"npm-run-all": "4.1.5",
"rimraf": "6.1.3",
"supertest": "^7.2.2",
"tsconfig-paths": "^4.2.0",
"tsx": "^4.22.4"
"supertest": "7.2.2",
"tsconfig-paths": "4.2.0",
"tsx": "4.22.4"
},
"scripts": {
"build": "npm-run-all build:clean generate build:codegen:clean build:codegen:compile build:tsc",
Expand Down
Loading
Loading