@mostajs/setup 2.1.21 → 2.1.24

package/dist/api/routes.js

@@ -124,6 +124,29 @@ export function createSetupRoutes(config) {
                     }
                 },
             },
+            // Create admin user — delegates to @mostajs/rbac via module discovery
+            'create-admin': {
+                POST: async (req) => {
+                    const body = await req.json();
+                    if (!body?.email || !body?.password || !body?.firstName) {
+                        return Response.json({ ok: false, error: 'email, password, firstName requis' }, { status: 400 });
+                    }
+                    try {
+                        // Try rbac module createAdmin (works in both ORM and NET mode)
+                        const { createAdmin } = await import('@mostajs/rbac/lib/create-admin');
+                        const result = await createAdmin({
+                            email: body.email,
+                            password: body.password,
+                            firstName: body.firstName,
+                            lastName: body.lastName || '',
+                        });
+                        return Response.json(result);
+                    }
+                    catch (e) {
+                        return Response.json({ ok: false, error: e instanceof Error ? e.message : 'Erreur creation admin' });
+                    }
+                },
+            },
         };
         return table;
     }

package/dist/components/SetupWizard.js

@@ -369,6 +369,8 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
     const [netTesting, setNetTesting] = useState(false);
     const [schemaUploadStatus, setSchemaUploadStatus] = useState(null);
     const [schemasReady, setSchemasReady] = useState(false);
+    const [adminSaving, setAdminSaving] = useState(false);
+    const [adminSaveResult, setAdminSaveResult] = useState(null);
     const [currentStep, setCurrentStep] = useState(0);
     const [dialect, setDialect] = useState('mongodb');
     const [dbConfig, setDbConfig] = useState({ ...DIALECT_DEFAULTS.mongodb, name: `${dbNamePrefix}_prod` });
@@ -965,7 +967,41 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                                                     }, children: "\uD83D\uDCC1 Scanner un r\u00E9pertoire" })] }), schemaUploadStatus && (_jsx("div", { style: { fontSize: 13, fontWeight: 500, color: schemaUploadStatus.color }, children: schemaUploadStatus.phase }))] })), netTestResult?.ok && (netTestResult.entities?.length ?? 0) > 0 && (_jsx("div", { style: {
                                         padding: 12, borderRadius: 8, marginBottom: 16,
                                         backgroundColor: '#f0fdf4', border: '1px solid #bbf7d0',
-                                    }, children: _jsxs("div", { style: { fontWeight: 600, color: '#166534' }, children: ["\u2705 Serveur pr\u00EAt \u2014 ", netTestResult.entities?.length, " entit\u00E9s charg\u00E9es"] }) })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'admin' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDC64" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.admin.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.admin.description') })] })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.firstName') }), _jsx("input", { style: S.input, value: adminConfig.firstName, onChange: e => setAdminConfig({ ...adminConfig, firstName: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.lastName') }), _jsx("input", { style: S.input, value: adminConfig.lastName, onChange: e => setAdminConfig({ ...adminConfig, lastName: e.target.value }) })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.email') }), _jsx("input", { style: S.input, type: "email", value: adminConfig.email, onChange: e => setAdminConfig({ ...adminConfig, email: e.target.value }), placeholder: "admin@example.com" })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.password') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.password, onChange: e => setAdminConfig({ ...adminConfig, password: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.confirmPassword') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.confirmPassword, onChange: e => setAdminConfig({ ...adminConfig, confirmPassword: e.target.value }) })] })] }), adminConfig.password && adminConfig.confirmPassword && adminConfig.password !== adminConfig.confirmPassword && (_jsx("p", { style: { fontSize: 13, color: '#dc2626' }, children: t('setup.admin.passwordMismatch') })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'summary' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\u2699\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.summary.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.summary.description') })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: setupMode === 'net' ? 'Serveur @mostajs/net' : t('setup.summary.dbConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsx("span", { style: { fontFamily: 'monospace' }, children: dbSummaryLabel() }), setupMode === 'net' && netTransport && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Transport: ", netTransport] }), setupMode !== 'net' && dialect !== 'sqlite' && dbConfig.user && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Utilisateur: ", dbConfig.user] })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.adminConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsxs("div", { children: [adminConfig.firstName, " ", adminConfig.lastName] }), _jsx("div", { children: adminConfig.email })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.modules.title') }), _jsx("div", { style: S.flexWrap, children: selectedModules.map(key => {
+                                    }, children: _jsxs("div", { style: { fontWeight: 600, color: '#166534' }, children: ["\u2705 Serveur pr\u00EAt \u2014 ", netTestResult.entities?.length, " entit\u00E9s charg\u00E9es"] }) })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'admin' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDC64" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.admin.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.admin.description') })] })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.firstName') }), _jsx("input", { style: S.input, value: adminConfig.firstName, onChange: e => setAdminConfig({ ...adminConfig, firstName: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.lastName') }), _jsx("input", { style: S.input, value: adminConfig.lastName, onChange: e => setAdminConfig({ ...adminConfig, lastName: e.target.value }) })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.email') }), _jsx("input", { style: S.input, type: "email", value: adminConfig.email, onChange: e => setAdminConfig({ ...adminConfig, email: e.target.value }), placeholder: "admin@example.com" })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.password') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.password, onChange: e => setAdminConfig({ ...adminConfig, password: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.confirmPassword') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.confirmPassword, onChange: e => setAdminConfig({ ...adminConfig, confirmPassword: e.target.value }) })] })] }), adminConfig.password && adminConfig.confirmPassword && adminConfig.password !== adminConfig.confirmPassword && (_jsx("p", { style: { fontSize: 13, color: '#dc2626' }, children: t('setup.admin.passwordMismatch') })), setupMode === 'net' && (_jsxs("div", { style: { marginTop: 16, marginBottom: 16 }, children: [_jsx("button", { style: { ...S.btn('primary'), backgroundColor: '#16a34a' }, disabled: adminSaving || !adminConfig.email || !adminConfig.password || !adminConfig.firstName || adminConfig.password !== adminConfig.confirmPassword, onClick: async () => {
+                                                setAdminSaving(true);
+                                                setAdminSaveResult(null);
+                                                try {
+                                                    // 1. Hash password côté serveur via un endpoint dédié, ou côté client
+                                                    // On envoie le mot de passe en clair — le serveur Next.js le hashera
+                                                    const res = await fetch(ep.setupJson.replace('setup-json', 'create-admin'), {
+                                                        method: 'POST',
+                                                        headers: { 'Content-Type': 'application/json' },
+                                                        body: JSON.stringify({
+                                                            url: netUrl,
+                                                            email: adminConfig.email,
+                                                            password: adminConfig.password,
+                                                            firstName: adminConfig.firstName,
+                                                            lastName: adminConfig.lastName,
+                                                        }),
+                                                    });
+                                                    const data = await res.json();
+                                                    if (data.ok) {
+                                                        setAdminSaveResult({ ok: true, message: `✅ Admin ${adminConfig.email} créé sur le serveur NET` });
+                                                    }
+                                                    else {
+                                                        setAdminSaveResult({ ok: false, message: `❌ ${data.error || 'Erreur'}` });
+                                                    }
+                                                }
+                                                catch (err) {
+                                                    setAdminSaveResult({ ok: false, message: `❌ ${err.message}` });
+                                                }
+                                                setAdminSaving(false);
+                                            }, children: adminSaving ? '⏳ Enregistrement...' : '💾 Enregistrer l\'admin sur le serveur' }), adminSaveResult && (_jsx("div", { style: {
+                                                marginTop: 8, padding: 8, borderRadius: 6, fontSize: 13, fontWeight: 500,
+                                                backgroundColor: adminSaveResult.ok ? '#f0fdf4' : '#fef2f2',
+                                                color: adminSaveResult.ok ? '#166534' : '#991b1b',
+                                                border: `1px solid ${adminSaveResult.ok ? '#bbf7d0' : '#fecaca'}`,
+                                            }, children: adminSaveResult.message }))] })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'summary' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\u2699\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.summary.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.summary.description') })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: setupMode === 'net' ? 'Serveur @mostajs/net' : t('setup.summary.dbConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsx("span", { style: { fontFamily: 'monospace' }, children: dbSummaryLabel() }), setupMode === 'net' && netTransport && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Transport: ", netTransport] }), setupMode !== 'net' && dialect !== 'sqlite' && dbConfig.user && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Utilisateur: ", dbConfig.user] })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.adminConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsxs("div", { children: [adminConfig.firstName, " ", adminConfig.lastName] }), _jsx("div", { children: adminConfig.email })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.modules.title') }), _jsx("div", { style: S.flexWrap, children: selectedModules.map(key => {
                                                 const mod = availableModules.find(m => m.key === key);
                                                 return mod ? (_jsxs("span", { style: {
                                                         display: 'inline-flex', alignItems: 'center', gap: 4,

package/dist/lib/module-registry.d.ts

@@ -0,0 +1,21 @@
+export interface ModuleDescriptor {
+    name: string;
+    label: string;
+    getSchemas: () => any[];
+    seed: (options?: any) => Promise<any>;
+    createAdmin?: (options: {
+        email: string;
+        password: string;
+        firstName: string;
+        lastName: string;
+    }) => Promise<any>;
+}
+/**
+ * Discover installed @mostajs modules and return their descriptors.
+ * Tries dynamic import of each module's module-info.
+ */
+export declare function discoverModules(moduleNames?: string[]): Promise<ModuleDescriptor[]>;
+/**
+ * Collect all schemas from discovered modules.
+ */
+export declare function collectSchemas(modules: ModuleDescriptor[]): any[];

package/dist/lib/module-registry.js

@@ -0,0 +1,58 @@
+// @mostajs/setup — Module registry
+// Discovers installed @mostajs modules and their schemas/seeds
+// Author: Dr Hamid MADANI drmdh@msn.com
+/**
+ * Discover installed @mostajs modules and return their descriptors.
+ * Tries dynamic import of each module's module-info.
+ */
+export async function discoverModules(moduleNames) {
+    const modules = [];
+    const candidates = moduleNames || ['rbac', 'audit', 'settings'];
+    for (const name of candidates) {
+        try {
+            // Try importing module-info from each @mostajs module
+            let info = null;
+            switch (name) {
+                case 'rbac':
+                case 'auth': // auth delegates to rbac
+                    info = await import('@mostajs/rbac/lib/module-info').catch(() => null);
+                    break;
+                case 'audit':
+                    info = await import('@mostajs/audit/lib/module-info').catch(() => null);
+                    break;
+                case 'settings':
+                    info = await import('@mostajs/settings/lib/module-info').catch(() => null);
+                    break;
+            }
+            if (info?.moduleInfo) {
+                modules.push({
+                    name: info.moduleInfo.name,
+                    label: info.moduleInfo.label,
+                    getSchemas: info.moduleInfo.schemas || info.getSchemas,
+                    seed: info.moduleInfo.seed,
+                    createAdmin: info.moduleInfo.createAdmin,
+                });
+            }
+        }
+        catch {
+            // Module not installed — skip
+        }
+    }
+    return modules;
+}
+/**
+ * Collect all schemas from discovered modules.
+ */
+export function collectSchemas(modules) {
+    const schemas = [];
+    const seen = new Set();
+    for (const mod of modules) {
+        for (const schema of mod.getSchemas()) {
+            if (!seen.has(schema.name)) {
+                seen.add(schema.name);
+                schemas.push(schema);
+            }
+        }
+    }
+    return schemas;
+}

package/dist/lib/setup.js

@@ -142,8 +142,20 @@ async function runNetInstall(installConfig, setupConfig) {
             extraVars['MOSTAJS_MODULES'] = installConfig.modules.join(',');
         }
         const seeded = [];
-        // 2. Verify NET server is reachable
-        const health = await net.health();
+        // 2. Verify NET server is reachable (retry up to 10s if just restarted)
+        let health = null;
+        for (let i = 0; i < 10; i++) {
+            try {
+                health = await net.health();
+                if (health.entities?.length > 0)
+                    break;
+            }
+            catch { }
+            await new Promise(r => setTimeout(r, 1000));
+        }
+        if (!health) {
+            return { ok: false, error: 'Serveur NET non joignable', needsRestart: false };
+        }
         // 3. Read setup.json for RBAC definitions
         const fs = await import('fs');
         const path = await import('path');
@@ -155,8 +167,8 @@ async function runNetInstall(installConfig, setupConfig) {
             }
             catch { }
         }
-        // 4. If server has no entities, try sending schemas via POST /api/upload-schemas-json
-        if (!health.entities?.length) {
+        // 4. If server has no entities (schemas not yet uploaded), try sending them
+        if (!health?.entities?.length) {
             let schemasToSend = [];
             // Try schemas.json local
             const schemasJsonPath = path.resolve(process.cwd(), 'schemas.json');
@@ -217,6 +229,7 @@ async function runNetInstall(installConfig, setupConfig) {
             }
         }
         await net.loadCollectionMap();
+        console.log(`[Setup NET] Serveur prêt — ${health?.entities?.length ?? 0} entités, collectionMap chargée`);
         if (setupJson?.rbac) {
             const rbac = setupJson.rbac;
             // 3a. Upsert categories

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "2.1.21",
+  "version": "2.1.24",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",
@@ -104,8 +104,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@mostajs/audit": "^2.0.2",
     "@mostajs/net": "^2.0.0",
     "@mostajs/orm": "^1.7.0",
+    "@mostajs/rbac": "^2.0.3",
+    "@mostajs/settings": "^2.0.3",
     "bcryptjs": "^2.4.3"
   },
   "devDependencies": {