@formigio/fazemos-cli 0.10.14 → 0.10.15

package/dist/index.js

@@ -1390,27 +1390,34 @@ const connections = program.command('connections').alias('conn').description('Gi
  */
 connections
     .command('list')
-    .description('List GitHub Connections in the active organization')
+    .description('List VCS Connections (GitHub + BitBucket) in the active organization')
     .option('-s, --status <status>', 'Filter: active (default), all, pending, suspended, revoked, uninstalled', 'active')
     .action(async (opts) => {
     try {
         const orgId = requireActiveOrgOrExit();
-        const data = await api('GET', `/api/organizations/${orgId}/github/connections?status=${encodeURIComponent(opts.status)}`, undefined, { noProjectHeader: true });
-        const list = data.connections ?? [];
+        // F22 — call the provider-agnostic /vcs/connections endpoint.
+        // The legacy /github/connections alias still works during the
+        // dual-write phase, but `vcs/` returns BOTH providers' rows so
+        // the user sees their full Org Connection list.
+        const data = await api('GET', `/api/organizations/${orgId}/vcs/connections?status=${encodeURIComponent(opts.status)}`, undefined, { noProjectHeader: true });
+        const list = (data.connections ?? []).map(normalizeConnection);
         if (list.length === 0) {
             const orgName = findOrgById(orgId)?.name ?? orgId;
-            console.log(chalk.yellow(`No GitHub connections in ${orgName}.`));
+            console.log(chalk.yellow(`No code platform connections in ${orgName}.`));
             console.log(chalk.gray('Add one with: fazemos connections install'));
             return;
         }
         const orgName = findOrgById(orgId)?.name ?? orgId;
-        console.log(chalk.cyan(`GitHub connections in ${orgName}:`));
+        console.log(chalk.cyan(`Code platform connections in ${orgName}:`));
         console.log('');
         for (const c of list) {
             const statusColor = pickStatusColor(c.status);
             const projects = c.projectCount == null ? '—' : `${c.projectCount} ${c.projectCount === 1 ? 'project' : 'projects'}`;
-            const login = c.githubAccountLogin ?? chalk.gray('—');
-            console.log(`  ${chalk.cyan(c.name)}  ${chalk.gray(login)}  ${statusColor(c.status)}  ${chalk.gray(projects)}`);
+            const login = c.accountLogin ?? chalk.gray('—');
+            const providerLabel = formatProviderLabel(c.provider);
+            // F22 §8.3 item 1: provider column. Renders as a prefix tag so
+            // mixed-provider lists are scannable at a glance.
+            console.log(`  ${chalk.magenta(providerLabel)}  ${chalk.cyan(c.name)}  ${chalk.gray(login)}  ${statusColor(c.status)}  ${chalk.gray(projects)}`);
             console.log(chalk.gray(`    ID: ${c.id}`));
         }
     }
@@ -1425,40 +1432,56 @@ connections
  */
 connections
     .command('show')
-    .description('Show a GitHub Connection in detail')
+    .description('Show a VCS Connection in detail')
     .argument('<id>', 'Connection ID')
     .action(async (id) => {
     try {
         const orgId = requireActiveOrgOrExit();
-        const data = await api('GET', `/api/organizations/${orgId}/github/connections/${id}`, undefined, { noProjectHeader: true });
-        const c = data.connection;
-        console.log(chalk.cyan(c.name));
+        // F22 — provider-agnostic detail endpoint. The serialized shape
+        // includes `provider`, `account_login`, `supports_contents_api`
+        // and (for GitHub) `installation_id` / (BitBucket) `workspace_uuid`.
+        const data = await api('GET', `/api/organizations/${orgId}/vcs/connections/${id}`, undefined, { noProjectHeader: true });
+        const raw = data.connection ?? data;
+        const c = normalizeConnection(raw);
+        console.log(chalk.cyan(c.name ?? '(unnamed connection)'));
         console.log(`  ID:           ${c.id}`);
-        console.log(`  GitHub:       ${c.githubAccountLogin ?? chalk.gray('— (pending)')}`);
-        if (c.githubAccountType)
-            console.log(`  Account type: ${c.githubAccountType}`);
+        // F22 §8.3 item 2 — provider line above account info.
+        console.log(`  Provider:     ${formatProviderLabel(c.provider)}`);
+        console.log(`  Account:      ${c.accountLogin ?? chalk.gray('— (pending)')}`);
+        if (c.accountType)
+            console.log(`  Account type: ${c.accountType}`);
         const statusColor = pickStatusColor(c.status);
         console.log(`  Status:       ${statusColor(c.status)}`);
-        console.log(`  Installed:    ${c.installedAt ? new Date(c.installedAt).toLocaleString() : '(unknown)'}`);
+        if (c.installedAt) {
+            console.log(`  Installed:    ${new Date(c.installedAt).toLocaleString()}`);
+        }
         if (c.lastHealthCheckAt) {
             console.log(`  Last checked: ${new Date(c.lastHealthCheckAt).toLocaleString()}`);
         }
         if (c.lastUsedAt) {
             console.log(`  Last used:    ${new Date(c.lastUsedAt).toLocaleString()}`);
         }
-        if (c.repositorySelection === 'all') {
-            console.log(`  Repos:        All repositories${c.githubAccountLogin ? ` in ${c.githubAccountLogin}` : ''}`);
+        // F22 §6.4 — supports_contents_api is the canonical signal for
+        // "can this Connection back F18 docs surfaces?" Surface it so
+        // users understand why docs may be unavailable on BitBucket.
+        if (typeof c.supportsContentsApi === 'boolean') {
+            const docs = c.supportsContentsApi ? 'yes' : chalk.yellow('no');
+            console.log(`  Docs API:     ${docs}`);
+        }
+        if (raw.repositorySelection === 'all') {
+            console.log(`  Repos:        All repositories${c.accountLogin ? ` in ${c.accountLogin}` : ''}`);
         }
-        else if (Array.isArray(c.repositories)) {
-            console.log(`  Repos:        ${c.repositories.length}${c.repositoriesTruncated ? ' (showing 100)' : ''}`);
-            for (const r of c.repositories) {
-                console.log(chalk.gray(`    · ${r.fullName}`));
+        else if (Array.isArray(raw.repositories)) {
+            console.log(`  Repos:        ${raw.repositories.length}${raw.repositoriesTruncated ? ' (showing 100)' : ''}`);
+            for (const r of raw.repositories) {
+                console.log(chalk.gray(`    · ${r.fullName ?? r.full_name ?? r.name}`));
             }
         }
-        if (Array.isArray(c.boundProjects) && c.boundProjects.length > 0) {
+        const boundProjects = raw.boundProjects ?? raw.bound_projects ?? [];
+        if (Array.isArray(boundProjects) && boundProjects.length > 0) {
             console.log('');
             console.log(chalk.cyan('Projects using this connection:'));
-            for (const p of c.boundProjects) {
+            for (const p of boundProjects) {
                 console.log(`  · ${p.name} (${p.slug})`);
             }
         }
@@ -1479,12 +1502,55 @@ connections
  */
 connections
     .command('install')
-    .description('Add a GitHub Connection. Prints an install URL and waits for a confirmation code.')
-    .action(async () => {
+    .description('Add a VCS Connection (GitHub or BitBucket). Prints an install URL and (for GitHub) waits for a confirmation code.')
+    .option('--provider <provider>', 'VCS provider: github | bitbucket')
+    .action(async (opts) => {
     try {
         const orgId = requireActiveOrgOrExit();
         const orgName = findOrgById(orgId)?.name ?? orgId;
-        const mintData = await api('POST', `/api/organizations/${orgId}/github/connections/install-url`, { source: 'cli', returnTo: null }, { noProjectHeader: true });
+        // F22 §8.3 item 3 — provider selection matrix.
+        // 1) `--provider github|bitbucket` supplied: use directly.
+        // 2) No flag: prompt the user interactively (provider-picker).
+        //    The CLI cannot probe server-side provider configuration, so the
+        //    "exactly one provider configured" auto-select branch of the spec
+        //    is implemented as "user always confirms" — narrower than the
+        //    spec wording but strictly safer (no silent provider choice).
+        let provider = opts.provider?.toLowerCase();
+        if (!provider) {
+            provider = await promptProviderChoice();
+        }
+        if (provider !== 'github' && provider !== 'bitbucket') {
+            console.error(chalk.red(`Invalid --provider: ${provider}. Use 'github' or 'bitbucket'.`));
+            process.exit(1);
+        }
+        // F22 prefers the new provider-agnostic /vcs/connections route, which
+        // expects `provider` in the body. The github-only endpoint is kept
+        // alive but not used here so all new connections flow through one path.
+        const mintData = await api('POST', `/api/organizations/${orgId}/vcs/connections/install-url`, { provider, source: 'cli', returnTo: null }, { noProjectHeader: true });
+        // F22 §8.3 item 8 — BitBucket install is browser-only in v1 (no CLI
+        // confirmation-code exchange counterpart). Print the literal copy
+        // block specified in the spec verbatim, then exit successfully.
+        // The user completes consent in the browser and the /api/bitbucket/
+        // oauth/callback handler finishes the Connection server-side.
+        //
+        // Dex nit N4 — output literal MUST match the spec block exactly so
+        // the acceptance test can assert it.
+        if (provider === 'bitbucket') {
+            console.log('');
+            console.log('BitBucket Connection install — browser required');
+            console.log('');
+            console.log('Open this URL in your browser to authorize Fazemos:');
+            console.log('');
+            console.log(`    ${mintData.url}`);
+            console.log('');
+            console.log('After you authorize, BitBucket will redirect to Fazemos and complete the Connection.');
+            console.log('You can then list your connections with:');
+            console.log('');
+            console.log('    fazemos connections list');
+            console.log('');
+            console.log('This URL expires in 10 minutes.');
+            return;
+        }
         console.log('');
         console.log(`To add a GitHub connection to ${chalk.cyan(orgName)}:`);
         console.log('');
@@ -1573,18 +1639,20 @@ connections
 connections
     .command('revoke')
     .alias('disconnect')
-    .description('Disconnect a GitHub Connection (Fazemos-side; does not uninstall the App from GitHub).')
+    .description('Disconnect a VCS Connection (Fazemos-side; does not uninstall the App from GitHub / revoke the OAuth grant on BitBucket).')
     .argument('<id>', 'Connection ID')
     .option('-f, --force', 'Skip the confirmation prompt', false)
     .action(async (id, opts) => {
     try {
         const orgId = requireActiveOrgOrExit();
         // Fetch the Connection so we can show what we're about to revoke
-        // and how many projects it affects (Sage §8.3 confirmation copy).
-        let connection;
+        // and how many projects it affects (UX §8.3 confirmation copy).
+        // F22 — use the provider-agnostic /vcs/ endpoint so both provider
+        // rows are reachable.
+        let raw;
         try {
-            const detail = await api('GET', `/api/organizations/${orgId}/github/connections/${id}`, undefined, { noProjectHeader: true });
-            connection = detail.connection;
+            const detail = await api('GET', `/api/organizations/${orgId}/vcs/connections/${id}`, undefined, { noProjectHeader: true });
+            raw = detail.connection ?? detail;
         }
         catch (err) {
             if (err instanceof ApiError && err.code === 'CONNECTION_NOT_FOUND') {
@@ -1593,15 +1661,17 @@ connections
             }
             throw err;
         }
-        const boundProjects = connection.boundProjects ?? [];
+        const connection = normalizeConnection(raw);
+        const boundProjects = raw.boundProjects ?? raw.bound_projects ?? [];
+        const providerLabelStr = formatProviderLabel(connection.provider);
         if (!opts.force) {
             console.log('');
-            console.log(`Disconnect ${chalk.cyan(connection.name)}?`);
+            console.log(`Disconnect ${chalk.magenta(providerLabelStr)} ${chalk.cyan(connection.name ?? id)}?`);
             console.log('');
             if (boundProjects.length > 0) {
                 const projectList = boundProjects.map(p => p.name).join(', ');
                 console.log(`  This connection is used by ${boundProjects.length} ${boundProjects.length === 1 ? 'project' : 'projects'}: ${projectList}.`);
-                console.log('  Pipelines in those projects will fail on GitHub steps until');
+                console.log(`  Pipelines in those projects will fail on ${providerLabelStr} steps until`);
                 console.log('  they are bound to a different connection.');
                 console.log('');
             }
@@ -1609,7 +1679,13 @@ connections
                 console.log('  No projects are using this connection.');
                 console.log('');
             }
-            console.log(chalk.gray('  This does not uninstall the Fazemos App from GitHub.'));
+            // Provider-aware caveat: GitHub App vs BitBucket OAuth grant.
+            if (connection.provider === 'bitbucket') {
+                console.log(chalk.gray('  This does not revoke the OAuth grant on BitBucket.'));
+            }
+            else {
+                console.log(chalk.gray('  This does not uninstall the Fazemos App from GitHub.'));
+            }
             console.log('');
             const answer = await promptLine('Disconnect? [y/N]: ');
             if (!answer || !/^y/i.test(answer.trim())) {
@@ -1617,11 +1693,14 @@ connections
                 return;
             }
         }
-        const data = await api('DELETE', `/api/organizations/${orgId}/github/connections/${id}`, undefined, { noProjectHeader: true });
-        console.log(chalk.green(`Disconnected: ${connection.name}`));
-        const affected = data.affectedProjects ?? [];
-        if (affected.length > 0) {
-            console.log(chalk.gray(`  ${affected.length} project${affected.length === 1 ? '' : 's'} unbound.`));
+        const data = await api('DELETE', `/api/organizations/${orgId}/vcs/connections/${id}`, undefined, { noProjectHeader: true });
+        console.log(chalk.green(`Disconnected: ${providerLabelStr} ${connection.name ?? id}`));
+        // F22 response shape: { revoked, secrets_deleted, projects_unbound }.
+        // F16 legacy shape: { affectedProjects: [...] }. Handle both during
+        // the dual-write rollout.
+        const unbound = data.projects_unbound ?? (data.affectedProjects ?? []).length ?? 0;
+        if (unbound > 0) {
+            console.log(chalk.gray(`  ${unbound} project${unbound === 1 ? '' : 's'} unbound.`));
         }
         invalidateAuthMeCache();
     }
@@ -1636,19 +1715,23 @@ connections
  */
 connections
     .command('health-check')
-    .description('Verify a Connection is still healthy on GitHub')
+    .description('Verify a Connection is still healthy on its code platform (GitHub or BitBucket)')
     .argument('<id>', 'Connection ID')
     .action(async (id) => {
     try {
         const orgId = requireActiveOrgOrExit();
-        const data = await api('POST', `/api/organizations/${orgId}/github/connections/${id}/health-check`, {}, { noProjectHeader: true });
-        const c = data.connection;
+        // F22 — provider-aware health-check route on the /vcs/ alias.
+        // The handler dispatches to the right provider (GitHub installation
+        // probe / BitBucket OAuth-refresh + workspace probe).
+        const data = await api('POST', `/api/organizations/${orgId}/vcs/connections/${id}/health-check`, {}, { noProjectHeader: true });
+        const c = normalizeConnection(data.connection ?? data);
         const statusColor = pickStatusColor(c.status);
+        const label = `${formatProviderLabel(c.provider)} ${c.name ?? id}`;
         if (data.changed) {
-            console.log(chalk.yellow(`Status changed: ${c.name} → ${statusColor(c.status)}`));
+            console.log(chalk.yellow(`Status changed: ${label} → ${statusColor(c.status)}`));
         }
         else {
-            console.log(chalk.green(`✓ ${c.name} — ${statusColor(c.status)}`));
+            console.log(chalk.green(`✓ ${label} — ${statusColor(c.status)}`));
         }
     }
     catch (err) {
@@ -1660,6 +1743,53 @@ connections
         process.exit(1);
     }
 });
+export function normalizeConnection(raw) {
+    if (!raw || typeof raw !== 'object') {
+        return {
+            id: '',
+            provider: null,
+            name: null,
+            accountLogin: null,
+            accountType: null,
+            status: 'unknown',
+            installedAt: null,
+            lastHealthCheckAt: null,
+            lastUsedAt: null,
+            supportsContentsApi: null,
+            projectCount: null,
+        };
+    }
+    // Provider — F22 new field. Older /github/ rows always meant github;
+    // default there for back-compat.
+    const provider = raw.provider ?? (raw.githubAccountLogin !== undefined ? 'github' : null);
+    return {
+        id: String(raw.id ?? ''),
+        provider,
+        name: raw.name ?? null,
+        accountLogin: raw.accountLogin ?? raw.account_login ?? raw.githubAccountLogin ?? null,
+        accountType: raw.accountType ?? raw.account_type ?? raw.githubAccountType ?? null,
+        status: raw.status ?? 'unknown',
+        installedAt: raw.installedAt ?? raw.installed_at ?? raw.created_at ?? null,
+        lastHealthCheckAt: raw.lastHealthCheckAt ?? raw.last_health_check_at ?? null,
+        lastUsedAt: raw.lastUsedAt ?? raw.last_used_at ?? null,
+        supportsContentsApi: typeof raw.supportsContentsApi === 'boolean'
+            ? raw.supportsContentsApi
+            : typeof raw.supports_contents_api === 'boolean'
+                ? raw.supports_contents_api
+                : null,
+        projectCount: raw.projectCount ?? raw.project_count ?? null,
+    };
+}
+/**
+ * F22 — Human-friendly provider label used in CLI columns and lines.
+ */
+export function formatProviderLabel(provider) {
+    if (provider === 'github')
+        return 'GitHub';
+    if (provider === 'bitbucket')
+        return 'BitBucket';
+    return '—';
+}
 /**
  * Helper — color a status string per the Sage §2.2 taxonomy.
  */
@@ -1679,6 +1809,30 @@ function pickStatusColor(status) {
             return chalk.white;
     }
 }
+/**
+ * F22 §8.3 item 3 — interactive provider picker. Used by
+ * `fazemos connections install` when no `--provider` flag is supplied
+ * so the user explicitly chooses GitHub or BitBucket before the URL
+ * mint hits the API. Mirrors the web `ProviderPickerModal` choice
+ * without the modal chrome.
+ *
+ * Returns 'github' or 'bitbucket'. Repeats on invalid input.
+ */
+export async function promptProviderChoice() {
+    console.log('');
+    console.log('Which code platform do you want to connect?');
+    console.log('  1. GitHub');
+    console.log('  2. BitBucket');
+    console.log('');
+    while (true) {
+        const ans = (await promptLine('  Choose [1=GitHub / 2=BitBucket]: ')).trim().toLowerCase();
+        if (ans === '1' || ans === 'github' || ans === 'gh')
+            return 'github';
+        if (ans === '2' || ans === 'bitbucket' || ans === 'bb')
+            return 'bitbucket';
+        console.log(chalk.yellow('  Please answer 1 (GitHub) or 2 (BitBucket).'));
+    }
+}
 /**
  * Read a single line of input from stdin. No fancy framing — `readline`
  * is sufficient for the install confirmation-code prompt and the