powr-sdk-api 2.3.6 → 2.3.8

package/dist/config.js

@@ -2,8 +2,6 @@
 
 const config = {
   mongoUri: process.env.POWR_DB_URI,
-  projectId: process.env.PROJECT_ID,
-  jwtToken: process.env.JWT_TOKEN,
-  storageBucket: process.env.STORAGE_BUCKET
+  jwtToken: process.env.JWT_TOKEN
 };
 module.exports = config;

package/dist/middleware/jwtToken.js

@@ -5,10 +5,11 @@ const {
   ObjectId
 } = require('mongodb');
 const config = require('../config');
-const generateJWTToken = user => {
+const generateJWTToken = (user, profile = null) => {
   return jwt.sign({
     userId: user._id,
-    fullName: user.fullName
+    fullName: user.fullName,
+    access: profile === null || profile === void 0 ? void 0 : profile.access
   }, config.jwtToken, {
     expiresIn: '24h'
   });
@@ -28,20 +29,21 @@ const verifyToken = async (req, res, next) => {
 
     // Extract token (remove 'Bearer ' if present)
     const token = authHeader.startsWith("Bearer ") ? authHeader.slice(7) : authHeader;
+    if (!token) {
+      return res.status(401).json({
+        success: false,
+        message: 'No token provided'
+      });
+    }
 
     // Verify JWT token
     const decoded = jwt.verify(token, config.jwtToken);
     console.log("JWT Decoded user data:", JSON.stringify(decoded, null, 2));
-
-    // Attach user info to request object
     req.user = {
-      powrId: new ObjectId(decoded.userId),
-      // powr-base user ID
-      fullName: decoded.fullName // User's full name
+      powrId: decoded.userId,
+      fullName: decoded.fullName,
+      access: decoded.access
     };
-    console.log("Authenticated user:", {
-      powrId: req.user.powrId
-    });
     next();
   } catch (error) {
     console.error("Error in auth middleware:", error);

package/dist/routes/auth.js

@@ -23,7 +23,8 @@ router.post("/register", async (req, res) => {
     fullName,
     username,
     phoneOrEmail,
-    password
+    password,
+    projectId
   } = req.body;
   try {
     if (!(username || phoneOrEmail)) {
@@ -44,6 +45,14 @@ router.post("/register", async (req, res) => {
         message: "Full name is required"
       });
     }
+
+    // if (!projectId) {
+    //   return res.status(400).json({
+    //     success: false,
+    //     message: "Project ID is required"
+    //   });
+    // }
+
     let q = username ? {
       username: username
     } : {
@@ -72,6 +81,15 @@ router.post("/register", async (req, res) => {
       createdAt: new Date()
     };
     const result = await getDb().collection("users").insertOne(newUser);
+    if (projectId) {
+      const newProfile = {
+        userId: result.insertedId,
+        projectId: projectId,
+        createdAt: new Date(),
+        updatedAt: new Date()
+      };
+      await getDb().collection("profiles").insertOne(newProfile);
+    }
     return res.status(201).json({
       success: true,
       message: "User registered successfully",
@@ -91,7 +109,8 @@ router.post("/login", async (req, res) => {
   const {
     username,
     phoneOrEmail,
-    password
+    password,
+    projectId
   } = req.body;
   try {
     if (!(username || phoneOrEmail)) {
@@ -131,15 +150,66 @@ router.post("/login", async (req, res) => {
         message: "Invalid username or password."
       });
     }
-    const token = generateJWTToken(user);
+
+    // Fetch profile data if projectId is provided
+    let profile = null;
+    if (projectId) {
+      profile = await getDb().collection("profiles").findOne({
+        userId: user._id,
+        projectId: projectId
+      });
+      if (profile) {
+        // Update lastActiveAt
+        await getDb().collection("profiles").updateOne({
+          _id: profile._id
+        }, {
+          $set: {
+            lastActiveAt: new Date()
+          }
+        });
+      } else {
+        // Create profile if it doesn't exist - only essential fields
+        const newProfile = {
+          userId: user._id,
+          projectId: projectId,
+          createdAt: new Date(),
+          updatedAt: new Date()
+        };
+        const profileResult = await getDb().collection("profiles").insertOne(newProfile);
+        profile = {
+          _id: profileResult.insertedId,
+          ...newProfile
+        };
+      }
+    }
+    const token = generateJWTToken(user, profile);
     const {
       password: _,
+      _id,
       ...userWithoutPassword
     } = user;
+    let mergedUser = {
+      ...userWithoutPassword,
+      powrId: user._id
+    };
+    if (profile) {
+      const {
+        _id,
+        userId,
+        projectId,
+        createdAt,
+        updatedAt,
+        ...profileData
+      } = profile;
+      mergedUser = {
+        ...mergedUser,
+        ...profileData
+      };
+    }
     return res.status(200).json({
       success: true,
       message: "Login successful",
-      user: userWithoutPassword,
+      user: mergedUser,
       token: token
     });
   } catch (error) {

package/dist/routes/files.js

@@ -3,11 +3,7 @@
 const express = require('express');
 const multer = require('multer');
 // const { uploadToGCS, bucket } = require('../uploadToGCS')
-const {
-  bucket,
-  uploadToGCS,
-  bucketName
-} = require('../uploadToGCS.js');
+// const { bucket, uploadToGCS, bucketName } = require('../uploadToGCS.js')
 // const uploadToGCS = require('../uploadToGCS.js')
 
 const router = express.Router();
@@ -20,11 +16,13 @@ router.post('/', upload.single('file'), async (req, res) => {
         message: 'No file uploaded'
       });
     }
-    const url = await uploadToGCS(req.file);
+
+    // const url = await uploadToGCS(req.file);
+
     return res.status(200).json({
       status: 'success',
-      message: 'File uploaded successfully',
-      url
+      message: 'File uploaded successfully'
+      // url,
     });
   } catch (err) {
     console.error('Error uploading file:', err);
@@ -37,12 +35,13 @@ router.post('/', upload.single('file'), async (req, res) => {
 });
 router.get('/', async (req, res) => {
   try {
-    const [files] = await bucket.getFiles();
-    const bucketName = bucket.name;
-    const imageUrls = files.map(file => `https://storage.googleapis.com/${bucketName}/${file.name}`);
+    // const [files] = await bucket.getFiles();
+    // const bucketName = bucket.name;
+    // const imageUrls = files.map(file => `https://storage.googleapis.com/${bucketName}/${file.name}`);
+
     return res.status(200).json({
-      message: 'Images fetched successfully',
-      images: imageUrls
+      message: 'Images fetched successfully'
+      // images: imageUrls,
     });
   } catch (err) {
     console.error('Error listing files from GCS:', err);

package/dist/routes/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const express = require('express');
+const config = require('../config');
 
 // Import all route modules
 const commentsRoutes = require('./comments');
@@ -17,17 +18,30 @@ const authRoutes = require('./auth');
 const blogsRoutes = require('./blogs');
 const slidesRoutes = require('./slides');
 const notificationsRoutes = require('./notifications');
-const createPowrRoutes = () => {
+const profilesRoutes = require('./profiles');
+const createPowrRoutes = (options = {}) => {
   const router = express.Router();
 
+  // Check if this is a central service (like powr-base-cloud)
+  const isCentralService = options.isCentralService || false;
+
   // Middleware to inject projectId into all requests
   router.use((req, res, next) => {
     try {
-      const {
-        getConfig
-      } = require('../config');
-      const config = getConfig();
-      req.projectId = config.projectId;
+      if (isCentralService) {
+        // For central services, get projectId from request
+        const projectId = req.query.projectId || req.body.projectId;
+        if (!projectId) {
+          return res.status(400).json({
+            success: false,
+            message: 'projectId is required for central services'
+          });
+        }
+        req.projectId = projectId;
+      } else {
+        // For individual APIs, use config.projectId
+        req.projectId = config.projectId;
+      }
     } catch (error) {
       console.error('❌ Config error:', error.message);
       return res.status(500).json({
@@ -38,8 +52,6 @@ const createPowrRoutes = () => {
     }
     next();
   });
-
-  // Mount all route modules
   router.use('/comments', commentsRoutes);
   // router.use('/files', filesRoutes); // Commented out for now
   router.use('/forms', formsRoutes);
@@ -54,6 +66,7 @@ const createPowrRoutes = () => {
   router.use('/blogs', blogsRoutes);
   router.use('/slides', slidesRoutes);
   router.use('/notifications', notificationsRoutes);
+  router.use('/profiles', profilesRoutes);
   return router;
 };
 module.exports = {

package/dist/routes/profiles.js

@@ -0,0 +1,60 @@
+"use strict";
+
+const express = require("express");
+const router = express.Router();
+const {
+  getDb
+} = require("../services/dbService");
+
+// Get all users for a project
+router.get("/", async (req, res) => {
+  try {
+    const {
+      projectId
+    } = req.query;
+    const profiles = await getDb().collection("profiles").find({
+      projectId: projectId
+    }).toArray();
+    if (profiles.length === 0) {
+      return res.status(200).json({
+        success: true,
+        users: []
+      });
+    }
+
+    // Get core user data for all profiles
+    const userIds = profiles.map(profile => profile.userId);
+    const users = await getDb().collection("users").find({
+      _id: {
+        $in: userIds
+      }
+    }).toArray();
+
+    // Create a map for quick lookup
+    const usersMap = users.reduce((acc, user) => {
+      const {
+        password,
+        ...userWithoutPassword
+      } = user;
+      acc[user._id.toString()] = userWithoutPassword;
+      return acc;
+    }, {});
+
+    // Merge user and profile data
+    const usersWithProfiles = profiles.map(profile => ({
+      ...usersMap[profile.userId.toString()],
+      ...profile
+    }));
+    return res.status(200).json({
+      success: true,
+      users: usersWithProfiles
+    });
+  } catch (error) {
+    console.error("Error fetching project users:", error);
+    return res.status(500).json({
+      success: false,
+      message: "Failed to fetch project users"
+    });
+  }
+});
+module.exports = router;

package/dist/services/dbService.js

@@ -3,38 +3,40 @@
 const {
   MongoClient
 } = require('mongodb');
-
-// Database service with lazy connection
-let client = null;
-let db = null;
-const getDb = async () => {
-  // Return existing connection if available
-  if (db) {
-    return db;
-  }
-
-  // Connect only when first needed
+const {
+  config
+} = require('../config');
+const mongoClient = new MongoClient(config.mongoUri, {
+  maxPoolSize: 10,
+  serverSelectionTimeoutMS: 5000,
+  socketTimeoutMS: 45000
+});
+let db;
+async function connect() {
   try {
-    const config = require('../config').getConfig();
-    client = new MongoClient(config.mongoUri);
-    await client.connect();
-    db = client.db();
-    console.log('✅ Connected to MongoDB via SDK (lazy connection)');
-    return db;
+    await mongoClient.connect();
+    db = mongoClient.db();
+    console.log("Connected to MongoDB via SDK");
   } catch (error) {
-    console.error('❌ MongoDB connection error:', error);
-    throw error;
+    console.error("Failed to connect to MongoDB:", error);
+    process.exit(1);
   }
-};
+}
+function getDb() {
+  if (!db) {
+    throw new Error("Database not initialized. Call connectToMongo() first.");
+  }
+  return db;
+}
 const closeConnection = async () => {
-  if (client) {
-    await client.close();
-    client = null;
+  if (mongoClient) {
+    await mongoClient.close();
     db = null;
     console.log('✅ MongoDB connection closed');
   }
 };
 module.exports = {
+  connect,
   getDb,
   closeConnection
 };

package/package.json

@@ -1,67 +1,67 @@
-{
-  "name": "powr-sdk-api",
-  "version": "2.3.6",
-  "description": "Shared API core library for PowrStack projects",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "jest --passWithNoTests",
-    "lint": "eslint .",
-    "build": "babel src -d dist",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run test"
-  },
-  "keywords": [
-    "api",
-    "express",
-    "middleware",
-    "error-handling",
-    "response-formatting",
-    "logging",
-    "swagger",
-    "documentation"
-  ],
-  "author": "PowrStack",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/powrstack/powr-sdk-api.git"
-  },
-  "bugs": {
-    "url": "https://github.com/powrstack/powr-sdk-api/issues"
-  },
-  "homepage": "https://github.com/powrstack/powr-sdk-api#readme",
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.787.0",
-    "@google-cloud/storage": "^7.16.0",
-    "express": "^4.18.2",
-    "jsonwebtoken": "^9.0.2",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.0",
-    "winston": "^3.17.0",
-    "mongodb": "^6.3.0",
-    "multer": "^1.4.5-lts.1",
-    "bcrypt": "^5.1.1"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@types/express": "^4.17.21",
-    "@types/swagger-jsdoc": "^6.0.4",
-    "@types/swagger-ui-express": "^4.1.6",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "typescript": "^5.3.3"
-  },
-  "peerDependencies": {
-    "express": "^4.18.2"
-  },
-  "engines": {
-    "node": ">=14.0.0"
-  }
-}
+{
+  "name": "powr-sdk-api",
+  "version": "2.3.8",
+  "description": "Shared API core library for PowrStack projects",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "jest --passWithNoTests",
+    "lint": "eslint .",
+    "build": "babel src -d dist",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run test"
+  },
+  "keywords": [
+    "api",
+    "express",
+    "middleware",
+    "error-handling",
+    "response-formatting",
+    "logging",
+    "swagger",
+    "documentation"
+  ],
+  "author": "PowrStack",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powrstack/powr-sdk-api.git"
+  },
+  "bugs": {
+    "url": "https://github.com/powrstack/powr-sdk-api/issues"
+  },
+  "homepage": "https://github.com/powrstack/powr-sdk-api#readme",
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.787.0",
+    "@google-cloud/storage": "^7.16.0",
+    "express": "^4.18.2",
+    "jsonwebtoken": "^9.0.2",
+    "swagger-jsdoc": "^6.2.8",
+    "swagger-ui-express": "^5.0.0",
+    "winston": "^3.17.0",
+    "mongodb": "^6.3.0",
+    "multer": "^1.4.5-lts.1",
+    "bcrypt": "^5.1.1"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.24.0",
+    "@babel/preset-env": "^7.24.0",
+    "@types/express": "^4.17.21",
+    "@types/swagger-jsdoc": "^6.0.4",
+    "@types/swagger-ui-express": "^4.1.6",
+    "eslint": "^8.57.0",
+    "jest": "^29.7.0",
+    "typescript": "^5.3.3"
+  },
+  "peerDependencies": {
+    "express": "^4.18.2"
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  }
+}