latest

src/services/auth/registrationService.ts

@@ -3,9 +3,10 @@ import { CCUser, convertToCCUser } from '../../services/auth/authService';
 import { EmailCredentials } from '../../services/auth/authService';
 import { formatEmailForDatabase } from '../graph/neoDBService';
 import { RegistrationResponse } from '../../services/auth/authService';
-import { neoRegistrationService } from '../graph/neoRegistrationService';
 import { storageService, StorageKeys } from './localStorageService';
 import { logger } from '../../debugConfig';
+import { provisionUser } from '../provisioningService';
+import { DatabaseNameService } from '../graph/databaseNameService';
 
 const REGISTRATION_SERVICE = 'registration-service';
 
@@ -76,38 +77,50 @@ export class RegistrationService {
 
             storageService.set(StorageKeys.IS_NEW_REGISTRATION, true);
 
+            let provisioningToken = authData.session?.access_token || null;
+            if (!provisioningToken) {
+                const { data: sessionData } = await supabase.auth.getSession();
+                provisioningToken = sessionData.session?.access_token || null;
+            }
+
             // 3. Create Neo4j nodes
             try {
-                const userNode = await neoRegistrationService.registerNeo4JUser(
-                    ccUser,
-                    username, // Pass username for database operations
-                    credentials.role
-                );
-
-                logger.info(REGISTRATION_SERVICE, '✅ Registration successful with Neo4j setup', {
+                const provisioned = await provisionUser(ccUser.id, provisioningToken);
+                if (provisioned) {
+                    ccUser.user_db_name = provisioned.user_db_name;
+                    if (provisioned.worker_db_name) {
+                        ccUser.school_db_name = provisioned.worker_db_name;
+                    }
+                    DatabaseNameService.rememberDatabaseNames({
+                        userDbName: ccUser.user_db_name,
+                        schoolDbName: ccUser.school_db_name
+                    });
+                    logger.info(REGISTRATION_SERVICE, '✅ Provisioning successful', {
+                        userId: ccUser.id,
+                        userDbName: provisioned.user_db_name,
+                        workerDbName: provisioned.worker_db_name
+                    });
+                } else {
+                    logger.warn(REGISTRATION_SERVICE, '⚠️ Provisioning skipped or pending', { userId: ccUser.id });
+                }
+            } catch (provisionError) {
+                logger.warn(REGISTRATION_SERVICE, '⚠️ Provisioning error', {
                     userId: ccUser.id,
-                    hasUserNode: !!userNode
+                    error: provisionError
                 });
-
-                return {
-                    user: ccUser,
-                    accessToken: authData.session?.access_token || null,
-                    userRole: credentials.role,
-                    message: 'Registration successful'
-                };
-            } catch (neo4jError) {
-                logger.warn(REGISTRATION_SERVICE, '⚠️ Neo4j setup problem', { 
-                    userId: ccUser.id,
-                    error: neo4jError 
-                });
-                // Return success even if Neo4j setup is pending
-                return {
-                    user: ccUser,
-                    accessToken: authData.session?.access_token || null,
-                    userRole: credentials.role,
-                    message: 'Registration successful - Neo4j setup pending'
-                };
             }
+
+            DatabaseNameService.rememberDatabaseNames({
+                userDbName: ccUser.user_db_name,
+                schoolDbName: ccUser.school_db_name
+            });
+
+            return {
+                user: ccUser,
+                accessToken: authData.session?.access_token || null,
+                userRole: credentials.role,
+                message: 'Registration successful'
+            };
         } catch (error) {
             logger.error(REGISTRATION_SERVICE, '❌ Registration failed:', error);
             throw error;