backend-manager 3.0.53 → 3.0.55

package/package.json

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

package/src/manager/functions/core/actions/api/user/create-custom-token.js

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       await self.libraries.admin.auth().createCustomToken(_.get(user, 'auth.uid', null))
       .then(token => {

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

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       // Disallow deleting users with subscriptions in any state other than cancelled or active payments
       if (
@@ -22,12 +22,6 @@ 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
-      await Api.import('user:sign-out-all-sessions')
-      .then(async (lib) => {
-        await lib.main().catch(e => e);
-      })
-
       // Perform the delete
       await self.libraries.admin.auth().deleteUser(_.get(user, 'auth.uid', null))
       .then(() => {

package/src/manager/functions/core/actions/api/user/get-active-sessions.js

@@ -13,7 +13,7 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
 
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       const uid = _.get(user, 'auth.uid', null);
       const id = _.get(payload.data.payload, 'id', 'app');

package/src/manager/functions/core/actions/api/user/get-subscription-info.js

@@ -16,7 +16,7 @@ Module.prototype.main = function () {
     const oldDate = powertools.timestamp(new Date(0), {output: 'string'})
     const oldDateUNIX = powertools.timestamp(oldDate, {output: 'unix'});
 
-    self.Api.resolveUser({adminRequired: false})
+    Api.resolveUser({adminRequired: false})
     .then(async (user) => {
       const result = {
         plan: {

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

@@ -22,7 +22,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
 
       self.ultimateJekyllOAuth2Url = assistant.meta.environment === 'development'

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

@@ -16,7 +16,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       const keys = powertools.arrayify(_.get(payload.data.payload, 'keys') || ['clientId', 'privateKey']);
       const newKeys = {};

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

@@ -12,7 +12,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       // TODO: resolve the account and send back
       // - Limits for the account

package/src/manager/functions/core/actions/api/user/sign-out-all-sessions.js

@@ -14,7 +14,7 @@ Module.prototype.main = function () {
 
   return new Promise(async function(resolve, reject) {
 
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
       const uid = _.get(user, 'auth.uid', null);
       const id = _.get(payload.data.payload, 'id', 'app');

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

@@ -17,7 +17,7 @@ Module.prototype.main = function () {
     const assistant = self.assistant;
     const payload = self.payload;
 
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
         // ⛔️⛔️⛔️ This function could be triggered when the user signs up with Google after already having a email/password account
         // Get auth user from firebase

package/src/manager/functions/core/actions/api/user/submit-feedback.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
 
       const docId = pushid();

package/src/manager/functions/core/actions/api/user/validate-settings.js

@@ -15,7 +15,7 @@ Module.prototype.main = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.Api.resolveUser({adminRequired: true})
+    Api.resolveUser({adminRequired: true})
     .then(async (user) => {
 
       payload.data.payload.defaultsPath = payload.data.payload.defaultsPath || '';

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

@@ -1,3 +1,5 @@
+const fetch = require('wonderful-fetch');
+
 function Module() {
   const self = this;
 }
@@ -35,23 +37,56 @@ Module.prototype.main = function () {
     });
 
     // Delete user record
+    assistant.log(`Delete user record...`);
     await libraries.admin.firestore().doc(`users/${user.uid}`)
       .delete()
+      .then((r) => {
+        assistant.log(`Delete user record success`);
+      })
       .catch((e) => {
-        assistant.error(`Delete user failed`, e);
+        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.backendManagerKey,
+        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`)
       .update({
         'users.total': libraries.admin.firestore.FieldValue.increment(-1),
       })
+      .then((r) => {
+        assistant.log(`Decrement user count success`);
+      })
       .catch((e) => {
         assistant.error(`Failed to decrement user`, e);
       })
 
+    // Log the updated user
     assistant.log(`User deleted ${user.uid}:`, user, context);
 
+    // Send response
     return resolve(self);
   });
 };

package/src/manager/helpers/usage.js

@@ -49,9 +49,6 @@ Usage.prototype.init = function (assistant, options) {
       return reject(new Error('Missing required {assistant} parameter'));
     }
 
-    const localKey = (options.localKey || self.assistant.request.geolocation.ip || '')
-      .replace(/[\.:]/g, '_');
-
     // Set options
     self.options = options;
 
@@ -61,6 +58,11 @@ Usage.prototype.init = function (assistant, options) {
     // Setup storage
     self.storage = Manager.storage({name: 'usage', temporary: true, clear: options.clear, log: options.log});
 
+    // Set local key
+    const localKey = (options.localKey || self.assistant.request.geolocation.ip || '')
+      .replace(/[\.:]/g, '_');
+
+    // Set paths
     self.paths.user = `users.${localKey}`;
     self.paths.app = `apps.${options.app}`;