@open-mercato/cli 0.10.1-develop.7994.1.c9f31972aa → 0.10.1-develop.8022.1.b6753de892

package/dist/mercato.js

@@ -5,7 +5,7 @@ import { parseBooleanToken } from "@open-mercato/shared/lib/boolean";
 import { getSslConfig } from "@open-mercato/shared/lib/db/ssl";
 import { getRedisUrl, getRedisUrlOrThrow, parseRedisUrl } from "@open-mercato/shared/lib/redis/connection";
 import { formatInitSummary } from "./lib/init-summary.js";
-import { resolveInitDerivedSecrets } from "./lib/init-secrets.js";
+import { resolveInitDerivedSecrets, resolveInitSuperadminCredentials } from "./lib/init-secrets.js";
 import { decideExistingDatabase, formatSkipIfInitializedMessage } from "./lib/init-existing-database.js";
 import {
   resolveAutoSpawnWorkersMode,
@@ -766,6 +766,7 @@ async function run(argv = process.argv) {
         delete process.env.OM_INIT_REINSTALL;
       }
       const skipIfInitialized = initArgs.includes("--skip-if-initialized");
+      const credentials = skipIfInitialized && !reinstall ? void 0 : resolveInitSuperadminCredentials(initArgs);
       const skipExamples = initArgs.includes("--no-examples");
       const skipDemoUsers = initArgs.includes("--no-demo-users");
       const stressTestEnabled = initArgs.includes("--stresstest") || initArgs.includes("--stress-test");
@@ -934,6 +935,7 @@ async function run(argv = process.argv) {
           }
         }
       }
+      const { email, password, skipPasswordPolicy } = credentials ?? resolveInitSuperadminCredentials(initArgs);
       console.log("\u{1F527} Preparing modules (registry, entities, DI)...");
       const { createResolver } = await import("./lib/resolver.js");
       const { generateEntityIds, generateModuleRegistries, generateModuleEntities, generateModuleDi, generateModulePackageSources, generateOpenApi, generateWebResearchAdapters } = await import("./lib/generators/index.js");
@@ -969,16 +971,7 @@ async function run(argv = process.argv) {
         }
         return fallback;
       };
-      const readEnvDefault = (key) => {
-        const value = process.env[key];
-        if (typeof value === "string" && value.trim().length > 0) return value.trim();
-        return void 0;
-      };
-      const defaultEmail = readEnvDefault("OM_INIT_SUPERADMIN_EMAIL") ?? "superadmin@acme.com";
-      const defaultPassword = readEnvDefault("OM_INIT_SUPERADMIN_PASSWORD") ?? "secret";
       const orgName = findArgValue(["--org=", "--orgName="], "Acme Corp");
-      const email = findArgValue(["--email="], defaultEmail);
-      const password = findArgValue(["--password="], defaultPassword);
       const derivedSecrets = resolveInitDerivedSecrets({ email, env: process.env });
       const adminEmailDerived = derivedSecrets.adminEmail;
       const employeeEmailDerived = derivedSecrets.employeeEmail;
@@ -996,10 +989,6 @@ async function run(argv = process.argv) {
         process.env.OM_INIT_EMPLOYEE_EMAIL = employeeEmailDerived;
       }
       const roles = findArgValue(["--roles="], "superadmin,admin,employee");
-      const skipPasswordPolicyRaw = initArgs.find(
-        (arg) => arg === "--skip-password-policy" || arg.startsWith("--skip-password-policy=") || arg === "--allow-weak-password" || arg.startsWith("--allow-weak-password=")
-      );
-      const skipPasswordPolicy = skipPasswordPolicyRaw ? parseBooleanToken(skipPasswordPolicyRaw.split("=")[1] ?? "true") ?? true : true;
       console.log("\u{1F510} Setting up RBAC and users...");
       const setupArgs = [
         "--orgName",