merge

1 files changed, 5 insertions, 1 deletions

diff --git a/src/server/database.ts b/src/server/database.ts
index 12626e594..b81fc03a4 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -60,6 +60,10 @@ export namespace Database {
 
         constructor() {
             this.MongoClient.connect(url, (_err, client) => {
+                if (!client) {
+                    console.error("\nPlease start MongoDB by running 'mongod' in a terminal before continuing...\n");
+                    process.exit(0);
+                }
                 this.db = client.db();
                 this.onConnect.forEach(fn => fn());
             });
@@ -298,7 +302,7 @@ export namespace Database {
 
             export type StoredCredentials = Credentials & { _id: string };
 
-            export const Fetch = async (userId: string, removeId = true) => {
+            export const Fetch = async (userId: string, removeId = true): Promise<Opt<StoredCredentials>> => {
                 return SanitizedSingletonQuery<StoredCredentials>({ userId }, GoogleAuthentication, removeId);
             };