Merge branch 'main' into zeroes

Decatur-Robotics · Feb 24, 2025 · 27245d5 · 27245d5
2 parents acde19c + 7b9d17f
commit 27245d5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 30 deletions.
diff --git a/lib/Auth.ts b/lib/Auth.ts
@@ -14,10 +14,10 @@ import CollectionId from "./client/CollectionId";
 import { AdapterUser } from "next-auth/adapters";
 import { wait } from "./client/ClientUtils";
 
-const db = getDatabase();
-
 const adapter = MongoDBAdapter(clientPromise, { databaseName: process.env.DB });
 
+const cachedDb = getDatabase();
+
 export const AuthenticationOptions: AuthOptions = {
 	secret: process.env.NEXTAUTH_SECRET,
 	providers: [
@@ -30,11 +30,7 @@ export const AuthenticationOptions: AuthOptions = {
 					profile.email,
 					profile.picture,
 					false,
-					await GenerateSlug(
-						await getDatabase(),
-						CollectionId.Users,
-						profile.name,
-					),
+					await GenerateSlug(await cachedDb, CollectionId.Users, profile.name),
 					[],
 					[],
 				);
@@ -62,11 +58,7 @@ export const AuthenticationOptions: AuthOptions = {
 					profile.email,
 					profile.picture,
 					false,
-					await GenerateSlug(
-						await getDatabase(),
-						CollectionId.Users,
-						profile.name,
-					),
+					await GenerateSlug(await cachedDb, CollectionId.Users, profile.name),
 					[],
 					[],
 					profile.sub,
@@ -92,7 +84,7 @@ export const AuthenticationOptions: AuthOptions = {
 	callbacks: {
 		async session({ session, user }) {
 			session.user = await (
-				await db
+				await cachedDb
 			).findObjectById(CollectionId.Users, new ObjectId(user.id));
 
 			return session;
@@ -106,7 +98,10 @@ export const AuthenticationOptions: AuthOptions = {
 		 * For email sign in, runs when the "Sign In" button is clicked (before email is sent).
 		 */
 		async signIn({ user }) {
+			console.log(`User is signing in: ${user.name}, ${user.email}, ${user.id}`);
+
 			Analytics.signIn(user.name ?? "Unknown User");
+			const db = await getDatabase(false);
 
 			let typedUser = user as Partial<User>;
 			if (!typedUser.slug || typedUser._id?.toString() != typedUser.id) {
@@ -116,9 +111,9 @@ export const AuthenticationOptions: AuthOptions = {
 					);
 					let foundUser: User | undefined = undefined;
 					while (!foundUser) {
-						foundUser = await (
-							await db
-						).findObject(CollectionId.Users, { email: typedUser.email });
+						foundUser = await db.findObject(CollectionId.Users, {
+							email: typedUser.email,
+						});
 
 						if (!foundUser) await wait(50);
 					}
@@ -128,7 +123,7 @@ export const AuthenticationOptions: AuthOptions = {
 					typedUser._id = foundUser._id;
 					typedUser.lastSignInDateTime = new Date();
 
-					typedUser = await repairUser(await db, typedUser);
+					typedUser = await repairUser(db, typedUser);
 
 					console.log("User updated:", typedUser._id?.toString());
 				};
@@ -142,14 +137,12 @@ export const AuthenticationOptions: AuthOptions = {
 				today.toDateString()
 			) {
 				// We use user.id since user._id strangely doesn't exist on user.
-				await getDatabase().then((db) =>
-					db.updateObjectById(
-						CollectionId.Users,
-						new ObjectId(typedUser._id?.toString()),
-						{
-							lastSignInDateTime: today,
-						},
-					),
+				db.updateObjectById(
+					CollectionId.Users,
+					new ObjectId(typedUser._id?.toString()),
+					{
+						lastSignInDateTime: today,
+					},
 				);
 			}
 

diff --git a/lib/MongoDB.ts b/lib/MongoDB.ts
@@ -30,13 +30,17 @@ clientPromise = global.clientPromise;
 
 export { clientPromise };
 
-export async function getDatabase(): Promise<DbInterface> {
+export async function getDatabase(
+	useCache: boolean = true,
+): Promise<DbInterface> {
 	if (!global.interface) {
 		await clientPromise;
-		const dbInterface = new CachedDbInterface(
-			new MongoDBInterface(clientPromise),
-			cacheOptions,
-		);
+
+		const mongo = new MongoDBInterface(clientPromise);
+
+		const dbInterface = useCache
+			? new CachedDbInterface(mongo, cacheOptions)
+			: mongo;
 		await dbInterface.init();
 		global.interface = dbInterface;