vasuzex 2.1.15 → 2.1.17

package/framework/Services/Notification/FirebaseAdmin.js

@@ -2,13 +2,14 @@
  * Firebase Admin SDK Singleton
  * Centralized Firebase Admin initialization for FCM
  * 
- * Configuration from environment variables:
- * - FIREBASE_PROJECT_ID
- * - FIREBASE_CLIENT_EMAIL  
- * - FIREBASE_PRIVATE_KEY
+ * Configuration options (in priority order):
+ * 1. FIREBASE_SERVICE_ACCOUNT_PATH - path to service account JSON file
+ * 2. Environment variables: FIREBASE_PROJECT_ID, FIREBASE_CLIENT_EMAIL, FIREBASE_PRIVATE_KEY
  */
 
 import admin from 'firebase-admin';
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
 import { Config, Log } from '../../Support/Facades/index.js';
 
 let firebaseApp = null;
@@ -24,20 +25,41 @@ export function initializeFirebaseAdmin() {
   }
 
   try {
+    // Option 1: Load from service account file (preferred)
+    const serviceAccountPath = Config.get('notification.fcm.service_account_path') || process.env.FIREBASE_SERVICE_ACCOUNT_PATH;
+    
+    if (serviceAccountPath) {
+      // Use PROJECT_ROOT if available, otherwise use process.cwd()
+      const projectRoot = process.env.PROJECT_ROOT || process.cwd();
+      
+      // Resolve from project root if relative, use as-is if absolute
+      const fullPath = serviceAccountPath.startsWith('/') 
+        ? serviceAccountPath 
+        : resolve(projectRoot, serviceAccountPath);
+      const serviceAccount = JSON.parse(readFileSync(fullPath, 'utf8'));
+      
+      firebaseApp = admin.initializeApp({
+        credential: admin.credential.cert(serviceAccount)
+      });
+
+      isInitialized = true;
+      Log.info('Firebase Admin SDK initialized from service account file', { 
+        projectId: serviceAccount.project_id,
+        path: fullPath 
+      });
+      return firebaseApp;
+    }
+
+    // Option 2: Load from environment variables
     const projectId = Config.get('notification.fcm.project_id') || process.env.FIREBASE_PROJECT_ID;
     const clientEmail = Config.get('notification.fcm.client_email') || process.env.FIREBASE_CLIENT_EMAIL;
     const privateKey = Config.get('notification.fcm.private_key') || process.env.FIREBASE_PRIVATE_KEY;
 
     if (!projectId || !clientEmail || !privateKey) {
-      Log.warning('Firebase Admin SDK not configured - FCM notifications disabled', {
-        hasProjectId: !!projectId,
-        hasClientEmail: !!clientEmail,
-        hasPrivateKey: !!privateKey
-      });
+      Log.warning('Firebase Admin SDK not configured - FCM notifications disabled');
       return null;
     }
 
-    // Handle escaped newlines in private key
     const formattedPrivateKey = privateKey.replace(/\\n/g, '\n');
 
     firebaseApp = admin.initializeApp({
@@ -49,13 +71,11 @@ export function initializeFirebaseAdmin() {
     });
 
     isInitialized = true;
-    Log.info('Firebase Admin SDK initialized successfully', { projectId });
-
+    Log.info('Firebase Admin SDK initialized from environment variables', { projectId });
     return firebaseApp;
   } catch (error) {
     Log.error('Failed to initialize Firebase Admin SDK', {
-      error: error.message,
-      stack: error.stack
+      error: error.message
     });
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vasuzex",
-  "version": "2.1.15",
+  "version": "2.1.17",
   "description": "Laravel-inspired framework for Node.js monorepos - V2 with optimized dependencies",
   "type": "module",
   "main": "./framework/index.js",
@@ -48,34 +48,6 @@
     "#config": "./config/index.cjs",
     "#config/*": "./config/*"
   },
-  "scripts": {
-    "dev": "turbo run dev",
-    "build": "turbo run build",
-    "start": "turbo run start",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch",
-    "test:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
-    "db:migrate": "npx vasuzex migrate",
-    "test:all": "NODE_OPTIONS=--experimental-vm-modules npx jest",
-    "test:unit": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/unit",
-    "test:integration": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/integration",
-    "test:e2e": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/e2e",
-    "scan:issues": "node deep-scan-issues.cjs",
-    "dev:pilot-test-api": "turbo run dev --filter=pilot-test-api",
-    "start:pilot-test-api": "turbo run start --filter=pilot-test-api",
-    "dev:pilot-test-web": "turbo run dev --filter=pilot-test-web",
-    "start:pilot-test-web": "turbo run start --filter=pilot-test-web",
-    "dev:integration-test-api": "turbo run dev --filter=integration-test-api",
-    "start:integration-test-api": "turbo run start --filter=integration-test-api",
-    "dev:test-gen-api-api": "turbo run dev --filter=test-gen-api-api",
-    "start:test-gen-api-api": "turbo run start --filter=test-gen-api-api",
-    "dev:cleanup-test-api": "turbo run dev --filter=cleanup-test-api",
-    "start:cleanup-test-api": "turbo run start --filter=cleanup-test-api",
-    "dev:auth-integration-test-api": "turbo run dev --filter=auth-integration-test-api",
-    "start:auth-integration-test-api": "turbo run start --filter=auth-integration-test-api",
-    "dev:e2e-test-api": "turbo run dev --filter=e2e-test-api",
-    "start:e2e-test-api": "turbo run start --filter=e2e-test-api"
-  },
   "keywords": [
     "framework",
     "laravel",
@@ -108,7 +80,7 @@
     "express-rate-limit": "^8.2.1",
     "firebase-admin": "^13.6.0",
     "fs-extra": "^11.3.2",
-    "guruorm": "^2.0.16",
+    "guruorm": "^2.0.17",
     "helmet": "^8.1.0",
     "inquirer": "^9.3.8",
     "ip2location-nodejs": "^9.7.0",
@@ -152,13 +124,6 @@
     "turbo": "^2.6.1",
     "vite": "^5.0.0"
   },
-  "pnpm": {
-    "overrides": {
-      "express": "^5.2.1",
-      "react": "^18.2.0",
-      "vue": "^3.4.0"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rishicool/vasuzex.git"
@@ -167,5 +132,32 @@
     "url": "https://github.com/rishicool/vasuzex/issues"
   },
   "homepage": "https://github.com/rishicool/vasuzex#readme",
-  "packageManager": "pnpm@10.0.0"
-}
+  "scripts": {
+    "dev": "turbo run dev",
+    "build": "turbo run build",
+    "start": "turbo run start",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch",
+    "test:coverage": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
+    "db:migrate": "npx vasuzex migrate",
+    "test:all": "NODE_OPTIONS=--experimental-vm-modules npx jest",
+    "test:unit": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/unit",
+    "test:integration": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/integration",
+    "test:e2e": "NODE_OPTIONS=--experimental-vm-modules npx jest tests/e2e",
+    "scan:issues": "node deep-scan-issues.cjs",
+    "dev:pilot-test-api": "turbo run dev --filter=pilot-test-api",
+    "start:pilot-test-api": "turbo run start --filter=pilot-test-api",
+    "dev:pilot-test-web": "turbo run dev --filter=pilot-test-web",
+    "start:pilot-test-web": "turbo run start --filter=pilot-test-web",
+    "dev:integration-test-api": "turbo run dev --filter=integration-test-api",
+    "start:integration-test-api": "turbo run start --filter=integration-test-api",
+    "dev:test-gen-api-api": "turbo run dev --filter=test-gen-api-api",
+    "start:test-gen-api-api": "turbo run start --filter=test-gen-api-api",
+    "dev:cleanup-test-api": "turbo run dev --filter=cleanup-test-api",
+    "start:cleanup-test-api": "turbo run start --filter=cleanup-test-api",
+    "dev:auth-integration-test-api": "turbo run dev --filter=auth-integration-test-api",
+    "start:auth-integration-test-api": "turbo run start --filter=auth-integration-test-api",
+    "dev:e2e-test-api": "turbo run dev --filter=e2e-test-api",
+    "start:e2e-test-api": "turbo run start --filter=e2e-test-api"
+  }
+}