wip

packages/identity/application/use-cases/LoginWithEmailUseCase.ts

@@ -39,13 +39,17 @@ export class LoginWithEmailUseCase {
     }
 
     // Create session
-    const authenticatedUser: AuthenticatedUserDTO = {
+    const authenticatedUserBase: AuthenticatedUserDTO = {
       id: user.id,
       displayName: user.displayName,
       email: user.email,
-      primaryDriverId: user.primaryDriverId,
     };
 
+    const authenticatedUser: AuthenticatedUserDTO =
+      user.primaryDriverId !== undefined
+        ? { ...authenticatedUserBase, primaryDriverId: user.primaryDriverId }
+        : authenticatedUserBase;
+
     return this.sessionPort.createSession(authenticatedUser);
   }
 

packages/identity/application/use-cases/SignupWithEmailUseCase.ts

@@ -71,7 +71,6 @@ export class SignupWithEmailUseCase {
       id: newUser.id,
       displayName: newUser.displayName,
       email: newUser.email,
-      primaryDriverId: undefined, // Will be set during onboarding
     };
 
     const session = await this.sessionPort.createSession(authenticatedUser);