Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-29 13:00:18 +00:00
Code Issues Projects Releases Wiki Activity

fix undefined protocol and example page (#4483)

Browse source 
fixes #4478
This commit is contained in:
Mikael Finstad 2023-06-08 19:20:14 +01:00 • committed by GitHub
parent 982cb554cc
commit da45a2af2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/@uppy/companion/src/standalone/helper.js
View file

@ -41,11 +41,13 @@ const hasProtocol = (url) => {
return url.startsWith('https://') || url.startsWith('http://')
}
const companionProtocol = process.env.COMPANION_PROTOCOL || 'http'
function getCorsOrigins () {
if (process.env.COMPANION_CLIENT_ORIGINS) {
return process.env.COMPANION_CLIENT_ORIGINS
.split(',')
.map((url) => (hasProtocol(url) ? url : `${process.env.COMPANION_PROTOCOL || 'http'}://${url}`))
.map((url) => (hasProtocol(url) ? url : `${companionProtocol}://${url}`))
}
if (process.env.COMPANION_CLIENT_ORIGINS_REGEX) {
return new RegExp(process.env.COMPANION_CLIENT_ORIGINS_REGEX)
@ -128,7 +130,7 @@ const getConfigFromEnv = () => {
},
server: {
host: process.env.COMPANION_DOMAIN,
protocol: process.env.COMPANION_PROTOCOL,
protocol: companionProtocol,
path: process.env.COMPANION_PATH,
implicitPath: process.env.COMPANION_IMPLICIT_PATH,
oauthDomain: process.env.COMPANION_OAUTH_DOMAIN,
@ -213,7 +215,7 @@ exports.buildHelpfulStartupMessage = (companionOptions) => {
const buildURL = utils.getURLBuilder(companionOptions)
const callbackURLs = []
Object.keys(companionOptions.providerOptions).forEach((providerName) => {
callbackURLs.push(buildURL(`/connect/${providerName}/redirect`, true))
callbackURLs.push(buildURL(`/${providerName}/redirect`, true))
})
return stripIndent`
@ -227,7 +229,8 @@ exports.buildHelpfulStartupMessage = (companionOptions) => {
While you did an awesome job on getting Companion running, this is just the welcome
message, so let's talk about the places that really matter:
- Be sure to add ${callbackURLs.join(', ')} as your Oauth redirect uris on their corresponding developer interfaces.
- Be sure to add the following URLs as your Oauth redirect uris on their corresponding developer interfaces:
${callbackURLs.join(', ')}
- The URL ${buildURL('/metrics', true)} is available for statistics to keep Companion running smoothly
- https://github.com/transloadit/uppy/issues - report your bugs here