@feardread/fear 1.1.5 → 1.1.7

package/controllers/order.js

@@ -7,7 +7,6 @@ exports.getMyOrders = async (req, res) => {
       const orders = await Order.find({ user: _id })
         .populate("user")
         .populate("orderItems.product")
-        .populate("orderItems.color");
       res.json({
         orders,
       });

package/controllers/payment.js

@@ -1,191 +1,11 @@
-const Razorpay = require("razorpay");
-const paypal = require("@paypal/checkout-server-sdk");
-const Payment = require("../models/payment");
+const Payment = require('../models/payment');
 const methods = require("./crud");
 
-const instance = new Razorpay({
-  key_id: "rzp_test_HSSeDI22muUrLR",
-  key_secret: "sRO0YkBxvgMg0PvWHJN16Uf7",
-});
 
-// Razorpay instance
-const razorpayInstance = new Razorpay({
-  key_id: "rzp_test_HSSeDI22muUrLR",
-  key_secret: "sRO0YkBxvgMg0PvWHJN16Uf7",
-});
-
-// PayPal environment setup
-const paypalEnvironment = () => {
-  const clientId = process.env.PAYPAL_CLIENT_ID || "YOUR_PAYPAL_CLIENT_ID";
-  const clientSecret = process.env.PAYPAL_CLIENT_SECRET || "YOUR_PAYPAL_CLIENT_SECRET";
-  
-  // Use sandbox for testing, live for production
-  return new paypal.core.SandboxEnvironment(clientId, clientSecret);
-  // For production: return new paypal.core.LiveEnvironment(clientId, clientSecret);
-};
-
-const paypalClient = () => {
-  return new paypal.core.PayPalHttpClient(paypalEnvironment());
-};
-
-exports.checkout = async (req, res) => {
-  try {
-    const { amount } = req.body;
-    const option = {
-      amount: amount * 100,
-      currency: "INR",
-    };
-    const order = await razorpayInstance.orders.create(option);
-    res.json({
-      success: true,
-      order,
-    });
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: "Error creating Razorpay order",
-      error: error.message,
-    });
-  }
-};
-
-exports.paymentVerification = async (req, res) => {
-  try {
-    const { razorpayOrderId, razorpayPaymentId, razorpaySignature } = req.body;
-    
-    // Verify signature for security
-    const crypto = require("crypto");
-    const generatedSignature = crypto
-      .createHmac("sha256", "sRO0YkBxvgMg0PvWHJN16Uf7")
-      .update(`${razorpayOrderId}|${razorpayPaymentId}`)
-      .digest("hex");
-    
-    if (generatedSignature === razorpaySignature) {
-      res.json({
-        success: true,
-        razorpayOrderId,
-        razorpayPaymentId,
-        verified: true,
-      });
-    } else {
-      res.status(400).json({
-        success: false,
-        message: "Payment verification failed",
-      });
-    }
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: "Error verifying payment",
-      error: error.message,
-    });
-  }
-};
-
-exports.createStripePayment = async (req, res) => {
-   try {
-    const { paymentMethodId, amount, currency } = req.body;
-
-    // Create a PaymentIntent
-    const paymentIntent = await stripe.paymentIntents.create({
-      amount: amount,
-      currency: currency || 'usd',
-      payment_method: paymentMethodId,
-      confirmation_method: 'manual',
-      confirm: true,
-      return_url: 'https://your-site.com/payment-success',
-    });
-
-    res.json({
-      clientSecret: paymentIntent.client_secret,
-      status: paymentIntent.status,
-    });
-  } catch (error) {
-    res.status(400).json({ error: error.message });
-  }
-};
-exports.saveStripePayment = async (req, res) => {
-  try {
-    const { paymentMethodId, customerId } = req.body;
-
-    // Attach payment method to customer
-    await stripe.paymentMethods.attach(paymentMethodId, {
-      customer: customerId,
-    });
-
-    // Set as default payment method
-    await stripe.customers.update(customerId, {
-      invoice_settings: {
-        default_payment_method: paymentMethodId,
-      },
-    });
-
-    res.json({ success: true });
-  } catch (error) {
-    res.status(400).json({ error: error.message });
-  }
-}
-// ============ PAYPAL METHODS ============
-
-exports.createPayPalOrder = async (req, res) => {
-  try {
-    const { amount, currency = "USD" } = req.body;
-    
-    const request = new paypal.orders.OrdersCreateRequest();
-    request.prefer("return=representation");
-    request.requestBody({
-      intent: "CAPTURE",
-      purchase_units: [{
-        amount: {
-          currency_code: currency,
-          value: amount.toString(),
-        },
-      }],
-    });
-    
-    const order = await paypalClient().execute(request);
-    
-    res.json({
-      success: true,
-      orderId: order.result.id,
-      order: order.result,
-    });
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: "Error creating PayPal order",
-      error: error.message,
-    });
-  }
-};
-
-exports.capturePayPalOrder = async (req, res) => {
-  try {
-    const { orderId } = req.body;
-    
-    const request = new paypal.orders.OrdersCaptureRequest(orderId);
-    request.requestBody({});
-    
-    const capture = await paypalClient().execute(request);
-    
-    res.json({
-      success: true,
-      captureId: capture.result.id,
-      status: capture.result.status,
-      capture: capture.result,
-    });
-  } catch (error) {
-    res.status(500).json({
-      success: false,
-      message: "Error capturing PayPal order",
-      error: error.message,
-    });
-  }
-};
-
-const crud = methods.crudController( Payment );
-for(prop in crud) {
-  if(crud.hasOwnProperty(prop)) {
+// Extend with CRUD methods
+const crud = methods.crudController(Payment);
+for (const prop in crud) {
+  if (crud.hasOwnProperty(prop)) {
     module.exports[prop] = crud[prop];
   }
 }

package/libs/db/index.js

@@ -41,6 +41,11 @@ class DatabaseManager {
       await this.close();
       process.exit(0);
     });
+
+    process.on('UnhandledRejection', async (promise, reson) => {
+      console.log('Unhandled Rejection at ', reason);
+      await this.close();
+    })
   }
 
   /**

package/libs/emailer/info.js

@@ -1,41 +1,29 @@
 require("dotenv").config({ path: "backend/.env" });
 
 module.exports = {
-  "smtp": {
-    "service": process.env.SMTP_SERVICE,
-    "host": process.env.SMTP_HOST,
-    "port": process.env.SMTP_PORT,
-    "auth": {
-      "user": process.env.SMTP_MAIL,
-      "pass": process.env.SMTP_PASS
-    },
-    "apps": {
-      "gfolio": {
-        "auth": {
-          "user": process.env.SMTP_MAIL,
-          "pass": process.env.SMTP_PASS
-        },
-      },
-      "gdrea": {
-        "auth": {
-          "user": process.env.SMTP_MAIL,
-          "pass": process.env.SMTP_PASS
-        },
-      },
-      "jbird": {
-        "auth": {
-          "user": process.env.SMTP_MAIL,
-          "pass": process.env.SMTP_PASS
-        },
-      },
-    }
+  mailgun: {
+    domain: "fear.dedyn.io",
+    region: 'US',
+    apikey: process.env.MG_API_KEY,
+    sandbox: "sandbox933b4315c0164f209bbf0bc7fb908598.mailgun.org"
   },
-  "imap": {
-    "host": "mail.mydomain.com",
-    "port": 999,
-    "auth": {
-      "user": "user@domain.com",
-      "pass": "xxx"
+  smtp: {
+    secure: process.env.SMTP_SECURE === 'true',
+    mailgun: {
+      host: process.env.MG_SMTP_HOST,
+      port: parseInt(process.env.SMTP_PORT),
+      auth: {
+        user: process.env.MG_SMTP_USER,
+        pass: process.env.MG_SMTP_PASS
+      }
+    },
+    google: {
+      host: process.env.GOOGLE_SMTP_HOST,
+      port: parseInt(process.env.SMTP_PORT),
+      auth: {
+        user: process.env.GOOGLE_SMTP_USER,
+        pass: process.env.GOOGLE_SMTP_PASS
+      }
     }
   }
 }