backend-manager 5.0.70 → 5.0.72

package/README.md

@@ -204,10 +204,7 @@ Route.prototype.main = async function (assistant) {
   }
 
   // Track analytics
-  analytics.event({
-    name: 'my_event',
-    params: { action: 'test' },
-  });
+  analytics.event('my_event', { action: 'test' });
 
   // Validate usage limits
   await usage.validate('requests');
@@ -495,13 +492,10 @@ const analytics = Manager.Analytics({
   uuid: user.auth.uid,
 });
 
-analytics.event({
-  name: 'purchase',
-  params: {
-    item_id: 'product-123',
-    value: 29.99,
-    currency: 'USD',
-  },
+analytics.event('purchase', {
+  item_id: 'product-123',
+  value: 29.99,
+  currency: 'USD',
 });
 ```
 

package/REFACTOR-PAYMENT.md

@@ -59,3 +59,8 @@ Firestore trigger for payments-webhooks/{id}
 * process the webhook data and update the user's subscription data in both their user doc and their subscription doc
 * various checks like
   * if status === completed, do nothing
+
+THen, we need to plan an effective way to test all of these scenarios in our emualted testing environment which you can explore here: /Users/ian/Developer/Repositories/ITW-Creative-Works/backend-manager/src/test
+* we should be able to START with certain subscripton levels (basic/free, premium etc) and then see how events influence and change the subscription status and data in the user doc, subscription doc, webhook event doc, etc
+
+So webhook comes in --> save immediateyl to return 200 to the payment provider --> process the webhook in a separate function trigger to update subscription data and user access (reprocess if something goes wrong, etc)

package/package.json

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

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

@@ -62,10 +62,7 @@ module.exports = async ({ Manager, assistant, user, context, libraries }) => {
   Manager.Analytics({
     assistant: assistant,
     uuid: user.uid,
-  }).event({
-    name: 'user_delete',
-    params: {},
-  });
+  }).event('user_delete', {});
 
   assistant.log(`onDelete: Completed for ${user.uid} (${Date.now() - startTime}ms)`);
 };

package/src/manager/events/firestore/notifications/on-write.js

@@ -42,10 +42,7 @@ module.exports = async ({ Manager, assistant, change, context, libraries }) => {
     Manager.Analytics({
       assistant: assistant,
       uuid: dataBefore?.owner?.uid,
-    }).event({
-      name: 'notification-unsubscribe',
-      params: {},
-    });
+    }).event('notification-unsubscribe', {});
 
     assistant.log('Notification subscription deleted:', dataBefore);
 
@@ -67,10 +64,7 @@ module.exports = async ({ Manager, assistant, change, context, libraries }) => {
     Manager.Analytics({
       assistant: assistant,
       uuid: dataAfter?.owner?.uid,
-    }).event({
-      name: 'notification-subscribe',
-      params: {},
-    });
+    }).event('notification-subscribe', {});
 
     assistant.log('Notification subscription created:', dataAfter);
 

package/src/manager/helpers/analytics.js

@@ -212,7 +212,7 @@ Analytics.prototype.generateId = function (id) {
     : undefined;
 };
 
-Analytics.prototype.event = function (payload) {
+Analytics.prototype.event = function (payload, params) {
   const self = this;
   const Manager = self.Manager;
   const assistant = self.assistant;
@@ -225,6 +225,10 @@ Analytics.prototype.event = function (payload) {
   // https://support.google.com/analytics/answer/13316687?hl=en#zippy=%2Cweb
   // https://support.google.com/analytics/answer/9268042?sjid=4476481583372132143-NC
   // https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference/events#screen_view
+  // Support both: event({ name, params }) and event('name', params)
+  if (typeof payload === 'string') {
+    payload = { name: payload, params: params || {} };
+  }
   payload = payload || {};
 
   // Fix event name

package/src/manager/index.js

@@ -314,12 +314,7 @@ Manager.prototype.init = function (exporter, options) {
     assistant: self.assistant,
     uuid: self.SERVER_UUID,
   })
-  .event({
-    name: 'admin/initialized',
-    params: {
-      // screen_class: 'MainActivity',
-    },
-  });
+  .event('admin/initialized', {});
 
   // Return
   return self;

package/src/manager/routes/general/uuid/post.js

@@ -22,10 +22,7 @@ module.exports = async ({ assistant, settings, analytics }) => {
     : uuid.v4();
 
   // Send analytics event
-  analytics.event({
-    name: 'general/uuid',
-    params: { version },
-  });
+  analytics.event('general/uuid', { version });
 
   // Log and respond
   assistant.log('UUID Generated', { name, version, namespace, result });

package/src/manager/routes/restart/index.js

@@ -3,10 +3,7 @@ const jetpack = require('fs-jetpack');
 module.exports = async ({ assistant, user, analytics }) => {
 
   // Send analytics event
-  analytics.event({
-    name: 'restart',
-    params: {},
-  });
+  analytics.event('restart', {});
 
   // Require authentication
   if (!user.authenticated) {

package/src/manager/routes/test/index.js

@@ -1,10 +1,7 @@
 module.exports = async ({ assistant, analytics }) => {
 
   // Send analytics event
-  analytics.event({
-    name: 'test',
-    params: {},
-  });
+  analytics.event('test', {});
 
   // Log
   assistant.log('Running test');

package/src/manager/routes/user/oauth2/providers/spotify.js

@@ -0,0 +1,56 @@
+const fetch = require('wonderful-fetch');
+
+module.exports = {
+  provider: 'spotify',
+  name: 'Spotify',
+  urls: {
+    authorize: 'https://accounts.spotify.com/authorize',
+    tokenize: 'https://accounts.spotify.com/api/token',
+    refresh: 'https://accounts.spotify.com/api/token',
+    revoke: '',
+    status: '',
+    removeAccess: 'https://www.spotify.com/account/apps/',
+  },
+  scope: ['user-read-email', 'user-read-private'],
+
+  // Spotify doesn't need special auth params
+  authParams: {},
+
+  // Spotify does not support token revocation
+  async revokeToken(token, context) {
+    const { assistant } = context;
+
+    assistant.log('Spotify does not support token revocation');
+
+    return { revoked: false, reason: 'Spotify does not support token revocation' };
+  },
+
+  async verifyIdentity(tokenizeResult, Manager, assistant) {
+    assistant.log('verifyIdentity(): tokenizeResult', tokenizeResult);
+
+    // Get identity from Spotify API
+    const identityResponse = await fetch('https://api.spotify.com/v1/me', {
+      timeout: 60000,
+      response: 'json',
+      tries: 1,
+      log: true,
+      cacheBreaker: false,
+      headers: {
+        authorization: `${tokenizeResult.token_type} ${tokenizeResult.access_token}`,
+      },
+    });
+
+    assistant.log('verifyIdentity(): identityResponse', identityResponse);
+
+    // Check if exists
+    const snap = await Manager.libraries.admin.firestore().collection('users')
+      .where('oauth2.spotify.identity.id', '==', identityResponse.id)
+      .get();
+
+    if (snap.size > 0) {
+      throw new Error(`This Spotify account is already connected to a ${Manager.config.brand.name} account`);
+    }
+
+    return identityResponse;
+  },
+};