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

remove google photos 😢 #331

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −227
Open

remove google photos 😢 #331

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions docs/companion.md
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,9 @@ OAuth.
## When should I use it?

If you want to let users download files from [Box][], [Dropbox][], [Facebook][],
[Google Drive][googledrive], [Google Photos][googlephotos], [Google Drive
Picker][googledrivepicker], [Google Photos Picker][googlephotospicker],
[Instagram][], [OneDrive][], [Unsplash][], [Import from URL][url], or [Zoom][] —
you need Companion.
[Google Drive][googledrive], [Google Drive Picker][googledrivepicker], [Google
Photos Picker][googlephotospicker], [Instagram][], [OneDrive][], [Unsplash][],
[Import from URL][url], or [Zoom][] — you need Companion.

Companion supports the same [uploaders](/docs/guides/choosing-uploader) as Uppy:
[Tus](/docs/tus), [AWS S3](/docs/aws-s3), and [regular multipart](/docs/tus).
@@ -474,16 +473,15 @@ the secret, nothing else.

:::

| Service | Key | Environment variables |
| ------------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Box | `box` | `COMPANION_BOX_KEY`, `COMPANION_BOX_SECRET`, `COMPANION_BOX_SECRET_FILE` |
| Dropbox | `dropbox` | `COMPANION_DROPBOX_KEY`, `COMPANION_DROPBOX_SECRET`, `COMPANION_DROPBOX_SECRET_FILE` |
| Facebook | `facebook` | `COMPANION_FACEBOOK_KEY`, `COMPANION_FACEBOOK_SECRET`, `COMPANION_FACEBOOK_SECRET_FILE` |
| Google Drive | `drive` | `COMPANION_GOOGLE_KEY`, `COMPANION_GOOGLE_SECRET`, `COMPANION_GOOGLE_SECRET_FILE` |
| Google Photos | `googlephotos` | `COMPANION_GOOGLE_KEY`, `COMPANION_GOOGLE_SECRET`, `COMPANION_GOOGLE_SECRET_FILE` |
| Instagram | `instagram` | `COMPANION_INSTAGRAM_KEY`, `COMPANION_INSTAGRAM_SECRET`, `COMPANION_INSTAGRAM_SECRET_FILE` |
| OneDrive | `onedrive` | `COMPANION_ONEDRIVE_KEY`, `COMPANION_ONEDRIVE_SECRET`, `COMPANION_ONEDRIVE_SECRET_FILE`, `COMPANION_ONEDRIVE_DOMAIN_VALIDATION` (Settings this variable to `true` enables a route that can be used to validate your app with OneDrive) |
| Zoom | `zoom` | `COMPANION_ZOOM_KEY`, `COMPANION_ZOOM_SECRET`, `COMPANION_ZOOM_SECRET_FILE`, `COMPANION_ZOOM_VERIFICATION_TOKEN` |
| Service | Key | Environment variables |
| ------------ | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Box | `box` | `COMPANION_BOX_KEY`, `COMPANION_BOX_SECRET`, `COMPANION_BOX_SECRET_FILE` |
| Dropbox | `dropbox` | `COMPANION_DROPBOX_KEY`, `COMPANION_DROPBOX_SECRET`, `COMPANION_DROPBOX_SECRET_FILE` |
| Facebook | `facebook` | `COMPANION_FACEBOOK_KEY`, `COMPANION_FACEBOOK_SECRET`, `COMPANION_FACEBOOK_SECRET_FILE` |
| Google Drive | `drive` | `COMPANION_GOOGLE_KEY`, `COMPANION_GOOGLE_SECRET`, `COMPANION_GOOGLE_SECRET_FILE` |
| Instagram | `instagram` | `COMPANION_INSTAGRAM_KEY`, `COMPANION_INSTAGRAM_SECRET`, `COMPANION_INSTAGRAM_SECRET_FILE` |
| OneDrive | `onedrive` | `COMPANION_ONEDRIVE_KEY`, `COMPANION_ONEDRIVE_SECRET`, `COMPANION_ONEDRIVE_SECRET_FILE`, `COMPANION_ONEDRIVE_DOMAIN_VALIDATION` (Settings this variable to `true` enables a route that can be used to validate your app with OneDrive) |
| Zoom | `zoom` | `COMPANION_ZOOM_KEY`, `COMPANION_ZOOM_SECRET`, `COMPANION_ZOOM_SECRET_FILE`, `COMPANION_ZOOM_VERIFICATION_TOKEN` |

#### `s3`

@@ -991,7 +989,6 @@ automatically restart when files are changed.
[dropbox]: /docs/dropbox
[facebook]: /docs/facebook
[googledrive]: /docs/google-drive
[googlephotos]: /docs/google-photos
[googledrivepicker]: /docs/google-drive-picker
[googlephotospicker]: /docs/google-photos-picker
[instagram]: /docs/instagram
8 changes: 0 additions & 8 deletions docs/sources/companion-plugins/google-photos-picker.mdx
View file
Original file line number Diff line number Diff line change
@@ -29,14 +29,6 @@ See also [Google Drive Picker](./google-drive-picker.mdx).
When you want to let users import files from their
[Google Photos](https://photos.google.com) account.

You should use this plugin over our other
[Google Photos plugin](/docs/google-photos) if you want to avoid using a
restricted API scope, which requires CASA Tier 2 compliance.

The downside of using the Picker UI made by Google is less controls, inability
to select folders, downloading an additional bundle, and a less consistent user
experience.

<Tabs>
<TabItem value="npm" label="NPM" default>

185 changes: 0 additions & 185 deletions docs/sources/companion-plugins/google-photos.mdx
View file

This file was deleted.

2 changes: 0 additions & 2 deletions docs/user-interfaces/dashboard.mdx
View file
Original file line number Diff line number Diff line change
@@ -730,8 +730,6 @@ all Uppy plugins.
[Facebook](https://facebook.com).
- [`@uppy/google-drive`](/docs/google-drive) — import from
[Google Drive](https://drive.google.com).
- [`@uppy/google-photos`](/docs/google-photos) — import from
[Google Photos](https://photos.google.com).
- [`@uppy/google-drive-picker`](/docs/google-drive-picker) — import from
[Google Drive](https://drive.google.com) using the new Picker API.
- [`@uppy/google-photos-picker`](/docs/google-photos-picker) — import from
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,6 @@
"@uppy/golden-retriever": "latest",
"@uppy/google-drive": "latest",
"@uppy/google-drive-picker": "latest",
"@uppy/google-photos": "latest",
"@uppy/google-photos-picker": "latest",
"@uppy/image-editor": "latest",
"@uppy/instagram": "latest",
14 changes: 0 additions & 14 deletions src/pages/examples.tsx
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ import UppyCore from '@uppy/core';
import Webcam from '@uppy/webcam';
import GoogleDrive from '@uppy/google-drive';
import GoogleDrivePicker from '@uppy/google-drive-picker';
import GooglePhotos from '@uppy/google-photos';
import GooglePhotosPicker from '@uppy/google-photos-picker';
import Instagram from '@uppy/instagram';
import Dropbox from '@uppy/dropbox';
@@ -113,14 +112,6 @@ const options = [
'Temporarily disabled until our credentials are approved again. You can still use the plugin yourself.',
disabled: true,
},
{
label: 'Google Photos',
value: 'GooglePhotos',
type: 'plugins',
title:
'Temporarily disabled until our credentials are approved again. You can still use the plugin yourself.',
disabled: true,
},
{
label: 'Google Drive Picker',
value: 'GoogleDrivePicker',
@@ -267,11 +258,6 @@ const Uppy = ({ state, locale }) => {
appId: googlePickerAppId,
});
}
if (state.plugins.includes('GooglePhotos') && !disabled('GooglePhotos')) {
uppy.use(GooglePhotos, {
companionUrl,
});
}
if (
state.plugins.includes('GooglePhotosPicker') &&
!disabled('GooglePhotosPicker')
3 changes: 1 addition & 2 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
@@ -3764,7 +3764,7 @@ __metadata:
languageName: node
linkType: hard

"@uppy/google-photos@npm:^0.5.1, @uppy/google-photos@npm:latest":
"@uppy/google-photos@npm:^0.5.1":
version: 0.5.1
resolution: "@uppy/google-photos@npm:0.5.1"
dependencies:
@@ -16120,7 +16120,6 @@ __metadata:
"@uppy/golden-retriever": "npm:latest"
"@uppy/google-drive": "npm:latest"
"@uppy/google-drive-picker": "npm:latest"
"@uppy/google-photos": "npm:latest"
"@uppy/google-photos-picker": "npm:latest"
"@uppy/image-editor": "npm:latest"
"@uppy/instagram": "npm:latest"