web-manager 2.1.34 → 2.1.37

package/index.js

@@ -240,23 +240,15 @@ function Manager() {
       user.getIdToken(false)
         .then(function(token) {
           var done;
-          // fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_api', {
-          //   method: 'POST',
-          //   body: JSON.stringify({
-          //     authenticationToken: token,
-          //     command: 'signup-handler',
-          //     payload: {
-          //       newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
-          //       affiliateCode: This.storage().get('auth.affiliateCode', '')
-          //     }
-          //   }),
-          // })
-          fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_signUpHandler', {
+          fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_api', {
             method: 'POST',
             body: JSON.stringify({
               authenticationToken: token,
-              newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
-              affiliateCode: This.storage().get('auth.affiliateCode', '')
+              command: 'user:sign-up',
+              payload: {
+                newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
+                affiliateCode: This.storage().get('auth.affiliateCode', ''),
+              }
             }),
           })
           .catch(function () {})
@@ -274,20 +266,6 @@ function Manager() {
             }
           }, 5000);
 
-          // This.ajax().request({
-          //   url: 'https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_signUpHandler',
-          //   // url: 'http://localhost:5001/ultimate-jekyll/us-central1/bm_signUpHandler',
-          //   body: {
-          //     authenticationToken: token,
-          //     newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
-          //     affiliateCode: This.storage().get('auth.affiliateCode', '')
-          //   },
-          //   timeout: 5000,
-          // })
-          // .always(function (response, status) {
-          //   // This.storage().set('notifications.lastSynced', new Date(0).toISOString())
-          //   _authHandle_in_normal(This, user);
-          // });
         })
         .catch(function(error) {
           console.error(error);
@@ -1062,6 +1040,9 @@ function Manager() {
         // This.log('subscribe()');
         return new Promise(function(resolve, reject) {
           // var subscribed = !This.notifications().isSubscribed();
+          if (!supported) {
+            return resolve(false)
+          }
           firebase.messaging().getToken({
             serviceWorkerRegistration: This.properties.references.serviceWorker,
           })

package/lib/account.js

@@ -202,6 +202,12 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
 
   var defaultPlanId = options.defaultPlanId || 'basic';
 
+  // Resolve auth
+  account.auth = account.auth || {};
+  account.auth.email = account.auth.email || currentUser.email || null;
+  account.auth.uid = account.auth.uid || currentUser.uid || null;
+  account.auth.temporary = account.auth.temporary || false;
+
   // Resolve plan
   account.plan = account.plan || {};
   account.plan.id = account.plan.id || defaultPlanId;
@@ -254,6 +260,27 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
   account.roles.vip = account.roles.vip === true || account.roles.vip === 'true';
   account.roles.promoExempt = account.roles.promoExempt === true || account.roles.promoExempt === 'true';
 
+  // Resolve affiliate
+  account.affiliate = account.affiliate || {};
+  account.affiliate.code = account.affiliate.code || 'unknown';
+  account.affiliate.referrals = account.affiliate.referrals || [];
+  account.affiliate.referrer = account.affiliate.referrer || 'unknown';
+
+  // Resolve activity
+  account.activity = account.activity || {};
+  account.activity.lastActivity = account.activity.lastActivity || {};
+  account.activity.lastActivity.timestamp = account.activity.lastActivity.timestamp || '1999-01-01T00:00:00Z';
+  account.activity.lastActivity.timestampUNIX = account.activity.lastActivity.timestampUNIX || 0;
+
+  account.activity.created = account.activity.created || {};
+  account.activity.created.timestamp = account.activity.created.timestamp || '1999-01-01T00:00:00Z';
+  account.activity.created.timestampUNIX = account.activity.created.timestampUNIX || 0;
+
+  // Api
+  account.api = account.api || {};
+  account.api.clientId = account.api.clientId || 'unknown';
+  account.api.privateKey = account.api.privateKey || 'unknown';
+
   // Set UI elements
   try {
     var isDevelopment = utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "2.1.34",
+  "version": "2.1.37",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {