kasy-cli 1.21.5 → 1.21.7

package/lib/commands/new.js

@@ -44,7 +44,7 @@ const { generateApiProject } = require('../scaffold/backends/api/generator');
 const { createProjectAndGetKeys, setupLinkedProject, checkLoggedIn, getOrgsList, getProjectsByOrg, getProjectKeys } = require('../scaffold/backends/supabase/deploy');
 const { writeSupabaseGoogleAuthOptions, readSupabaseGoogleCredentials, getGoogleClientSecretViaGcloud, flutterfireConfigure, writeGoogleAuthOptions, writeGoogleIosUrlScheme, writeGoogleIosUrlSchemeFromClientId } = require('../scaffold/shared/post-build');
 const { toPackageName } = require('../scaffold/backends/firebase/tokens');
-const { setupFromScratch, setupExistingProject, listBillingAccounts, listGcpOrganizations, checkGcloudAuth, getGcloudInstallInstructions, enableAuthProviders, registerDebugSha1 } = require('../scaffold/backends/firebase/setup-from-scratch');
+const { setupFromScratch, setupExistingProject, listBillingAccounts, listGcpOrganizations, checkGcloudAuth, getFirebaseAccount, getGcloudInstallInstructions, enableAuthProviders, registerDebugSha1 } = require('../scaffold/backends/firebase/setup-from-scratch');
 const { enableAuthViaFirebaseCli } = require('../scaffold/backends/firebase/enable-auth-via-cli');
 const { createFcmServiceAccountKey } = require('../scaffold/shared/fcm-service-account');
 
@@ -123,6 +123,78 @@ async function promptOrganizationIfNeeded(tr, onCancel) {
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
+/**
+ * Before creating any cloud project, show WHICH account each service is logged
+ * in as (gcloud, Firebase, and Supabase when relevant), so the user never
+ * creates the project on the wrong account. Warns if gcloud and Firebase are
+ * different accounts (a common cause of mid-flow failures), and lets the user
+ * bail out with the exact commands to switch.
+ */
+async function confirmIdentities(backend, gcloudAccount, tr, cancel) {
+  let firebaseAccount = await getFirebaseAccount();
+  let supabaseLoggedIn = backend === 'supabase' ? (await checkLoggedIn()).ok : true;
+
+  const showStatus = () => {
+    const notLogged = kleur.yellow(tr('new.accounts.notLoggedIn'));
+    const lines = [
+      `🔑 Google Cloud:  ${gcloudAccount ? kleur.cyan(gcloudAccount) : notLogged}`,
+      `🔥 Firebase:      ${firebaseAccount ? kleur.cyan(firebaseAccount) : notLogged}`,
+    ];
+    if (backend === 'supabase') {
+      lines.push(`🟢 Supabase:      ${supabaseLoggedIn ? kleur.cyan(tr('new.accounts.connected')) : notLogged}`);
+    }
+    ui.note(lines.join('\n'), tr('new.accounts.title'));
+  };
+  showStatus();
+
+  // For any required service that's NOT logged in, offer to log in right here:
+  // Enter runs the service's own login command (which opens the browser / asks
+  // for the token), then we re-check. gcloud was already verified above.
+  const offerLogin = async (name, cmd, revalidate) => {
+    const doLogin = await ui.confirm({ message: tr('new.accounts.loginPrompt', { name }), initialValue: true, onCancel: cancel });
+    if (!doLogin) return;
+    ui.log.message(tr('new.accounts.loggingIn', { name }));
+    const { spawnSync } = require('node:child_process');
+    spawnSync(cmd, { stdio: 'inherit', shell: true });
+    await revalidate();
+  };
+
+  if (!firebaseAccount) {
+    await offerLogin('Firebase', 'firebase login', async () => { firebaseAccount = await getFirebaseAccount(); });
+  }
+  if (backend === 'supabase' && !supabaseLoggedIn) {
+    await offerLogin('Supabase', 'supabase login', async () => { supabaseLoggedIn = (await checkLoggedIn()).ok; });
+  }
+
+  // Still missing a required login (user declined or it failed)? Stop with the
+  // exact command so they can do it and re-run.
+  const stillMissing = [];
+  if (!firebaseAccount) stillMissing.push(`🔥 Firebase:  ${kleur.cyan('firebase login')}`);
+  if (backend === 'supabase' && !supabaseLoggedIn) stillMissing.push(`🟢 Supabase:  ${kleur.cyan('supabase login')}`);
+  if (stillMissing.length > 0) {
+    ui.log.error(tr('new.accounts.needLogin'));
+    ui.note(stillMissing.join('\n'), tr('new.accounts.loginTitle'));
+    ui.cancel(tr('new.accounts.rerun'));
+    process.exit(0);
+  }
+
+  if (gcloudAccount && firebaseAccount && gcloudAccount !== firebaseAccount) {
+    ui.log.warn(`⚠ ${tr('new.accounts.mismatch')}`);
+  }
+
+  const ok = await ui.confirm({ message: tr('new.accounts.confirm'), initialValue: true, onCancel: cancel });
+  if (!ok) {
+    const sw = [
+      `🔑 gcloud:    ${kleur.cyan('gcloud auth login')}`,
+      `🔥 Firebase:  ${kleur.cyan('firebase login --reauth')}`,
+    ];
+    if (backend === 'supabase') sw.push(`🟢 Supabase:  ${kleur.cyan('supabase login')}`);
+    ui.note(sw.join('\n'), tr('new.accounts.switchTitle'));
+    ui.cancel(tr('new.accounts.rerun'));
+    process.exit(0);
+  }
+}
+
 function printPrerequisites(tr, backend, firebaseSetupMode = 'existing', checkResults = []) {
   const gcloudOk = checkResults.every(
     (r) => !r.name?.includes('gcloud') || r.ok
@@ -580,6 +652,10 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       process.exit(1);
     }
 
+    // Show which account each service is logged in as before creating anything,
+    // so the project never lands on the wrong account.
+    await confirmIdentities(backend, gcloudCheck.account, tr, cancel);
+
     // ── Billing account check — Firebase needs an active billing account (Blaze) ─
     // Without it, project creation succeeds but Storage and Cloud Functions fail later.
     // Catching it here saves the user from a confusing mid-flow error.

package/lib/scaffold/backends/firebase/setup-from-scratch.js

@@ -108,7 +108,16 @@ async function checkGcloudAuth() {
   const auth = await run('gcloud auth print-access-token');
   if (!auth.ok) return { ok: false, error: 'Not logged in. Run: gcloud auth login', missing: 'auth' };
 
-  return { ok: true };
+  const acct = await run('gcloud config get-value account');
+  return { ok: true, account: acct.ok ? acct.stdout.trim() : null };
+}
+
+/** The Google account the Firebase CLI is logged in as, or null. */
+async function getFirebaseAccount() {
+  const r = await run('firebase login:list');
+  if (!r.ok) return null;
+  const m = (r.stdout || '').match(/Logged in as ([^\s@]+@[^\s]+)/);
+  return m ? m[1] : null;
 }
 
 /**
@@ -1232,6 +1241,7 @@ module.exports = {
   listBillingAccounts,
   listGcpOrganizations,
   checkGcloudAuth,
+  getFirebaseAccount,
   getGcloudInstallInstructions,
   generateProjectId,
   extractSha1,

package/lib/scaffold/shared/fcm-service-account.js

@@ -101,11 +101,21 @@ async function createFcmServiceAccountKey(projectId) {
 
   const tmpPath = path.join(os.tmpdir(), `kasy-fcm-${Date.now()}.json`);
 
-  const keyResult = await run(
-    `gcloud iam service-accounts keys create "${tmpPath}"` +
-    ` --iam-account="${saEmail}"` +
-    ` --project=${projectId.trim()}`
-  );
+  // Right after granting the FCM admin role (and on a brand-new project), the
+  // IAM permission takes a moment to propagate — so the first key-create often
+  // fails with "permission still propagating". Back off and retry a few times
+  // before giving up, instead of leaving push half-configured.
+  const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+  let keyResult;
+  for (let attempt = 1; attempt <= 4; attempt++) {
+    keyResult = await run(
+      `gcloud iam service-accounts keys create "${tmpPath}"` +
+      ` --iam-account="${saEmail}"` +
+      ` --project=${projectId.trim()}`
+    );
+    if (keyResult.ok) break;
+    if (attempt < 4) await sleep(7000);
+  }
 
   if (!keyResult.ok) {
     await fs.remove(tmpPath).catch(() => {});

package/lib/utils/i18n/messages-en.js

@@ -216,6 +216,17 @@ module.exports = {
     'new.firebase.create.success': 'Firebase project created successfully.',
     'new.firebase.create.failed': 'Could not create project',
     'new.firebase.create.gcloudRequired': 'gcloud CLI is required for "create from scratch". Without it, the full Firebase flow cannot run.',
+    'new.accounts.title': 'Connected accounts (where the project will be created)',
+    'new.accounts.notLoggedIn': 'not connected',
+    'new.accounts.connected': 'connected',
+    'new.accounts.mismatch': 'gcloud and Firebase are on different accounts: this can fail while creating the project.',
+    'new.accounts.confirm': 'Create the project on these accounts?',
+    'new.accounts.switchTitle': 'To switch accounts, run and try again:',
+    'new.accounts.rerun': 'Switch the account and run `kasy new` again.',
+    'new.accounts.needLogin': 'You need to be logged in to continue.',
+    'new.accounts.loginTitle': 'Log in and run `kasy new` again:',
+    'new.accounts.loginPrompt': 'Log in to {name} now?',
+    'new.accounts.loggingIn': 'Opening {name} login…',
     'new.firebase.billing.required': 'You do not have a billing account on Google Cloud yet. Firebase needs the Blaze plan to use Storage and Cloud Functions.',
     'new.firebase.billing.create.steps': 'Opening the billing account creation page. Create the account (credit card required, no charges within the free quota) and come back here:',
     'new.firebase.billing.created.ready': 'I created the billing account, ready to continue?',

package/lib/utils/i18n/messages-es.js

@@ -216,6 +216,17 @@ module.exports = {
     'new.firebase.create.success': 'Proyecto Firebase creado correctamente.',
     'new.firebase.create.failed': 'No se pudo crear el proyecto',
     'new.firebase.create.gcloudRequired': 'gcloud CLI es obligatorio para "crear desde cero". Sin él, el flujo completo de Firebase no puede ejecutarse.',
+    'new.accounts.title': 'Cuentas conectadas (donde se creará el proyecto)',
+    'new.accounts.notLoggedIn': 'no conectado',
+    'new.accounts.connected': 'conectado',
+    'new.accounts.mismatch': 'gcloud y Firebase están en cuentas distintas: esto puede fallar al crear el proyecto.',
+    'new.accounts.confirm': '¿Crear el proyecto en estas cuentas?',
+    'new.accounts.switchTitle': 'Para cambiar de cuenta, ejecuta y prueba de nuevo:',
+    'new.accounts.rerun': 'Cambia la cuenta y ejecuta `kasy new` de nuevo.',
+    'new.accounts.needLogin': 'Necesitas estar conectado para continuar.',
+    'new.accounts.loginTitle': 'Inicia sesión y ejecuta `kasy new` de nuevo:',
+    'new.accounts.loginPrompt': '¿Iniciar sesión en {name} ahora?',
+    'new.accounts.loggingIn': 'Abriendo el inicio de sesión de {name}…',
     'new.firebase.billing.required': 'Aún no tienes una cuenta de facturación en Google Cloud. Firebase necesita el plan Blaze para usar Storage y Cloud Functions.',
     'new.firebase.billing.create.steps': 'Abriendo la página de creación de cuenta de facturación. Crea la cuenta (tarjeta de crédito requerida, sin cargos dentro de la cuota gratuita) y vuelve aquí:',
     'new.firebase.billing.created.ready': 'Ya creé la cuenta de facturación, ¿puedo continuar?',

package/lib/utils/i18n/messages-pt.js

@@ -216,6 +216,17 @@ module.exports = {
     'new.firebase.create.success': 'Projeto Firebase criado com sucesso.',
     'new.firebase.create.failed': 'Não foi possível criar o projeto',
     'new.firebase.create.gcloudRequired': 'gcloud CLI é obrigatório para "criar do zero". Sem ele, o fluxo completo do Firebase não pode rodar.',
+    'new.accounts.title': 'Contas conectadas (onde o projeto será criado)',
+    'new.accounts.notLoggedIn': 'não conectado',
+    'new.accounts.connected': 'conectado',
+    'new.accounts.mismatch': 'gcloud e Firebase estão em contas diferentes: isso pode falhar ao criar o projeto.',
+    'new.accounts.confirm': 'É nessas contas que você quer criar o projeto?',
+    'new.accounts.switchTitle': 'Para trocar de conta, rode e tente de novo:',
+    'new.accounts.rerun': 'Troque a conta e rode `kasy new` novamente.',
+    'new.accounts.needLogin': 'Você precisa estar logado para continuar.',
+    'new.accounts.loginTitle': 'Faça login e rode `kasy new` de novo:',
+    'new.accounts.loginPrompt': 'Fazer login no {name} agora?',
+    'new.accounts.loggingIn': 'Abrindo login do {name}…',
     'new.firebase.billing.required': 'Você ainda não tem uma conta de faturamento no Google Cloud. O Firebase precisa do plano Blaze para usar Storage e Cloud Functions.',
     'new.firebase.billing.create.steps': 'Vou abrir a página de criação de conta de faturamento. Crie a conta (cartão de crédito, sem cobrança até bater a cota gratuita) e volte aqui:',
     'new.firebase.billing.created.ready': 'Já criei a conta de faturamento, pode seguir?',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.21.5",
+  "version": "1.21.7",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"