companion: remove fallback `UPPYSERVER_*` env options

CHANGELOG.md

@@ -108,6 +108,7 @@ PRs are welcome! Please do open an issue to discuss first if it's a big feature,
 - [x] dashboard: Bring back "Drop Here" screen for dragged URLs without introducing flickering (tricky! see PR #1400)
 - [x] companion: remove deprecated "authorized" endpoint
 - [x] companion: remove default upload protocol
+- [x] companion: remove fallback `UPPYSERVER_*` env options
 
 ## 1.0 Goals
 

packages/@uppy/companion/src/standalone/helper.js

@@ -23,50 +23,50 @@ exports.getUppyOptions = () => {
  * @returns {object}
  */
 const getConfigFromEnv = () => {
-  const uploadUrls = process.env.COMPANION_UPLOAD_URLS || process.env.UPPYSERVER_UPLOAD_URLS
-  const domains = process.env.COMPANION_DOMAINS || process.env.COMPANION_DOMAIN || process.env.UPPYSERVER_DOMAINS || process.env.UPPYSERVER_DOMAIN || null
+  const uploadUrls = process.env.COMPANION_UPLOAD_URLS
+  const domains = process.env.COMPANION_DOMAINS || process.env.COMPANION_DOMAIN || null
   const validHosts = domains ? domains.split(',') : []
 
   return {
     // TODO: Rename providerOptions to providers.
     providerOptions: {
       google: {
-        key: process.env.COMPANION_GOOGLE_KEY || process.env.UPPYSERVER_GOOGLE_KEY,
-        secret: process.env.COMPANION_GOOGLE_SECRET || process.env.UPPYSERVER_GOOGLE_SECRET
+        key: process.env.COMPANION_GOOGLE_KEY,
+        secret: process.env.COMPANION_GOOGLE_SECRET
       },
       dropbox: {
-        key: process.env.COMPANION_DROPBOX_KEY || process.env.UPPYSERVER_DROPBOX_KEY,
-        secret: process.env.COMPANION_DROPBOX_SECRET || process.env.UPPYSERVER_DROPBOX_SECRET
+        key: process.env.COMPANION_DROPBOX_KEY,
+        secret: process.env.COMPANION_DROPBOX_SECRET
       },
       instagram: {
-        key: process.env.COMPANION_INSTAGRAM_KEY || process.env.UPPYSERVER_INSTAGRAM_KEY,
-        secret: process.env.COMPANION_INSTAGRAM_SECRET || process.env.UPPYSERVER_INSTAGRAM_SECRET
+        key: process.env.COMPANION_INSTAGRAM_KEY,
+        secret: process.env.COMPANION_INSTAGRAM_SECRET
       },
       s3: {
-        key: process.env.COMPANION_AWS_KEY || process.env.UPPYSERVER_AWS_KEY,
-        secret: process.env.COMPANION_AWS_SECRET || process.env.UPPYSERVER_AWS_SECRET,
-        bucket: process.env.COMPANION_AWS_BUCKET || process.env.UPPYSERVER_AWS_BUCKET,
-        endpoint: process.env.COMPANION_AWS_ENDPOINT || process.env.UPPYSERVER_AWS_ENDPOINT,
-        region: process.env.COMPANION_AWS_REGION || process.env.UPPYSERVER_AWS_REGION
+        key: process.env.COMPANION_AWS_KEY,
+        secret: process.env.COMPANION_AWS_SECRET,
+        bucket: process.env.COMPANION_AWS_BUCKET,
+        endpoint: process.env.COMPANION_AWS_ENDPOINT,
+        region: process.env.COMPANION_AWS_REGION
       }
     },
     server: {
-      host: process.env.COMPANION_DOMAIN || process.env.UPPYSERVER_DOMAIN,
-      protocol: process.env.COMPANION_PROTOCOL || process.env.UPPYSERVER_PROTOCOL,
-      path: process.env.COMPANION_PATH || process.env.UPPYSERVER_PATH,
-      implicitPath: process.env.COMPANION_IMPLICIT_PATH || process.env.UPPYSERVER_IMPLICIT_PATH,
-      oauthDomain: process.env.COMPANION_OAUTH_DOMAIN || process.env.UPPYSERVER_OAUTH_DOMAIN,
+      host: process.env.COMPANION_DOMAIN,
+      protocol: process.env.COMPANION_PROTOCOL,
+      path: process.env.COMPANION_PATH,
+      implicitPath: process.env.COMPANION_IMPLICIT_PATH,
+      oauthDomain: process.env.COMPANION_OAUTH_DOMAIN,
       validHosts: validHosts
     },
-    filePath: process.env.COMPANION_DATADIR || process.env.UPPYSERVER_DATADIR,
-    redisUrl: process.env.COMPANION_REDIS_URL || process.env.UPPYSERVER_REDIS_URL,
-    sendSelfEndpoint: process.env.COMPANION_SELF_ENDPOINT || process.env.UPPYSERVER_SELF_ENDPOINT,
+    filePath: process.env.COMPANION_DATADIR,
+    redisUrl: process.env.COMPANION_REDIS_URL,
+    sendSelfEndpoint: process.env.COMPANION_SELF_ENDPOINT,
     uploadUrls: uploadUrls ? uploadUrls.split(',') : null,
-    secret: process.env.COMPANION_SECRET || process.env.UPPYSERVER_SECRET || generateSecret(),
+    secret: process.env.COMPANION_SECRET || generateSecret(),
     debug: process.env.NODE_ENV !== 'production',
     // TODO: this is a temporary hack to support distributed systems.
     // it is not documented, because it should be changed soon.
-    cookieDomain: process.env.COMPANION_COOKIE_DOMAIN || process.env.UPPYSERVER_COOKIE_DOMAIN,
+    cookieDomain: process.env.COMPANION_COOKIE_DOMAIN,
     multipleInstances: true
   }
 }

packages/@uppy/companion/src/standalone/index.js

@@ -61,16 +61,16 @@ const sessionOptions = {
   saveUninitialized: true
 }
 
-if (process.env.COMPANION_REDIS_URL || process.env.UPPYSERVER_REDIS_URL) {
+if (process.env.COMPANION_REDIS_URL) {
   const RedisStore = require('connect-redis')(session)
   sessionOptions.store = new RedisStore({
-    url: process.env.COMPANION_REDIS_URL || process.env.UPPYSERVER_REDIS_URL
+    url: process.env.COMPANION_REDIS_URL
   })
 }
 
-if (process.env.COMPANION_COOKIE_DOMAIN || process.env.UPPYSERVER_COOKIE_DOMAIN) {
+if (process.env.COMPANION_COOKIE_DOMAIN) {
   sessionOptions.cookie = {
-    domain: process.env.COMPANION_COOKIE_DOMAIN || process.env.UPPYSERVER_COOKIE_DOMAIN,
+    domain: process.env.COMPANION_COOKIE_DOMAIN,
     maxAge: 24 * 60 * 60 * 1000 // 1 day
   }
 }
@@ -78,7 +78,7 @@ if (process.env.COMPANION_COOKIE_DOMAIN || process.env.UPPYSERVER_COOKIE_DOMAIN)
 app.use(session(sessionOptions))
 
 app.use((req, res, next) => {
-  const protocol = process.env.COMPANION_PROTOCOL || process.env.UPPYSERVER_PROTOCOL || 'http'
+  const protocol = process.env.COMPANION_PROTOCOL || 'http'
 
   // if endpoint urls are specified, then we only allow those endpoints
   // otherwise, we allow any client url to access companion.
@@ -116,8 +116,8 @@ app.get('/', (req, res) => {
 
 // initialize uppy
 helper.validateConfig(uppyOptions)
-if (process.env.COMPANION_PATH || process.env.UPPYSERVER_PATH) {
-  app.use(process.env.COMPANION_PATH || process.env.UPPYSERVER_PATH, uppy.app(uppyOptions))
+if (process.env.COMPANION_PATH) {
+  app.use(process.env.COMPANION_PATH, uppy.app(uppyOptions))
 } else {
   app.use(uppy.app(uppyOptions))
 }

packages/@uppy/companion/src/standalone/start-server.js

@@ -3,7 +3,7 @@ const uppy = require('../uppy')
 // @ts-ignore
 const { version } = require('../../package.json')
 const { app } = require('.')
-const port = process.env.COMPANION_PORT || process.env.UPPYSERVER_PORT || 3020
+const port = process.env.COMPANION_PORT || 3020
 
 uppy.socket(app.listen(port))
 

packages/@uppy/companion/test/__tests__/companion.js

@@ -19,7 +19,7 @@ const authData = {
   dropbox: 'token value',
   drive: 'token value'
 }
-const token = tokenService.generateToken(authData, process.env.COMPANION_SECRET || process.env.UPPYSERVER_SECRET)
+const token = tokenService.generateToken(authData, process.env.COMPANION_SECRET)
 const OAUTH_STATE = 'some-cool-nice-encrytpion'
 
 describe('set i-am header', () => {