Merge branch 'master' of github.com:firebase/firebase-tools into laun…

…ch.multisite
firebase · Aug 20, 2018 · 83df772 · 83df772
2 parents c47b1d2 + 30ff32a
commit 83df772
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 42 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1 +0,0 @@
-fixed - Cached Hosting file hashes should be located at the project root.

diff --git a/commands/deploy.js b/commands/deploy.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var acquireRefs = require("../lib/acquireRefs");
+var requireAccess = require("../lib/requireAccess");
 var clc = require("cli-color");
 var checkDupHostingKeys = require("../lib/checkDupHostingKeys");
 var checkValidTargetFilters = require("../lib/checkValidTargetFilters");
@@ -30,7 +30,7 @@ module.exports = new Command("deploy")
   .option("--except <targets>", 'deploy to all targets except specified (e.g. "database")')
   .before(requireConfig)
   .before(function(options) {
-    return acquireRefs(options, [scopes.CLOUD_PLATFORM]).catch(function(err) {
+    return requireAccess(options, [scopes.CLOUD_PLATFORM]).catch(function(err) {
       if (options.config.has("functions")) {
         throw err;
       }
@@ -42,7 +42,7 @@ module.exports = new Command("deploy")
       utils.logWarning(clc.bold("Please run " + clc.underline("firebase login --reauth")));
       logger.info();
 
-      return acquireRefs(options, []);
+      return requireAccess(options, []);
     });
   })
   .before(checkDupHostingKeys)

diff --git a/lib/acquireRefs.js b/lib/acquireRefs.js
diff --git a/lib/requireAccess.js b/lib/requireAccess.js
@@ -3,7 +3,6 @@
 var _ = require("lodash");
 var clc = require("cli-color");
 
-var api = require("./api");
 var getInstanceId = require("./getInstanceId");
 var getProjectId = require("./getProjectId");
 var FirebaseError = require("./error");
@@ -24,10 +23,6 @@ module.exports = function(options, authScopes) {
     })
     .then(function(instance) {
       options.instance = instance;
-      return api.request("GET", "/v1/database/" + options.instance + "/tokens", { auth: true });
-    })
-    .then(function(res) {
-      options.metadataToken = res.body.metadata;
       return;
     })
     .catch(function(err) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Command-Line Interface for Firebase",
   "main": "index.js",
   "bin": {