backend-manager 3.2.114 → 3.2.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.114",
+  "version": "3.2.115",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/helpers/assistant.js

@@ -139,8 +139,16 @@ BackendAssistant.prototype.init = function (ref, options) {
     https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-CH-UA
   */
 
-  self.request.type = (self.ref.req.xhr || _.get(self.ref.req, 'headers.accept', '').indexOf('json') > -1) || (_.get(self.ref.req, 'headers.content-type', '').indexOf('json') > -1) ? 'ajax' : 'form';
-  self.request.path = (self.ref.req.path || '');
+  // Set request type
+  if (
+    self.ref.req.xhr || (self.ref.req?.headers?.accept || '').includes('json')
+    || (self.ref.req?.headers?.['content-type'] || '').includes('json')
+  ) {
+    self.request.type = 'ajax';
+  } else {
+    self.request.type = 'form';
+  }
+  self.request.path = self.ref.req.path || '';
   self.request.user = self.resolveAccount({authenticated: false});
 
   // Set body and query
@@ -602,8 +610,8 @@ BackendAssistant.prototype.authenticate = async function (options) {
     // Check with custom BEM Token
     let storedApiKey;
     try {
-      const workingConfig = _.get(self.Manager, 'config') || functions.config();
-      storedApiKey = _.get(workingConfig, 'backend_manager.key', '')
+      const workingConfig = self.Manager?.config || functions.config();
+      const storedApiKey = workingConfig?.backend_manager?.key || '';
     } catch (e) {
 
     }
@@ -875,13 +883,18 @@ BackendAssistant.prototype.parseMultipartFormData = function (options) {
       return reject(new Error('Cannot run .parseMultipartForm() until .init() has been called'));
     }
     const existingData = self.request.multipartData;
-    // console.log('-----existingData', existingData, Object.keys(_.get(existingData, 'fields', {})).length, Object.keys(_.get(existingData, 'files', {})).length);
-    if (Object.keys(_.get(existingData, 'fields', {})).length + Object.keys(_.get(existingData, 'files', {})).length > 0) {
+    const getFields = existingData?.fields || {};
+    const getFiles = existingData?.files || {};
+
+    // If there are already fields or files, return them
+    if (Object.keys(getFields).length + Object.keys(getFiles).length > 0) {
       return resolve(existingData);
     }
 
+    // Set options
     options = options || {};
 
+    // Set headers
     const fs = require('fs');
     const req = self.ref.req;
     const res = self.ref.res;

package/src/manager/index.js

@@ -50,6 +50,7 @@ Manager.prototype.init = function (exporter, options) {
   options.setupFunctions = typeof options.setupFunctions === 'undefined' ? true : options.setupFunctions;
   options.setupFunctionsLegacy = typeof options.setupFunctionsLegacy === 'undefined' ? false : options.setupFunctionsLegacy;
   options.setupFunctionsIdentity = typeof options.setupFunctionsIdentity === 'undefined' ? true : options.setupFunctionsIdentity;
+  options.setupServer = typeof options.setupServer === 'undefined' ? true : options.setupServer;
   options.initializeLocalStorage = typeof options.initializeLocalStorage === 'undefined' ? false : options.initializeLocalStorage;
   options.resourceZone = typeof options.resourceZone === 'undefined' ? 'us-central1' : options.resourceZone;
   options.sentry = typeof options.sentry === 'undefined' ? true : options.sentry;
@@ -67,7 +68,7 @@ Manager.prototype.init = function (exporter, options) {
   // Load libraries
   self.libraries = {
     // Third-party
-    functions: require('firebase-functions'),
+    functions: options.projectType === 'firebase' ? require('firebase-functions') : null,
     admin: require('firebase-admin'),
     cors: require('cors')({ origin: true }),
     sentry: null,
@@ -92,7 +93,7 @@ Manager.prototype.init = function (exporter, options) {
   self.package = resolveProjectPackage();
   self.config = merge(
     requireJSON5(self.project.backendManagerConfigPath),
-    self.libraries.functions.config()
+    self.libraries.functions ? self.libraries.functions.config() : {}
   );
 
   // Saved config
@@ -224,7 +225,7 @@ Manager.prototype.init = function (exporter, options) {
   }
 
   // Setup custom server
-  if (options.projectType === 'custom') {
+  if (options.projectType === 'custom' && options.setupServer) {
     self.setupCustomServer(exporter, options);
   }
 
@@ -356,8 +357,12 @@ Manager.prototype._preProcess = function (mod) {
 
 Manager.prototype.Assistant = function(ref, options) {
   const self = this;
+
+  // Set options defaults
   ref = ref || {};
   options = options || {};
+
+  // Create assistant instance
   return (new self.libraries.Assistant()).init({
     req: ref.req,
     res: ref.res,
@@ -365,26 +370,6 @@ Manager.prototype.Assistant = function(ref, options) {
     functions: self.libraries.functions,
     Manager: self,
   }, options)
-  // return (new self.libraries.Assistant()).init({
-  //   req: ref.req,
-  //   res: ref.res,
-  //   admin: self.libraries.admin,
-  //   functions: self.libraries.functions,
-  //   Manager: self,
-  // }, {
-  //   accept: options.accept,
-  //   functionName: options.functionName,
-  //   functionType: options.functionType,
-  // })
-  // self._inner.ip = (!self._inner.ip || self._inner.ip === '127.0.0.1') ? ass.request.ip : self._inner.ip;
-  // self._inner.country = self._inner.country || ass.request.country;
-  // self._inner.referrer = self._inner.referrer || ass.request.referrer;
-  // self._inner.userAgent = (!self._inner.userAgent || self._inner.userAgent === 'empty') ? ass.request.userAgent : self._inner.userAgent;
-  // self._inner.name = self._inner.name || ass.meta.name;
-  // if (ref.req) {
-  //   console.log('ref.req.headers', ref.req.headers);
-  // }
-  // console.log('self._inner', self._inner);
 };
 
 Manager.prototype.User = function () {