Merge branch 'main' into development
diff --git a/src/utils/database.ts b/src/utils/database.ts
index 67c1c5f..49ed6f0 100644
--- a/src/utils/database.ts
+++ b/src/utils/database.ts
@@ -9,11 +9,12 @@
 
 const username = encodeURIComponent(config.mongoOptions.username);
 const password = encodeURIComponent(config.mongoOptions.password);
-const mongoClient = new MongoClient(username ? `mongodb://${username}:${password}@${config.mongoOptions.host}?authMechanism=DEFAULT` : `mongodb://${config.mongoOptions.host}`, {authSource: "admin"});
+
+const mongoClient = new MongoClient(username ? `mongodb://${username}:${password}@${config.mongoOptions.host}?authMechanism=DEFAULT` : `mongodb://${config.mongoOptions.host}`, {authSource: config.mongoOptions.authSource});
 await mongoClient.connect();
 const database = mongoClient.db();
 
-const collectionOptions = { authdb: "admin" };
+const collectionOptions = { authdb: config.mongoOptions.authSource, w: "majority" };
 const getIV = () => crypto.randomBytes(16);