small refactors to address comments

Author: victoriahuang1

README.md

@@ -34,6 +34,10 @@ API access is available only to users with active subscriptions. Visit https://a
 
 ## Deploy Firebase
 
+### Prerequisites
+
+ `npm` and `firebase-tools` must be installed in order to deploy to Firebase. You can follow the instructions at https://firebase.google.com/docs/cli#install_the_firebase_cli.
+
 ### Usage
 
 `flutterflow deploy-firebase --project <project id> --dest <output folder> --token <token>`
@@ -47,7 +51,6 @@ API access is available only to users with active subscriptions. Visit https://a
 | ----------- | ----------- | ----------- |
 | `--project`      | `-p`       | [Required or environment variable] Project ID. |
 | `--token`      | `-t`       | [Required or environment variable] API Token. |
-| `--dest`   | `-d`        | [Optional] Output folder. Defaults to the current directory if none is specified. |
 
 ## Issues
 

bin/flutterflow_cli.dart

@@ -58,11 +58,10 @@ void main(List<String> args) async {
           exportAsModule: parsedArguments.command!['as-module'],
         );
         break;
-      case 'firebase-deploy':
+      case 'deploy-firebase':
         await firebaseDeploy(
           token: token,
           projectId: project,
-          destinationPath: parsedArguments.command!['dest'],
           endpoint: endpoint,
         );
         break;
@@ -112,17 +111,15 @@ ArgResults _parseArgs(List<String> args) {
     );
 
   final firebaseDeployCommandParser = ArgParser()
-    ..addOption('project', abbr: 'p', help: 'Project id')
-    ..addOption('dest',
-        abbr: 'd', help: 'Destination directory', defaultsTo: '.');
+    ..addOption('project', abbr: 'p', help: 'Project id');
 
   final parser = ArgParser()
     ..addOption('endpoint', abbr: 'e', help: 'Endpoint', hide: true)
     ..addOption('environment', help: 'Environment', hide: true)
     ..addOption('token', abbr: 't', help: 'API Token')
     ..addFlag('help', negatable: false, abbr: 'h', help: 'Help')
     ..addCommand('export-code', exportCodeCommandParser)
-    ..addCommand('firebase-deploy', firebaseDeployCommandParser);
+    ..addCommand('deploy-firebase', firebaseDeployCommandParser);
 
   late ArgResults parsed;
   try {

lib/src/flutterflow_api_client.dart

@@ -283,15 +283,13 @@ Future _runFix({
 Future firebaseDeploy({
   required String token,
   required String projectId,
-  required String destinationPath,
   String endpoint = kDefaultEndpoint,
 }) async {
   final endpointUrl = Uri.parse(endpoint);
   final body = jsonEncode({
     'project': {
       'path': 'projects/$projectId',
     },
-    'token': token,
   });
   final result = await _callEndpoint(
     client: http.Client(),
@@ -304,47 +302,51 @@ Future firebaseDeploy({
   // Download actual code
   final projectZipBytes = base64Decode(result['firebase_zip']);
   final firebaseProjectId = result['firebase_project_id'];
+  final tmpFolder =
+      Directory.systemTemp.createTempSync('${projectId}_$firebaseProjectId');
   final projectFolder = ZipDecoder().decodeBytes(projectZipBytes);
-  extractArchiveToCurrentDirectory(projectFolder, destinationPath);
-  final firebaseDir = '$destinationPath/firebase';
-
-  // Install required modules for deployment.
-  await Process.run(
-    'npm',
-    ['install'],
-    workingDirectory: '$firebaseDir/functions',
-    runInShell: true,
-    stdoutEncoding: utf8,
-    stderrEncoding: utf8,
-  );
-  final directoriesResult = await Process.run(
-    'ls',
-    [],
-    workingDirectory: firebaseDir,
-    runInShell: true,
-    stdoutEncoding: utf8,
-    stderrEncoding: utf8,
-  );
+  extractArchiveToCurrentDirectory(projectFolder, tmpFolder.path);
+  final firebaseDir = '${tmpFolder.path}/firebase';
 
-  // This directory only exists if there were custom cloud functions.
-  if (directoriesResult.stdout.contains('custom_cloud_functions')) {
+  try {
+    // Install required modules for deployment.
     await Process.run(
       'npm',
       ['install'],
-      workingDirectory: '$firebaseDir/custom_cloud_functions',
+      workingDirectory: '$firebaseDir/functions',
       runInShell: true,
       stdoutEncoding: utf8,
       stderrEncoding: utf8,
     );
-  }
+    final directoriesResult = tmpFolder.listSync(recursive: true);
 
-  final deployProcess = await Process.start(
-    'firebase',
-    ['deploy', '--project', firebaseProjectId],
-    workingDirectory: firebaseDir,
-    runInShell: true,
-  );
-  // There may be a need for the user to interactively provide inputs.
-  deployProcess.stdout.transform(utf8.decoder).forEach(print);
-  deployProcess.stdin.addStream(stdin);
+    // This directory only exists if there were custom cloud functions.
+    if (directoriesResult.map((f) => f.path).any(
+        (path) => path.startsWith('$firebaseDir/custom_cloud_functions'))) {
+      await Process.run(
+        'npm',
+        ['install'],
+        workingDirectory: '$firebaseDir/custom_cloud_functions',
+        runInShell: true,
+        stdoutEncoding: utf8,
+        stderrEncoding: utf8,
+      );
+    }
+
+    final deployProcess = await Process.start(
+      'firebase',
+      ['deploy', '--project', firebaseProjectId],
+      workingDirectory: firebaseDir,
+      runInShell: true,
+    );
+    // There may be a need for the user to interactively provide inputs.
+    deployProcess.stdout.transform(utf8.decoder).forEach(print);
+    deployProcess.stdin.addStream(stdin);
+    final exitCode = await deployProcess.exitCode;
+    if (exitCode != 0) {
+      stderr.write('Failed to deploy to Firebase.\n');
+    }
+  } finally {
+    tmpFolder.deleteSync(recursive: true);
+  }
 }