Updating the schematic for the list depreciation

Author: jamesdaniels

src/schematics/deploy/actions.ts

@@ -12,14 +12,8 @@ export default async function deploy(
     throw new Error("Cannot find firebase project for your app in .firebaserc");
   }
 
-  try {
-    await firebaseTools.list();
-  } catch (e) {
-    context.logger.warn(
-      "🚨 You're not logged into Firebase. Logging you in..."
-    );
-    await firebaseTools.login();
-  }
+  await firebaseTools.login();
+
   if (!context.target) {
     throw new Error("Cannot execute the build target");
   }

src/schematics/deploy/builder.ts

@@ -37,7 +37,7 @@ export default createBuilder<any>(
       context.target.project
     );
 
-    const buildTarget = options.buildTarget || `build:${context.target.project}:production`;
+    const buildTarget = options.buildTarget || `${context.target.project}:build:production`;
 
     try {
       await deploy(

src/schematics/interfaces.ts

@@ -1,7 +1,9 @@
 export interface Project {
+  projectId: string;
+  projectNumber: string;
+  displayName: string;
   name: string;
-  id: string;
-  permission: "edit" | "view" | "own";
+  resources: { [key:string]: string }
 }
 
 export interface FirebaseDeployConfig {
@@ -12,7 +14,9 @@ export interface FirebaseDeployConfig {
 export interface FirebaseTools {
   login(): Promise<void>;
 
-  list(): Promise<Project[]>;
+  projects: {
+    list(): Promise<Project[]>;
+  }
 
   deploy(config: FirebaseDeployConfig): Promise<any>;
 

src/schematics/utils.ts

@@ -2,12 +2,10 @@ import { readFileSync } from "fs";
 import { FirebaseRc, Project } from "./interfaces";
 import { join } from "path";
 
-export function listProjects() {
+export async function listProjects() {
   const firebase = require('firebase-tools');
-  return firebase.list().catch(
-    /* If list failed, then login and try again. */
-    () => firebase.login().then(() => firebase.list())
-  );
+  await firebase.login();
+  return firebase.projects.list();
 }
 
 // `fuzzy` passes either the original list of projects or an internal object
@@ -22,7 +20,7 @@ const searchProjects = (projects: Project[]) => {
       require('fuzzy')
         .filter(input, projects, {
           extract(el: Project) {
-            return `${el.id} ${el.name} ${el.permission}`;
+            return `${el.projectId} ${el.displayName}`;
           }
         })
         .map((result: Project | { original: Project }) => {
@@ -33,9 +31,9 @@ const searchProjects = (projects: Project[]) => {
             original = result.original;
           }
           return {
-            name: `${original.id} (${original.name})`,
-            title: original.name,
-            value: original.id
+            name: `${original.displayName} (${original.projectId})`,
+            title: original.displayName,
+            value: original.projectId
           };
         })
     );