m

src/commands/init.ts

@@ -8,15 +8,13 @@
 import { init, Setup } from "../init";
 import { logger } from "../logger";
 import { checkbox, confirm } from "../prompt";
-import { requireAuth } from "../requireAuth";
 import * as fsutils from "../fsutils";
 import * as utils from "../utils";
 import { Options } from "../options";
 import { isEnabled } from "../experiments";
 import { readTemplateSync } from "../templates";
 import { FirebaseError } from "../error";
 import { logBullet } from "../utils";
-import { EmulatorHub } from "../emulator/hub";
 
 const homeDir = os.homedir();
 
@@ -164,9 +162,6 @@
  ".",
  );
  }
- if (options.project !== EmulatorHub.MISSING_PROJECT_PLACEHOLDER) {
- await requireAuth(options);
- }
 
  const cwd = options.cwd || process.cwd();
 
@@ -205,7 +200,7 @@
 
  const setup: Setup = {
  config: config.src,
  rcfile: config.readProjectFile(".firebaserc", {
  json: true,
  fallback: {},
  }),

src/init/features/project.ts

@@ -16,6 +16,7 @@
 import * as prompt from "../../prompt";
 import { Options } from "../../options";
 import { EmulatorHub } from "../../emulator/hub";
+import { requireAuth } from "../../requireAuth";
 
 const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
@@ -73,7 +74,7 @@
  * @param options the Firebase CLI options object.
  * @return the project metadata, or undefined if no project was selected.
  */
 async function projectChoicePrompt(options: any): Promise<FirebaseProjectMetadata | undefined> {
  const choices = [OPTION_USE_PROJECT, OPTION_NEW_PROJECT, OPTION_ADD_FIREBASE, OPTION_NO_PROJECT];
  const projectSetupOption: string = await prompt.select<(typeof choices)[number]>({
  message: "Please select an option:",
@@ -82,9 +83,9 @@
 
  switch (projectSetupOption) {
  case OPTION_USE_PROJECT:
  return getOrPromptProject(options);
  case OPTION_NEW_PROJECT:
  return promptAndCreateNewProject(options);
  case OPTION_ADD_FIREBASE:
  return promptAndAddFirebaseToCloudProject();
  default:
@@ -99,12 +100,13 @@
  * @param config Configuration for the project.
  * @param options Command line options.
  */
 export async function doSetup(setup: any, config: any, options: any): Promise<void> {
  setup.project = {};
  if (options.projectId === EmulatorHub.MISSING_PROJECT_PLACEHOLDER) {
  logger.info(`Skipping Firebase project given --project=${options.projectId}`);
  return;
  }
+ await requireAuth(options);
 
  logger.info();
  logger.info(`First, let's associate this project directory with a Firebase project.`);