add try catch to handle for getUserData

Real-Dev-Squad · Aug 25, 2023 · ac5884d · ac5884d
1 parent 9191dcb
commit ac5884d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/controllers/auth.ts b/controllers/auth.ts
@@ -77,11 +77,13 @@ const googleAuthCallback = (
 
   let rCalUiUrl = new URL(config.get('services.rCalUi.baseUrl'));
 
-  try {
-    rCalUiUrl = new URL(redirectURL);
-  } catch (error) {
-    logger.error('Invalid redirect URL provided');
-    logger.error(error);
+  if (redirectURL) {
+    try {
+      rCalUiUrl = new URL(redirectURL);
+    } catch (error) {
+      logger.error('Invalid redirect URL provided');
+      logger.error(error);
+    }
   }
 
   try {

diff --git a/services/authService.ts b/services/authService.ts
@@ -47,24 +47,29 @@ const decodeAuthToken = (token: string): any => {
  */
 const getUserData = async (
   email: string
-): Promise<Users & { calendarId: number }> => {
-  const user = await prisma.users.findUniqueOrThrow({
-    where: {
-      email,
-    },
-    include: {
-      Calendar: {
-        where: {
-          isDeleted: false,
-          isPrimary: true,
-        },
-        select: {
-          id: true,
+): Promise<(Users & { calendarId: number }) | undefined> => {
+  try {
+    const user = await prisma.users.findUniqueOrThrow({
+      where: {
+        email,
+      },
+      include: {
+        Calendar: {
+          where: {
+            isDeleted: false,
+            isPrimary: true,
+          },
+          select: {
+            id: true,
+          },
         },
       },
-    },
-  });
-  return { ...user, calendarId: user.Calendar[0].id };
+    });
+    return { ...user, calendarId: user.Calendar[0].id };
+  } catch (error) {
+    logger.error('Could not find user', error);
+    return undefined;
+  }
 };
 
 /**