@agenticmail/enterprise 0.5.17 → 0.5.18

package/src/db/adapter.ts

@@ -175,6 +175,7 @@ export interface SsoConfig {
 
 export interface CompanySettings {
   id: string;
+  orgId?: string;
   name: string;
   domain?: string;
   subdomain: string;       // <subdomain>.agenticmail.io

package/src/db/postgres.ts

@@ -97,6 +97,10 @@ export class PostgresAdapter extends DatabaseAdapter {
         INSERT INTO retention_policy (id) VALUES ('default')
         ON CONFLICT (id) DO NOTHING
       `);
+      // Add org_id column if missing
+      await client.query(`
+        ALTER TABLE company_settings ADD COLUMN IF NOT EXISTS org_id TEXT
+      `).catch(() => {});
       await client.query('COMMIT');
     } catch (err) {
       await client.query('ROLLBACK');
@@ -126,7 +130,7 @@ export class PostgresAdapter extends DatabaseAdapter {
     const values: any[] = [];
     let i = 1;
     const map: Record<string, string> = {
-      name: 'name', domain: 'domain', subdomain: 'subdomain',
+      name: 'name', orgId: 'org_id', domain: 'domain', subdomain: 'subdomain',
       smtpHost: 'smtp_host', smtpPort: 'smtp_port', smtpUser: 'smtp_user',
       smtpPass: 'smtp_pass', dkimPrivateKey: 'dkim_private_key',
       logoUrl: 'logo_url', primaryColor: 'primary_color', plan: 'plan',
@@ -526,7 +530,7 @@ export class PostgresAdapter extends DatabaseAdapter {
 
   private mapSettings(r: any): CompanySettings {
     return {
-      id: r.id, name: r.name, domain: r.domain, subdomain: r.subdomain,
+      id: r.id, orgId: r.org_id || undefined, name: r.name, domain: r.domain, subdomain: r.subdomain,
       smtpHost: r.smtp_host, smtpPort: r.smtp_port, smtpUser: r.smtp_user, smtpPass: r.smtp_pass,
       dkimPrivateKey: r.dkim_private_key, logoUrl: r.logo_url, primaryColor: r.primary_color,
       ssoConfig: r.sso_config ? (typeof r.sso_config === 'string' ? JSON.parse(r.sso_config) : r.sso_config) : undefined,

package/src/setup/provision.ts

@@ -6,8 +6,17 @@
  * after all prompts are collected.
  */
 
-import { randomUUID } from 'crypto';
+import { randomUUID, randomBytes } from 'crypto';
 import type { DatabaseAdapter } from '../db/adapter.js';
+
+/** Generate a unique 10-char org ID like "BKSID30HKS" */
+function generateOrgId(): string {
+  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+  const bytes = randomBytes(10);
+  let id = '';
+  for (let i = 0; i < 10; i++) id += chars[bytes[i] % chars.length];
+  return id;
+}
 import type { CompanyInfo } from './company.js';
 import type { DatabaseSelection } from './database.js';
 import type { DeployTarget } from './deployment.js';
@@ -72,12 +81,14 @@ export async function provision(
 
     // ─── Company Settings ──────────────────────────
     spinner.start('Creating company...');
+    const orgId = generateOrgId();
     await db.updateSettings({
       name: config.company.companyName,
       subdomain: config.company.subdomain,
       domain: config.domain.customDomain,
-    });
-    spinner.succeed('Company created');
+      orgId,
+    } as any);
+    spinner.succeed(`Company created (org: ${orgId})`);
 
     // ─── Domain Registration ─────────────────────────
     if (config.registration?.registered) {