backend-manager 3.0.58 → 3.0.59

package/package.json

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

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

@@ -1,4 +1,5 @@
-const _ = require('lodash')
+const _ = require('lodash');
+const fetch = require('wonderful-fetch');
 
 function Module() {
 
@@ -22,6 +23,29 @@ Module.prototype.main = function () {
         return reject(assistant.errorManager(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)
       }
 
+      // Signout of all sessions
+      assistant.log(`Signout of all sessions...`);
+      await fetch(`https://us-central1-${self.Manager.project.projectId}.cloudfunctions.net/bm_api`, {
+        method: 'post',
+        timeout: 30000,
+        response: 'json',
+        tries: 2,
+        log: true,
+        body: {
+          backendManagerKey: self.Manager.config.backend_manager.key,
+          command: 'user:sign-out-all-sessions',
+          payload: {
+            uid: user.uid,
+          }
+        },
+      })
+      .then((json) => {
+        assistant.log(`Signout of all sessions success`, json);
+      })
+      .catch(e => {
+        assistant.error(`Signout of all sessions failed`, e);
+      })
+
       // Perform the delete
       await self.libraries.admin.auth().deleteUser(_.get(user, 'auth.uid', null))
       .then(() => {

package/src/manager/functions/core/actions/api/user/sign-up.js

@@ -1,5 +1,5 @@
 const _ = require('lodash')
-const fetch = require('node-fetch');
+const fetch = require('wonderful-fetch');
 
 const MAX_SIGNUPS = 3;
 const MAX_AGE = 30;
@@ -239,17 +239,17 @@ function addToMCList(key, listId, email) {
     let datacenter = key.split('-')[1];
     fetch(`https://${datacenter}.api.mailchimp.com/3.0/lists/${listId}/members`, {
         method: 'post',
-        body: JSON.stringify({
+        timeout: 30000,
+        response: 'json',
+        body: {
           email_address: email,
           status: 'subscribed',
-        }),
-        timeout: 10000,
+        },
         headers: {
           'Content-Type': 'application/json',
           'Authorization': `Basic ${key}`,
         },
       })
-      .then(res => res.json())
       .then(json => {
         if (json.status !== 'subscribed') {
           return reject(new Error(json.status));

package/src/manager/functions/core/events/auth/on-delete.js

@@ -47,29 +47,6 @@ Module.prototype.main = function () {
         assistant.error(`Delete user record failed`, e);
       })
 
-    // Signout of all sessions
-    assistant.log(`Signout of all sessions...`);
-    await fetch(`https://us-central1-${self.Manager.project.projectId}.cloudfunctions.net/bm_api`, {
-      method: 'post',
-      timeout: 30000,
-      response: 'json',
-      tries: 2,
-      log: true,
-      body: {
-        backendManagerKey: self.Manager.config.backend_manager.key,
-        command: 'user:sign-out-all-sessions',
-        payload: {
-          uid: user.uid,
-        }
-      },
-    })
-    .then((json) => {
-      assistant.log(`Signout of all sessions success`, json);
-    })
-    .catch(e => {
-      assistant.error(`Signout of all sessions failed`, e);
-    })
-
     // Update user count
     assistant.log(`Decrement user count...`);
     await libraries.admin.firestore().doc(`meta/stats`)