Fix auth deploy (#3030)

Author: dahliasalem

CHANGELOG.md

@@ -2,3 +2,4 @@
 - Fixes issue where `host` header was being incorrectly set when proxying to Cloud Run or Cloud Functions for Firebase from the Hosting emulator. (#3012)
 - Fixes issue where emulated HTTP functions would crash when the URL contained query parameters (#3032)
 - Fixes issue with routing to emulated HTTP functions in regions outside of `us-central1` (#3031)
+- Fixes issue where authorized domains were not being correctly updated when deploying to Hosting channels. (#3002)

src/commands/hosting-channel-create.ts

@@ -1,6 +1,6 @@
 import { bold, yellow } from "cli-color";
 
-import { Channel, createChannel, addAuthDomain, normalizeName } from "../hosting/api";
+import { Channel, createChannel, addAuthDomains, normalizeName } from "../hosting/api";
 import { Command } from "../command";
 import { DEFAULT_DURATION, calculateChannelExpireTTL } from "../hosting/expireUtils";
 import { FirebaseError } from "../error";
@@ -74,7 +74,7 @@ export default new Command("hosting:channel:create [channelId]")
       }
 
       try {
-        await addAuthDomain(projectId, channel.url);
+        await addAuthDomains(projectId, [channel.url]);
       } catch (e) {
         logLabeledWarning(
           LOG_TAG,

src/commands/hosting-channel-deploy.ts

@@ -7,7 +7,7 @@ import {
   getChannel,
   createChannel,
   updateChannelTtl,
-  addAuthDomain,
+  addAuthDomains,
   cleanAuthState,
   normalizeName,
 } from "../hosting/api";
@@ -120,26 +120,6 @@ export default new Command("hosting:channel:deploy [channelId]")
               LOG_TAG,
               `Channel ${bold(channelId)} has been created on site ${bold(site)}.`
             );
-            try {
-              await addAuthDomain(projectId, chan.url);
-            } catch (e) {
-              logLabeledWarning(
-                LOG_TAG,
-                marked(
-                  `Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${consoleUrl(
-                    projectId,
-                    "/authentication/providers"
-                  )}`
-                )
-              );
-              logger.debug("[hosting] unable to add auth domain", e);
-            }
-          }
-          try {
-            await cleanAuthState(projectId, site);
-          } catch (e) {
-            logLabeledWarning(LOG_TAG, "Unable to sync Firebase Auth state.");
-            logger.debug("[hosting] unable to sync auth domain", e);
           }
           siteInfo.url = chan.url;
           siteInfo.expireTime = chan.expireTime;
@@ -150,6 +130,7 @@ export default new Command("hosting:channel:deploy [channelId]")
       await deploy(["hosting"], options, { hostingChannel: channelId });
 
       logger.info();
+      await syncAuthState(projectId, sites);
       const deploys: { [key: string]: ChannelInfo } = {};
       sites.forEach((d) => {
         deploys[d.target || d.site] = d;
@@ -162,7 +143,37 @@ export default new Command("hosting:channel:deploy [channelId]")
           `Channel URL (${bold(d.site || d.target)}): ${d.url} ${expires}`
         );
       });
-
       return deploys;
     }
   );
+
+/**
+ * Helper function to sync authorized domains for deployed sites.
+ * @param projectId the project id.
+ * @param sites list of sites & url to sync auth state for.
+ */
+async function syncAuthState(projectId: string, sites: ChannelInfo[]) {
+  const siteNames = sites.map((d) => d.site);
+  const urlNames = sites.map((d) => d.url);
+  try {
+    await addAuthDomains(projectId, urlNames);
+    logger.debug("[hosting] added auth domain for urls", urlNames);
+  } catch (e) {
+    logLabeledWarning(
+      LOG_TAG,
+      marked(
+        `Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${consoleUrl(
+          projectId,
+          "/authentication/providers"
+        )}`
+      )
+    );
+    logger.debug("[hosting] unable to add auth domain", e);
+  }
+  try {
+    await cleanAuthState(projectId, siteNames);
+  } catch (e) {
+    logLabeledWarning(LOG_TAG, "Unable to sync Firebase Auth state.");
+    logger.debug("[hosting] unable to sync auth domain", e);
+  }
+}

src/commands/hosting-clone.ts

@@ -8,7 +8,7 @@ import {
   createChannel,
   cloneVersion,
   createRelease,
-  addAuthDomain,
+  addAuthDomains,
   normalizeName,
 } from "../hosting/api";
 import * as utils from "../utils";
@@ -87,7 +87,7 @@ export default new Command("hosting:clone <source> <targetChannel>")
       utils.logSuccess(`Created new channel ${targetChannelId}`);
       try {
         const tProjectId = getProjectId(tChannel.name);
-        await addAuthDomain(tProjectId, tChannel.url);
+        await addAuthDomains(tProjectId, [tChannel.url]);
       } catch (e) {
         utils.logLabeledWarning(
           "hosting:clone",

src/hosting/api.ts

@@ -353,18 +353,20 @@ export async function createRelease(
 }
 
 /**
- * Adds channel domain to Firebase Auth list.
+ * Adds list of channel domains to Firebase Auth list.
  * @param project the project ID.
- * @param url the url of the channel.
+ * @param urls the list of urls of the channel.
  */
-export async function addAuthDomain(project: string, url: string): Promise<string[]> {
+export async function addAuthDomains(project: string, urls: string[]): Promise<string[]> {
   const domains = await getAuthDomains(project);
-  const domain = url.replace("https://", "");
   const authDomains = domains || [];
-  if (authDomains.includes(domain)) {
-    return authDomains;
+  for (const url of urls) {
+    const domain = url.replace("https://", "");
+    if (authDomains.includes(domain)) {
+      continue;
+    }
+    authDomains.push(domain);
   }
-  authDomains.push(domain);
   return await updateAuthDomains(project, authDomains);
 }
 
@@ -432,9 +434,17 @@ export async function getCleanDomains(project: string, site: string): Promise<st
  * updates Firebase Auth Api with aforementioned
  * list.
  * @param project the project ID.
- * @param site the site for the channel.
+ * @param sites the list of sites for the channel.
  */
-export async function cleanAuthState(project: string, site: string): Promise<string[]> {
-  const authDomains = await getCleanDomains(project, site);
-  return await updateAuthDomains(project, authDomains);
+export async function cleanAuthState(
+  project: string,
+  sites: string[]
+): Promise<Map<string, Array<string>>> {
+  const siteDomainMap = new Map();
+  for (const site of sites) {
+    const authDomains = await getCleanDomains(project, site);
+    const updatedDomains = await updateAuthDomains(project, authDomains);
+    siteDomainMap.set(site, updatedDomains);
+  }
+  return siteDomainMap;
 }