fixed upload handling:

3 files changed, 12 insertions, 5 deletions

diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index 0215c533f..e91f8352b 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -52,6 +52,7 @@ export namespace GooglePhotosUploadUtils {
         };
         return new Promise<any>((resolve, reject) => request(parameters, (error, _response, body) => {
             if (error) {
+                console.log(error);
                 return reject(error);
             }
             resolve(body);
@@ -124,7 +125,8 @@ export namespace DownloadUtils {
 
     export const UploadImage = async (url: string, filename?: string, prefix = ""): Promise<Opt<UploadInformation>> => {
         const resolved = filename ? sanitize(filename) : generate(prefix, url);
-        const extension = (path.extname(url) || path.extname(resolved)).toLowerCase() || ".png";
+        let extension = path.extname(url) || path.extname(resolved);
+        extension && (extension = extension.toLowerCase());
         let information: UploadInformation = {
             mediaPaths: [],
             fileNames: { clean: resolved }
@@ -151,12 +153,13 @@ export namespace DownloadUtils {
                     suffix: size.suffix
                 }))
             ];
+            let nonVisual = false;
             if (pngs.includes(extension)) {
                 resizers.forEach(element => element.resizer = element.resizer.png());
             } else if (jpgs.includes(extension)) {
                 resizers.forEach(element => element.resizer = element.resizer.jpeg());
             } else if (![...imageFormats, ...videoFormats].includes(extension.toLowerCase())) {
-                return resolve(undefined);
+                nonVisual = true;
             }
             if (imageFormats.includes(extension)) {
                 for (let resizer of resizers) {
@@ -172,7 +175,7 @@ export namespace DownloadUtils {
                     });
                 }
             }
-            if (!isLocal) {
+            if (!isLocal || nonVisual) {
                 await new Promise<void>(resolve => {
                     stream(url).pipe(fs.createWriteStream(uploadDirectory + resolved)).on('close', resolve);
                 });
diff --git a/src/server/credentials/google_docs_token.json b/src/server/credentials/google_docs_token.json
index 31763c2cf..bb313f136 100644
--- a/src/server/credentials/google_docs_token.json
+++ b/src/server/credentials/google_docs_token.json
@@ -1 +1 @@
-{"access_token":"ya29.GlyBB9YYhy7l9LZ9yDpItKvLpibt59SpmBQUMo_sX-3d4eN8W-9teuc_7Ca4YiOboy_gHTdcwaR1ArnpQEqZlzOsfNmV6dXZsldgxin3bVuDn1q4sCWvz01yuZduIA","refresh_token":"1/HTv_xFHszu2Nf3iiFrUTaeKzC_Vp2-6bpIB06xW_WHI","scope":"https://www.googleapis.com/auth/presentations.readonly https://www.googleapis.com/auth/documents.readonly https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/documents https://www.googleapis.com/auth/photoslibrary https://www.googleapis.com/auth/photoslibrary.appendonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/presentations https://www.googleapis.com/auth/photoslibrary.sharing","token_type":"Bearer","expiry_date":1568281677559}
\ No newline at end of file
+{"access_token":"ya29.GlyBB9xs77CFscdtWApHKMcsd6eS9NW3tO0FEvZlfO87HTl7zc1nIVhvtB7MLxadXvxVg4VUAvl6eFjVFsbdmA7TmURhIygYsZbds87ybMuLH5W68mRAVd3HDYyCzg","refresh_token":"1/HTv_xFHszu2Nf3iiFrUTaeKzC_Vp2-6bpIB06xW_WHI","scope":"https://www.googleapis.com/auth/presentations.readonly https://www.googleapis.com/auth/documents.readonly https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/documents https://www.googleapis.com/auth/photoslibrary https://www.googleapis.com/auth/photoslibrary.appendonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/presentations https://www.googleapis.com/auth/photoslibrary.sharing","token_type":"Bearer","expiry_date":1568310697477}
\ No newline at end of file
diff --git a/src/server/index.ts b/src/server/index.ts
index 62c3df8de..d7273bd88 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -86,6 +86,7 @@ app.use(expressValidator());
 app.use(passport.initialize());
 app.use(passport.session());
 app.use((req, res, next) => {
+    console.log(req.originalUrl);
     res.locals.user = req.user;
     next();
 });
@@ -831,7 +832,10 @@ app.post(RouteStore.googlePhotosMediaUpload, async (req, res) => {
     const media: GooglePhotosUploadUtils.MediaInput[] = req.body.media;
     await GooglePhotosUploadUtils.initialize({ uploadDirectory, credentialsPath, tokenPath });
     const newMediaItems = await Promise.all(media.map(async element => {
-        const uploadToken = await GooglePhotosUploadUtils.DispatchGooglePhotosUpload(element.url).catch(error => _error(res, tokenError, error));
+        const uploadToken = await GooglePhotosUploadUtils.DispatchGooglePhotosUpload(element.url).catch(error => {
+            console.log("Dispatching upload error!");
+            console.log(error);
+        });
         return !uploadToken ? undefined : {
             description: element.description,
             simpleMediaItem: { uploadToken }