make sure that we reset serverToken when an upload fails #4376
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
also: sync duplicated code between all plugins fixes #4356
|
GR does restore previously selected remote files, yes. How successfully it can retry the upload, is a good question. |
|
Ok, i think we should test this also before merging this PR |
|
Ok I just tested, and when I use golden retriever, it will remember the remote file, however if the upload has failed, it seems to be deleted from golden retriever. is this intentional @arturi ? I see that this is also the behavior before this PR, so I think we can merge this PR |
Murderlon
approved these changes
Mar 29, 2023
|
@mifi I don't recall unfortunately what we decided for GR remote files, but not sure they can be retried over time, Companion’s reference to that file will expire, right? Indeed probably not affected by this PR. |
|
I think companion remote files could theoretically be retried later (with GR), because a new upload (serverToken) will be created in companion. |
|
But do you not loose access to the selected file when oauth expires (it expires quite soon with our default setup)? File URLs could be temporary for security? |
|
I think the URL to the file is not stored, only the file ID or path inside the provider, which I think is not tied to auth? not sure about this though |
Merged
github-actions bot
added a commit
that referenced
this pull request
Apr 4, 2023
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/aws-s3 | 3.0.6 | @uppy/status-bar | 3.1.0 | | @uppy/aws-s3-multipart | 3.1.3 | @uppy/transloadit | 3.1.2 | | @uppy/companion | 4.4.0 | @uppy/tus | 3.0.6 | | @uppy/companion-client | 3.1.2 | @uppy/unsplash | 3.2.0 | | @uppy/core | 3.1.2 | @uppy/url | 3.3.0 | | @uppy/dashboard | 3.3.2 | @uppy/utils | 5.2.0 | | @uppy/locales | 3.1.0 | @uppy/xhr-upload | 3.1.1 | | @uppy/provider-views | 3.2.0 | uppy | 3.7.0 | | @uppy/react | 3.1.1 | | | - @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/tus,@uppy/xhr-upload: make sure that we reset serverToken when an upload fails (Mikael Finstad / #4376) - @uppy/aws-s3-multipart: do not auto-open sockets, clean them up on abort (Antoine du Hamel) - @uppy/aws-s3: Update types (Minh Hieu / #4294) - @uppy/companion-client: do not open socket more than once (Artur Paikin) - @uppy/companion: add `service: 'companion'` to periodic ping (Mikael Finstad / #4383) - @uppy/companion: add connection keep-alive to dropbox (Mikael Finstad / #4365) - @uppy/companion: add missing env variable for standalone option (Mikael Finstad / #4382) - @uppy/companion: add S3 prefix env variable (Mikael Finstad / #4320) - @uppy/companion: allow local ips when testing (Mikael Finstad / #4328) - @uppy/companion: fix typo in redis-emitter.js (Ikko Eltociear Ashimine / #4362) - @uppy/companion: merge Provider/SearchProvider (Mikael Finstad / #4330) - @uppy/companion: only body parse when needed & increased body size for s3 (Mikael Finstad / #4372) - @uppy/core: fix bug with `setOptions` (Nguyễn bảo Trung / #4350) - @uppy/locales: locales: add es_MX (Kevin van Zonneveld / #4393) - @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / #4391) - @uppy/provider-views: fix race condition when adding folders (Mikael Finstad / #4384) - @uppy/provider-views: UI: Use form attribite with a form in doc root to prevent outer form submit (Artur Paikin / #4283) - @uppy/transloadit: fix socket error message (Artur Paikin / #4352) - @uppy/tus: do not auto-open sockets, clean them up on abort (Antoine du Hamel) - meta: add version info in the bundlers CI (Antoine du Hamel / #4386) - meta: deploy to Heroku on every companion commit (Mikael Finstad / #4367) - meta: example: migrate `redux` to ESM (Antoine du Hamel / #4158) - meta: fix all ESLint warnings and turn them into errors (Antoine du Hamel / #4398) - meta: fixup! website: update links to work under the new URL (Antoine du Hamel / #4371) - meta: remove duplicate outdated OSS support docs (Mikael Finstad, Artur Paikin / #4364) - meta: use overrides to make sure no uppy package is fetch from npm (Antoine du Hamel / #4395) - website: add a deprecation notice and a link to the new website (Antoine du Hamel / #4370) - website: fix home page (Antoine du Hamel) - website: Remove the website (Merlijn Vos / #4369) - website: update links to work under the new URL (Antoine du Hamel / #4371)
HeavenFox
pushed a commit
to docsend/uppy
that referenced
this pull request
Jun 27, 2023
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/aws-s3 | 3.0.6 | @uppy/status-bar | 3.1.0 | | @uppy/aws-s3-multipart | 3.1.3 | @uppy/transloadit | 3.1.2 | | @uppy/companion | 4.4.0 | @uppy/tus | 3.0.6 | | @uppy/companion-client | 3.1.2 | @uppy/unsplash | 3.2.0 | | @uppy/core | 3.1.2 | @uppy/url | 3.3.0 | | @uppy/dashboard | 3.3.2 | @uppy/utils | 5.2.0 | | @uppy/locales | 3.1.0 | @uppy/xhr-upload | 3.1.1 | | @uppy/provider-views | 3.2.0 | uppy | 3.7.0 | | @uppy/react | 3.1.1 | | | - @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/tus,@uppy/xhr-upload: make sure that we reset serverToken when an upload fails (Mikael Finstad / transloadit#4376) - @uppy/aws-s3-multipart: do not auto-open sockets, clean them up on abort (Antoine du Hamel) - @uppy/aws-s3: Update types (Minh Hieu / transloadit#4294) - @uppy/companion-client: do not open socket more than once (Artur Paikin) - @uppy/companion: add `service: 'companion'` to periodic ping (Mikael Finstad / transloadit#4383) - @uppy/companion: add connection keep-alive to dropbox (Mikael Finstad / transloadit#4365) - @uppy/companion: add missing env variable for standalone option (Mikael Finstad / transloadit#4382) - @uppy/companion: add S3 prefix env variable (Mikael Finstad / transloadit#4320) - @uppy/companion: allow local ips when testing (Mikael Finstad / transloadit#4328) - @uppy/companion: fix typo in redis-emitter.js (Ikko Eltociear Ashimine / transloadit#4362) - @uppy/companion: merge Provider/SearchProvider (Mikael Finstad / transloadit#4330) - @uppy/companion: only body parse when needed & increased body size for s3 (Mikael Finstad / transloadit#4372) - @uppy/core: fix bug with `setOptions` (Nguyễn bảo Trung / transloadit#4350) - @uppy/locales: locales: add es_MX (Kevin van Zonneveld / transloadit#4393) - @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / transloadit#4391) - @uppy/provider-views: fix race condition when adding folders (Mikael Finstad / transloadit#4384) - @uppy/provider-views: UI: Use form attribite with a form in doc root to prevent outer form submit (Artur Paikin / transloadit#4283) - @uppy/transloadit: fix socket error message (Artur Paikin / transloadit#4352) - @uppy/tus: do not auto-open sockets, clean them up on abort (Antoine du Hamel) - meta: add version info in the bundlers CI (Antoine du Hamel / transloadit#4386) - meta: deploy to Heroku on every companion commit (Mikael Finstad / transloadit#4367) - meta: example: migrate `redux` to ESM (Antoine du Hamel / transloadit#4158) - meta: fix all ESLint warnings and turn them into errors (Antoine du Hamel / transloadit#4398) - meta: fixup! website: update links to work under the new URL (Antoine du Hamel / transloadit#4371) - meta: remove duplicate outdated OSS support docs (Mikael Finstad, Artur Paikin / transloadit#4364) - meta: use overrides to make sure no uppy package is fetch from npm (Antoine du Hamel / transloadit#4395) - website: add a deprecation notice and a link to the new website (Antoine du Hamel / transloadit#4370) - website: fix home page (Antoine du Hamel) - website: Remove the website (Merlijn Vos / transloadit#4369) - website: update links to work under the new URL (Antoine du Hamel / transloadit#4371)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also: sync duplicated code between all plugins - created #4377 for this
Not sure if this has any side effects. Does golden retriever depend on this? does golden retriever even support retrieving companion uploads?
fixes #4356