From 025a25a7fbf88c53d153cec19b8f93097116210e Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Tue, 19 Nov 2019 13:30:27 -0500
Subject: fixed authorization

---
 src/client/views/nodes/AudioBox.tsx                    |  3 +--
 src/server/apis/google/GoogleApiServerUtils.ts         | 12 +++++++-----
 src/server/credentials/google_project_credentials.json | 11 ++++-------
 3 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/client/views/nodes/AudioBox.tsx b/src/client/views/nodes/AudioBox.tsx
index 86bd23b67..77b10e395 100644
--- a/src/client/views/nodes/AudioBox.tsx
+++ b/src/client/views/nodes/AudioBox.tsx
@@ -8,7 +8,6 @@ import { DocExtendableComponent } from "../DocComponent";
 import { makeInterface, createSchema } from "../../../new_fields/Schema";
 import { documentSchema } from "../../../new_fields/documentSchemas";
 import { Utils, returnTrue, emptyFunction, returnOne, returnTransparent } from "../../../Utils";
-import { RouteStore } from "../../../server/RouteStore";
 import { runInAction, observable, reaction, IReactionDisposer, computed, action } from "mobx";
 import { DateField } from "../../../new_fields/DateField";
 import { SelectionManager } from "../../util/SelectionManager";
@@ -140,7 +139,7 @@ export class AudioBox extends DocExtendableComponent<FieldViewProps, AudioDocume
             self._recorder.ondataavailable = async function (e: any) {
                 const formData = new FormData();
                 formData.append("file", e.data);
-                const res = await fetch(Utils.prepend(RouteStore.upload), {
+                const res = await fetch(Utils.prepend("/upload"), {
                     method: 'POST',
                     body: formData
                 });
diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index b3657ee43..b0f3ba993 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -48,7 +48,7 @@ export namespace GoogleApiServerUtils {
      * allow us to build OAuth2 clients with Dash's
      * application specific credentials.
      */
-    let installed: OAuth2ClientOptions;
+    let oAuthOptions: OAuth2ClientOptions;
 
     /**
      * This is a global authorization client that is never 
@@ -69,7 +69,7 @@ export namespace GoogleApiServerUtils {
     export function processProjectCredentials(): void {
         const { client_secret, client_id, redirect_uris } = GoogleCredentialsLoader.ProjectCredentials;
         // initialize the global authorization client
-        installed = {
+        oAuthOptions = {
             clientId: client_id,
             clientSecret: client_secret,
             redirectUri: redirect_uris[0]
@@ -201,7 +201,7 @@ export namespace GoogleApiServerUtils {
      * @returns the newly created, potentially certified, OAuth2 client instance
      */
     function generateClient(credentials?: Credentials): OAuth2Client {
-        const client = new google.auth.OAuth2(installed);
+        const client = new google.auth.OAuth2(oAuthOptions);
         credentials && client.setCredentials(credentials);
         return client;
     }
@@ -341,10 +341,12 @@ export namespace GoogleApiServerUtils {
      */
     async function refreshAccessToken(credentials: Credentials, userId: string): Promise<Credentials> {
         let headerParameters = { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } };
+        const { client_id, client_secret } = GoogleCredentialsLoader.ProjectCredentials;
         let url = `https://oauth2.googleapis.com/token?${qs.stringify({
             refreshToken: credentials.refresh_token,
-            grant_type: "refresh_token",
-            ...installed
+            client_id,
+            client_secret,
+            grant_type: "refresh_token"
         })}`;
         const { access_token, expires_in } = await new Promise<any>(async resolve => {
             const response = await request.post(url, headerParameters);
diff --git a/src/server/credentials/google_project_credentials.json b/src/server/credentials/google_project_credentials.json
index 5d9c62eb1..955c5a3c1 100644
--- a/src/server/credentials/google_project_credentials.json
+++ b/src/server/credentials/google_project_credentials.json
@@ -1,14 +1,11 @@
 {
     "installed": {
-        "client_id": "1005546247619-kqpnvh42mpa803tem8556b87umi4j9r0.apps.googleusercontent.com",
-        "project_id": "brown-dash",
+        "client_id": "343179513178-ud6tvmh275r2fq93u9eesrnc66t6akh9.apps.googleusercontent.com",
+        "project_id": "quickstart-1565056383187",
         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
         "token_uri": "https://oauth2.googleapis.com/token",
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-        "client_secret": "WshLb5TH9SdFVGGbQcnYj7IU",
-        "redirect_uris": [
-            "urn:ietf:wg:oauth:2.0:oob",
-            "http://localhost"
-        ]
+        "client_secret": "w8KIFSc0MQpmUYHed4qEzn8b",
+        "redirect_uris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost"]
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2