kasy-cli 1.21.4 → 1.21.6

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,42 @@ 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) {
+  const firebaseAccount = await getFirebaseAccount();
+  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') {
+    const sb = await checkLoggedIn();
+    lines.push(`🟢 Supabase:      ${sb.ok ? kleur.cyan(tr('new.accounts.connected')) : notLogged}`);
+  }
+  if (gcloudAccount && firebaseAccount && gcloudAccount !== firebaseAccount) {
+    lines.push('', kleur.yellow(`⚠ ${tr('new.accounts.mismatch')}`));
+  }
+  ui.note(lines.join('\n'), tr('new.accounts.title'));
+
+  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 +616,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

@@ -49,6 +49,16 @@ const REQUIRED_APIS = [
   'logging.googleapis.com',            // Cloud Logging (Cloud Build writes build logs here)
 ];
 
+// fcmOnly (Supabase/API): only the APIs needed for push + Google Sign-In, all
+// of which work on the free Spark plan. Crucially NONE of these require billing
+// — the heavy Cloud Run/Functions/Build/Compute APIs above all demand Blaze.
+const FCM_ONLY_APIS = [
+  'firebase.googleapis.com',           // Firebase Management (addFirebase)
+  'identitytoolkit.googleapis.com',    // Firebase Auth / Google Sign-In
+  'fcm.googleapis.com',                // Cloud Messaging (push) — free
+  'iam.googleapis.com',                // service accounts (the FCM admin key)
+];
+
 async function run(cmd, cwd = process.cwd()) {
   try {
     const { stdout, stderr } = await execAsync(cmd, {
@@ -98,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;
 }
 
 /**
@@ -382,8 +401,8 @@ async function applyStorageCors(projectId, options = {}) {
 /**
  * Enable required Google Cloud APIs.
  */
-async function enableApis(projectId) {
-  const apis = REQUIRED_APIS.join(' ');
+async function enableApis(projectId, fcmOnly = false) {
+  const apis = (fcmOnly ? FCM_ONLY_APIS : REQUIRED_APIS).join(' ');
   const result = await run(`gcloud services enable ${apis} --project=${projectId}`);
   if (!result.ok) {
     return { ok: false, error: result.stderr || result.error };
@@ -954,7 +973,7 @@ async function setupFromScratch(appName, bundleId, options = {}) {
   }
 
   onProgress('enable-apis');
-  const apisResult = await enableApis(projectId);
+  const apisResult = await enableApis(projectId, fcmOnly);
   if (!apisResult.ok) return { ok: false, error: apisResult.error };
 
   // Set ADC quota project so Firebase REST API calls (createAndroidApp etc.) work with user credentials.
@@ -1222,6 +1241,7 @@ module.exports = {
   listBillingAccounts,
   listGcpOrganizations,
   checkGcloudAuth,
+  getFirebaseAccount,
   getGcloudInstallInstructions,
   generateProjectId,
   extractSha1,

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

@@ -216,6 +216,13 @@ 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.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,13 @@ 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.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,13 @@ 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.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.4",
+  "version": "1.21.6",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"