firebase-tools 10.6.0 → 10.7.2

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

@@ -1,47 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceForEndpoint = exports.EVENT_SERVICE_MAPPING = exports.FirebaseAlertsService = exports.StorageService = exports.PubSubService = exports.NoOpService = void 0;
+exports.serviceForEndpoint = exports.noopProjectBindings = exports.noop = void 0;
 const backend = require("../backend");
+const auth_1 = require("./auth");
 const storage_1 = require("./storage");
 const firebaseAlerts_1 = require("./firebaseAlerts");
 const noop = () => Promise.resolve();
+exports.noop = noop;
 const noopProjectBindings = () => Promise.resolve([]);
-exports.NoOpService = {
+exports.noopProjectBindings = noopProjectBindings;
+const noOpService = {
     name: "noop",
     api: "",
-    requiredProjectBindings: undefined,
-    ensureTriggerRegion: noop,
+    ensureTriggerRegion: exports.noop,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
 };
-exports.PubSubService = {
+const pubSubService = {
     name: "pubsub",
     api: "pubsub.googleapis.com",
-    requiredProjectBindings: undefined,
-    ensureTriggerRegion: noop,
+    requiredProjectBindings: exports.noopProjectBindings,
+    ensureTriggerRegion: exports.noop,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
 };
-exports.StorageService = {
+const storageService = {
     name: "storage",
     api: "storage.googleapis.com",
     requiredProjectBindings: storage_1.obtainStorageBindings,
     ensureTriggerRegion: storage_1.ensureStorageTriggerRegion,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
 };
-exports.FirebaseAlertsService = {
+const firebaseAlertsService = {
     name: "firebasealerts",
-    api: "logging.googleapis.com",
-    requiredProjectBindings: noopProjectBindings,
+    api: "firebasealerts.googleapis.com",
+    requiredProjectBindings: exports.noopProjectBindings,
     ensureTriggerRegion: firebaseAlerts_1.ensureFirebaseAlertsTriggerRegion,
+    validateTrigger: exports.noop,
+    registerTrigger: exports.noop,
+    unregisterTrigger: exports.noop,
 };
-exports.EVENT_SERVICE_MAPPING = {
-    "google.cloud.pubsub.topic.v1.messagePublished": exports.PubSubService,
-    "google.cloud.storage.object.v1.finalized": exports.StorageService,
-    "google.cloud.storage.object.v1.archived": exports.StorageService,
-    "google.cloud.storage.object.v1.deleted": exports.StorageService,
-    "google.cloud.storage.object.v1.metadataUpdated": exports.StorageService,
-    "google.firebase.firebasealerts.alerts.v1.published": exports.FirebaseAlertsService,
+const authBlockingService = new auth_1.AuthBlockingService();
+const EVENT_SERVICE_MAPPING = {
+    "google.cloud.pubsub.topic.v1.messagePublished": pubSubService,
+    "google.cloud.storage.object.v1.finalized": storageService,
+    "google.cloud.storage.object.v1.archived": storageService,
+    "google.cloud.storage.object.v1.deleted": storageService,
+    "google.cloud.storage.object.v1.metadataUpdated": storageService,
+    "google.firebase.firebasealerts.alerts.v1.published": firebaseAlertsService,
+    "providers/cloud.auth/eventTypes/user.beforeCreate": authBlockingService,
+    "providers/cloud.auth/eventTypes/user.beforeSignIn": authBlockingService,
 };
 function serviceForEndpoint(endpoint) {
-    if (!backend.isEventTriggered(endpoint)) {
-        return exports.NoOpService;
+    if (backend.isEventTriggered(endpoint)) {
+        return EVENT_SERVICE_MAPPING[endpoint.eventTrigger.eventType] || noOpService;
     }
-    return exports.EVENT_SERVICE_MAPPING[endpoint.eventTrigger.eventType] || exports.NoOpService;
+    if (backend.isBlockingTriggered(endpoint)) {
+        return EVENT_SERVICE_MAPPING[endpoint.blockingTrigger.eventType] || noOpService;
+    }
+    return noOpService;
 }
 exports.serviceForEndpoint = serviceForEndpoint;

package/lib/deploy/functions/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreValid = void 0;
+exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.endpointsAreValid = void 0;
 const path = require("path");
 const clc = require("cli-color");
 const error_1 = require("../../error");
@@ -10,18 +10,21 @@ const fsutils = require("../../fsutils");
 const backend = require("./backend");
 const utils = require("../../utils");
 const secrets = require("../../functions/secrets");
+const services_1 = require("./services");
 function endpointsAreValid(wantBackend) {
-    functionIdsAreValid(backend.allEndpoints(wantBackend));
-    const gcfV1WithConcurrency = backend
-        .allEndpoints(wantBackend)
+    const endpoints = backend.allEndpoints(wantBackend);
+    functionIdsAreValid(endpoints);
+    for (const ep of endpoints) {
+        (0, services_1.serviceForEndpoint)(ep).validateTrigger(ep, wantBackend);
+    }
+    const gcfV1WithConcurrency = endpoints
         .filter((endpoint) => (endpoint.concurrency || 1) !== 1 && endpoint.platform === "gcfv1")
         .map((endpoint) => endpoint.id);
     if (gcfV1WithConcurrency.length) {
         const msg = `Cannot set concurrency on the functions ${gcfV1WithConcurrency.join(",")} because they are GCF gen 1`;
         throw new error_1.FirebaseError(msg);
     }
-    const tooSmallForConcurrency = backend
-        .allEndpoints(wantBackend)
+    const tooSmallForConcurrency = endpoints
         .filter((endpoint) => {
         if ((endpoint.concurrency || 1) === 1) {
             return false;
@@ -36,6 +39,29 @@ function endpointsAreValid(wantBackend) {
     }
 }
 exports.endpointsAreValid = endpointsAreValid;
+function endpointsAreUnique(backends) {
+    const endpointToCodebases = {};
+    for (const [codebase, b] of Object.entries(backends)) {
+        for (const endpoint of backend.allEndpoints(b)) {
+            const key = backend.functionName(endpoint);
+            const cs = endpointToCodebases[key] || new Set();
+            cs.add(codebase);
+            endpointToCodebases[key] = cs;
+        }
+    }
+    const conflicts = {};
+    for (const [fn, codebases] of Object.entries(endpointToCodebases)) {
+        if (codebases.size > 1) {
+            conflicts[fn] = Array.from(codebases);
+        }
+    }
+    if (Object.keys(conflicts).length === 0) {
+        return;
+    }
+    const msgs = Object.entries(conflicts).map(([fn, codebases]) => `${fn}: ${codebases.join(",")}`);
+    throw new error_1.FirebaseError("More than one codebase claims following functions:\n\t" + `${msgs.join("\n\t")}`);
+}
+exports.endpointsAreUnique = endpointsAreUnique;
 function functionsDirectoryExists(sourceDir, projectDir) {
     if (!fsutils.dirExistsSync(sourceDir)) {
         const sourceDirName = path.relative(projectDir, sourceDir);
@@ -60,7 +86,7 @@ function functionIdsAreValid(functions) {
         return fn.platform === "gcfv2" && !v2FunctionName.test(fn.id);
     });
     if (invalidV2Ids.length !== 0) {
-        const msg = `${invalidV2Ids.map((f) => f.id).join(", ")} v2 function name(s) can only contin lower ` +
+        const msg = `${invalidV2Ids.map((f) => f.id).join(", ")} v2 function name(s) can only contain lower ` +
             `case letters, numbers, hyphens, and not exceed 62 characters in length`;
         throw new error_1.FirebaseError(msg);
     }

package/lib/deploy/hosting/args.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/deploy/hosting/convertConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertConfig = void 0;
 const error_1 = require("../../error");
+const backend_1 = require("../functions/backend");
 function has(obj, k) {
     return obj[k] !== undefined;
 }
@@ -28,7 +29,7 @@ function extractPattern(type, spec) {
     }
     throw new error_1.FirebaseError(`Cannot specify a ${type} with no pattern (either a glob or regex required).`);
 }
-function convertConfig(config) {
+async function convertConfig(context, payload, config, finalize) {
     if (Array.isArray(config)) {
         throw new error_1.FirebaseError(`convertConfig should be given a single configuration, not an array.`, {
             exit: 2,
@@ -38,29 +39,59 @@ function convertConfig(config) {
     if (!config) {
         return out;
     }
+    const endpointBeingDeployed = (serviceId, region = "us-central1") => {
+        var _a;
+        for (const { wantBackend } of Object.values(payload.functions || {})) {
+            const endpoint = (_a = wantBackend === null || wantBackend === void 0 ? void 0 : wantBackend.endpoints[region]) === null || _a === void 0 ? void 0 : _a[serviceId];
+            if (endpoint && (0, backend_1.isHttpsTriggered)(endpoint) && endpoint.platform === "gcfv2")
+                return endpoint;
+        }
+        return undefined;
+    };
+    const matchingEndpoint = async (serviceId, region = "us-central1") => {
+        const pendingEndpoint = endpointBeingDeployed(serviceId, region);
+        if (pendingEndpoint)
+            return pendingEndpoint;
+        const backend = await (0, backend_1.existingBackend)(context);
+        return (0, backend_1.allEndpoints)(backend).find((it) => (0, backend_1.isHttpsTriggered)(it) &&
+            it.platform === "gcfv2" &&
+            it.id === serviceId &&
+            it.region === region);
+    };
     if (Array.isArray(config.rewrites)) {
-        out.rewrites = config.rewrites.map((rewrite) => {
+        out.rewrites = [];
+        for (const rewrite of config.rewrites) {
             const vRewrite = extractPattern("rewrite", rewrite);
             if ("destination" in rewrite) {
                 vRewrite.path = rewrite.destination;
             }
             else if ("function" in rewrite) {
-                vRewrite.function = rewrite.function;
-                if (rewrite.region) {
-                    vRewrite.functionRegion = rewrite.region;
+                if (!finalize && endpointBeingDeployed(rewrite.function, rewrite.region))
+                    continue;
+                const endpoint = await matchingEndpoint(rewrite.function, rewrite.region);
+                if (endpoint) {
+                    vRewrite.run = { serviceId: endpoint.id, region: endpoint.region };
                 }
                 else {
-                    vRewrite.functionRegion = "us-central1";
+                    vRewrite.function = rewrite.function;
+                    if (rewrite.region) {
+                        vRewrite.functionRegion = rewrite.region;
+                    }
+                    else {
+                        vRewrite.functionRegion = "us-central1";
+                    }
                 }
             }
             else if ("dynamicLinks" in rewrite) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;
             }
             else if ("run" in rewrite) {
+                if (!finalize && endpointBeingDeployed(rewrite.run.serviceId, rewrite.run.region))
+                    continue;
                 vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
             }
-            return vRewrite;
-        });
+            out.rewrites.push(vRewrite);
+        }
     }
     if (Array.isArray(config.redirects)) {
         out.redirects = config.redirects.map((redirect) => {

package/lib/deploy/hosting/deploy.js

@@ -5,7 +5,7 @@ const uploader_1 = require("./uploader");
 const detectProjectRoot_1 = require("../../detectProjectRoot");
 const listFiles_1 = require("../../listFiles");
 const logger_1 = require("../../logger");
-const track = require("../../track");
+const track_1 = require("../../track");
 const utils_1 = require("../../utils");
 const clc = require("cli-color");
 const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -63,7 +63,7 @@ async function deploy(context, options) {
             await uploader.start();
         }
         catch (err) {
-            void track("Hosting Deploy", "failure");
+            void (0, track_1.track)("Hosting Deploy", "failure");
             throw err;
         }
         finally {
@@ -75,7 +75,7 @@ async function deploy(context, options) {
         (0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
         const dt = Date.now() - t0;
         logger_1.logger.debug("[hosting] deploy completed after " + dt + "ms");
-        void track("Hosting Deploy", "success", dt);
+        void (0, track_1.track)("Hosting Deploy", "success", dt);
         return runDeploys(deploys, debugging);
     }
     const debugging = !!(options.debug || options.nonInteractive);

package/lib/deploy/hosting/prepare.js

@@ -8,7 +8,7 @@ const normalizedHostingConfigs_1 = require("../../hosting/normalizedHostingConfi
 const validate_1 = require("./validate");
 const convertConfig_1 = require("./convertConfig");
 const deploymentTool = require("../../deploymentTool");
-async function prepare(context, options) {
+async function prepare(context, options, payload) {
     if (options.public) {
         if (Array.isArray(options.config.get("hosting"))) {
             throw new error_1.FirebaseError("Cannot specify --public option with multi-site configuration.");
@@ -30,7 +30,7 @@ async function prepare(context, options) {
         const cfg = deploy.config;
         (0, validate_1.validateDeploy)(deploy, options);
         const data = {
-            config: (0, convertConfig_1.convertConfig)(cfg),
+            config: await (0, convertConfig_1.convertConfig)(context, payload, cfg, false),
             labels: deploymentTool.labels(),
         };
         versionCreates.push(client_1.client

package/lib/deploy/hosting/release.js

@@ -5,7 +5,8 @@ const client_1 = require("./client");
 const logger_1 = require("../../logger");
 const projectUtils_1 = require("../../projectUtils");
 const utils = require("../../utils");
-async function release(context, options) {
+const convertConfig_1 = require("./convertConfig");
+async function release(context, options, payload) {
     if (!context.hosting || !context.hosting.deploys) {
         return;
     }
@@ -13,7 +14,10 @@ async function release(context, options) {
     logger_1.logger.debug(JSON.stringify(context.hosting.deploys, null, 2));
     await Promise.all(context.hosting.deploys.map(async (deploy) => {
         utils.logLabeledBullet(`hosting[${deploy.site}]`, "finalizing version...");
-        const finalizeResult = await client_1.client.patch(`/${deploy.version}`, { status: "FINALIZED" }, { queryParams: { updateMask: "status" } });
+        const config = await (0, convertConfig_1.convertConfig)(context, payload, deploy.config, true);
+        const data = { status: "FINALIZED", config };
+        const queryParams = { updateMask: "status,config" };
+        const finalizeResult = await client_1.client.patch(`/${deploy.version}`, data, { queryParams });
         logger_1.logger.debug(`[hosting] finalized version for ${deploy.site}:${finalizeResult.body}`);
         utils.logLabeledSuccess(`hosting[${deploy.site}]`, "version finalized");
         utils.logLabeledBullet(`hosting[${deploy.site}]`, "releasing new version...");

package/lib/deploy/index.js

@@ -1,103 +1,92 @@
 "use strict";
-const { logger } = require("../logger");
-var api = require("../api");
-var clc = require("cli-color");
-var _ = require("lodash");
-var needProjectId = require("../projectUtils").needProjectId;
-var utils = require("../utils");
-var { FirebaseError } = require("../error");
-var track = require("../track");
-var lifecycleHooks = require("./lifecycleHooks");
-var TARGETS = {
-    hosting: require("./hosting"),
-    database: require("./database"),
-    firestore: require("./firestore"),
-    functions: require("./functions"),
-    storage: require("./storage"),
-    remoteconfig: require("./remoteconfig"),
-    extensions: require("./extensions"),
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deploy = void 0;
+const logger_1 = require("../logger");
+const api_1 = require("../api");
+const cli_color_1 = require("cli-color");
+const lodash_1 = require("lodash");
+const projectUtils_1 = require("../projectUtils");
+const utils_1 = require("../utils");
+const error_1 = require("../error");
+const track_1 = require("../track");
+const lifecycleHooks = require("./lifecycleHooks");
+const previews_1 = require("../previews");
+const HostingTarget = require("./hosting");
+const DatabaseTarget = require("./database");
+const FirestoreTarget = require("./firestore");
+const FunctionsTarget = require("./functions");
+const StorageTarget = require("./storage");
+const RemoteConfigTarget = require("./remoteconfig");
+const ExtensionsTarget = require("./extensions");
+const TARGETS = {
+    hosting: HostingTarget,
+    database: DatabaseTarget,
+    firestore: FirestoreTarget,
+    functions: FunctionsTarget,
+    storage: StorageTarget,
+    remoteconfig: RemoteConfigTarget,
+    extensions: ExtensionsTarget,
 };
-var _noop = function () {
-    return Promise.resolve();
-};
-var _chain = function (fns, context, options, payload) {
-    var latest = (fns.shift() || _noop)(context, options, payload);
-    if (fns.length) {
-        return latest.then(function () {
-            return _chain(fns, context, options, payload);
-        });
+const chain = async function (fns, context, options, payload) {
+    for (const latest of fns) {
+        await latest(context, options, payload);
     }
-    return latest;
 };
-var deploy = function (targetNames, options, customContext = {}) {
-    var projectId = needProjectId(options);
-    var payload = {};
-    var context = Object.assign({ projectId }, customContext);
-    var predeploys = [];
-    var prepares = [];
-    var deploys = [];
-    var releases = [];
-    var postdeploys = [];
-    var startTime = Date.now();
-    for (var i = 0; i < targetNames.length; i++) {
-        var targetName = targetNames[i];
-        var target = TARGETS[targetName];
+const deploy = async function (targetNames, options, customContext = {}) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const payload = {};
+    const context = Object.assign({ projectId }, customContext);
+    const predeploys = [];
+    const prepares = [];
+    const deploys = [];
+    const releases = [];
+    const postdeploys = [];
+    const startTime = Date.now();
+    if (previews_1.previews.frameworkawareness && targetNames.includes("hosting")) {
+        const config = options.config.get("hosting");
+        if (Array.isArray(config) ? config.some((it) => it.source) : config.source) {
+            await require("firebase-frameworks").prepare(targetNames, context, options);
+        }
+    }
+    for (const targetName of targetNames) {
+        const target = TARGETS[targetName];
         if (!target) {
-            return Promise.reject(new FirebaseError(clc.bold(targetName) + " is not a valid deploy target", { exit: 1 }));
+            return Promise.reject(new error_1.FirebaseError((0, cli_color_1.bold)(targetName) + " is not a valid deploy target", { exit: 1 }));
         }
         predeploys.push(lifecycleHooks(targetName, "predeploy"));
-        if (target.prepare) {
-            prepares.push(target.prepare);
-        }
-        if (target.deploy) {
-            deploys.push(target.deploy);
-        }
-        if (target.release) {
-            releases.push(target.release);
-        }
+        prepares.push(target.prepare);
+        deploys.push(target.deploy);
+        releases.push(target.release);
         postdeploys.push(lifecycleHooks(targetName, "postdeploy"));
     }
-    logger.info();
-    logger.info(clc.bold(clc.white("===") + " Deploying to '" + projectId + "'..."));
-    logger.info();
-    utils.logBullet("deploying " + clc.bold(targetNames.join(", ")));
-    return _chain(predeploys, context, options, payload)
-        .then(function () {
-        return _chain(prepares, context, options, payload);
-    })
-        .then(function () {
-        return _chain(deploys, context, options, payload);
-    })
-        .then(function () {
-        return _chain(releases, context, options, payload);
-    })
-        .then(function () {
-        return _chain(postdeploys, context, options, payload);
-    })
-        .then(function () {
-        if (_.has(options, "config.notes.databaseRules")) {
-            return track("Rules Deploy", options.config.notes.databaseRules);
-        }
-        return;
-    })
-        .then(function () {
-        const duration = Date.now() - startTime;
-        return track("Product Deploy", [...targetNames].sort().join(","), duration);
-    })
-        .then(function () {
-        logger.info();
-        utils.logSuccess(clc.underline.bold("Deploy complete!"));
-        logger.info();
-        var deployedHosting = _.includes(targetNames, "hosting");
-        logger.info(clc.bold("Project Console:"), utils.consoleUrl(options.project, "/overview"));
-        if (deployedHosting) {
-            _.each(context.hosting.deploys, function (deploy) {
-                logger.info(clc.bold("Hosting URL:"), utils.addSubdomain(api.hostingOrigin, deploy.site));
-            });
-            const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
-            return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };
-        }
-    });
+    logger_1.logger.info();
+    logger_1.logger.info((0, cli_color_1.bold)((0, cli_color_1.white)("===") + " Deploying to '" + projectId + "'..."));
+    logger_1.logger.info();
+    (0, utils_1.logBullet)("deploying " + (0, cli_color_1.bold)(targetNames.join(", ")));
+    await chain(predeploys, context, options, payload);
+    await chain(prepares, context, options, payload);
+    await chain(deploys, context, options, payload);
+    await chain(releases, context, options, payload);
+    await chain(postdeploys, context, options, payload);
+    if ((0, lodash_1.has)(options, "config.notes.databaseRules")) {
+        await (0, track_1.track)("Rules Deploy", options.config.notes.databaseRules);
+    }
+    const duration = Date.now() - startTime;
+    await (0, track_1.track)("Product Deploy", [...targetNames].sort().join(","), duration);
+    logger_1.logger.info();
+    (0, utils_1.logSuccess)(cli_color_1.bold.underline("Deploy complete!"));
+    logger_1.logger.info();
+    const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
+    logger_1.logger.info((0, cli_color_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
+    if (deployedHosting) {
+        (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
+            logger_1.logger.info((0, cli_color_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
+        });
+        const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
+        return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };
+    }
+    else {
+        return { hosting: undefined };
+    }
 };
-deploy.TARGETS = TARGETS;
-module.exports = deploy;
+exports.deploy = deploy;

package/lib/deploy/remoteconfig/deploy.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1() { }
+exports.default = default_1;

package/lib/deploy/remoteconfig/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.release = exports.prepare = void 0;
+exports.deploy = exports.release = exports.prepare = void 0;
 const prepare_1 = require("./prepare");
 exports.prepare = prepare_1.default;
 const release_1 = require("./release");
 exports.release = release_1.default;
+const deploy_1 = require("./deploy");
+exports.deploy = deploy_1.default;

package/lib/emulator/auth/cloudFunctions.js

@@ -62,8 +62,12 @@ class AuthCloudFunction {
             phoneNumber: user.phoneNumber,
             disabled: user.disabled,
             metadata: {
-                creationTime: user.createdAt,
-                lastSignInTime: user.lastLoginAt,
+                creationTime: user.createdAt
+                    ? new Date(parseInt(user.createdAt, 10)).toISOString()
+                    : undefined,
+                lastSignInTime: user.lastLoginAt
+                    ? new Date(parseInt(user.lastLoginAt, 10)).toISOString()
+                    : undefined,
             },
             customClaims: JSON.parse(user.customAttributes || "{}"),
             providerData: user.providerUserInfo,

package/lib/emulator/auth/operations.js

@@ -39,6 +39,7 @@ exports.authOperations = {
         projects: {
             createSessionCookie,
             queryAccounts,
+            getConfig,
             updateConfig,
             accounts: {
                 _: signUp,
@@ -1209,7 +1210,6 @@ function grantToken(state, reqBody) {
     (0, errors_1.assert)(reqBody.grantType === "refresh_token", "INVALID_GRANT_TYPE");
     (0, errors_1.assert)(reqBody.refreshToken, "MISSING_REFRESH_TOKEN");
     const refreshTokenRecord = state.validateRefreshToken(reqBody.refreshToken);
-    (0, errors_1.assert)(refreshTokenRecord, "INVALID_REFRESH_TOKEN");
     (0, errors_1.assert)(!refreshTokenRecord.user.disabled, "USER_DISABLED");
     const tokens = issueTokens(state, refreshTokenRecord.user, refreshTokenRecord.provider, {
         extraClaims: refreshTokenRecord.extraClaims,
@@ -1380,6 +1380,10 @@ function mfaSignInFinalize(state, reqBody) {
         refreshToken,
     };
 }
+function getConfig(state, reqBody, ctx) {
+    (0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Can only get top-level configurations on agent projects.))");
+    return state.config;
+}
 function updateConfig(state, reqBody, ctx) {
     var _a;
     (0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Can only update top-level configurations on agent projects.))");

package/lib/emulator/auth/server.js

@@ -342,7 +342,7 @@ function toExegesisController(ops, getProjectStateById) {
     }
     function toExegesisOperation(operation) {
         return (ctx) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let targetProjectId = ctx.params.path.targetProjectId || ((_a = ctx.requestBody) === null || _a === void 0 ? void 0 : _a.targetProjectId);
             if (targetProjectId) {
                 if ((_b = ctx.api.operationObject.security) === null || _b === void 0 ? void 0 : _b.some((sec) => sec.Oauth2)) {
@@ -365,6 +365,13 @@ function toExegesisController(ops, getProjectStateById) {
                 }
                 targetTenantId = targetTenantId || (decoded === null || decoded === void 0 ? void 0 : decoded.payload.firebase.tenant);
             }
+            if ((_h = ctx.requestBody) === null || _h === void 0 ? void 0 : _h.refreshToken) {
+                const refreshTokenRecord = (0, state_1.decodeRefreshToken)(ctx.requestBody.refreshToken);
+                if (refreshTokenRecord.tenantId && targetTenantId) {
+                    (0, errors_2.assert)(refreshTokenRecord.tenantId === targetTenantId, "TENANT_ID_MISMATCH: ((Refresh token tenant ID does not match target tenant ID.))");
+                }
+                targetTenantId = targetTenantId || refreshTokenRecord.tenantId;
+            }
             return operation(getProjectStateById(targetProjectId, targetTenantId), ctx.requestBody, ctx);
         };
     }