firebase-tools 15.5.0 → 15.6.0

package/lib/deploy/functions/runtimes/index.js

@@ -6,7 +6,15 @@ const python = require("./python");
 const validate = require("../validate");
 const error_1 = require("../../../error");
 const supported = require("./supported");
-const factories = [node.tryCreateDelegate, python.tryCreateDelegate];
+const dart = require("./dart");
+const experiments = require("../../../experiments");
+const factories = [
+    node.tryCreateDelegate,
+    python.tryCreateDelegate,
+    (ctx) => experiments.isEnabled("functionsrunapionly")
+        ? dart.tryCreateDelegate(ctx)
+        : Promise.resolve(undefined),
+];
 async function getRuntimeDelegate(context) {
     const { projectDir, sourceDir, runtime } = context;
     if (runtime && !supported.isRuntime(runtime)) {

package/lib/deploy/functions/runtimes/supported/types.js

@@ -89,4 +89,10 @@ exports.RUNTIMES = runtimes({
         deprecationDate: "2029-10-10",
         decommissionDate: "2030-04-10",
     },
+    dart3: {
+        friendly: "Dart 3",
+        status: "experimental",
+        deprecationDate: "2030-01-01",
+        decommissionDate: "2030-01-01",
+    },
 });

package/lib/deploy/index.js

@@ -21,6 +21,7 @@ const RemoteConfigTarget = require("./remoteconfig");
 const ExtensionsTarget = require("./extensions");
 const DataConnectTarget = require("./dataconnect");
 const AppHostingTarget = require("./apphosting");
+const AuthTarget = require("./auth");
 const frameworks_1 = require("../frameworks");
 const prepare_1 = require("./hosting/prepare");
 const utils_2 = require("../utils");
@@ -37,6 +38,7 @@ const TARGETS = {
     extensions: ExtensionsTarget,
     dataconnect: DataConnectTarget,
     apphosting: AppHostingTarget,
+    auth: AuthTarget,
 };
 const chain = async function (fns, context, options, payload) {
     for (const latest of fns) {

package/lib/emulator/auth/index.js

@@ -69,23 +69,29 @@ class AuthEmulator {
         else {
             logger.logLabeled("WARN", "auth", `Skipped importing config because ${configPath} does not exist.`);
         }
-        const accountsPath = path.join(authExportDir, "accounts.json");
-        const accountsStat = await stat(accountsPath);
-        if (accountsStat?.isFile()) {
-            logger.logLabeled("BULLET", "auth", `Importing accounts from ${accountsPath}`);
-            await importFromFile({
-                method: "POST",
-                host: utils.connectableHostname(host),
-                port,
-                path: `/identitytoolkit.googleapis.com/v1/projects/${projectId}/accounts:batchCreate`,
-                headers: {
-                    Authorization: "Bearer owner",
-                    "Content-Type": "application/json",
-                },
-            }, accountsPath, { ignoreErrors: ["MISSING_USER_ACCOUNT"] });
-        }
-        else {
-            logger.logLabeled("WARN", "auth", `Skipped importing accounts because ${accountsPath} does not exist.`);
+        const accountFiles = fs
+            .readdirSync(authExportDir)
+            .filter((fileName) => fileName.includes("accounts"));
+        for (const accountFile of accountFiles) {
+            const accountsPath = path.join(authExportDir, accountFile);
+            const accountsStat = await stat(accountsPath);
+            const tenantId = accountFile.replace(/accounts(-|)|.json/gm, "");
+            if (accountsStat?.isFile()) {
+                logger.logLabeled("BULLET", "auth", `Importing accounts from ${accountsPath}`);
+                await importFromFile({
+                    method: "POST",
+                    host: utils.connectableHostname(host),
+                    port,
+                    path: `/identitytoolkit.googleapis.com/v1/projects/${projectId}/tenants/${tenantId}/accounts:batchCreate`,
+                    headers: {
+                        Authorization: "Bearer owner",
+                        "Content-Type": "application/json",
+                    },
+                }, accountsPath, { ignoreErrors: ["MISSING_USER_ACCOUNT"] });
+            }
+            else {
+                logger.logLabeled("WARN", "auth", `Skipped importing accounts because ${accountsPath} does not exist.`);
+            }
         }
     }
 }

package/lib/emulator/auth/operations.js

@@ -426,7 +426,15 @@ function batchDelete(state, reqBody) {
 function batchGet(state, reqBody, ctx) {
     (0, errors_1.assert)(!state.disableAuth, "PROJECT_DISABLED");
     const maxResults = Math.min(Math.floor(ctx.params.query.maxResults) || 20, 1000);
-    const users = state.queryUsers({}, { sortByField: "localId", order: "ASC", startToken: ctx.params.query.nextPageToken });
+    const queryTenantId = ctx.params.query.tenantId;
+    let users;
+    if (queryTenantId && state instanceof state_1.AgentProjectState) {
+        const tenant = state.getTenantProject(queryTenantId);
+        users = tenant.queryUsers({}, { sortByField: "localId", order: "ASC", startToken: ctx.params.query.nextPageToken });
+    }
+    else {
+        users = state.queryUsers({}, { sortByField: "localId", order: "ASC", startToken: ctx.params.query.nextPageToken });
+    }
     let newPageToken = undefined;
     if (maxResults >= 0 && users.length >= maxResults) {
         users.length = maxResults;

package/lib/emulator/downloadableEmulatorInfo.json

@@ -44,46 +44,46 @@
         }
     },
     "pubsub": {
-        "version": "0.8.25",
-        "expectedSize": 52169500,
-        "expectedChecksum": "ff855b79e84d26b2b5b2d56e84e0fb51",
-        "expectedChecksumSHA256": "a69fe788be3b0b3866c55b7ed8790efa424a88e6f26843bdbe9d34b93c9509af",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.25.zip",
-        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.25.zip",
-        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.25/pubsub-emulator/bin/cloud-pubsub-emulator"
+        "version": "0.8.27",
+        "expectedSize": 52924291,
+        "expectedChecksum": "cb0d35db6aa1bb5e3f7e2a5a690c631d",
+        "expectedChecksumSHA256": "0b793b420b608b68c200a0d15123c63967ac2863bbd9545ecb087d5b28871339",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.27.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.27.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.27/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.1.1",
-            "expectedSize": 30450528,
-            "expectedChecksum": "06e49453e3c9f876d445972a3588965f",
-            "expectedChecksumSHA256": "07dbbb5d1356597acc478d3c58dbf48e716b3795f4da0e7e174b0fd472b004d2",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.1.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.1"
+            "version": "3.1.3",
+            "expectedSize": 30753632,
+            "expectedChecksum": "db15fbb3d596b056390c08d065500c63",
+            "expectedChecksumSHA256": "f1b98402e9d8497e88a96de6ac80425aee3a61513eccc1fb76b4e387862625ee",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.1.3",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.3"
         },
         "darwin_arm64": {
-            "version": "3.1.1",
-            "expectedSize": 29916818,
-            "expectedChecksum": "477dd3da175dba6d7545ade62a8274f6",
-            "expectedChecksumSHA256": "472fe448f25fa8546aa383406db78eaf4eec4d8b700bb325dbc65899aba1bd20",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.1.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.1"
+            "version": "3.1.3",
+            "expectedSize": 30203330,
+            "expectedChecksum": "8ac08faf1b797615d91c58f7ea781af0",
+            "expectedChecksumSHA256": "eb00f5bd3c97c17b617a9ce5f5153d6d9f20bc482e4ac091a6361f9ff3bd8841",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.1.3",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.3"
         },
         "win32": {
-            "version": "3.1.1",
-            "expectedSize": 30951424,
-            "expectedChecksum": "c51ec99bffd2f37fa2bb793f7cc74ea7",
-            "expectedChecksumSHA256": "e03d0dae5f040b03d211d6741540ed11206b03548b230eb8e36338b5b57545ee",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.1.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.1.exe"
+            "version": "3.1.3",
+            "expectedSize": 31262208,
+            "expectedChecksum": "b6723bed0937b1a3fed6fdb64df39f4d",
+            "expectedChecksumSHA256": "3d213e26ab7ea4cd44083a32d882128e0ff9313a69795d88cb7a9f31042675ff",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.1.3",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.3.exe"
         },
         "linux": {
-            "version": "3.1.1",
-            "expectedSize": 30372024,
-            "expectedChecksum": "8a3977f07facaacaa9be3f9ec6bd90b7",
-            "expectedChecksumSHA256": "5c36d16d4ded51dd887c939a82e8cdc7e84cb40a2c5d00cb02bff90ca65c2472",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.1.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.1"
+            "version": "3.1.3",
+            "expectedSize": 30679224,
+            "expectedChecksum": "f1d0f701d8e56669a93f00f1c10a7437",
+            "expectedChecksumSHA256": "826aa0fcbb28bad7ced433e6386ea1cce2407357a145da7111e800489c6cf3c9",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.1.3",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.1.3"
         }
     }
 }

package/lib/emulator/hubExport.js

@@ -166,8 +166,22 @@ class HubExport {
         if (!fs.existsSync(authExportPath)) {
             fs.mkdirSync(authExportPath);
         }
+        const tenantsRes = await registry_1.EmulatorRegistry.client(types_1.Emulators.AUTH).get(`/identitytoolkit.googleapis.com/v2/projects/${this.projectId}/tenants`, {
+            headers: { Authorization: "Bearer owner" },
+        });
+        const tenants = tenantsRes.body.tenants.map((instance) => instance.tenantId);
+        for (const tenantId of tenants) {
+            const accountsFile = path.join(authExportPath, `accounts-${tenantId}.json`);
+            logger_1.logger.debug(`Exporting auth users in Project ${this.projectId} ${tenantId} tenant to ${accountsFile}`);
+            await fetchToFile({
+                host,
+                port,
+                path: `/identitytoolkit.googleapis.com/v1/projects/${this.projectId}/accounts:batchGet?maxResults=-1&tenantId=${tenantId}`,
+                headers: { Authorization: "Bearer owner" },
+            }, accountsFile);
+        }
         const accountsFile = path.join(authExportPath, "accounts.json");
-        logger_1.logger.debug(`Exporting auth users in Project ${this.projectId} to ${accountsFile}`);
+        logger_1.logger.debug(`Exporting auth users in Project ${this.projectId} default tenant to ${accountsFile}`);
         await fetchToFile({
             host,
             port,

package/lib/ensureApiEnabled.js

@@ -27,7 +27,7 @@ async function check(projectId, apiUri, prefix, silent = false) {
         return true;
     }
     const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`, {
-        headers: { "x-goog-user-project": `projects/${projectId}` },
+        headers: { "x-goog-user-project": `${projectId}` },
         skipLog: { resBody: true },
     });
     const isEnabled = res.body.state === "ENABLED";
@@ -45,7 +45,7 @@ function isPermissionError(e) {
 async function enable(projectId, apiName) {
     try {
         await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`, undefined, {
-            headers: { "x-goog-user-project": `projects/${projectId}` },
+            headers: { "x-goog-user-project": `${projectId}` },
             skipLog: { resBody: true },
         });
         cacheEnabledAPI(projectId, apiName);

package/lib/gcp/cloudbilling.js

@@ -20,16 +20,19 @@ async function isBillingEnabled(setup) {
     return setup.isBillingEnabled;
 }
 async function checkBillingEnabled(projectId) {
-    const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), { retryCodes: [500, 503] });
+    const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), {
+        retries: 3,
+        retryCodes: [429, 500, 503],
+    });
     return res.body.billingEnabled;
 }
 async function setBillingAccount(projectId, billingAccountName) {
     const res = await client.put(utils.endpoint(["projects", projectId, "billingInfo"]), {
         billingAccountName: billingAccountName,
-    }, { retryCodes: [500, 503] });
+    }, { retryCodes: [429, 500, 503] });
     return res.body.billingEnabled;
 }
 async function listBillingAccounts() {
-    const res = await client.get(utils.endpoint(["billingAccounts"]), { retryCodes: [500, 503] });
+    const res = await client.get(utils.endpoint(["billingAccounts"]), { retryCodes: [429, 500, 503] });
     return res.body.billingAccounts || [];
 }

package/lib/gcp/iam.js

@@ -78,7 +78,7 @@ async function testResourceIamPermissions(origin, apiVersion, resourceName, perm
     };
 }
 async function testIamPermissions(projectId, permissions) {
-    return testResourceIamPermissions((0, api_1.resourceManagerOrigin)(), "v1", `projects/${projectId}`, permissions, `projects/${projectId}`);
+    return testResourceIamPermissions((0, api_1.resourceManagerOrigin)(), "v1", `projects/${projectId}`, permissions, `${projectId}`);
 }
 function mergeBindings(policy, requiredBindings) {
     let updated = false;

package/lib/gcp/runv2.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FIREBASE_FUNCTION_METADTA_ANNOTATION = exports.FUNCTION_SIGNATURE_TYPE_ENV = exports.FUNCTION_TARGET_ENV = exports.FUNCTION_ID_ANNOTATION = exports.FUNCTION_TARGET_ANNOTATION = exports.TRIGGER_TYPE_ANNOTATION = exports.CLIENT_NAME_LABEL = exports.RUNTIME_LABEL = exports.API_VERSION = void 0;
 exports.submitBuild = submitBuild;
 exports.updateService = updateService;
+exports.createService = createService;
+exports.deleteService = deleteService;
+exports.getService = getService;
 exports.listServices = listServices;
 exports.endpointFromService = endpointFromService;
 exports.serviceFromEndpoint = serviceFromEndpoint;
@@ -51,6 +54,34 @@ async function updateService(service) {
     });
     return svc;
 }
+async function createService(projectId, location, serviceId, service) {
+    const { name, ...serviceBody } = service;
+    const res = await client.post(`/projects/${projectId}/locations/${location}/services`, serviceBody, {
+        queryParams: {
+            serviceId,
+        },
+    });
+    const svc = await (0, operation_poller_1.pollOperation)({
+        apiOrigin: (0, api_1.runOrigin)(),
+        apiVersion: exports.API_VERSION,
+        operationResourceName: res.body.name,
+    });
+    return svc;
+}
+async function deleteService(projectId, location, serviceId) {
+    const name = `projects/${projectId}/locations/${location}/services/${serviceId}`;
+    const res = await client.delete(name);
+    await (0, operation_poller_1.pollOperation)({
+        apiOrigin: (0, api_1.runOrigin)(),
+        apiVersion: exports.API_VERSION,
+        operationResourceName: res.body.name,
+    });
+}
+async function getService(projectId, location, serviceId) {
+    const name = `projects/${projectId}/locations/${location}/services/${serviceId}`;
+    const res = await client.get(name);
+    return res.body;
+}
 async function listServices(projectId) {
     const allServices = [];
     let pageToken = undefined;
@@ -115,6 +146,15 @@ function endpointFromService(service) {
             service.annotations?.[exports.FUNCTION_TARGET_ANNOTATION] ||
             service.annotations?.[exports.FUNCTION_ID_ANNOTATION] ||
             id,
+        timeoutSeconds: service.template.timeout
+            ? proto.secondsFromDuration(service.template.timeout)
+            : 60,
+        serviceAccount: service.template.serviceAccount || null,
+        ingressSettings: (service.annotations?.["run.googleapis.com/ingress"] === "internal"
+            ? "ALLOW_INTERNAL_ONLY"
+            : service.annotations?.["run.googleapis.com/ingress"] === "internal-and-cloud-load-balancing"
+                ? "ALLOW_INTERNAL_AND_GCLB"
+                : "ALLOW_ALL"),
         ...(service.annotations?.[exports.TRIGGER_TYPE_ANNOTATION] === "HTTP_TRIGGER"
             ? { httpsTrigger: {} }
             : {
@@ -124,7 +164,7 @@ function endpointFromService(service) {
                 },
             }),
     };
-    proto.renameIfPresent(endpoint, service.template, "concurrency", "containerConcurrency");
+    proto.renameIfPresent(endpoint, service.template, "concurrency", "maxInstanceRequestConcurrency");
     proto.renameIfPresent(endpoint, service.labels || {}, "codebase", constants_1.CODEBASE_LABEL);
     proto.renameIfPresent(endpoint, service.scaling || {}, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, service.scaling || {}, "maxInstances", "maxInstanceCount");
@@ -141,6 +181,12 @@ function endpointFromService(service) {
             version: e.valueSource.secretKeyRef.version || "latest",
         };
     });
+    if (service.template.vpcAccess) {
+        endpoint.vpc = {
+            connector: service.template.vpcAccess.connector || "",
+            egressSettings: service.template.vpcAccess.egress || null,
+        };
+    }
     return endpoint;
 }
 function serviceFromEndpoint(endpoint, image) {
@@ -194,11 +240,14 @@ function serviceFromEndpoint(endpoint, image) {
                     cpuIdle: true,
                     startupCpuBoost: true,
                 },
+                ...(endpoint.baseImageUri ? { baseImageUri: endpoint.baseImageUri } : {}),
+                ...(endpoint.command ? { command: endpoint.command } : {}),
+                ...(endpoint.args ? { args: endpoint.args } : {}),
             },
         ],
-        containerConcurrency: endpoint.concurrency || backend.DEFAULT_CONCURRENCY,
+        maxInstanceRequestConcurrency: endpoint.concurrency || backend.DEFAULT_CONCURRENCY,
     };
-    proto.renameIfPresent(template, endpoint, "containerConcurrency", "concurrency");
+    proto.renameIfPresent(template, endpoint, "maxInstanceRequestConcurrency", "concurrency");
     const service = {
         name: `projects/${endpoint.project}/locations/${endpoint.region}/services/${functionNameToServiceName(endpoint.id)}`,
         labels,
@@ -211,5 +260,28 @@ function serviceFromEndpoint(endpoint, image) {
         proto.renameIfPresent(service.scaling, endpoint, "minInstanceCount", "minInstances");
         proto.renameIfPresent(service.scaling, endpoint, "maxInstanceCount", "maxInstances");
     }
+    if (endpoint.serviceAccount) {
+        template.serviceAccount = endpoint.serviceAccount;
+    }
+    if (endpoint.timeoutSeconds) {
+        template.timeout = proto.durationFromSeconds(endpoint.timeoutSeconds);
+    }
+    if (endpoint.vpc) {
+        template.vpcAccess = {
+            connector: endpoint.vpc.connector,
+            egress: endpoint.vpc.egressSettings || undefined,
+        };
+    }
+    if (endpoint.ingressSettings) {
+        const ingressAnnotation = endpoint.ingressSettings === "ALLOW_INTERNAL_ONLY"
+            ? "internal"
+            : endpoint.ingressSettings === "ALLOW_INTERNAL_AND_GCLB"
+                ? "internal-and-cloud-load-balancing"
+                : "all";
+        service.annotations = {
+            ...service.annotations,
+            "run.googleapis.com/ingress": ingressAnnotation,
+        };
+    }
     return service;
 }

package/lib/gcp/serviceusage.js

@@ -22,7 +22,7 @@ const serviceUsagePollerOptions = {
 async function generateServiceIdentity(projectNumber, service, prefix) {
     utils.logLabeledBullet(prefix, `generating the service identity for ${(0, colorette_1.bold)(service)}...`);
     try {
-        const res = await exports.apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`, {}, { headers: { "x-goog-user-project": `projects/${projectNumber}` } });
+        const res = await exports.apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`, {}, { headers: { "x-goog-user-project": `${projectNumber}` } });
         return res.body;
     }
     catch (err) {
@@ -39,6 +39,6 @@ async function generateServiceIdentityAndPoll(projectNumber, service, prefix) {
     await poller.pollOperation({
         ...serviceUsagePollerOptions,
         operationResourceName: op.name,
-        headers: { "x-goog-user-project": `projects/${projectNumber}` },
+        headers: { "x-goog-user-project": `${projectNumber}` },
     });
 }

package/lib/gemini/fdcExperience.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROMPT_GENERATE_SEED_DATA = exports.PROMPT_GENERATE_CONNECTOR = void 0;
 exports.generateSchema = generateSchema;
-exports.chatWithFirebase = chatWithFirebase;
 exports.generateOperation = generateOperation;
 exports.extractCodeBlock = extractCodeBlock;
 const apiv2_1 = require("../apiv2");
@@ -10,7 +9,6 @@ const api_1 = require("../api");
 const error_1 = require("../error");
 const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.cloudAiCompanionOrigin)(), auth: true });
 const SCHEMA_GENERATOR_EXPERIENCE = "/appeco/firebase/fdc-schema-generator";
-const GEMINI_IN_FIREBASE_EXPERIENCE = "/appeco/firebase/firebase-chat/free";
 const OPERATION_GENERATION_EXPERIENCE = "/appeco/firebase/fdc-query-generator";
 const FIREBASE_CHAT_REQUEST_CONTEXT_TYPE_NAME = "type.googleapis.com/google.cloud.cloudaicompanion.v1main.FirebaseChatRequestContext";
 exports.PROMPT_GENERATE_CONNECTOR = "Create 4 operations for an app using the instance schema with proper authentication.";
@@ -24,15 +22,6 @@ async function generateSchema(prompt, project, chatHistory = []) {
     });
     return extractCodeBlock(res.body.output.messages[0].content);
 }
-async function chatWithFirebase(prompt, project, chatHistory = []) {
-    const res = await apiClient.post(`/v1beta/projects/${project}/locations/global/instances/default:completeTask`, {
-        input: { messages: [...chatHistory, { content: prompt, author: "USER" }] },
-        experienceContext: {
-            experience: GEMINI_IN_FIREBASE_EXPERIENCE,
-        },
-    });
-    return res.body;
-}
 async function generateOperation(prompt, service, project, chatHistory = []) {
     const res = await apiClient.post(`/v1beta/projects/${project}/locations/global/instances/default:completeTask`, {
         input: { messages: [...chatHistory, { content: prompt, author: "USER" }] },

package/lib/init/features/auth.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.askQuestions = askQuestions;
+exports.actuate = actuate;
+const clc = require("colorette");
+const prompt_1 = require("../../prompt");
+const logger_1 = require("../../logger");
+async function askQuestions(setup) {
+    const authConfig = setup.config.auth;
+    const choices = [
+        {
+            name: "Google Sign-In",
+            value: "google",
+            checked: !!authConfig?.providers?.googleSignIn,
+        },
+        {
+            name: "Email/Password",
+            value: "email",
+            checked: !!authConfig?.providers?.emailPassword,
+        },
+        {
+            name: "Anonymous",
+            value: "anonymous",
+            checked: !!authConfig?.providers?.anonymous,
+        },
+    ];
+    const providers = await (0, prompt_1.checkbox)({
+        message: "Which providers would you like to enable? If you don't see a provider here, go to the Firebase Console to set it up.",
+        choices: choices,
+    });
+    const providersConfig = {};
+    if (providers.includes("anonymous")) {
+        providersConfig.anonymous = true;
+    }
+    if (providers.includes("email")) {
+        providersConfig.emailPassword = true;
+    }
+    if (providers.includes("google")) {
+        logger_1.logger.info("");
+        logger_1.logger.info("Configuring Google Sign-In...");
+        const oAuthBrandDisplayName = await (0, prompt_1.input)({
+            message: "What display name would you like to use for your OAuth brand?",
+            default: authConfig?.providers?.googleSignIn?.oAuthBrandDisplayName ||
+                setup.project?.projectId ||
+                "My App",
+        });
+        const supportEmail = await (0, prompt_1.input)({
+            message: "What support email would you like to register for your OAuth brand?",
+            default: authConfig?.providers?.googleSignIn?.supportEmail ||
+                (setup.project ? `support@${setup.project.projectId}.firebaseapp.com` : undefined),
+        });
+        providersConfig.googleSignIn = {
+            oAuthBrandDisplayName,
+            supportEmail,
+        };
+    }
+    if (!setup.featureInfo) {
+        setup.featureInfo = {};
+    }
+    setup.featureInfo.auth = { providers: providersConfig };
+}
+async function actuate(setup, config) {
+    const authConfig = setup.featureInfo?.auth;
+    if (!authConfig) {
+        return;
+    }
+    config.set("auth", authConfig);
+    config.writeProjectFile("firebase.json", config.src);
+    logger_1.logger.info("");
+    logger_1.logger.info("Generated firebase.json with auth configuration.");
+    logger_1.logger.info("Run " + clc.bold("firebase deploy") + " to enable these providers.");
+}

package/lib/init/features/dataconnect/resolver.js

@@ -4,7 +4,6 @@ exports.askQuestions = askQuestions;
 exports.actuate = actuate;
 exports.addSchemaToDataConnectYaml = addSchemaToDataConnectYaml;
 const clc = require("colorette");
-const fs = require("fs-extra");
 const path_1 = require("path");
 const yaml = require("yaml");
 const prompt_1 = require("../../../prompt");
@@ -14,11 +13,15 @@ const names_1 = require("../../../dataconnect/names");
 const experiments = require("../../../experiments");
 const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const track_1 = require("../../../track");
-async function askQuestions(setup, config) {
+const functions = require("../functions");
+const templates_1 = require("../../../templates");
+const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/secondary_schema.gql");
+async function askQuestions(setup, config, options) {
     const resolverInfo = {
         id: "",
         uri: "",
         serviceInfo: {},
+        shouldInitFunctions: false,
     };
     const serviceInfos = await (0, load_1.loadAll)(setup.projectId || "", config);
     if (!serviceInfos.length) {
@@ -50,8 +53,15 @@ async function askQuestions(setup, config) {
         " as the custom resolver URL. To change this, update your " +
         clc.bold(`dataconnect.yaml`) +
         " later.");
+    resolverInfo.shouldInitFunctions = await (0, prompt_1.confirm)({
+        message: "Would you like to proceed with initializing a functions codebase with sample custom resolvers code?",
+        default: true,
+    });
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnectResolver = resolverInfo;
+    if (resolverInfo.shouldInitFunctions) {
+        await functions.askQuestions(setup, config, options);
+    }
 }
 async function actuate(setup, config) {
     if (!experiments.isEnabled("fdcwebhooks")) {
@@ -76,6 +86,9 @@ async function actuate(setup, config) {
                 : "missing",
         }, Date.now() - startTime);
     }
+    if (resolverInfo.shouldInitFunctions) {
+        await functions.actuate(setup, config);
+    }
 }
 function actuateWithInfo(config, info) {
     const dataConnectYaml = JSON.parse(JSON.stringify(info.serviceInfo?.dataConnectYaml));
@@ -83,8 +96,9 @@ function actuateWithInfo(config, info) {
     info.serviceInfo.dataConnectYaml = dataConnectYaml;
     const dataConnectYamlContents = yaml.stringify(dataConnectYaml);
     const dataConnectYamlPath = (0, path_1.join)(info.serviceInfo.sourceDirectory, "dataconnect.yaml");
+    const dataConnectSchemaPath = (0, path_1.join)(info.serviceInfo.sourceDirectory, `schema_${info.id}`, "schema.gql");
     config.writeProjectFile((0, path_1.relative)(config.projectDir, dataConnectYamlPath), dataConnectYamlContents);
-    fs.ensureFileSync((0, path_1.join)(info.serviceInfo.sourceDirectory, `schema_${info.id}`, "schema.gql"));
+    config.writeProjectFile((0, path_1.relative)(config.projectDir, dataConnectSchemaPath), SCHEMA_TEMPLATE);
 }
 function addSchemaToDataConnectYaml(dataConnectYaml, info) {
     const secondarySchema = {