merged with soon-to-be-master

1 files changed, 8 insertions, 8 deletions

diff --git a/src/server/apis/google/GoogleApiServerUtils.ts b/src/server/apis/google/GoogleApiServerUtils.ts
index 3940b7a3d..d3acc968b 100644
--- a/src/server/apis/google/GoogleApiServerUtils.ts
+++ b/src/server/apis/google/GoogleApiServerUtils.ts
@@ -1,9 +1,9 @@
-import { google } from 'googleapis';
-import { OAuth2Client, Credentials, OAuth2ClientOptions } from 'google-auth-library';
-import { Opt } from '../../../fields/Doc';
 import { GaxiosResponse } from 'gaxios';
-import * as request from 'request-promise';
+import { Credentials, OAuth2Client, OAuth2ClientOptions } from 'google-auth-library';
+import { google } from 'googleapis';
 import * as qs from 'query-string';
+import * as request from 'request-promise';
+import { Opt } from '../../../fields/Doc';
 import { Database } from '../../database';
 import { GoogleCredentialsLoader } from './CredentialsLoader';
 
@@ -57,12 +57,12 @@ export namespace GoogleApiServerUtils {
      * global, intentionally unauthenticated worker OAuth2 client instance.
      */
     export function processProjectCredentials(): void {
-        const { client_secret, client_id, redirect_uris } = GoogleCredentialsLoader.ProjectCredentials;
+        const { client_secret: clientSecret, client_id: clientId, redirect_uris: redirectUris } = GoogleCredentialsLoader.ProjectCredentials;
         // initialize the global authorization client
         oAuthOptions = {
-            clientId: client_id,
-            clientSecret: client_secret,
-            redirectUri: redirect_uris[0],
+            clientId,
+            clientSecret,
+            redirectUri: redirectUris[0],
         };
         worker = generateClient();
     }