fixed typecheck errors

Author: ericallam

apps/webapp/app/services/emailAuth.server.tsx

@@ -1,12 +1,12 @@
-import { EmailLinkStrategy } from "remix-auth-email-link";
 import type { Authenticator } from "remix-auth";
-import type { AuthUser } from "./authUser";
-import { findOrCreateUser } from "~/models/user.server";
+import { EmailLinkStrategy } from "remix-auth-email-link";
 import { env } from "~/env.server";
+import { findOrCreateUser } from "~/models/user.server";
 import { sendMagicLinkEmail } from "~/services/email.server";
-import { postAuthentication } from "./postAuth.server";
+import type { AuthUser } from "./authUser";
 import { logger } from "./logger.server";
-import { MfaRequiredError } from "./mfa/multiFactorAuthentication.server";
+
+import { postAuthentication } from "./postAuth.server";
 
 let secret = env.MAGIC_LINK_SECRET;
 if (!secret) throw new Error("Missing MAGIC_LINK_SECRET env variable.");
@@ -39,11 +39,6 @@ const emailStrategy = new EmailLinkStrategy(
 
       return { userId: user.id };
     } catch (error) {
-      // Skip logging the error if it's a MfaRequiredError
-      if (error instanceof MfaRequiredError) {
-        throw error;
-      }
-
       logger.debug("Magic link user failed to authenticate", { error: JSON.stringify(error) });
       throw error;
     }

apps/webapp/app/services/gitHubAuth.server.ts

@@ -3,9 +3,8 @@ import { GitHubStrategy } from "remix-auth-github";
 import { env } from "~/env.server";
 import { findOrCreateUser } from "~/models/user.server";
 import type { AuthUser } from "./authUser";
-import { postAuthentication } from "./postAuth.server";
 import { logger } from "./logger.server";
-import { MfaRequiredError } from "./mfa/multiFactorAuthentication.server";
+import { postAuthentication } from "./postAuth.server";
 
 export function addGitHubStrategy(
   authenticator: Authenticator<AuthUser>,
@@ -45,12 +44,7 @@ export function addGitHubStrategy(
           userId: user.id,
         };
       } catch (error) {
-        // Skip logging the error if it's a MfaRequiredError
-        if (error instanceof MfaRequiredError) {
-          throw error;
-        }
-
-        console.error(error);
+        logger.error("GitHub login failed", { error: JSON.stringify(error) });
         throw error;
       }
     }