Merge branch 'master' into joehanley-ext-links-to-console

src/commands/auth-export.js

@@ -8,7 +8,7 @@ var Command = require("../command");
 var accountExporter = require("../accountExporter");
 var getProjectId = require("../getProjectId");
 var logger = require("../logger");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 
 var MAX_BATCH_SIZE = 1000;
 

src/commands/auth-import.js

@@ -10,7 +10,7 @@ var Command = require("../command");
 var accountImporter = require("../accountImporter");
 var getProjectId = require("../getProjectId");
 var logger = require("../logger");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 
 var MAX_BATCH_SIZE = 1000;

src/commands/database-get.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var request = require("request");
 var api = require("../api");
 var responseToError = require("../responseToError");

src/commands/database-instances-create.ts

@@ -1,6 +1,6 @@
 import Command = require("../command");
 import logger = require("../logger");
-import requirePermissions = require("../requirePermissions");
+import { requirePermissions } from "../requirePermissions";
 import getProjectNumber = require("../getProjectNumber");
 import firedata = require("../gcp/firedata");
 

src/commands/database-instances-list.ts

@@ -1,6 +1,6 @@
 import Command = require("../command");
 import logger = require("../logger");
-import requirePermissions = require("../requirePermissions");
+import { requirePermissions } from "../requirePermissions";
 import getProjectNumber = require("../getProjectNumber");
 import firedata = require("../gcp/firedata");
 

src/commands/database-profile.js

@@ -4,7 +4,7 @@ var _ = require("lodash");
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 var profiler = require("../profiler");
 

src/commands/database-push.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var request = require("request");
 var api = require("../api");
 var responseToError = require("../responseToError");

src/commands/database-remove.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var DatabaseRemove = require("../database/remove").default;
 var api = require("../api");
 

src/commands/database-set.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var request = require("request");
 var api = require("../api");
 var responseToError = require("../responseToError");

src/commands/database-settings-get.ts

@@ -6,7 +6,7 @@ import * as responseToError from "../responseToError";
 import * as Command from "../command";
 import * as logger from "../logger";
 import { FirebaseError } from "../error";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 import * as api from "../api";
 import * as requireInstance from "../requireInstance";

src/commands/database-settings-set.ts

@@ -6,7 +6,7 @@ import * as responseToError from "../responseToError";
 import * as Command from "../command";
 import * as logger from "../logger";
 import { FirebaseError } from "../error";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 import * as api from "../api";
 import * as requireInstance from "../requireInstance";

src/commands/database-update.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var request = require("request");
 var api = require("../api");
 var responseToError = require("../responseToError");

src/commands/deploy.js

@@ -3,7 +3,7 @@
 var _ = require("lodash");
 
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var checkDupHostingKeys = require("../checkDupHostingKeys");
 var checkValidTargetFilters = require("../checkValidTargetFilters");
 var checkFirebaseSDKVersion = require("../checkFirebaseSDKVersion");

src/commands/experimental-functions-shell.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var Command = require("../command");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var requireConfig = require("../requireConfig");
 var action = require("../functionsShellCommandAction");
 

src/commands/ext-configure.ts

@@ -10,7 +10,7 @@ import * as getProjectId from "../getProjectId";
 import * as extensionsApi from "../extensions/extensionsApi";
 import { logPrefix } from "../extensions/extensionsHelper";
 import * as paramHelper from "../extensions/paramHelper";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 import * as logger from "../logger";
 
@@ -21,7 +21,7 @@ marked.setOptions({
 /**
  * Command for configuring an existing extension instance
  */
-export default new Command("ext:configure <instanceId>")
+export default new Command("ext:configure <extensionInstanceId>")
   .description("configure an existing extension instance")
   .option("--params <paramsFile>", "path of params file with .env format.")
   .before(requirePermissions, ["firebasemods.instances.update", "firebasemods.instances.get"])

src/commands/ext-info.ts

@@ -6,7 +6,7 @@ import { resolveSource } from "../extensions/resolveSource";
 import * as extensionsApi from "../extensions/extensionsApi";
 import { ensureExtensionsApiEnabled, logPrefix } from "../extensions/extensionsHelper";
 import * as logger from "../logger";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 
 import * as marked from "marked";

src/commands/ext-install.ts

@@ -21,7 +21,7 @@ import {
   logPrefix,
   promptForValidInstanceId,
 } from "../extensions/extensionsHelper";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 import * as logger from "../logger";
 

src/commands/ext-list.ts

@@ -2,7 +2,7 @@ import * as Command from "../command";
 import * as getProjectId from "../getProjectId";
 import { listExtensions } from "../extensions/listExtensions";
 import { ensureExtensionsApiEnabled } from "../extensions/extensionsHelper";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 
 module.exports = new Command("ext:list")
   .description("list all the extensions that are installed in your Firebase project")

src/commands/ext-uninstall.ts

@@ -8,7 +8,7 @@ import { iam } from "../gcp";
 import * as extensionsApi from "../extensions/extensionsApi";
 import { ensureExtensionsApiEnabled, logPrefix } from "../extensions/extensionsHelper";
 import { promptOnce } from "../prompt";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 
 export default new Command("ext:uninstall <extensionInstanceId>")

src/commands/ext-update.ts

@@ -12,7 +12,7 @@ import * as extensionsApi from "../extensions/extensionsApi";
 import { ensureExtensionsApiEnabled, logPrefix } from "../extensions/extensionsHelper";
 import * as paramHelper from "../extensions/paramHelper";
 import { displayChanges, update, UpdateOptions } from "../extensions/updateHelper";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as utils from "../utils";
 
 marked.setOptions({
@@ -22,7 +22,7 @@ marked.setOptions({
 /**
  * Command for updating an existing extension instance
  */
-export default new Command("ext:update <instanceId>")
+export default new Command("ext:update <extensionInstanceId>")
   .description("update an existing extension instance to the latest version")
   .before(requirePermissions, ["firebasemods.instances.update", "firebasemods.instances.get"])
   .before(ensureExtensionsApiEnabled)

src/commands/ext.ts

@@ -4,7 +4,7 @@ import * as clc from "cli-color";
 import * as Command from "../command";
 import * as getProjectId from "../getProjectId";
 import { listExtensions } from "../extensions/listExtensions";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as logger from "../logger";
 
 module.exports = new Command("ext")

src/commands/firestore-delete.js

@@ -4,7 +4,7 @@ var clc = require("cli-color");
 var Command = require("../command");
 var FirestoreDelete = require("../firestore/delete");
 var { prompt } = require("../prompt");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 
 var _getConfirmationMessage = function(deleteOp, options) {

src/commands/firestore-indexes-list.ts

@@ -2,7 +2,7 @@ import * as Command from "../command";
 import * as clc from "cli-color";
 import * as fsi from "../firestore/indexes";
 import * as logger from "../logger";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 
 module.exports = new Command("firestore:indexes")
   .description("List indexes in your project's Cloud Firestore database.")

src/commands/functions-config-clone.js

@@ -5,7 +5,7 @@ var Command = require("../command");
 var functionsConfig = require("../functionsConfig");
 var functionsConfigClone = require("../functionsConfigClone");
 var getProjectId = require("../getProjectId");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 var logger = require("../logger");
 

src/commands/functions-config-get.js

@@ -4,7 +4,7 @@ var _ = require("lodash");
 var Command = require("../command");
 var getProjectId = require("../getProjectId");
 var logger = require("../logger");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var functionsConfig = require("../functionsConfig");
 
 function _materialize(projectId, path) {

src/commands/functions-config-legacy.js

@@ -4,7 +4,7 @@ var _ = require("lodash");
 
 var Command = require("../command");
 var getProjectId = require("../getProjectId");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var runtimeconfig = require("../gcp/runtimeconfig");
 var functionsConfig = require("../functionsConfig");
 var logger = require("../logger");

src/commands/functions-config-set.js

@@ -4,7 +4,7 @@ var clc = require("cli-color");
 
 var Command = require("../command");
 var getProjectId = require("../getProjectId");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var logger = require("../logger");
 var utils = require("../utils");
 var functionsConfig = require("../functionsConfig");

src/commands/functions-config-unset.js

@@ -7,7 +7,7 @@ var Command = require("../command");
 var functionsConfig = require("../functionsConfig");
 var getProjectId = require("../getProjectId");
 var logger = require("../logger");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 var runtimeconfig = require("../gcp/runtimeconfig");
 

src/commands/functions-delete.js

@@ -10,7 +10,7 @@ var functionsDelete = require("../functionsDelete");
 var getProjectId = require("../getProjectId");
 var helper = require("../functionsDeployHelper");
 var { prompt } = require("../prompt");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var utils = require("../utils");
 
 module.exports = new Command("functions:delete [filters...]")

src/commands/functions-log.ts

@@ -7,7 +7,7 @@ import { FirebaseError } from "../error";
 import * as gcp from "../gcp";
 import * as getProjectId from "../getProjectId";
 import * as logger from "../logger";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 
 module.exports = new Command("functions:log")
   .description("read logs from deployed functions")

src/commands/functions-shell.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var Command = require("../command");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var requireConfig = require("../requireConfig");
 var action = require("../functionsShellCommandAction");
 

src/commands/hosting-disable.js

@@ -2,7 +2,7 @@
 
 var Command = require("../command");
 var requireInstance = require("../requireInstance");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var api = require("../api");
 var utils = require("../utils");
 var { prompt } = require("../prompt");

src/commands/open.ts

@@ -7,7 +7,7 @@ import * as api from "../api";
 import * as Command from "../command";
 import * as logger from "../logger";
 import { promptOnce } from "../prompt";
-import * as requirePermissions from "../requirePermissions";
+import { requirePermissions } from "../requirePermissions";
 import * as requireInstance from "../requireInstance";
 import * as utils from "../utils";
 

src/commands/serve.js

@@ -6,7 +6,7 @@ var _ = require("lodash");
 var Command = require("../command");
 var logger = require("../logger");
 var utils = require("../utils");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 var requireConfig = require("../requireConfig");
 var checkDupHostingKeys = require("../checkDupHostingKeys");
 var serve = require("../serve/index");

src/commands/setup-web.js

@@ -5,7 +5,7 @@ var fs = require("fs");
 var Command = require("../command");
 var { fetchWebSetup } = require("../fetchWebSetup");
 var logger = require("../logger");
-var requirePermissions = require("../requirePermissions");
+var { requirePermissions } = require("../requirePermissions");
 
 var JS_TEMPLATE = fs.readFileSync(__dirname + "/../../templates/setup/web.js", "utf8");
 

src/init/features/firestore/index.ts

@@ -1,13 +1,13 @@
 import { ensureLocationSet } from "../../../ensureCloudResourceLocation";
-import requireAccess = require("../../../requireAccess");
+import { requirePermissions } from "../../../requirePermissions";
 import * as rules from "./rules";
 import * as indexes from "./indexes";
 
 export async function doSetup(setup: any, config: any): Promise<void> {
   setup.config.firestore = {};
 
   ensureLocationSet(setup.projectLocation, "Cloud Firestore");
-  await requireAccess.requireAccess({ project: setup.projectId });
+  await requirePermissions({ project: setup.projectId });
   await rules.initRules(setup, config);
   await indexes.initIndexes(setup, config);
 }

src/init/features/functions/index.js

@@ -7,8 +7,7 @@ var _ = require("lodash");
 var logger = require("../../../logger");
 var { prompt } = require("../../../prompt");
 var enableApi = require("../../../ensureApiEnabled").enable;
-var requireAccess = require("../../../requireAccess").requireAccess;
-var scopes = require("../../../scopes");
+var { requirePermissions } = require("../../../requirePermissions");
 
 module.exports = function(setup, config) {
   logger.info();
@@ -22,14 +21,14 @@ module.exports = function(setup, config) {
 
   setup.functions = {};
   var projectId = _.get(setup, "rcfile.projects.default");
-  var enableApis;
+  var enableApis = Promise.resolve();
   if (projectId) {
-    enableApis = requireAccess({ project: projectId }, [scopes.CLOUD_PLATFORM]).then(function() {
-      enableApi(projectId, "cloudfunctions.googleapis.com");
-      enableApi(projectId, "runtimeconfig.googleapis.com");
+    enableApis = requirePermissions({ project: projectId }).then(() => {
+      return Promise.all([
+        enableApi(projectId, "cloudfunctions.googleapis.com"),
+        enableApi(projectId, "runtimeconfig.googleapis.com"),
+      ]);
     });
-  } else {
-    enableApis = Promise.resolve();
   }
   return enableApis.then(function() {
     return prompt(setup.functions, [