Google photos #5061
Open
Google photos #5061
+1,184
−192
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
in companion - make one authProvider for each of drive/googlephotos, because reusing would have been a big rewrite - allow the provider.download method to optionally return a size as an optimization
Diff output filesdiff --git a/packages/@uppy/aws-s3-multipart/lib/index.js b/packages/@uppy/aws-s3-multipart/lib/index.js
index aef977f..2830942 100644
--- a/packages/@uppy/aws-s3-multipart/lib/index.js
+++ b/packages/@uppy/aws-s3-multipart/lib/index.js
@@ -489,7 +489,7 @@ export default class AwsS3Multipart extends BasePlugin {
};
reject(error);
});
- xhr.addEventListener("load", ev => {
+ xhr.addEventListener("load", () => {
cleanup();
if (xhr.status === 403 && xhr.responseText.includes("<Message>Request has expired</Message>")) {
const error = new Error("Request has expired");
diff --git a/packages/@uppy/box/lib/Box.js b/packages/@uppy/box/lib/Box.js
index e45f972..1122bd4 100644
--- a/packages/@uppy/box/lib/Box.js
+++ b/packages/@uppy/box/lib/Box.js
@@ -58,6 +58,7 @@ export default class Box extends UIPlugin {
this.view = new ProviderViews(this, {
provider: this.provider,
loadAllFiles: true,
+ virtualList: true,
});
const {
target,
diff --git a/packages/@uppy/companion/lib/config/grant.d.ts b/packages/@uppy/companion/lib/config/grant.d.ts
index f7df73c..97c46b1 100644
--- a/packages/@uppy/companion/lib/config/grant.d.ts
+++ b/packages/@uppy/companion/lib/config/grant.d.ts
@@ -1,12 +1,29 @@
declare function _exports(): {
- google: {
- transport: string;
+ googledrive: {
+ callback: string;
scope: string[];
+ transport: string;
+ custom_params: {
+ access_type: string;
+ prompt: string;
+ };
+ authorize_url: string;
+ access_url: string;
+ oauth: number;
+ scope_delimiter: string;
+ };
+ googlephotos: {
callback: string;
+ scope: string[];
+ transport: string;
custom_params: {
access_type: string;
prompt: string;
};
+ authorize_url: string;
+ access_url: string;
+ oauth: number;
+ scope_delimiter: string;
};
dropbox: {
transport: string;
diff --git a/packages/@uppy/companion/lib/config/grant.js b/packages/@uppy/companion/lib/config/grant.js
index 861adf7..6f113e3 100644
--- a/packages/@uppy/companion/lib/config/grant.js
+++ b/packages/@uppy/companion/lib/config/grant.js
@@ -1,21 +1,36 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+const google = {
+ transport: "session",
+ // access_type: offline is needed in order to get refresh tokens.
+ // prompt: 'consent' is needed because sometimes a user will get stuck in an authenticated state where we will
+ // receive no refresh tokens from them. This seems to be happen when running on different subdomains.
+ // therefore to be safe that we always get refresh tokens, we set this.
+ // https://stackoverflow.com/questions/10827920/not-receiving-google-oauth-refresh-token/65108513#65108513
+ custom_params: { access_type: "offline", prompt: "consent" },
+ // copied from https://github.com/simov/grant/blob/master/config/oauth.json
+ "authorize_url": "https://accounts.google.com/o/oauth2/v2/auth",
+ "access_url": "https://oauth2.googleapis.com/token",
+ "oauth": 2,
+ "scope_delimiter": " ",
+};
// oauth configuration for provider services that are used.
module.exports = () => {
return {
- // for drive
- google: {
- transport: "session",
- scope: [
- "https://www.googleapis.com/auth/drive.readonly",
- ],
+ // we need separate auth providers because scopes are different,
+ // and because it would be a too big rewrite to allow reuse of the same provider.
+ googledrive: {
+ ...google,
callback: "/drive/callback",
- // access_type: offline is needed in order to get refresh tokens.
- // prompt: 'consent' is needed because sometimes a user will get stuck in an authenticated state where we will
- // receive no refresh tokens from them. This seems to be happen when running on different subdomains.
- // therefore to be safe that we always get refresh tokens, we set this.
- // https://stackoverflow.com/questions/10827920/not-receiving-google-oauth-refresh-token/65108513#65108513
- custom_params: { access_type: "offline", prompt: "consent" },
+ scope: ["https://www.googleapis.com/auth/drive.readonly"],
+ },
+ googlephotos: {
+ ...google,
+ callback: "/googlephotos/callback",
+ scope: [
+ "https://www.googleapis.com/auth/photoslibrary.readonly",
+ "https://www.googleapis.com/auth/userinfo.email",
+ ], // if name is needed, then add https://www.googleapis.com/auth/userinfo.profile too
},
dropbox: {
transport: "session",
diff --git a/packages/@uppy/companion/lib/server/controllers/get.js b/packages/@uppy/companion/lib/server/controllers/get.js
index c3b5129..44c2d07 100644
--- a/packages/@uppy/companion/lib/server/controllers/get.js
+++ b/packages/@uppy/companion/lib/server/controllers/get.js
@@ -10,10 +10,7 @@ async function get(req, res) {
async function getSize() {
return provider.size({ id, token: accessToken, query: req.query });
}
- async function download() {
- const { stream } = await provider.download({ id, token: accessToken, providerUserSession, query: req.query });
- return stream;
- }
+ const download = () => provider.download({ id, token: accessToken, providerUserSession, query: req.query });
try {
await startDownUpload({ req, res, getSize, download });
} catch (err) {
diff --git a/packages/@uppy/companion/lib/server/controllers/url.js b/packages/@uppy/companion/lib/server/controllers/url.js
index 4ab5695..9c36bd4 100644
--- a/packages/@uppy/companion/lib/server/controllers/url.js
+++ b/packages/@uppy/companion/lib/server/controllers/url.js
@@ -26,8 +26,8 @@ const downloadURL = async (url, blockLocalIPs, traceId) => {
try {
const protectedGot = getProtectedGot({ blockLocalIPs });
const stream = protectedGot.stream.get(url, { responseType: "json" });
- await prepareStream(stream);
- return stream;
+ const { size } = await prepareStream(stream);
+ return { stream, size };
} catch (err) {
logger.error(err, "controller.url.download.error", traceId);
throw err;
@@ -73,9 +73,7 @@ const get = async (req, res) => {
const { size } = await getURLMeta(req.body.url, !allowLocalUrls);
return size;
}
- async function download() {
- return downloadURL(req.body.url, !allowLocalUrls, req.id);
- }
+ const download = () => downloadURL(req.body.url, !allowLocalUrls, req.id);
try {
await startDownUpload({ req, res, getSize, download });
} catch (err) {
diff --git a/packages/@uppy/companion/lib/server/helpers/oauth-state.d.ts b/packages/@uppy/companion/lib/server/helpers/oauth-state.d.ts
index f1c2709..f2b204d 100644
--- a/packages/@uppy/companion/lib/server/helpers/oauth-state.d.ts
+++ b/packages/@uppy/companion/lib/server/helpers/oauth-state.d.ts
@@ -1,4 +1,5 @@
export function encodeState(state: any, secret: any): string;
+export function decodeState(state: any, secret: any): any;
export function generateState(): {
id: string;
};
diff --git a/packages/@uppy/companion/lib/server/helpers/oauth-state.js b/packages/@uppy/companion/lib/server/helpers/oauth-state.js
index ccdc572..9421cec 100644
--- a/packages/@uppy/companion/lib/server/helpers/oauth-state.js
+++ b/packages/@uppy/companion/lib/server/helpers/oauth-state.js
@@ -7,7 +7,7 @@ module.exports.encodeState = (state, secret) => {
const encodedState = Buffer.from(JSON.stringify(state)).toString("base64");
return encrypt(encodedState, secret);
};
-const decodeState = (state, secret) => {
+module.exports.decodeState = (state, secret) => {
const encodedState = decrypt(state, secret);
return JSON.parse(atob(encodedState));
};
@@ -17,7 +17,7 @@ module.exports.generateState = () => {
};
};
module.exports.getFromState = (state, name, secret) => {
- return decodeState(state, secret)[name];
+ return module.exports.decodeState(state, secret)[name];
};
module.exports.getGrantDynamicFromRequest = (req) => {
var _a, _b;
diff --git a/packages/@uppy/companion/lib/server/helpers/upload.js b/packages/@uppy/companion/lib/server/helpers/upload.js
index 923af2a..948e8b4 100644
--- a/packages/@uppy/companion/lib/server/helpers/upload.js
+++ b/packages/@uppy/companion/lib/server/helpers/upload.js
@@ -5,12 +5,20 @@ const logger = require("../logger");
const { respondWithError } = require("../provider/error");
async function startDownUpload({ req, res, getSize, download }) {
try {
- const size = await getSize();
+ logger.debug("Starting download stream.", null, req.id);
+ const { stream, size: maybeSize } = await download();
+ let size;
+ // if the provider already knows the size, we can use that
+ if (typeof maybeSize === "number" && !Number.isNaN(maybeSize) && maybeSize > 0) {
+ size = maybeSize;
+ }
+ // if not we need to get the size
+ if (size == null) {
+ size = await getSize();
+ }
const { clientSocketConnectTimeout } = req.companion.options;
logger.debug("Instantiating uploader.", null, req.id);
const uploader = new Uploader(Uploader.reqToOptions(req, size));
- logger.debug("Starting download stream.", null, req.id);
- const stream = await download();
(async () => {
// wait till the client has connected to the socket, before starting
// the download, so that the client can receive all download/upload progress.
diff --git a/packages/@uppy/companion/lib/server/helpers/utils.js b/packages/@uppy/companion/lib/server/helpers/utils.js
index 5b2a4a7..b7b58e4 100644
--- a/packages/@uppy/companion/lib/server/helpers/utils.js
+++ b/packages/@uppy/companion/lib/server/helpers/utils.js
@@ -140,11 +140,14 @@ module.exports.StreamHttpJsonError = StreamHttpJsonError;
module.exports.prepareStream = async (stream) =>
new Promise((resolve, reject) => {
stream
- .on("response", () => {
+ .on("response", (response) => {
+ const contentLengthStr = response.headers["content-length"];
+ const contentLength = parseInt(contentLengthStr, 10);
+ const size = !Number.isNaN(contentLength) && contentLength >= 0 ? contentLength : undefined;
// Don't allow any more data to flow yet.
// https://github.com/request/request/issues/1990#issuecomment-184712275
stream.pause();
- resolve();
+ resolve({ size });
})
.on("error", (err) => {
var _a, _b;
diff --git a/packages/@uppy/companion/lib/server/provider/index.js b/packages/@uppy/companion/lib/server/provider/index.js
index de030b5..3c7caea 100644
--- a/packages/@uppy/companion/lib/server/provider/index.js
+++ b/packages/@uppy/companion/lib/server/provider/index.js
@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
*/
const dropbox = require("./dropbox");
const box = require("./box");
-const drive = require("./drive");
+const drive = require("./google/drive");
+const googlephotos = require("./google/googlephotos");
const instagram = require("./instagram/graph");
const facebook = require("./facebook");
const onedrive = require("./onedrive");
@@ -63,7 +64,7 @@ module.exports.getProviderMiddleware = (providers, grantConfig) => {
* @returns {Record<string, typeof Provider>}
*/
module.exports.getDefaultProviders = () => {
- const providers = { dropbox, box, drive, facebook, onedrive, zoom, instagram, unsplash };
+ const providers = { dropbox, box, drive, googlephotos, facebook, onedrive, zoom, instagram, unsplash };
return providers;
};
/**
diff --git a/packages/@uppy/companion/lib/standalone/helper.js b/packages/@uppy/companion/lib/standalone/helper.js
index 9c21b17..6a83a86 100644
--- a/packages/@uppy/companion/lib/standalone/helper.js
+++ b/packages/@uppy/companion/lib/standalone/helper.js
@@ -72,6 +72,11 @@ const getConfigFromEnv = () => {
secret: getSecret("COMPANION_GOOGLE_SECRET"),
credentialsURL: process.env.COMPANION_GOOGLE_KEYS_ENDPOINT,
},
+ googlephotos: {
+ key: process.env.COMPANION_GOOGLE_KEY,
+ secret: getSecret("COMPANION_GOOGLE_SECRET"),
+ credentialsURL: process.env.COMPANION_GOOGLE_KEYS_ENDPOINT,
+ },
dropbox: {
key: process.env.COMPANION_DROPBOX_KEY,
secret: getSecret("COMPANION_DROPBOX_SECRET"),
diff --git a/packages/@uppy/dashboard/lib/utils/copyToClipboard.js b/packages/@uppy/dashboard/lib/utils/copyToClipboard.js
index ed94e73..05bf18e 100644
--- a/packages/@uppy/dashboard/lib/utils/copyToClipboard.js
+++ b/packages/@uppy/dashboard/lib/utils/copyToClipboard.js
@@ -19,7 +19,7 @@ export default function copyToClipboard(textToCopy, fallbackString) {
textArea.value = textToCopy;
document.body.appendChild(textArea);
textArea.select();
- const magicCopyFailed = cause => {
+ const magicCopyFailed = () => {
document.body.removeChild(textArea);
window.prompt(fallbackString, textToCopy);
resolve();
@@ -27,13 +27,13 @@ export default function copyToClipboard(textToCopy, fallbackString) {
try {
const successful = document.execCommand("copy");
if (!successful) {
- return magicCopyFailed("copy command unavailable");
+ return magicCopyFailed();
}
document.body.removeChild(textArea);
return resolve();
} catch (err) {
document.body.removeChild(textArea);
- return magicCopyFailed(err);
+ return magicCopyFailed();
}
});
}
diff --git a/packages/@uppy/dropbox/lib/Dropbox.js b/packages/@uppy/dropbox/lib/Dropbox.js
index 3a5bae8..76d0e03 100644
--- a/packages/@uppy/dropbox/lib/Dropbox.js
+++ b/packages/@uppy/dropbox/lib/Dropbox.js
@@ -50,6 +50,7 @@ export default class Dropbox extends UIPlugin {
this.view = new ProviderViews(this, {
provider: this.provider,
loadAllFiles: true,
+ virtualList: true,
});
const {
target,
diff --git a/packages/@uppy/google-drive/lib/GoogleDrive.js b/packages/@uppy/google-drive/lib/GoogleDrive.js
index 1269a20..14c8f7e 100644
--- a/packages/@uppy/google-drive/lib/GoogleDrive.js
+++ b/packages/@uppy/google-drive/lib/GoogleDrive.js
@@ -75,6 +75,7 @@ export default class GoogleDrive extends UIPlugin {
this.view = new DriveProviderViews(this, {
provider: this.provider,
loadAllFiles: true,
+ virtualList: true,
});
const {
target,
diff --git a/packages/@uppy/onedrive/lib/OneDrive.js b/packages/@uppy/onedrive/lib/OneDrive.js
index edec3e4..86c3896 100644
--- a/packages/@uppy/onedrive/lib/OneDrive.js
+++ b/packages/@uppy/onedrive/lib/OneDrive.js
@@ -67,6 +67,7 @@ export default class OneDrive extends UIPlugin {
this.view = new ProviderViews(this, {
provider: this.provider,
loadAllFiles: true,
+ virtualList: true,
});
const {
target,
diff --git a/packages/@uppy/provider-views/lib/Browser.js b/packages/@uppy/provider-views/lib/Browser.js
index 60ad2f8..06876c0 100644
--- a/packages/@uppy/provider-views/lib/Browser.js
+++ b/packages/@uppy/provider-views/lib/Browser.js
@@ -43,7 +43,7 @@ function ListItem(props) {
id: f.id,
title: f.name,
author: f.author,
- getItemIcon: () => f.icon,
+ getItemIcon: () => viewType === "grid" && f.thumbnail ? f.thumbnail : f.icon,
isChecked: isChecked(f),
toggleCheckbox: event => toggleCheckbox(event, f),
isCheckboxDisabled: false,
@@ -84,7 +84,7 @@ function Browser(props) {
cancel,
done,
noResultsLabel,
- loadAllFiles,
+ virtualList,
} = props;
const selected = currentSelection.length;
const rows = useMemo(() => [...folders, ...files], [folders, files]);
@@ -131,7 +131,7 @@ function Browser(props) {
className: "uppy-Provider-empty",
}, noResultsLabel);
}
- if (loadAllFiles) {
+ if (virtualList) {
return h(
"div",
{
diff --git a/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js b/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
index 3943455..faf9509 100644
--- a/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
+++ b/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
@@ -47,6 +47,7 @@ const defaultOptions = {
showFilter: true,
showBreadcrumbs: true,
loadAllFiles: false,
+ virtualList: false,
};
var _abortController = _classPrivateFieldLooseKey("abortController");
var _withAbort = _classPrivateFieldLooseKey("withAbort");
@@ -386,6 +387,7 @@ export default class ProviderView extends View {
getNextFolder: this.getNextFolder,
getFolder: this.getFolder,
loadAllFiles: this.opts.loadAllFiles,
+ virtualList: this.opts.virtualList,
showSearchFilter: targetViewOptions.showFilter,
search: this.filterQuery,
clearSearch: this.clearFilter,
diff --git a/packages/@uppy/provider-views/lib/View.js b/packages/@uppy/provider-views/lib/View.js
index 69cd639..0886ac5 100644
--- a/packages/@uppy/provider-views/lib/View.js
+++ b/packages/@uppy/provider-views/lib/View.js
@@ -1,5 +1,3 @@
-import getFileType from "@uppy/utils/lib/getFileType";
-import isPreviewSupported from "@uppy/utils/lib/isPreviewSupported";
import remoteFileObjToLocal from "@uppy/utils/lib/remoteFileObjToLocal";
export default class View {
constructor(plugin, opts) {
@@ -104,8 +102,7 @@ export default class View {
requestClientId: this.requestClientId,
},
};
- const fileType = getFileType(tagFile);
- if (fileType && isPreviewSupported(fileType)) {
+ if (file.thumbnail) {
tagFile.preview = file.thumbnail;
}
if (file.author) {
diff --git a/packages/@uppy/remote-sources/lib/index.js b/packages/@uppy/remote-sources/lib/index.js
index a8af254..9ad3645 100644
--- a/packages/@uppy/remote-sources/lib/index.js
+++ b/packages/@uppy/remote-sources/lib/index.js
@@ -13,6 +13,7 @@ import { BasePlugin } from "@uppy/core";
import Dropbox from "@uppy/dropbox";
import Facebook from "@uppy/facebook";
import GoogleDrive from "@uppy/google-drive";
+import GooglePhotos from "@uppy/google-photos";
import Instagram from "@uppy/instagram";
import OneDrive from "@uppy/onedrive";
import Unsplash from "@uppy/unsplash";
@@ -27,28 +28,30 @@ const availablePlugins = {
Dropbox,
Facebook,
GoogleDrive,
+ GooglePhotos,
Instagram,
OneDrive,
Unsplash,
Url,
Zoom,
};
-const defaultOptions = {
- sources: Object.keys(availablePlugins),
-};
var _installedPlugins = _classPrivateFieldLooseKey("installedPlugins");
export default class RemoteSources extends BasePlugin {
constructor(uppy, opts) {
- super(uppy, {
- ...defaultOptions,
- ...opts,
- });
+ super(uppy, opts);
Object.defineProperty(this, _installedPlugins, {
writable: true,
value: new Set(),
});
this.id = this.opts.id || "RemoteSources";
this.type = "preset";
+ const defaultOptions = {
+ sources: Object.keys(availablePlugins),
+ };
+ this.opts = {
+ ...defaultOptions,
+ ...opts,
+ };
if (this.opts.companionUrl == null) {
throw new Error(
"Please specify companionUrl for RemoteSources to work, see https://uppy.io/docs/remote-sources#companionUrl",
diff --git a/packages/@uppy/transloadit/lib/index.js b/packages/@uppy/transloadit/lib/index.js
index 31e4d6c..42c1b13 100644
--- a/packages/@uppy/transloadit/lib/index.js
+++ b/packages/@uppy/transloadit/lib/index.js
@@ -533,6 +533,7 @@ function _getClientVersion2() {
addPluginVersion("Box", "uppy-box");
addPluginVersion("Facebook", "uppy-facebook");
addPluginVersion("GoogleDrive", "uppy-google-drive");
+ addPluginVersion("GooglePhotos", "uppy-google-photos");
addPluginVersion("Instagram", "uppy-instagram");
addPluginVersion("OneDrive", "uppy-onedrive");
addPluginVersion("Zoom", "uppy-zoom"); |
they are different concept and virtual list doesn't support grid
|
I think this is now ready for MVP |
mifi
added a commit
to transloadit/uppy.io
that referenced
this pull request
Apr 12, 2024
This comment was marked as resolved.
This comment was marked as resolved.
|
hmm i ran |
# Conflicts: # packages/@uppy/provider-views/src/ProviderView/ProviderView.tsx
as required by google
Murderlon
reviewed
May 9, 2024
| :::tip | ||
|
|
||
| [Try out the live example](/examples) or take it for a spin in | ||
| [CodeSandbox](https://codesandbox.io/s/uppy-dashboard-xpxuhd). |
There was a problem hiding this comment.
This should be Stackblitz since #5125
|
|
||
| return { | ||
| username, | ||
| items: adaptedItems, |
There was a problem hiding this comment.
Do we need any additional sorting? Or is mediaItems already sorted by the API?
| /** | ||
| * Reusable google stuff | ||
| */ | ||
| class Google extends Provider { |
There was a problem hiding this comment.
Not the biggest fan of inheritance for this instead of just having three simple functions which are reused, but more of a nit.
| @@ -85,6 +85,7 @@ export default class Dropbox<M extends Meta, B extends Body> extends UIPlugin< | |||
| this.view = new ProviderViews(this, { | |||
| provider: this.provider, | |||
| loadAllFiles: true, | |||
| virtualList: true, | |||
There was a problem hiding this comment.
Did you test this in all providers where you added this?
| import { ProviderViews } from '@uppy/provider-views' | ||
| import type { Body, Meta } from '@uppy/utils/lib/UppyFile' | ||
|
|
||
| export default class GooglePhotosProviderViews< |
| Zoom, | ||
| } | ||
|
|
||
| export default class RemoteSources extends BasePlugin { |
There was a problem hiding this comment.
You're putting the .js file back, this should be .ts
| } | ||
| } | ||
|
|
||
| componentDidUpdate () { | ||
| componentDidUpdate(): void { |
There was a problem hiding this comment.
lot's unrelated changes aren't great in a PR this big. But we can leave it for now
Murderlon
reviewed
May 9, 2024
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.
closes #2163
remaining tasks:
Partner program
Potential problems
links: