backend-manager 2.4.24 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.4.24",
+  "version": "2.5.0",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -66,4 +66,4 @@
     "src/",
     "templates/"
   ]
-}
+}

package/src/cli/cli.js

@@ -11,13 +11,13 @@ const path = require('path');
 const chalk = require('chalk');
 const _ = require('lodash');
 const log = console.log;
-let NpmApi = require('npm-api');
+const Npm = require('npm-api');
 const semver = require('semver');
-let inquirer = require('inquirer');
+const inquirer = require('inquirer');
 const { spawn } = require('child_process');
-let argv = require('yargs').argv;
 const JSON5 = require('json5');
-const fetch = require('node-fetch');
+const fetch = require('wonderful-fetch');
+const argv = require('yargs').argv;
 
 // function parseArgumentsIntoOptions(rawArgs) {
 //   const args = arg(
@@ -252,8 +252,9 @@ Main.prototype.setup = async function () {
   // tests
   self.projectName = self.firebaseRC.projects.default;
   self.projectUrl = `https://console.firebase.google.com/project/${self.projectName}`;
-  log(chalk.black(`Id: `, chalk.bold(`${self.projectName}`)));
-  log(chalk.black(`Url:`, chalk.bold(`${self.projectUrl}`)));
+  
+  log(`Id: `, chalk.bold(`${self.projectName}`));
+  log(`Url:`, chalk.bold(`${self.projectUrl}`));
 
   if (!self.package || !self.package.engines || !self.package.engines.node) {
     throw new Error('Missing <engines.node> in package.json')
@@ -566,29 +567,13 @@ Main.prototype.setup = async function () {
   // const prepareStatsURL = `https://us-central1-${_.get(self.firebaseRC, 'projects.default')}.cloudfunctions.net/bm_api?authenticationToken=undefined`;
   const statsFetchResult = await fetch(prepareStatsURL, {
     method: 'post',
-    body: JSON.stringify({
+    timeout: 10000,
+    response: 'json',
+    body: {
       command: 'admin:get-stats',
-    }),
-    timeout: 3000,
-  })
-  .then(async (res) => {
-    if (!res.ok) {
-      return res.text()
-        .then(data => {
-          throw new Error(data || res.statusText || 'Unknown error.');
-        })
-        .catch(e => e)
-    } else {
-      return res.text()
-      .then(data => {
-        try {
-          return JSON5.parse(data);
-        } catch (e) {
-          return e;
-        }
-      })
-    }
+    },
   })
+  .then(json => json)
   .catch(e => e);
 
   if (statsFetchResult instanceof Error) {
@@ -659,7 +644,7 @@ Main.prototype.test = async function(name, fn, fix, args) {
       status = chalk.red('failed');
       self.testTotal++;
     }
-    log(chalk.black.bold(`[${self.testTotal}]`), chalk.black(`${name}:`), status);
+    log(chalk.bold(`[${self.testTotal}]`), `${name}:`, status);
     if (!passed) {
       log(chalk.yellow(`Fixing...`));
       fix(self, args)
@@ -1060,7 +1045,7 @@ function fix_firebaseHosting(self) {
 
 function getPkgVersion(package) {
   return new Promise(async function(resolve, reject) {
-    let npm = new NpmApi();
+    let npm = new Npm();
     npm.repo(package)
     .package()
       .then(function(pkg) {

package/src/manager/functions/core/actions/api/user/regenerate-api-keys.js

@@ -0,0 +1,53 @@
+const uuid4 = require('uuid').v4;
+const UIDGenerator = require('uid-generator');
+const _ = require('lodash')
+const powertools = require('node-powertools')
+const uidgen = new UIDGenerator(256);
+
+function Module() {
+
+}
+
+Module.prototype.main = function () {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
+
+  return new Promise(async function(resolve, reject) {
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
+      const keys = powertools.arrayify(_.get(payload.data.payload, 'keys') || ['clientId', 'privateKey']);
+      const newKeys = {};
+
+      keys
+      .forEach(key => {
+        if (key.match(/client/ig)) {
+          newKeys.clientId = uuid4();
+        } else if (key.match(/private/ig)) {
+          newKeys.privateKey = uidgen.generateSync();
+        }
+      });
+
+      self.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
+      .set({
+        api: newKeys,
+      }, {merge: true})
+      .then(r => {
+        return resolve({data: newKeys});
+      })
+      .catch(e => {
+        return reject(assistant.errorManager(`Failed to generate keys: ${e}`, {code: 500, sentry: true, send: false, log: false}).error)
+      })      
+
+    })
+    .catch(e => {
+      return reject(e);
+    })
+  });
+
+};
+
+
+module.exports = Module;

package/src/manager/functions/core/actions/api.js

@@ -48,6 +48,10 @@ Module.prototype.main = function() {
       self.payload.data = assistant.request.data;
       self.payload.user = await assistant.authenticate();
 
+      if (self.assistant.request.method === 'OPTIONS') {
+        return resolve();
+      }
+
       const resolved = self.resolveCommand(self.payload.data.command);
 
       self.assistant.log(`Executing: ${resolved.command}`, self.payload, JSON.stringify(self.payload), {environment: 'production'})

package/src/manager/index.js

@@ -400,7 +400,6 @@ Manager.prototype.init = function (exporter, options) {
 Manager.prototype._process = function (mod) {
   const self = this;
   const name = mod.assistant.meta.name;
-  const method = mod.assistant.request.method;
   const hook = self.handlers && self.handlers[name];
   const req = mod.req;
   const res = mod.res;
@@ -408,11 +407,6 @@ Manager.prototype._process = function (mod) {
   return new Promise(async function(resolve, reject) {
     let error;
 
-    console.log('---REQ', method, mod.assistant.request);
-    if (method === 'OPTIONS') {
-      return resolve();
-    }
-
     function _reject(e, log) {
       if (log) {
         // self.assistant.error(e, {environment: 'production'});