3 files changed, 26 insertions, 30 deletions

diff --git a/src/server/apis/google/CredentialsLoader.ts b/src/server/apis/google/CredentialsLoader.ts
index ef1f9a91e..a6e0644c3 100644
--- a/src/server/apis/google/CredentialsLoader.ts
+++ b/src/server/apis/google/CredentialsLoader.ts
@@ -1,10 +1,9 @@
-import { readFile, readFileSync } from "fs";
-import { pathFromRoot } from "../../ActionUtilities";
-import { SecureContextOptions } from "tls";
-import { blue, red } from "colors";
+import { readFile, readFileSync } from 'fs';
+import { SecureContextOptions } from 'tls';
+import { blue, red } from 'colors';
+import { pathFromRoot } from '../../ActionUtilities';
 
 export namespace GoogleCredentialsLoader {
-
     export interface InstalledCredentials {
         client_id: string;
         project_id: string;
@@ -19,7 +18,8 @@ export namespace GoogleCredentialsLoader {
 
     export async function loadCredentials() {
         ProjectCredentials = await new Promise<InstalledCredentials>(resolve => {
-            readFile(__dirname + '/google_project_credentials.json', function processClientSecrets(err, content) {
+            // eslint-disable-next-line no-path-concat
+            readFile(__dirname + '/google_project_credentials.json', (err, content) => {
                 if (err) {
                     console.log('Error loading client secret file: ' + err);
                     return;
@@ -28,18 +28,16 @@ export namespace GoogleCredentialsLoader {
             });
         });
     }
-
 }
 
 export namespace SSL {
-
     export let Credentials: SecureContextOptions = {};
     export let Loaded = false;
 
     const suffixes = {
-        privateKey: ".key",
-        certificate: ".crt",
-        caBundle: "-ca.crt"
+        privateKey: '.key',
+        certificate: '.crt',
+        caBundle: '-ca.crt',
     };
 
     export async function loadCredentials() {
@@ -57,11 +55,10 @@ export namespace SSL {
     }
 
     export function exit() {
-        console.log(red("Running this server in release mode requires the following SSL credentials in the project root:"));
-        const serverName = process.env.serverName ? process.env.serverName : "{process.env.serverName}";
+        console.log(red('Running this server in release mode requires the following SSL credentials in the project root:'));
+        const serverName = process.env.serverName ? process.env.serverName : '{process.env.serverName}';
         Object.values(suffixes).forEach(suffix => console.log(blue(`${serverName}${suffix}`)));
-        console.log(red("Please ensure these files exist and restart, or run this in development mode."));
+        console.log(red('Please ensure these files exist and restart, or run this in development mode.'));
         process.exit(0);
     }
-
 }
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();
     }
diff --git a/src/server/apis/google/SharedTypes.ts b/src/server/apis/google/SharedTypes.ts
index 9ad6130b6..f5e0e2e2b 100644
--- a/src/server/apis/google/SharedTypes.ts
+++ b/src/server/apis/google/SharedTypes.ts
@@ -1,9 +1,3 @@
-export interface NewMediaItemResult {
-    uploadToken: string;
-    status: { code: number, message: string };
-    mediaItem: MediaItem;
-}
-
 export interface MediaItem {
     id: string;
     description: string;
@@ -17,5 +11,10 @@ export interface MediaItem {
     };
     filename: string;
 }
+export interface NewMediaItemResult {
+    uploadToken: string;
+    status: { code: number; message: string };
+    mediaItem: MediaItem;
+}
 
-export type MediaItemCreationResult = { newMediaItemResults: NewMediaItemResult[] };
\ No newline at end of file
+export type MediaItemCreationResult = { newMediaItemResults: NewMediaItemResult[] };