From 956ba14e290c2e9eb177ba08879e6629c5c4a0b8 Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Sat, 10 Apr 2021 18:49:41 -0400 Subject: [PATCH] Implement getUser methods --- src/api.ts | 4 ++-- src/data.ts | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/api.ts b/src/api.ts index fa7cdeb..42e406d 100644 --- a/src/api.ts +++ b/src/api.ts @@ -12,7 +12,7 @@ import { export const router = Router(); -router.get('/user', (req, res) => { +router.get('/user', async (req, res) => { if (typeof req.query.userID != 'string') { return; } @@ -23,7 +23,7 @@ router.get('/user', (req, res) => { userID = req.session.accountID; } - let user = getUserByID(userID); + let user = await getUserByID(userID); if (user) { res.json({ status: 'success', data: user }); diff --git a/src/data.ts b/src/data.ts index 9f359b4..9a57bab 100644 --- a/src/data.ts +++ b/src/data.ts @@ -57,8 +57,8 @@ export function getPoolsWithUser(userID: string) { return poolIDs; } -export function getUserByID(userID: string): Carpool.User | undefined { - return users[userID]; +export async function getUserByID(userID: string) { + return await UserModel.findById(userID).exec(); } export function getPoolByID(poolID: string): Carpool.Pool | undefined { @@ -72,7 +72,9 @@ export function getGroupByID(groupID: string): Carpool.Group | undefined { export async function getUserByEmail( email: string ): Promise { - return undefined; + return ((await UserModel.findOne({ + email, + }).exec()) as unknown) as Carpool.User; } export async function registerUserFromIonProfile(