web-manager 4.1.6 → 4.1.8

package/CLAUDE.md

@@ -257,7 +257,6 @@ Current test coverage is minimal - focuses on configuration and storage.
 | `firebase` (^12.x) | Auth, Firestore, Messaging |
 | `@sentry/browser` (^10.x) | Error tracking |
 | `lodash` (^4.x) | get/set for path-based access |
-| `resolve-account` (^2.x) | Account data resolution |
 | `itwcw-package-analytics` | Analytics (internal) |
 
 ## Important Notes

package/dist/index.js

@@ -281,6 +281,9 @@ class Manager {
           autoRequest: 1000 * 60
         }
       },
+      env: {
+        FIREBASE_EMULATOR_CONNECT: false,
+      },
       validRedirectHosts: [],
 
       // Non-configurable defaults

package/dist/modules/auth.js

@@ -1,4 +1,62 @@
-import resolveAccount from 'resolve-account';
+const DEFAULT_ACCOUNT = {
+  auth: { uid: null, email: null, temporary: false },
+  subscription: {
+    product: { id: 'basic', name: 'Basic' },
+    status: 'active',
+    expires: { timestamp: null, timestampUNIX: null },
+    trial: { activated: false, expires: { timestamp: null, timestampUNIX: null } },
+    cancellation: { pending: false, date: { timestamp: null, timestampUNIX: null } },
+    payment: {
+      processor: null,
+      resourceId: null,
+      frequency: null,
+      startDate: { timestamp: null, timestampUNIX: null },
+      updatedBy: {
+        event: { name: null, id: null },
+        date: { timestamp: null, timestampUNIX: null },
+      },
+    },
+  },
+  roles: { admin: false, betaTester: false, developer: false },
+  affiliate: { code: null, referrals: [] },
+  activity: {
+    lastActivity: { timestamp: null, timestampUNIX: null },
+    created: { timestamp: null, timestampUNIX: null },
+  },
+  api: { clientId: null, privateKey: null },
+  usage: { requests: { total: 0, period: 0 } },
+  personal: { name: { first: '', last: '' } },
+  oauth2: {},
+};
+
+function resolveAccount(rawData, firebaseUser) {
+  const user = firebaseUser || {};
+  const data = rawData || {};
+
+  // Deep merge: rawData values take precedence over defaults
+  function deepMerge(target, source) {
+    const result = { ...target };
+    for (const key in source) {
+      if (!source.hasOwnProperty(key)) continue;
+      if (result[key] === null || result[key] === undefined) {
+        result[key] = source[key];
+      } else if (typeof result[key] === 'object' && !Array.isArray(result[key])
+        && typeof source[key] === 'object' && !Array.isArray(source[key])) {
+        result[key] = deepMerge(result[key], source[key]);
+      }
+    }
+    return result;
+  }
+
+  const account = deepMerge(data, DEFAULT_ACCOUNT);
+
+  // Set auth from firebase user if not already set
+  account.auth = account.auth || {};
+  account.auth.uid = account.auth.uid || user.uid || null;
+  account.auth.email = account.auth.email || user.email || null;
+
+  return account;
+}
 
 class Auth {
   constructor(manager) {

package/dist/modules/firestore.js

@@ -27,7 +27,7 @@ class Firestore {
 
       // Dynamically import Firestore
       const { getFirestore, doc: firestoreDoc, collection: firestoreCollection, getDoc, setDoc, updateDoc, deleteDoc, getDocs, query, where, orderBy, limit, startAt, endAt } = await import('firebase/firestore');
-      
+
       // Store references for later use
       this._firestoreMethods = {
         getFirestore,
@@ -48,6 +48,15 @@ class Firestore {
 
       // Initialize Firestore
       this._db = getFirestore(this.manager._firebaseApp);
+
+      // Connect to Firestore emulator in development
+      if (this.manager.isDevelopment() && this.manager.config.env?.FIREBASE_EMULATOR_CONNECT) {
+        console.log('[Firestore] Connecting to emulator at localhost:8080');
+        const { connectFirestoreEmulator } = await import('firebase/firestore');
+        connectFirestoreEmulator(this._db, 'localhost', 8080);
+        console.log('[Firestore] Emulator connected');
+      }
+
       this._initialized = true;
 
       return this._db;
@@ -78,7 +87,7 @@ class Firestore {
         await self._ensureInitialized();
         const docRef = self._firestoreMethods.doc(self._db, docPath);
         const docSnap = await self._firestoreMethods.getDoc(docRef);
-        
+
         return {
           exists: () => docSnap.exists(),
           data: () => docSnap.data(),
@@ -110,13 +119,13 @@ class Firestore {
   // Collection method for queries
   collection(collectionPath) {
     const self = this;
-    
+
     return {
       async get() {
         await self._ensureInitialized();
         const collRef = self._firestoreMethods.collection(self._db, collectionPath);
         const querySnapshot = await self._firestoreMethods.getDocs(collRef);
-        
+
         return {
           docs: querySnapshot.docs.map(doc => ({
             id: doc.id,
@@ -185,7 +194,7 @@ class Firestore {
       async get() {
         await self._ensureInitialized();
         const collRef = self._firestoreMethods.collection(self._db, collectionPath);
-        
+
         // Build query constraints
         const queryConstraints = [];
         for (const constraint of constraints) {
@@ -210,7 +219,7 @@ class Firestore {
 
         const q = self._firestoreMethods.query(collRef, ...queryConstraints);
         const querySnapshot = await self._firestoreMethods.getDocs(q);
-        
+
         return {
           docs: querySnapshot.docs.map(doc => ({
             id: doc.id,
@@ -239,4 +248,4 @@ class Firestore {
   }
 }
 
-export default Firestore;
+export default Firestore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "4.1.6",
+  "version": "4.1.8",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "dist/index.js",
   "module": "src/index.js",
@@ -42,14 +42,13 @@
     "@sentry/browser": "Resolved by using OVERRIDES in web-manager (lighthouse is the issue"
   },
   "dependencies": {
-    "@sentry/browser": "^10.30.0",
-    "firebase": "^12.6.0",
-    "itwcw-package-analytics": "^1.0.6",
-    "lodash": "^4.17.21",
-    "resolve-account": "^2.0.1"
+    "@sentry/browser": "^10.38.0",
+    "firebase": "^12.9.0",
+    "itwcw-package-analytics": "^1.0.8",
+    "lodash": "^4.17.23"
   },
   "devDependencies": {
     "mocha": "^8.4.0",
-    "prepare-package": "^1.2.5"
+    "prepare-package": "^1.2.6"
   }
 }