latest

src/services/auth/authService.ts

@@ -44,11 +44,19 @@ export function convertToCCUser(user: User, metadata: CCUserMetadata): CCUser {
   // Default to student if no user type specified
   const userType = metadata.user_type || 'student';
 
-  const userDbName = DatabaseNameService.getUserPrivateDB(
+  const storedUserDb = DatabaseNameService.getStoredUserDatabase();
+  const storedSchoolDb = DatabaseNameService.getStoredSchoolDatabase();
+
+  const userDbName = storedUserDb || DatabaseNameService.getUserPrivateDB(
     userType,
-    username
+    user.id
   );
-  const schoolDbName = DatabaseNameService.getDevelopmentSchoolDB();
+  const schoolDbName = metadata.school_db_name || metadata.worker_db_name || storedSchoolDb || '';
+
+  DatabaseNameService.rememberDatabaseNames({
+    userDbName,
+    schoolDbName
+  });
 
   return {
     id: user.id,
@@ -222,6 +230,7 @@ class AuthService {
       storageService.set(StorageKeys.USER_ROLE, ccUser.user_type);
       storageService.set(StorageKeys.USER, ccUser);
       storageService.set(StorageKeys.SUPABASE_TOKEN, data.session.access_token);
+      storageService.set(StorageKeys.SUPABASE_SESSION, data.session);
 
       logger.info('auth-service', '✅ Login successful', {
         userId: ccUser.id,
@@ -262,4 +271,3 @@ class AuthService {
 }
 
 export const authService = AuthService.getInstance();
-