backend-manager 2.4.6 → 2.4.9

package/package.json

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

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

@@ -21,9 +21,13 @@ Module.prototype.main = function () {
     if (!payload.user.roles.admin) {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
     } else {
-      const client = new self.libraries.admin.firestore.v1.FirestoreAdminClient({});
-      const projectId = self.Manager.project.projectId;
-      const resourceZone = self.Manager.project.resourceZone;
+      const client = new self.libraries.admin.firestore.v1.FirestoreAdminClient({
+        credential: Manager.libraries.admin.credential.cert(
+          require(Manager.project.serviceAccountPath)
+        ),
+      });
+      const projectId = Manager.project.projectId;
+      const resourceZone = Manager.project.resourceZone;
       const databaseName = client.databasePath(projectId, '(default)');
       const bucketName = `bm-backup-firestore-${projectId}`;
       const bucketAddress = `gs://${bucketName}`;

package/src/manager/index.js

@@ -63,20 +63,14 @@ Manager.prototype.init = function (exporter, options) {
     Analytics: null,
   };
 
-  // Manager inner variables
-  // self._inner = {
-  //   ip: '',
-  //   country: '',
-  //   referrer: '',
-  //   userAgent: '',
-  // };
-
   // Set properties
+  self.cwd = process.cwd();
+
   self.options = options;
   self.project = options.firebaseConfig || JSON.parse(process.env.FIREBASE_CONFIG || '{}');
   self.project.resourceZone = options.resourceZone;
+  self.project.serviceAccountPath = path.resolve(self.cwd, options.serviceAccountPath)
 
-  self.cwd = process.cwd();
   self.package = resolveProjectPackage();
   self.config = merge(
     require(path.resolve(self.cwd, 'backend-manager-config.json')),
@@ -86,13 +80,13 @@ Manager.prototype.init = function (exporter, options) {
   // Init assistant
   self.assistant = self.Assistant().init(undefined, options.assistant);
 
-  process.env.ENVIRONMENT = !process.env.ENVIRONMENT ? self.assistant.meta.environment : process.env.ENVIRONMENT;
-
-  // set more properties (need to wait for assistant to determine if DEV)
+  // Set more properties (need to wait for assistant to determine if DEV)
   self.project.functionsUrl = self.assistant.meta.environment === 'development'
     ? `http://localhost:5001/${self.project.projectId}/${self.project.resourceZone}`
     : `https://${self.project.resourceZone}-${self.project.projectId}.cloudfunctions.net`;
 
+  process.env.ENVIRONMENT = !process.env.ENVIRONMENT ? self.assistant.meta.environment : process.env.ENVIRONMENT;
+
   // Use the working Firebase logger that they disabled for whatever reason
   if (self.assistant.meta.environment !== 'development' && options.useFirebaseLogger) {
     require('firebase-functions/lib/logger/compat');
@@ -137,7 +131,7 @@ Manager.prototype.init = function (exporter, options) {
       } else {
         self.libraries.initializedAdmin = self.libraries.admin.initializeApp({
           credential: self.libraries.admin.credential.cert(
-            require(path.resolve(self.cwd, options.serviceAccountPath))
+            require(self.project.serviceAccountPath)
           ),
           databaseURL: self.project.databaseURL,
         }, options.uniqueAppName);