remove dependency on api.getSecret

firebase · Jul 7, 2016 · e3872c5 · e3872c5
1 parent 1438d31
commit e3872c5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/lib/acquireRefs.js b/lib/acquireRefs.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var FirebaseError = require('./error');
 var api = require('./api');
 var Firebase = require('firebase');
 var RSVP = require('rsvp');
@@ -9,17 +8,8 @@ var requireAccess = require('./requireAccess');
 
 module.exports = function(options, authScopes) {
   return requireAccess(options, authScopes).then(function() {
-    return new RSVP.Promise(function(resolve, reject) {
-      var firebaseRef = new Firebase(utils.addSubdomain(api.realtimeOrigin, 'firebase'));
-      firebaseRef.authWithCustomToken(options.metadataToken, function(err) {
-        if (err) {
-          return reject(new FirebaseError('Failed to authenticate to Firebase', {
-            original: err
-          }));
-        }
-        options.firebaseRef = firebaseRef;
-        resolve();
-      });
-    });
+    var firebaseRef = new Firebase(utils.addSubdomain(api.realtimeOrigin, 'firebase'));
+    options.firebaseRef = firebaseRef;
+    return RSVP.resolve();
   });
 };
diff --git a/lib/api.js b/lib/api.js
@@ -168,14 +168,6 @@ var api = {
         exit: 2
       }));
     });
-  },
-  getSecret: function(instance, adminToken) {
-    return api.request('GET', '/.settings/secrets.json', {
-      origin: utils.addSubdomain(api.realtimeOrigin, instance),
-      query: {auth: adminToken}
-    }).then(function(response) {
-      return response.body[0];
-    });
   }
 };
 

diff --git a/lib/deploy/functions/deploy.js b/lib/deploy/functions/deploy.js
@@ -25,7 +25,6 @@ module.exports = function(context, options, payload) {
       origin: api.deployOrigin
     });
   };
-
   if (options.config.get('functions')) {
     utils.logBullet(chalk.cyan.bold('functions:') + ' preparing ' + chalk.bold(options.config.get('functions.source')) + ' directory for uploading...');
 

diff --git a/lib/deploy/hosting/deploy.js b/lib/deploy/hosting/deploy.js
@@ -110,6 +110,9 @@ module.exports = function(context, options, payload) {
           }
         },
         origin: api.deployOrigin
+      }).then(function() {
+        utils.logSuccess(chalk.green.bold('hosting:') + ' ' + chalk.bold(payload.hosting.public) + ' folder uploaded successfully');
+        resolve();
       }).catch(reject);
     });
   });

diff --git a/lib/prepareFunctionsUpload.js b/lib/prepareFunctionsUpload.js
@@ -42,20 +42,17 @@ var _prepareSource = function(options) {
     }
   }
 
-  return api.getSecret(options.instance, options.databaseAdminToken).then(function(secret) { // maybe not needed?
-    _.assign(env, {
-      firebase: {
-        database: {
-          url: utils.addSubdomain(api.realtimeOrigin, options.instance),
-          secret: secret
-        }
+  _.assign(env, {
+    firebase: {
+      database: {
+        url: utils.addSubdomain(api.realtimeOrigin, options.instance)
       }
-    });
-
-    fs.ensureFileSync(envDestPath);
-    fs.writeFileSync(envDestPath, JSON.stringify(env, null, 2));
-    return tmpdir;
+    }
   });
+
+  fs.ensureFileSync(envDestPath);
+  fs.writeFileSync(envDestPath, JSON.stringify(env, null, 2));
+  return tmpdir;
 };
 
 var TRIGGER_PARSER = path.resolve(__dirname, './triggerParser.js');
@@ -140,12 +137,9 @@ var _packageSource = function(options, tmpdir) {
 };
 
 module.exports = function(options) {
-  var tmpdir;
-  return _prepareSource(options).then(function(result) {
-    tmpdir = result;
-    return _parseTriggers(options, tmpdir);
-  }).then(function(triggers) {
-    // respect any manually defined triggers in firebase.json
+  var tmpdir = _prepareSource(options);
+  return _parseTriggers(options, tmpdir).then(function(triggers) {
+   // respect any manually defined triggers in firebase.json
     options.config.set('functions.triggers',
       options.config.get('functions.triggers', []).concat(triggers)
     );