Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove companion provider compat api #3828

Merged
merged 1 commit into from Jun 27, 2022
Merged

remove companion provider compat api #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/Provider.js
View file
Open in desktop
Expand Up @@ -77,6 +77,4 @@ class Provider {
}
}

Provider.version = 1

module.exports = Provider
54 changes: 0 additions & 54 deletions packages/@uppy/companion/src/server/provider/ProviderCompat.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/SearchProvider.js
View file
Open in desktop
Expand Up @@ -33,6 +33,4 @@ class SearchProvider {
}
}

SearchProvider.version = 1

module.exports = SearchProvider
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/box/index.js
View file
Open in desktop
Expand Up @@ -216,8 +216,6 @@ class Box extends Provider {
}
}

Box.version = 2

Box.prototype.list = promisify(Box.prototype._list)
Box.prototype.size = promisify(Box.prototype._size)
Box.prototype.logout = promisify(Box.prototype._logout)
Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/drive/index.js
View file
Open in desktop
Expand Up @@ -290,8 +290,6 @@ class Drive extends Provider {
}
}

Drive.version = 2

Drive.prototype.logout = promisify(Drive.prototype._logout)

module.exports = Drive
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/dropbox/index.js
View file
Open in desktop
Expand Up @@ -224,8 +224,6 @@ class DropBox extends Provider {
}
}

DropBox.version = 2

DropBox.prototype.list = promisify(DropBox.prototype._list)
DropBox.prototype.size = promisify(DropBox.prototype._size)
DropBox.prototype.logout = promisify(DropBox.prototype._logout)
Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/facebook/index.js
View file
Open in desktop
Expand Up @@ -187,8 +187,6 @@ class Facebook extends Provider {
}
}

Facebook.version = 2

Facebook.prototype.list = promisify(Facebook.prototype._list)
Facebook.prototype.size = promisify(Facebook.prototype._size)
Facebook.prototype.logout = promisify(Facebook.prototype._logout)
Expand Down
7 changes: 1 addition & 6 deletions packages/@uppy/companion/src/server/provider/index.js
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@ const { getCredentialsResolver } = require('./credentials')
const Provider = require('./Provider')
// eslint-disable-next-line
const SearchProvider = require('./SearchProvider')
const { wrapLegacyProvider } = require('./ProviderCompat')

// leave here for now until Purest Providers gets updated with Zoom provider
purestConfig.zoom = {
Expand Down Expand Up @@ -80,12 +79,8 @@ module.exports.getProviderMiddleware = (providers, needsProviderCredentials) =>
* @param {string} providerName
*/
const middleware = (req, res, next, providerName) => {
let ProviderClass = providers[providerName]
const ProviderClass = providers[providerName]
if (ProviderClass && validOptions(req.companion.options)) {
// TODO remove this legacy provider compatibility when we release a new major
// @ts-ignore
if (ProviderClass.version !== 2) ProviderClass = wrapLegacyProvider(ProviderClass)

req.companion.provider = new ProviderClass({ providerName, config: purestConfig })

if (needsProviderCredentials) {
Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/instagram/graph/index.js
View file
Open in desktop
Expand Up @@ -169,8 +169,6 @@ class Instagram extends Provider {
}
}

Instagram.version = 2

Instagram.prototype.list = promisify(Instagram.prototype._list)
Instagram.prototype.size = promisify(Instagram.prototype._size)

Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/onedrive/index.js
View file
Open in desktop
Expand Up @@ -145,8 +145,6 @@ class OneDrive extends Provider {
}
}

OneDrive.version = 2

OneDrive.prototype.list = promisify(OneDrive.prototype._list)
OneDrive.prototype.size = promisify(OneDrive.prototype._size)

Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/unsplash/index.js
View file
Open in desktop
Expand Up @@ -150,8 +150,6 @@ class Unsplash extends SearchProvider {
}
}

Unsplash.version = 2

Unsplash.prototype.list = promisify(Unsplash.prototype._list)
Unsplash.prototype.size = promisify(Unsplash.prototype._size)

Expand Down
2 changes: 0 additions & 2 deletions packages/@uppy/companion/src/server/provider/zoom/index.js
View file
Open in desktop
Expand Up @@ -339,8 +339,6 @@ class Zoom extends Provider {
}
}

Zoom.version = 2

Zoom.prototype.list = promisify(Zoom.prototype._list)
Zoom.prototype.size = promisify(Zoom.prototype._size)
Zoom.prototype.logout = promisify(Zoom.prototype._logout)
Expand Down
1 change: 0 additions & 1 deletion website/src/docs/companion.md
View file
Open in desktop
Expand Up @@ -524,7 +524,6 @@ To work well with Companion, the **module** must be a class with the following m
The class must also have:

* A unique `authProvider` string property - a lowercased value which typically indicates the name of the provider (e.g “dropbox”).
* A `static` property `static version = 2`, which is the current version of the Companion Provider API.

See also [example code with a custom provider](https://github.com/transloadit/uppy/blob/main/examples/custom-provider/server).

Expand Down