backend-manager 2.5.49 → 2.5.51

package/package.json

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

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

@@ -18,52 +18,57 @@ Module.prototype.main = function () {
 
     payload.data.payload.deletionRegex = payload.data.payload.deletionRegex ? powertools.regexify(payload.data.payload.deletionRegex) : payload.data.payload.deletionRegex;
 
-    if (!payload.user.roles.admin) {
+    if (!payload.user.roles.admin && assistant.meta.environment === 'production') {
       return reject(assistant.errorManager(`Admin required.`, {code: 401, sentry: false, send: false, log: false}).error)
-    } else {
-      // https://googleapis.dev/nodejs/firestore/latest/v1.FirestoreAdminClient.html#exportDocuments
-      // https://firebase.google.com/docs/firestore/solutions/schedule-export#firebase-cli
-      // https://levelup.gitconnected.com/how-to-back-up-firestore-easily-and-automatically-eab6bf0d7e1f
-      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}`;
-
-      await self.createBucket(bucketName, resourceZone);
-      // await self.deleteOldFiles(bucketName, resourceZone);
-
-      client.exportDocuments({
-        name: databaseName,
-        outputUriPrefix: bucketAddress,
-        // Leave collectionIds empty to export all collections
-        // or set to a list of collection IDs to export,
-        collectionIds: []
-      })
-      .then(async (responses) => {
+    }
 
-        await self._setMetaStats();
+    // https://googleapis.dev/nodejs/firestore/latest/v1.FirestoreAdminClient.html#exportDocuments
+    // https://firebase.google.com/docs/firestore/solutions/schedule-export#firebase-cli
+    // https://levelup.gitconnected.com/how-to-back-up-firestore-easily-and-automatically-eab6bf0d7e1f
+    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}`;
+
+    await self.createBucket(bucketName, resourceZone);
+    // await self.deleteOldFiles(bucketName, resourceZone);
+
+    client.exportDocuments({
+      name: databaseName,
+      outputUriPrefix: bucketAddress,
+      // Leave collectionIds empty to export all collections
+      // or set to a list of collection IDs to export,
+      collectionIds: []
+    })
+    .then(async (responses) => {
 
-        const response = responses[0];
-        assistant.log('Saved backup successfully:', response.metadata.outputUriPrefix, {environment: 'development'})
+      const response = responses[0];
+      const meta = {
+
+      }
+
+      assistant.log('Saved backup successfully:', response.metadata.outputUriPrefix, meta, {environment: 'development'})
+
+      await self._setMetaStats(null, meta);
+
+      return resolve(response['name']);
+    })
+    .catch(async (e) => {
+      await self._setMetaStats(e);
+      return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: true}).error)
+    });    
 
-        return resolve(response['name']);
-      })
-      .catch(async (e) => {
-        await self._setMetaStats(e);
-        return reject(assistant.errorManager(e, {code: 500, sentry: false, send: false, log: true}).error)
-      });
-    }
   });
 
 };
 
-Module.prototype._setMetaStats = function (error) {
+Module.prototype._setMetaStats = function (error, meta) {
   const self = this;
   const Manager = self.Manager;
   const Api = self.Api;

package/src/manager/functions/core/actions/api/admin/sync-users.js

@@ -91,7 +91,7 @@ Module.prototype.main = function () {
               await self.libraries.admin.firestore().doc(`meta/stats`)
                 .update({
                   syncUsers: {
-                    lastPageToken: batch.pageToken
+                    lastPageToken: batch.pageToken,
                   }
                 })
                 .then(r => {

package/src/manager/functions/core/cron/daily.js

@@ -38,17 +38,18 @@ Module.prototype.main = function() {
       }),
 
       // Sync Firestore users to the database
-      fetch(`${Manager.project.functionsUrl}/bm_api`, {
-        method: 'post',
-        response: 'json',
-        body: {
-          backendManagerKey: Manager.config.backend_manager.key,
-          command: 'admin:sync-users',
-        }
-      })
-      .then(response => {
-        assistant.log(`Successfully executed sync-users:`, response, {environment: 'production'})
-      }),
+      // TODO: This is not working becaues the pageToken is not relative any more when its saved...
+      // fetch(`${Manager.project.functionsUrl}/bm_api`, {
+      //   method: 'post',
+      //   response: 'json',
+      //   body: {
+      //     backendManagerKey: Manager.config.backend_manager.key,
+      //     command: 'admin:sync-users',
+      //   }
+      // })
+      // .then(response => {
+      //   assistant.log(`Successfully executed sync-users:`, response, {environment: 'production'})
+      // }),
 
       // More daily processes
       // ...

package/src/manager/index.js

@@ -177,7 +177,7 @@ Manager.prototype.init = function (exporter, options) {
         const serviceAccount = require(self.project.serviceAccountPath);
         self.libraries.initializedAdmin = self.libraries.admin.initializeApp({
           credential: self.libraries.admin.credential.cert(serviceAccount),
-          databaseURL: self.project.databaseURL,
+          databaseURL: self.project.databaseURL || `https://${self.project.projectId}.firebaseio.com`,
         }, options.uniqueAppName);
 
         // const loadedProjectId = get(self.libraries.initializedAdmin, 'options_.credential.projectId', null);   

package/templates/backend-manager-config.json

@@ -26,7 +26,6 @@
   "firebaseConfig": {
     "apiKey": "123-456",
     "authDomain": "PROJECT-ID.firebaseapp.com",
-    "databaseURL": "https://PROJECT-ID.firebaseio.com",
     "projectId": "PROJECT-ID",
     "storageBucket": "PROJECT-ID.appspot.com",
     "messagingSenderId": "123",