From 1f6e1d7e063f9ce1c08486f8c0c11b6c2c4198dc Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Mon, 28 Oct 2019 04:11:53 -0400
Subject: repaired google photos routine, no route handlers can have dangling
 promises

---
 src/server/apis/google/GoogleApiServerUtils.ts    | 9 +++++++--
 src/server/apis/google/GooglePhotosUploadUtils.ts | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/server/apis')

diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index ad7540e5d..1cca07036 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -62,12 +62,17 @@ export namespace GoogleApiServerUtils {
 
     export const loadClientSecret = async () => {
         return new Promise<void>((resolve, reject) => {
-            readFile(path.join(__dirname, "../../credentials/google_docs_credentials.json"), async (err, credentials) => {
+            readFile(path.join(__dirname, "../../credentials/google_docs_credentials.json"), async (err, projectCredentials) => {
                 if (err) {
                     reject(err);
                     return console.log('Error loading client secret file:', err);
                 }
-                installed = parseBuffer(credentials).installed;
+                const { client_secret, client_id, redirect_uris } = parseBuffer(projectCredentials).installed;
+                installed = {
+                    clientId: client_id,
+                    clientSecret: client_secret,
+                    redirectUri: redirect_uris[0]
+                };
                 worker = generateClient();
                 resolve();
             });
diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index d704faa71..172fa8d46 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -22,7 +22,7 @@ export namespace GooglePhotosUploadUtils {
     const prepend = (extension: string) => `https://photoslibrary.googleapis.com/v1/${extension}`;
     const headers = (type: string, token: string) => ({
         'Content-Type': `application/${type}`,
-        'Authorization': token,
+        'Authorization': `Bearer ${token}`,
     });
 
     export const DispatchGooglePhotosUpload = async (bearerToken: string, url: string) => {
-- 
cgit v1.2.3-70-g09d2