web-manager 3.1.2 → 3.1.6

package/lib/account.js

@@ -194,9 +194,35 @@ function getMonth(date) {
   return monthNames[date.getMonth()];
 }
 
-Account.prototype._resolveAccount = function (currentUser, account, options) {
+Account.prototype._resolveAccount2 = function (firebaseUser, account, options) {
+  // TODO: USE resolve-account library Instead
+
+  /*
+  const resolver = new (require('resolve-account'))({
+    Manager: self.Manager,
+    utilities: utilities,
+    dom: dom,
+  });
+
+
+  self.properties = resolver.resolve(firebaseUser, account, options)
+
+  return self.properties;
+
+  */
+
+}
+
+/*
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+  THIS HAS BEEN MOVED TO the resolve-account lib
+  still here until figure out how to import resolve-account here
+  any changes to resolve-account must go here too
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*/
+Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   var self = this;
-  currentUser = currentUser || {};
+  firebaseUser = firebaseUser || {};
   account = account || {};
   options = options || {};
 
@@ -207,8 +233,8 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
 
   // 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.email = account.auth.email || firebaseUser.email || null;
+  account.auth.uid = account.auth.uid || firebaseUser.uid || null;
   account.auth.temporary = account.auth.temporary || false;
 
   // Resolve plan
@@ -256,7 +282,9 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
       });
     }
   } catch (e) {
-    // console.error('Unable to check query strings', e);
+    if (typeof window !== 'undefined') {
+      console.error('Unable to check query strings', e);
+    }
   }
 
   var planExpireDate = new Date(account.plan.expires.timestamp);
@@ -274,8 +302,8 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
 
   // Resolve oAuth2
   account.oauth2 = account.oauth2 || {};
-  account.oauth2.discord = account.oauth2.discord || {};
-  account.oauth2.discord.user = account.oauth2.discord.user || {};
+  // account.oauth2.discord = account.oauth2.discord || {};
+  // account.oauth2.discord.user = account.oauth2.discord.user || {};
 
   // Resolve roles
   account.roles = account.roles || {};
@@ -355,8 +383,15 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
     referralURL.pathname = '/';
     referralURL.searchParams.set('aff', account.affiliate.code)
 
-    authCreatedEl.setInnerHTML(new Date(parseInt(currentUser.metadata.a)).toLocaleString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }))
-    authPhoneInput.setInnerHTML(currentUser.phoneNumber).setValue(currentUser.phoneNumber)
+    authCreatedEl.setInnerHTML(
+      new Date(
+        parseInt(utilities.get(firebaseUser, 'metadata.a', '0'))
+      )
+      .toLocaleString(undefined, {
+        weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+      })
+    )
+    authPhoneInput.setInnerHTML(firebaseUser.phoneNumber).setValue(firebaseUser.phoneNumber)
 
     billingSubscribeBtn.setAttribute('hidden', true);
     billingUpdateBtn.setAttribute('hidden', true);
@@ -365,8 +400,8 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
       updateURL.searchParams.set('appName', utilities.get(self.Manager, 'properties.global.brand.name', 'Unknown'));
       updateURL.searchParams.set('supportUrl', currentURL.origin + '/support');
       updateURL.searchParams.set('supportEmail', utilities.get(self.Manager, 'properties.contact.emailSupport', 'unknown@email.com'));
-      updateURL.searchParams.set('userEmail', currentUser.email);
-      updateURL.searchParams.set('userId', currentUser.uid);
+      updateURL.searchParams.set('userEmail', firebaseUser.email);
+      updateURL.searchParams.set('userId', firebaseUser.uid);
       updateURL.searchParams.set('orderId', account.plan.payment.orderId);
       updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
       billingUpdateBtn.removeAttribute('hidden').setAttribute('href', updateURL.toString());
@@ -416,7 +451,9 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
     })
 
   } catch (e) {
-    // console.error('Unable to set DOM elements', e);
+    if (typeof window !== 'undefined') {
+      console.error('Unable to set DOM elements', e);
+    }
   }
 
   self.properties = account;

package/package.json

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