Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-17 16:50:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into gr-indexedDb

Browse source
This commit is contained in:
Prakash 2026-06-28 08:53:27 +05:30 • committed by GitHub
commit caa0d8aff0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/@uppy/companion/package.json
View file

@ -82,14 +82,14 @@
"@types/compression": "1.8.1",
"@types/content-disposition": "0.5.9",
"@types/cookie-parser": "1.4.10",
"@types/cors": "2.8.6",
"@types/cors": "2.8.19",
"@types/eslint": "9.6.1",
"@types/express-session": "1.19.0",
"@types/http-proxy": "1.17.17",
"@types/jsonwebtoken": "9.0.10",
"@types/lodash": "4.17.24",
"@types/mime-types": "3.0.1",
"@types/morgan": "1.7.37",
"@types/morgan": "1.9.10",
"@types/ms": "2.1.0",
"@types/node": "20.19.41",
"@types/node-schedule": "2.1.8",

9
packages/@uppy/companion/src/server/controllers/connect.ts
View file

@ -143,7 +143,14 @@ export default function connect(
next(err)
return
}
stateObj.origin = finalOrigin
// RegExp is not allowed in the state object because it cannot be serialized to JSON, so we filter it out here.
if (Array.isArray(finalOrigin)) {
stateObj.origin = finalOrigin.flatMap((v) =>
v instanceof RegExp ? [] : [v],
)
} else if (!(finalOrigin instanceof RegExp)) {
stateObj.origin = finalOrigin
}
encodeStateAndRedirect(req, res, stateObj)
})
return

2
packages/@uppy/companion/src/server/helpers/oauth-state.ts
View file

@ -5,7 +5,7 @@ import { decrypt, encrypt } from './utils.js'
export type OAuthState = {
id: string
origin?: string | string[] | number | boolean | undefined // weird type because this is what express's res.getHeader and cors callback combined can possibly return
origin?: string | number | boolean | (string | boolean)[] | undefined // weird type because this is what express's res.getHeader and cors callback combined can possibly return
preAuthToken?: string
companionInstance?: string
customerDefinedAllowedOrigins?: string[]

2
packages/@uppy/companion/src/standalone/index.ts
View file

@ -84,7 +84,7 @@ export default function server(inputCompanionOptions?: CompanionInitOptions) {
})
// log server requests.
router.use(morgan('combined'))
morgan.token('url', (req) => {
morgan.token<Request>('url', (req) => {
const { query, censored } = censorQuery(req.query)
return censored
? `${req.path}?${qs.stringify(query)}`

24
yarn.lock
View file

@ -8457,12 +8457,12 @@ __metadata:
languageName: node
linkType: hard
"@types/cors@npm:2.8.6":
version: 2.8.6
resolution: "@types/cors@npm:2.8.6"
"@types/cors@npm:2.8.19":
version: 2.8.19
resolution: "@types/cors@npm:2.8.19"
dependencies:
"@types/express": "npm:*"
checksum: 10/686ee19f6913812dffc218a7f9fdb0017b833457fc075bdfe0c5969ad327b5d3a76414441f703b96f9e0c51b78d08d11bd0fd3f33880113971323b29f5e692e6
"@types/node": "npm:*"
checksum: 10/9545cc532c9218754443f48a0c98c1a9ba4af1fe54a3425c95de75ff3158147bb39e666cb7c6bf98cc56a9c6dc7b4ce5b2cbdae6b55d5942e50c81b76ed6b825
languageName: node
linkType: hard
@ -8708,12 +8708,12 @@ __metadata:
languageName: node
linkType: hard
"@types/morgan@npm:1.7.37":
version: 1.7.37
resolution: "@types/morgan@npm:1.7.37"
"@types/morgan@npm:1.9.10":
version: 1.9.10
resolution: "@types/morgan@npm:1.9.10"
dependencies:
"@types/express": "npm:*"
checksum: 10/bd9151317067c254e6e2c5c7d7c1041e6e6fa4ef886ab3fdfb707772cf3de6174fd1156d2d62131b015062e86e4838ccec5eb1d22f351dcafa87541b6a2b4a91
"@types/node": "npm:*"
checksum: 10/67c974efe93ae4f20084acc56800671fa7258eeef0126947f4cff8559493b2f72148676ca11c7bf88ae2e71031392108984d87bce913d89aeed78b82b82aee44
languageName: node
linkType: hard
@ -9117,14 +9117,14 @@ __metadata:
"@types/compression": "npm:1.8.1"
"@types/content-disposition": "npm:0.5.9"
"@types/cookie-parser": "npm:1.4.10"
"@types/cors": "npm:2.8.6"
"@types/cors": "npm:2.8.19"
"@types/eslint": "npm:9.6.1"
"@types/express-session": "npm:1.19.0"
"@types/http-proxy": "npm:1.17.17"
"@types/jsonwebtoken": "npm:9.0.10"
"@types/lodash": "npm:4.17.24"
"@types/mime-types": "npm:3.0.1"
"@types/morgan": "npm:1.7.37"
"@types/morgan": "npm:1.9.10"
"@types/ms": "npm:2.1.0"
"@types/node": "npm:20.19.41"
"@types/node-schedule": "npm:2.1.8"