From 1676ff82fd23a1d03e0d2cf5a1024478c130bf79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Mon, 15 Oct 2018 11:39:39 +0200 Subject: [PATCH 1/4] transloadit: Update API key URL. --- packages/@uppy/transloadit/src/AssemblyOptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@uppy/transloadit/src/AssemblyOptions.js b/packages/@uppy/transloadit/src/AssemblyOptions.js index bfce66c7a..9d1447304 100644 --- a/packages/@uppy/transloadit/src/AssemblyOptions.js +++ b/packages/@uppy/transloadit/src/AssemblyOptions.js @@ -19,7 +19,7 @@ function validateParams (params) { if (!params.auth || !params.auth.key) { throw new Error('Transloadit: The `params.auth.key` option is required. ' + - 'You can find your Transloadit API key at https://transloadit.com/accounts/credentials.') + 'You can find your Transloadit API key at https://transloadit.com/account/api-settings.') } } From 9836999f5f13ff96c782a193bf8638e2424cac3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Mon, 15 Oct 2018 11:40:08 +0200 Subject: [PATCH 2/4] transloadit: Error early if neither `params` nor `getAssemblyOptions` are given. --- packages/@uppy/transloadit/src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js index 6b1b1b1db..bd57ed785 100644 --- a/packages/@uppy/transloadit/src/index.js +++ b/packages/@uppy/transloadit/src/index.js @@ -67,7 +67,9 @@ module.exports = class Transloadit extends Plugin { this._onRestored = this._onRestored.bind(this) this._getPersistentData = this._getPersistentData.bind(this) - if (this.opts.params) { + if (this.opts.params || + // No params _and_ no custom getAssemblyOptions is an early error. + this.opts.getAssemblyOptions === defaultOptions.getAssemblyOptions) { AssemblyOptions.validateParams(this.opts.params) } From 620e78a02c89f7c761fd9d92ebd77d8c16e5fa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Thu, 18 Oct 2018 13:08:19 +0200 Subject: [PATCH 3/4] refactor --- packages/@uppy/transloadit/src/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js index bd57ed785..78cf4524f 100644 --- a/packages/@uppy/transloadit/src/index.js +++ b/packages/@uppy/transloadit/src/index.js @@ -67,10 +67,11 @@ module.exports = class Transloadit extends Plugin { this._onRestored = this._onRestored.bind(this) this._getPersistentData = this._getPersistentData.bind(this) - if (this.opts.params || - // No params _and_ no custom getAssemblyOptions is an early error. - this.opts.getAssemblyOptions === defaultOptions.getAssemblyOptions) { + const hasCustomAssemblyOptions = this.opts.getAssemblyOptions !== defaultOptions.getAssemblyOptions + if (this.opts.params) { AssemblyOptions.validateParams(this.opts.params) + } else if (!hasCustomAssemblyOptions) { + AssemblyOptions.validateParams(null) } this.client = new Client({ From db49bfbec2445338051898fc38b1ab2cfdd6c572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Mon, 22 Oct 2018 13:05:17 +0200 Subject: [PATCH 4/4] comment --- packages/@uppy/transloadit/src/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@uppy/transloadit/src/index.js b/packages/@uppy/transloadit/src/index.js index 78cf4524f..0e1965bf7 100644 --- a/packages/@uppy/transloadit/src/index.js +++ b/packages/@uppy/transloadit/src/index.js @@ -71,6 +71,8 @@ module.exports = class Transloadit extends Plugin { if (this.opts.params) { AssemblyOptions.validateParams(this.opts.params) } else if (!hasCustomAssemblyOptions) { + // Throw the same error that we'd throw if the `params` returned from a + // `getAssemblyOptions()` function is null. AssemblyOptions.validateParams(null) }