Refactor authentication services to use server imports and enhance error handling in PrismaAuthService

Author: tikazyq

apps/web/app/api/auth/login/route.ts

@@ -16,7 +16,7 @@ export async function POST(req: NextRequest) {
     const validatedData = loginSchema.parse(body);
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
     await authService.initialize();
     const result = await authService.login(validatedData);

apps/web/app/api/auth/me/route.ts

@@ -16,7 +16,7 @@ export async function GET(req: NextRequest) {
     const token = authHeader.substring(7); // Remove 'Bearer ' prefix
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
     await authService.initialize();
 

apps/web/app/api/auth/refresh/route.ts

@@ -15,7 +15,7 @@ export async function POST(req: NextRequest) {
     const validatedData = refreshSchema.parse(body);
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
     const newTokens = await authService.refreshToken(validatedData.refreshToken);
 

apps/web/app/api/auth/register/route.ts

@@ -17,7 +17,7 @@ export async function POST(req: NextRequest) {
     const validatedData = registrationSchema.parse(body);
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
     await authService.initialize();
     const result = await authService.register(validatedData);

apps/web/app/api/auth/reset-password/route.ts

@@ -21,7 +21,7 @@ export async function POST(req: NextRequest) {
     const action = searchParams.get('action');
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
 
     if (action === 'request') {

apps/web/app/api/auth/sso/route.ts

@@ -17,7 +17,7 @@ export async function POST(req: NextRequest) {
     const { provider, returnUrl } = authorizationSchema.parse(body);
 
     // Dynamic import to keep server-only
-    const { SSOService } = await import('@codervisor/devlog-core/auth');
+    const { SSOService } = await import('@codervisor/devlog-core/server');
     const ssoService = SSOService.getInstance();
 
     // Generate state for CSRF protection
@@ -64,7 +64,7 @@ export async function POST(req: NextRequest) {
 export async function GET(req: NextRequest) {
   try {
     // Dynamic import to keep server-only
-    const { SSOService } = await import('@codervisor/devlog-core/auth');
+    const { SSOService } = await import('@codervisor/devlog-core/server');
     const ssoService = SSOService.getInstance();
 
     // Get available providers

apps/web/app/api/auth/verify-email/route.ts

@@ -15,7 +15,7 @@ export async function POST(req: NextRequest) {
     const validatedData = verifyEmailSchema.parse(body);
 
     // Dynamic import to keep server-only
-    const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+    const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
     const authService = PrismaAuthService.getInstance();
     const user = await authService.verifyEmail(validatedData.token);
 

apps/web/lib/auth-middleware.ts

@@ -28,10 +28,10 @@ export async function withAuth<T>(
       const token = authHeader.substring(7); // Remove 'Bearer ' prefix
 
       // Import PrismaAuthService dynamically to avoid initialization issues
-      const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+      const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
       const authService = PrismaAuthService.getInstance();
 
-      const user = await authService.verifyToken(token);
+      const user = await authService.validateToken(token);
 
       // Attach user to request
       const authenticatedReq = req as AuthenticatedRequest;
@@ -59,11 +59,11 @@ export async function withOptionalAuth<T>(
       if (authHeader && authHeader.startsWith('Bearer ')) {
         const token = authHeader.substring(7);
 
-        const { PrismaAuthService } = await import('@codervisor/devlog-core/auth');
+        const { PrismaAuthService } = await import('@codervisor/devlog-core/server');
         const authService = PrismaAuthService.getInstance();
 
         try {
-          const user = await authService.verifyToken(token);
+          const user = await authService.validateToken(token);
           (req as any).user = user;
         } catch {
           // Ignore token verification errors for optional auth

packages/core/src/services/prisma-auth-service.ts

@@ -76,7 +76,7 @@ export class PrismaAuthService {
       }
     } catch (error) {
       // Prisma client not available - service will operate in fallback mode
-      console.warn('[PrismaAuthService] Prisma client not available, operating in fallback mode:', error.message);
+      console.warn('[PrismaAuthService] Prisma client not available, operating in fallback mode:', (error as Error).message);
       this.fallbackMode = true;
     }
   }
@@ -203,24 +203,40 @@ export class PrismaAuthService {
 
       // Generate email verification token if required
       let emailVerificationToken: string | undefined;
-      if (registration.requireEmailVerification) {
-        emailVerificationToken = await this.generateEmailVerificationToken(user.id);
-      }
+      // Note: requireEmailVerification would need to be added to UserRegistration type if needed
+      // if (registration.requireEmailVerification) {
+      //   emailVerificationToken = await this.generateEmailVerificationToken(user.id);
+      // }
 
       // Generate auth tokens
       const tokens = await this.generateTokens(user);
 
       return {
-        user: this.mapPrismaToUser(user),
+        user: this.convertPrismaUserToUser(user),
         tokens,
-        emailVerificationToken,
       };
     } catch (error) {
       console.error('[PrismaAuthService] Registration failed:', error);
       throw new Error(`Registration failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
   }
 
+  /**
+   * Convert Prisma user to User type
+   */
+  private convertPrismaUserToUser(prismaUser: any): User {
+    return {
+      id: prismaUser.id,
+      email: prismaUser.email,
+      name: prismaUser.name || '',
+      avatarUrl: prismaUser.avatarUrl,
+      isEmailVerified: prismaUser.isEmailVerified || false,
+      createdAt: prismaUser.createdAt?.toISOString() || new Date().toISOString(),
+      updatedAt: prismaUser.updatedAt?.toISOString() || new Date().toISOString(),
+      lastLoginAt: prismaUser.lastLoginAt?.toISOString(),
+    };
+  }
+
   /**
    * Authenticate user login
    */
@@ -280,7 +296,7 @@ export class PrismaAuthService {
       const tokens = await this.generateTokens(user);
 
       return {
-        user: this.mapPrismaToUser(user),
+        user: this.convertPrismaUserToUser(user),
         tokens,
       };
     } catch (error) {

packages/core/src/services/prisma-devlog-service.ts

@@ -66,7 +66,7 @@ export class PrismaDevlogService {
       }
     } catch (error) {
       // Prisma client not available - service will operate in fallback mode
-      console.warn('[PrismaDevlogService] Prisma client not available, operating in fallback mode:', error.message);
+      console.warn('[PrismaDevlogService] Prisma client not available, operating in fallback mode:', (error as Error).message);
       this.fallbackMode = true;
     }
   }