backend-manager 2.5.30 → 2.5.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.30",
+  "version": "2.5.32",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -61,4 +61,4 @@
     "wonderful-fetch": "^0.0.14",
     "yargs": "^17.5.1"
   }
-}
+}

package/src/manager/functions/core/actions/api/general/emails/general:download-app-link.js

@@ -14,7 +14,7 @@ module.exports = function (payload, config) {
         {
           to: [
             {
-              name: payload.name || 'Valued member',
+              name: payload.name,
               email: payload.email,
             },
           ],
@@ -47,9 +47,9 @@ module.exports = function (payload, config) {
         email: config.brand.email,
       },
       subject: subject,
-      template_id: 'd-1d730ac8cc544b7cbccc8fa4a4b3f9ce',
+      template_id: templateId,
       asm: {
-        group_id: 16223,
+        group_id: groupId,
       },
       categories: ['transactional', 'download', config.app.id],
     }

package/src/manager/functions/core/actions/api/general/send-email.js

@@ -16,7 +16,7 @@ Module.prototype.main = function () {
   return new Promise(async function(resolve, reject) {
     payload.data.payload.id = payload.data.payload.id;
     payload.data.payload.email = payload.data.payload.email;
-    payload.data.payload.name = payload.data.payload.name || 'Friend';
+    payload.data.payload.name = payload.data.payload.name;
 
     const DEFAULT = {
       spamFilter: {

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

@@ -11,6 +11,7 @@ function OAuth2() {
 
     authorize: 'https://discord.com/api/oauth2/authorize',
     tokenize: 'https://discord.com/api/oauth2/token',
+    refresh: 'https://discord.com/api/oauth2/token',
     status: '',
     removeAccess: 'https://discord.com/channels/@me',
   }

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

@@ -9,6 +9,7 @@ function OAuth2() {
   self.urls = {
     authorize: 'https://accounts.google.com/o/oauth2/v2/auth',
     tokenize: 'https://oauth2.googleapis.com/token',
+    refresh: 'https://oauth2.googleapis.com/token',
     // status: 'https://oauth2.googleapis.com/tokeninfo?id_token={token}'
     status: 'https://oauth2.googleapis.com/tokeninfo',
     removeAccess: 'https://myaccount.google.com/security',

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

@@ -119,19 +119,23 @@ Module.prototype.main = function () {
 
       // Process by state
       if (payload.data.payload.state === 'authorize') {
-        self.processState_authorize(newUrl)
+        self.processState_authorize(newUrl, user)
         .then(r => {resolve(r)})
         .catch(e => {reject(e)})
       } else if (payload.data.payload.state === 'tokenize') {
-        self.processState_tokenize(newUrl)
+        self.processState_tokenize(newUrl, user)
         .then(r => {resolve(r)})
         .catch(e => {reject(e)})
+      } else if (payload.data.payload.state === 'refresh') {
+        self.processState_refresh(newUrl, user)
+        .then(r => {resolve(r)})
+        .catch(e => {reject(e)})        
       } else if (payload.data.payload.state === 'deauthorize') {
-        self.processState_deauthorize(newUrl)
+        self.processState_deauthorize(newUrl, user)
         .then(r => {resolve(r)})
         .catch(e => {reject(e)})
       } else if (payload.data.payload.state === 'status') {
-        self.processState_status(newUrl)
+        self.processState_status(newUrl, user)
         .then(r => {resolve(r)})
         .catch(e => {reject(e)})
       }
@@ -143,7 +147,7 @@ Module.prototype.main = function () {
 
 };
 
-Module.prototype.processState_authorize = function (newUrl) {
+Module.prototype.processState_authorize = function (newUrl, user) {
   const self = this;
   const Manager = self.Manager;
   const Api = self.Api;
@@ -162,7 +166,7 @@ Module.prototype.processState_authorize = function (newUrl) {
   });
 };
 
-Module.prototype.processState_tokenize = function (newUrl) {
+Module.prototype.processState_tokenize = function (newUrl, user) {
   const self = this;
   const Manager = self.Manager;
   const Api = self.Api;
@@ -219,7 +223,7 @@ Module.prototype.processState_tokenize = function (newUrl) {
       return reject(new Error(`Missing "refresh_token" in response. This is likely because you disconnected your account and tried to reconnect it. Visit ${self.oauth2.urls.removeAccess} and remove our app from your account and then try again or contact us if you need help!`));
     }
 
-    const storeResponse = await self.libraries.admin.firestore().doc(`users/${payload.user.auth.uid}`)
+    const storeResponse = await self.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
     .set({
       oauth2: {
         [payload.data.payload.provider]: {
@@ -239,7 +243,7 @@ Module.prototype.processState_tokenize = function (newUrl) {
     .then(r => r)
     .catch(e => e)
 
-    assistant.log('storeResponse', storeResponse, {environment: 'production'});
+    assistant.log('storeResponse', user.auth.uid, storeResponse, {environment: 'production'});
 
     if (storeResponse instanceof Error) {
       return reject(storeResponse);
@@ -252,7 +256,93 @@ Module.prototype.processState_tokenize = function (newUrl) {
   });
 };
 
-Module.prototype.processState_deauthorize = function () {
+Module.prototype.processState_refresh = function (newUrl, user) {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
+
+  return new Promise(async function(resolve, reject) {
+    const finalUrl = newUrl.toString();
+
+    assistant.log('Running processState_refresh()', {environment: 'production'});
+
+    const body = {
+      client_id: _.get(Manager.config, `oauth2.${payload.data.payload.provider}.client_id`),
+      client_secret: _.get(Manager.config, `oauth2.${payload.data.payload.provider}.client_secret`),
+      grant_type: 'refresh_token',
+      refresh_token: _.get(user, `oauth2.${payload.data.payload.provider}.token.refresh_token`),
+    };
+
+    assistant.log('body', body, {environment: 'production'});
+
+    const refreshResponse = await fetch(finalUrl, {
+      method: 'POST',
+      timeout: 60000,
+      response: 'json',
+      tries: 1,
+      log: true,
+      body: new URLSearchParams(body),
+      cacheBreaker: false,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+    })
+    .then(json => json)
+    .catch(e => e)
+
+    assistant.log('refreshResponse', refreshResponse, {environment: 'production'});
+
+    if (refreshResponse instanceof Error) {
+      return reject(refreshResponse);
+    }
+
+    // DISABLED .verifyIdentity() BECAUSE IT WILL TRY TO CHECK IF IT EXISTS
+    // Determine identity
+    // const verifiedIdentity = await self.oauth2.verifyIdentity(refreshResponse)
+    // .then(identity => identity)
+    // .catch(e => e);
+
+    // assistant.log('verifiedIdentity', verifiedIdentity, {environment: 'production'});
+
+    // if (verifiedIdentity instanceof Error) {
+    //   return reject(verifiedIdentity);
+    // } else if (refreshResponse && !refreshResponse.refresh_token) {
+    //   return reject(new Error(`Missing "refresh_token" in response. This is likely because you disconnected your account and tried to reconnect it. Visit ${self.oauth2.urls.removeAccess} and remove our app from your account and then try again or contact us if you need help!`));
+    // }
+
+    const storeResponse = await self.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
+    .set({
+      oauth2: {
+        [payload.data.payload.provider]: {
+          token: refreshResponse,
+          // identity: verifiedIdentity,
+          updated: {
+            timestamp: assistant.meta.startTime.timestamp,
+            timestampUNIX: assistant.meta.startTime.timestampUNIX,
+          }
+        }
+      }
+    }, { merge: true })
+    .then(r => r)
+    .catch(e => e)
+
+    assistant.log('storeResponse', user.auth.uid, storeResponse, {environment: 'production'});
+
+    if (storeResponse instanceof Error) {
+      return reject(storeResponse);
+    }
+
+    return resolve({
+      data: {success: true}
+    })
+
+  });
+};
+
+
+Module.prototype.processState_deauthorize = function (newUrl, user) {
   const self = this;
   const Manager = self.Manager;
   const Api = self.Api;
@@ -260,7 +350,7 @@ Module.prototype.processState_deauthorize = function () {
   const payload = self.payload;
 
   return new Promise(async function(resolve, reject) {
-    self.libraries.admin.firestore().doc(`users/${payload.user.auth.uid}`)
+    self.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
     .set({
       oauth2: {
         [payload.data.payload.provider]: {},
@@ -281,7 +371,7 @@ Module.prototype.processState_deauthorize = function () {
   });
 };
 
-Module.prototype.processState_status = function (newUrl) {
+Module.prototype.processState_status = function (newUrl, user) {
   const self = this;
   const Manager = self.Manager;
   const Api = self.Api;
@@ -301,7 +391,7 @@ Module.prototype.processState_status = function (newUrl) {
           return resolve();
         }
 
-        Manager.libraries.admin.firestore().doc(`users/${payload.user.auth.uid}`)
+        Manager.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
         .set({
           oauth2: {
             [payload.data.payload.provider]: {},
@@ -312,7 +402,7 @@ Module.prototype.processState_status = function (newUrl) {
           }
         }, { merge: true })
         .then(async () => {
-          assistant.log(`Removed disconnected token for user: ${payload.user.auth.uid}`)
+          assistant.log(`Removed disconnected token for user: ${user.auth.uid}`)
         })
         .catch((e) => e)
         .finally(() => {
@@ -321,7 +411,7 @@ Module.prototype.processState_status = function (newUrl) {
       });
     }
 
-    Manager.libraries.admin.firestore().doc(`users/${payload.user.auth.uid}`)
+    Manager.libraries.admin.firestore().doc(`users/${user.auth.uid}`)
     .get()
     .then(async (doc) => {
       const data = doc.data();

package/src/manager/index.js

@@ -83,6 +83,9 @@ Manager.prototype.init = function (exporter, options) {
     self.libraries.functions.config()
   );
 
+  // Saved config
+  const appId = get(self.config, 'app.id');
+
   // Init assistant
   self.assistant = self.Assistant().init(undefined, options.assistant);
 
@@ -134,9 +137,13 @@ Manager.prototype.init = function (exporter, options) {
     self.assistant.log('Resolved backendManagerConfigPath', self.project.backendManagerConfigPath);
   }
 
+  if (!appId) {
+    console.warn('⚠️ Missing config.app.id');
+  }
+
   // Setup sentry
   if (self.options.sentry) {
-    const sentryRelease = `${get(self.config, 'app.id') || self.project.projectId}@${self.package.version}`;
+    const sentryRelease = `${appId || self.project.projectId}@${self.package.version}`;
     const sentryDSN = get(self.config, 'sentry.dsn', '');
     // console.log('Sentry', sentryRelease, sentryDSN);
 
@@ -175,8 +182,8 @@ Manager.prototype.init = function (exporter, options) {
 
         // const loadedProjectId = get(self.libraries.initializedAdmin, 'options_.credential.projectId', null);   
         const loadedProjectId = serviceAccount.project_id;   
-        if (!loadedProjectId || !loadedProjectId.includes(self.config.app.id)) {
-          self.assistant.error(`Loaded app may have wrong service account: ${loadedProjectId} =/= ${self.config.app.id}`, {environment: 'production'});
+        if (!loadedProjectId || !loadedProjectId.includes(appId)) {
+          self.assistant.error(`Loaded app may have wrong service account: ${loadedProjectId} =/= ${appId}`, {environment: 'production'});
         }        
       }