@stoker-platform/cli 0.5.54 → 0.5.56

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.53",
+    "version": "0.5.55",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.1",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.3.2",
-        "@stoker-platform/node-client": "0.5.40",
-        "@stoker-platform/types": "0.5.27",
-        "@stoker-platform/utils": "0.5.34",
+        "@stoker-platform/node-client": "0.5.41",
+        "@stoker-platform/types": "0.5.28",
+        "@stoker-platform/utils": "0.5.35",
         "algoliasearch": "^5.50.0",
         "commander": "^14.0.0",
         "cross-spawn": "^7.0.6",

package/lib/src/project/addProject.js

@@ -638,6 +638,12 @@ export const addProject = async (options) => {
         await updateProjectData(26);
     }
     if (getProgress() < 27) {
+        if (!smtpPasswordSecret?.name) {
+            const [existingSmtpPasswordSecret] = await secretManager.getSecret({
+                name: `projects/${projectId}/secrets/firestore-send-email-SMTP_PASSWORD`,
+            });
+            smtpPasswordSecret = existingSmtpPasswordSecret;
+        }
         const [smtpPasswordSecretVersion] = await secretManager.addSecretVersion({
             parent: smtpPasswordSecret.name,
             payload: {
@@ -667,6 +673,12 @@ export const addProject = async (options) => {
     }
     if (getProgress() < 29) {
         if (process.env.TWILIO_AUTH_TOKEN) {
+            if (!twilioPasswordSecret?.name) {
+                const [existingTwilioPasswordSecret] = await secretManager.getSecret({
+                    name: `projects/${projectId}/secrets/TWILIO_AUTH_TOKEN`,
+                });
+                twilioPasswordSecret = existingTwilioPasswordSecret;
+            }
             const [twilioPasswordSecretVersion] = await secretManager.addSecretVersion({
                 parent: twilioPasswordSecret.name,
                 payload: {
@@ -697,6 +709,12 @@ export const addProject = async (options) => {
     }
     if (getProgress() < 31) {
         if (process.env.TWILIO_ACCOUNT_SID) {
+            if (!twilioAccountSidSecret?.name) {
+                const [existingTwilioAccountSidSecret] = await secretManager.getSecret({
+                    name: `projects/${projectId}/secrets/TWILIO_ACCOUNT_SID`,
+                });
+                twilioAccountSidSecret = existingTwilioAccountSidSecret;
+            }
             const [twilioAccountSidSecretVersion] = await secretManager.addSecretVersion({
                 parent: twilioAccountSidSecret.name,
                 payload: {
@@ -785,29 +803,53 @@ export const addProject = async (options) => {
         await runChildProcess("gcloud", apiKeyUpdateArgs);
         await updateProjectData(34);
     }
-    const recaptchaResponse = await fetch(`https://recaptchaenterprise.googleapis.com/v1/projects/${projectId}/keys`, {
-        method: "POST",
-        headers: {
-            Authorization: `Bearer ${token}`,
-            "Content-Type": "application/json",
-            "X-Goog-User-Project": projectId,
-        },
-        body: JSON.stringify({
-            displayName: "Firebase App Check",
-            webSettings: {
-                allowedDomains: [`${projectId}.web.app`, `${projectId}.firebaseapp.com`],
-                integrationType: "SCORE",
+    let recaptchaKeyId;
+    if (getProgress() < 35) {
+        const recaptchaResponse = await fetch(`https://recaptchaenterprise.googleapis.com/v1/projects/${projectId}/keys`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json",
+                "X-Goog-User-Project": projectId,
             },
-        }),
-    });
-    const recaptchaResponseJson = await recaptchaResponse.json();
-    console.log(recaptchaResponseJson);
-    if (!recaptchaResponse.ok) {
-        throw new Error("Failed to create Recaptcha key");
+            body: JSON.stringify({
+                displayName: "Firebase App Check",
+                webSettings: {
+                    allowedDomains: [`${projectId}.web.app`, `${projectId}.firebaseapp.com`],
+                    integrationType: "SCORE",
+                },
+            }),
+        });
+        const recaptchaResponseJson = await recaptchaResponse.json();
+        console.log(recaptchaResponseJson);
+        if (!recaptchaResponse.ok) {
+            throw new Error("Failed to create Recaptcha key");
+        }
+        const recaptchaKey = recaptchaResponseJson.name;
+        recaptchaKeyId = recaptchaKey.split("/").pop();
+        await updateProjectData(35);
     }
-    const recaptchaKey = recaptchaResponseJson.name;
-    const recaptchaKeyId = recaptchaKey.split("/").pop();
-    if (getProgress() < 35) {
+    if (getProgress() < 36) {
+        if (!recaptchaKeyId) {
+            const listKeysResponse = await fetch(`https://recaptchaenterprise.googleapis.com/v1/projects/${projectId}/keys?pageSize=100`, {
+                method: "GET",
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    "Content-Type": "application/json",
+                    "X-Goog-User-Project": projectId,
+                },
+            });
+            const listKeysJson = await listKeysResponse.json();
+            if (!listKeysResponse.ok) {
+                throw new Error("Failed to list Recaptcha keys");
+            }
+            const matchingKey = listKeysJson.keys.find((key) => key.displayName === "Firebase App Check");
+            const recaptchaKey = matchingKey?.name;
+            recaptchaKeyId = recaptchaKey ? recaptchaKey.split("/").pop() : undefined;
+            if (!recaptchaKeyId) {
+                throw new Error("Failed to recover Recaptcha key ID");
+            }
+        }
         const recaptchaEnterpriseConfig = await fetch(`https://firebaseappcheck.googleapis.com/v1beta/projects/${projectId}/apps/${appId}/recaptchaEnterpriseConfig?updateMask=siteKey,tokenTtl,riskAnalysis`, {
             method: "PATCH",
             headers: {
@@ -830,9 +872,9 @@ export const addProject = async (options) => {
         if (!recaptchaEnterpriseConfig.ok) {
             throw new Error("Failed to create Recaptcha Enterprise config");
         }
-        await updateProjectData(35);
+        await updateProjectData(36);
     }
-    if (getProgress() < 36) {
+    if (getProgress() < 37) {
         if (process.env.FB_ENABLE_APP_CHECK === "true") {
             const servicesResponse = await fetch(`https://firebaseappcheck.googleapis.com/v1beta/projects/${projectId}/services:batchUpdate`, {
                 method: "POST",
@@ -887,7 +929,7 @@ export const addProject = async (options) => {
                 throw new Error("Failed to update App Check services");
             }
         }
-        await updateProjectData(36);
+        await updateProjectData(37);
     }
     const firebaseJson = JSON.parse(await readFile(join(process.cwd(), "firebase.json"), "utf8"));
     const authPort = firebaseJson.emulators.auth.port;
@@ -924,9 +966,9 @@ STOKER_FB_EMULATOR_FUNCTIONS_PORT=${functionsPort}`;
     // eslint-disable-next-line security/detect-non-literal-fs-filename
     await writeFile(envFile, envContent);
     dotenv.config({ path: join(process.cwd(), ".env", `.env.${projectId}`), quiet: true });
-    if (getProgress() < 37) {
+    if (getProgress() < 38) {
         await runChildProcess("npx", ["stoker", "deploy", "--initial", "--retry"]);
-        await updateProjectData(37);
+        await updateProjectData(38);
     }
     await runChildProcess("npx", ["stoker", "set-project"]);
     await addTenant();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.54",
+    "version": "0.5.56",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.1",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.3.2",
-        "@stoker-platform/node-client": "0.5.41",
+        "@stoker-platform/node-client": "0.5.42",
         "@stoker-platform/types": "0.5.28",
-        "@stoker-platform/utils": "0.5.35",
+        "@stoker-platform/utils": "0.5.36",
         "algoliasearch": "^5.50.0",
         "commander": "^14.0.0",
         "cross-spawn": "^7.0.6",