Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 12 insertions, 15 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);
     }
-
 }