Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00
Code Issues Projects Releases Wiki Activity

chore: sync dependencies with enterprise (#7482)

Browse Source 
As the title says. We had some mismatch in our dependencies where
enterprise was ahead of oss, and some places where oss was ahead of
enterprise. Hence
https://github.com/ivarconr/unleash-enterprise/pull/1419 and this PR
This commit is contained in:
Christopher Kolstad 2024-06-28 10:54:37 +02:00 committed by GitHub
parent 82a53fa9b3
commit fbda7cdc48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 318 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@ -114,7 +114,7 @@
"async": "^3.2.4",
"bcryptjs": "^2.4.3",
"compression": "^1.7.4",
"connect-session-knex": "^3.0.0",
"connect-session-knex": "^5.0.0",
"cookie-parser": "^1.4.6",
"cookie-session": "^2.0.0-rc.1",
"cors": "^2.8.5",
@ -126,35 +126,35 @@
"deepmerge": "^4.3.1",
"errorhandler": "^1.5.1",
"express": "4.19.2",
"express-rate-limit": "^7.1.2",
"express-rate-limit": "^7.3.1",
"express-session": "^1.17.3",
"fast-json-patch": "^3.1.0",
"hash-sum": "^2.0.0",
"helmet": "^6.0.0",
"http-errors": "^2.0.0",
"ip": "^2.0.1",
"joi": "^17.3.0",
"joi": "^17.13.3",
"js-sha256": "^0.11.0",
"js-yaml": "^4.1.0",
"json-diff": "^1.0.6",
"json-schema-to-ts": "2.12.0",
"json2csv": "^5.0.7",
"knex": "^2.5.1",
"knex": "^3.1.0",
"lodash.get": "^4.4.2",
"lodash.groupby": "^4.6.0",
"lodash.sortby": "^4.7.0",
"log4js": "^6.0.0",
"make-fetch-happen": "^13.0.0",
"memoizee": "^0.4.15",
"memoizee": "^0.4.17",
"mime": "^3.0.0",
"multer": "^1.4.5-lts.1",
"murmurhash3js": "^3.0.1",
"mustache": "^4.1.0",
"nodemailer": "^6.9.9",
"openapi-types": "^12.0.0",
"openapi-types": "^12.1.3",
"owasp-password-strength-test": "^1.3.0",
"parse-database-url": "^0.3.0",
"pg": "^8.7.3",
"pg": "^8.12.0",
"pg-connection-string": "^2.5.0",
"pkginfo": "^0.4.1",
"prom-client": "^14.0.0",

9
src/lib/middleware/session-db.ts
View File

@ -1,6 +1,6 @@
import type { Knex } from 'knex';
import session from 'express-session';
import knexSessionStore from 'connect-session-knex';
import { ConnectSessionKnexStore } from 'connect-session-knex';
import type { RequestHandler } from 'express';
import type { IUnleashConfig } from '../types/option';
import { hoursToMilliseconds } from 'date-fns';
@ -13,11 +13,10 @@ function sessionDb(
const { db, cookieName } = config.session;
const age =
hoursToMilliseconds(config.session.ttlHours) || hoursToMilliseconds(48);
const KnexSessionStore = knexSessionStore(session);
if (db) {
store = new KnexSessionStore({
tablename: 'unleash_session',
createtable: false,
store = new ConnectSessionKnexStore({
tableName: 'unleash_session',
createTable: false,
knex,
});
} else {

101
yarn.lock
View File

@ -2017,9 +2017,9 @@ __metadata:
linkType: hard
"@types/json-schema@npm:^7.0.9":
version: 7.0.11
resolution: "@types/json-schema@npm:7.0.11"
checksum: 10c0/bd1f9a7b898ff15c4bb494eb19124f2d688b804c39f07cbf135ac73f35324970e9e8329b72aae1fb543d925ea295a1568b23056c26658cecec4741fa28c3b81a
version: 7.0.15
resolution: "@types/json-schema@npm:7.0.15"
checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
languageName: node
linkType: hard
@ -2719,7 +2719,7 @@ __metadata:
languageName: node
linkType: hard
"bluebird@npm:^3.1.1, bluebird@npm:^3.7.2":
"bluebird@npm:^3.1.1":
version: 3.7.2
resolution: "bluebird@npm:3.7.2"
checksum: 10c0/680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2
@ -3264,13 +3264,12 @@ __metadata:
languageName: node
linkType: hard
"connect-session-knex@npm:^3.0.0":
version: 3.0.1
resolution: "connect-session-knex@npm:3.0.1"
"connect-session-knex@npm:^5.0.0":
version: 5.0.0
resolution: "connect-session-knex@npm:5.0.0"
dependencies:
bluebird: "npm:^3.7.2"
knex: "npm:^2.3.0"
checksum: 10c0/4deb263c213504f374b3dd8ef8e7f72ecc41c1c13570dedf328911a0826d64204ea777bda5994db41de7caaf1a19fa3e662f25e67d88f71fcc64431ade15a26b
knex: "npm:3"
checksum: 10c0/26ff173f0001494d1a0c2777343a25d7ed5f283b79e46b75266f2a8ab498cfcde635d5a03e3a4f794e2f4e2e35dde8a3c3b5364de6a15bf87e5dda1952a32e4f
languageName: node
linkType: hard
@ -4208,7 +4207,7 @@ __metadata:
languageName: node
linkType: hard
"express-rate-limit@npm:^7.1.2":
"express-rate-limit@npm:^7.3.1":
version: 7.3.1
resolution: "express-rate-limit@npm:7.3.1"
peerDependencies:
@ -6010,7 +6009,7 @@ __metadata:
languageName: node
linkType: hard
"joi@npm:^17.11.0, joi@npm:^17.3.0":
"joi@npm:^17.11.0, joi@npm:^17.13.3":
version: 17.13.3
resolution: "joi@npm:17.13.3"
dependencies:
@ -6259,9 +6258,9 @@ __metadata:
languageName: node
linkType: hard
"knex@npm:^2.3.0, knex@npm:^2.5.1":
version: 2.5.1
resolution: "knex@npm:2.5.1"
"knex@npm:3, knex@npm:^3.1.0":
version: 3.1.0
resolution: "knex@npm:3.1.0"
dependencies:
colorette: "npm:2.0.19"
commander: "npm:^10.0.0"
@ -6272,7 +6271,7 @@ __metadata:
getopts: "npm:2.3.0"
interpret: "npm:^2.2.0"
lodash: "npm:^4.17.21"
pg-connection-string: "npm:2.6.1"
pg-connection-string: "npm:2.6.2"
rechoir: "npm:^0.8.0"
resolve-from: "npm:^5.0.0"
tarn: "npm:^3.0.2"
@ -6294,7 +6293,7 @@ __metadata:
optional: true
bin:
knex: bin/cli.js
checksum: 10c0/33580641feaa93074bdc10e78f06382e5017d46a3cd22821c09057e7da303c35772add39a110fffe685c2f438a78751a0eb6f50aad1c4bdb032e8ec9b7879b69
checksum: 10c0/d8a1f99fad143c6057e94759b2ae700ae661a0b0b2385f643011962ef501dcc7b32cfdb5bda66ef81283ca56f13630f47691c579ce66ad0e8128e209533c3785
languageName: node
linkType: hard
@ -6617,7 +6616,7 @@ __metadata:
languageName: node
linkType: hard
"memoizee@npm:^0.4.15":
"memoizee@npm:^0.4.17":
version: 0.4.17
resolution: "memoizee@npm:0.4.17"
dependencies:
@ -7386,7 +7385,7 @@ __metadata:
languageName: node
linkType: hard
"openapi-types@npm:^12.0.0":
"openapi-types@npm:^12.1.3":
version: 12.1.3
resolution: "openapi-types@npm:12.1.3"
checksum: 10c0/4ad4eb91ea834c237edfa6ab31394e87e00c888fc2918009763389c00d02342345195d6f302d61c3fd807f17723cd48df29b47b538b68375b3827b3758cd520f
@ -7659,14 +7658,14 @@ __metadata:
languageName: node
linkType: hard
"pg-connection-string@npm:2.6.1":
version: 2.6.1
resolution: "pg-connection-string@npm:2.6.1"
checksum: 10c0/e5a71a2da143b8dc17143a9db7737679b210643771aa678d3bc60c7bc70da11bbb8e2d531be91c8c4eddd6ac6046307811e793f5850b9ba595a11785c948a417
"pg-connection-string@npm:2.6.2":
version: 2.6.2
resolution: "pg-connection-string@npm:2.6.2"
checksum: 10c0/e8fdea74fcc8bdc3d7c5c6eadd9425fdba7e67fb7fe836f9c0cecad94c8984e435256657d1d8ce0483d1fedef667e7a57e32449a63cb805cb0289fc34b62da35
languageName: node
linkType: hard
"pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.6.2":
"pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.6.2, pg-connection-string@npm:^2.6.4":
version: 2.6.4
resolution: "pg-connection-string@npm:2.6.4"
checksum: 10c0/0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6
@ -7696,6 +7695,15 @@ __metadata:
languageName: node
linkType: hard
"pg-pool@npm:^3.6.2":
version: 3.6.2
resolution: "pg-pool@npm:3.6.2"
peerDependencies:
pg: ">=8.0"
checksum: 10c0/14c524549490954b5e48457a4b808df8f619f6deeb3b395b0cd184a8f4ed65a9273fe0697ba0341a41d6745af197f1437eb1cf51fff0cbbf5b0fb3852ebe5392
languageName: node
linkType: hard
"pg-protocol@npm:*, pg-protocol@npm:^1.6.0":
version: 1.6.0
resolution: "pg-protocol@npm:1.6.0"
@ -7703,6 +7711,13 @@ __metadata:
languageName: node
linkType: hard
"pg-protocol@npm:^1.6.1":
version: 1.6.1
resolution: "pg-protocol@npm:1.6.1"
checksum: 10c0/7eadef4010ac0a3925c460be7332ca4098a5c6d5181725a62193fcfa800000ae6632d98d814f3989b42cf5fdc3b45e34c714a1959d29174e81e30730e140ae5f
languageName: node
linkType: hard
"pg-types@npm:^2.1.0":
version: 2.2.0
resolution: "pg-types@npm:2.2.0"
@ -7731,7 +7746,7 @@ __metadata:
languageName: node
linkType: hard
"pg@npm:^8.11.2, pg@npm:^8.7.3":
"pg@npm:^8.11.2":
version: 8.11.3
resolution: "pg@npm:8.11.3"
dependencies:
@ -7755,6 +7770,28 @@ __metadata:
languageName: node
linkType: hard
"pg@npm:^8.12.0":
version: 8.12.0
resolution: "pg@npm:8.12.0"
dependencies:
pg-cloudflare: "npm:^1.1.1"
pg-connection-string: "npm:^2.6.4"
pg-pool: "npm:^3.6.2"
pg-protocol: "npm:^1.6.1"
pg-types: "npm:^2.1.0"
pgpass: "npm:1.x"
peerDependencies:
pg-native: ">=3.0.1"
dependenciesMeta:
pg-cloudflare:
optional: true
peerDependenciesMeta:
pg-native:
optional: true
checksum: 10c0/973e49b5e7327c42fc62806efa8c824159ab7a0b676cefe6eeb51a59b6e226587911ec27697f36c18d69e58a7f4f0b76d0829364087194d13ed431ab7c9c417a
languageName: node
linkType: hard
"pgpass@npm:1.x":
version: 1.0.5
resolution: "pgpass@npm:1.0.5"
@ -9796,7 +9833,7 @@ __metadata:
bcryptjs: "npm:^2.4.3"
compression: "npm:^1.7.4"
concurrently: "npm:^8.0.1"
connect-session-knex: "npm:^3.0.0"
connect-session-knex: "npm:^5.0.0"
cookie-parser: "npm:^1.4.6"
cookie-session: "npm:^2.0.0-rc.1"
copyfiles: "npm:2.4.1"
@ -9811,7 +9848,7 @@ __metadata:
del-cli: "npm:5.1.0"
errorhandler: "npm:^1.5.1"
express: "npm:4.19.2"
express-rate-limit: "npm:^7.1.2"
express-rate-limit: "npm:^7.3.1"
express-session: "npm:^1.17.3"
faker: "npm:5.5.3"
fast-check: "npm:3.19.0"
@ -9824,20 +9861,20 @@ __metadata:
ip: "npm:^2.0.1"
jest: "npm:29.7.0"
jest-junit: "npm:^16.0.0"
joi: "npm:^17.3.0"
joi: "npm:^17.13.3"
js-sha256: "npm:^0.11.0"
js-yaml: "npm:^4.1.0"
json-diff: "npm:^1.0.6"
json-schema-to-ts: "npm:2.12.0"
json2csv: "npm:^5.0.7"
knex: "npm:^2.5.1"
knex: "npm:^3.1.0"
lint-staged: "npm:15.2.7"
lodash.get: "npm:^4.4.2"
lodash.groupby: "npm:^4.6.0"
lodash.sortby: "npm:^4.7.0"
log4js: "npm:^6.0.0"
make-fetch-happen: "npm:^13.0.0"
memoizee: "npm:^0.4.15"
memoizee: "npm:^0.4.17"
mime: "npm:^3.0.0"
multer: "npm:^1.4.5-lts.1"
murmurhash3js: "npm:^3.0.1"
@ -9845,10 +9882,10 @@ __metadata:
nock: "npm:13.5.4"
nodemailer: "npm:^6.9.9"
openapi-enforcer: "npm:1.23.0"
openapi-types: "npm:^12.0.0"
openapi-types: "npm:^12.1.3"
owasp-password-strength-test: "npm:^1.3.0"
parse-database-url: "npm:^0.3.0"
pg: "npm:^8.7.3"
pg: "npm:^8.12.0"
pg-connection-string: "npm:^2.5.0"
pkginfo: "npm:^0.4.1"
prom-client: "npm:^14.0.0"