companion: Remove deprecated serverHeaders in favour of companionHeaders (#2995)

* remove deprecated serverHeaders in favour of companionHeaders

* remove TL_UPPY_SERVER and exports.UPPY_SERVER

@kvz @goto-bus-stop ok to do this already, right?

examples/custom-provider/client/MyCustomProvider.js

@@ -19,7 +19,7 @@ module.exports = class MyCustomProvider extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       provider: 'myunsplash',
       pluginId: this.id,
     })

packages/@uppy/box/src/index.js

@@ -25,7 +25,7 @@ module.exports = class Box extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'box',

packages/@uppy/companion-client/src/RequestClient.js

@@ -34,7 +34,7 @@ module.exports = class RequestClient {
   }
 
   headers () {
-    const userHeaders = this.opts.companionHeaders || this.opts.serverHeaders || {}
+    const userHeaders = this.opts.companionHeaders || {}
     return Promise.resolve({
       ...this.defaultHeaders,
       ...userHeaders,

packages/@uppy/companion-client/types/index.d.ts

@@ -12,10 +12,6 @@ export interface RequestClientOptions {
   companionUrl: string
   companionHeaders?: object
   companionCookiesRule?: RequestCredentials
-  /**
-   * Deprecated, use `companionHeaders` instead.
-   */
-  serverHeaders?: object
 }
 
 export class RequestClient {

packages/@uppy/dropbox/src/index.js

@@ -22,7 +22,7 @@ module.exports = class Dropbox extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'dropbox',

packages/@uppy/facebook/src/index.js

@@ -22,7 +22,7 @@ module.exports = class Facebook extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'facebook',

packages/@uppy/google-drive/src/index.js

@@ -23,7 +23,7 @@ module.exports = class GoogleDrive extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'drive',

packages/@uppy/instagram/src/index.js

@@ -22,7 +22,7 @@ module.exports = class Instagram extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'instagram',

packages/@uppy/onedrive/src/index.js

@@ -25,7 +25,7 @@ module.exports = class OneDrive extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'onedrive',
       pluginId: this.id,

packages/@uppy/robodog/src/addProviders.js

@@ -18,7 +18,6 @@ const remoteProviderOptionNames = [
   'companionUrl',
   'companionAllowedHosts',
   'companionHeaders',
-  'serverHeaders',
   'target',
 ]
 

packages/@uppy/transloadit/src/index.js

@@ -20,7 +20,6 @@ const COMPANION = 'https://api2.transloadit.com/companion'
 const ALLOWED_COMPANION_PATTERN = /\.transloadit\.com$/
 // Regex used to check if a Companion address is run by Transloadit.
 const TL_COMPANION = /https?:\/\/api2(?:-\w+)?\.transloadit\.com\/companion/
-const TL_UPPY_SERVER = /https?:\/\/api2(?:-\w+)?\.transloadit\.com\/uppy-server/
 
 /**
  * Upload files to Transloadit using Tus.
@@ -165,19 +164,6 @@ module.exports = class Transloadit extends BasePlugin {
     // We only replace the hostname for Transloadit's companions, so that
     // people can also self-host them while still using Transloadit for encoding.
     let remote = file.remote
-    if (file.remote && TL_UPPY_SERVER.test(file.remote.companionUrl)) {
-      const err = new Error(
-        'The https://api2.transloadit.com/uppy-server endpoint was renamed to '
-        + 'https://api2.transloadit.com/companion, please update your `companionUrl` '
-        + 'options accordingly.'
-      )
-      // Explicitly log this error here because it is caught by the `createAssembly`
-      // Promise further along.
-      // That's fine, but createAssembly only shows the informer, we need something a
-      // little more noisy.
-      this.uppy.log(err)
-      throw err
-    }
 
     if (file.remote && TL_COMPANION.test(file.remote.companionUrl)) {
       const newHost = status.companion_url
@@ -850,5 +836,4 @@ module.exports = class Transloadit extends BasePlugin {
 }
 
 module.exports.COMPANION = COMPANION
-module.exports.UPPY_SERVER = COMPANION
 module.exports.COMPANION_PATTERN = ALLOWED_COMPANION_PATTERN

packages/@uppy/url/src/index.js

@@ -60,7 +60,7 @@ module.exports = class Url extends UIPlugin {
 
     this.client = new RequestClient(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionCookiesRule: this.opts.companionCookiesRule,
     })
   }

packages/@uppy/zoom/src/index.js

@@ -23,7 +23,7 @@ module.exports = class Zoom extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       companionKeysParams: this.opts.companionKeysParams,
       companionCookiesRule: this.opts.companionCookiesRule,
       provider: 'zoom',

website/src/_posts/2020-03-custom-providers.md

@@ -441,7 +441,7 @@ module.exports = class MyCustomProvider extends UIPlugin {
 
     this.provider = new Provider(uppy, {
       companionUrl: this.opts.companionUrl,
-      companionHeaders: this.opts.companionHeaders || this.opts.serverHeaders,
+      companionHeaders: this.opts.companionHeaders,
       provider: 'myunsplash',
       pluginId: this.id,
     })