Minor imporvements and logs

src/pages/api/paypal/approve.ts

@@ -42,16 +42,14 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   if (!trackingId)
     return res.status(401).json({ ok: false, reason: "Missing tracking id!" });
 
-  const request = await axios.post(
+  const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders/${id}/capture`;
-    `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders/${id}/capture`,
+  const headers = {
-    {},
-    {
     headers: {
       Authorization: `Bearer ${accessToken}`,
       "PayPal-Client-Metadata-Id": trackingId,
     },
-    }
+  };
-  );
+  const request = await axios.post(url, {}, headers);
 
   if (request.data.status === "COMPLETED") {
     const user = req.session.user;
@@ -75,22 +73,21 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     );
 
     try {
-			await setDoc(
+      await setDoc(doc(db, "paypalpayments", v4()), {
-				doc(db, 'paypalpayments', v4()),
-				{
         orderId: id,
         userId: req.session.user.id,
         status: request.data.status,
         createdAt: new Date().toISOString(),
         value: request.data.purchase_units[0].payments.captures[0].amount.value,
-					currency: request.data.purchase_units[0].payments.captures[0].amount.currency_code,
+        currency:
+          request.data.purchase_units[0].payments.captures[0].amount
+            .currency_code,
         subscriptionDuration: duration,
         subscriptionDurationUnit: duration_unit,
         subscriptionExpirationDate: updatedExpirationDate.toISOString(),
-				}
+      });
-			);
+    } catch (err) {
-		} catch(err) {
+      console.error("Failed to insert paypal payment!", err);
-			console.error('Failed to insert paypal payment!', err);
     }
 
     if (user.type === "corporate") {
@@ -123,9 +120,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     return res.status(200).json({ ok: true });
   }
 
-  res
+  res.status(404).json({
-    .status(404)
-    .json({
     ok: false,
     reason: "Order ID not found or purchase was not approved!",
   });

src/pages/api/paypal/index.ts

@@ -1,34 +1,42 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type {NextApiRequest, NextApiResponse} from "next";
+import type { NextApiRequest, NextApiResponse } from "next";
-import {app} from "@/firebase";
+import { app } from "@/firebase";
-import {getFirestore, collection, getDocs} from "firebase/firestore";
+import { getFirestore, collection, getDocs } from "firebase/firestore";
-import {withIronSessionApiRoute} from "iron-session/next";
+import { withIronSessionApiRoute } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
 import axios from "axios";
-import {v4} from "uuid";
+import { v4 } from "uuid";
-import {OrderResponseBody} from "@paypal/paypal-js";
+import { OrderResponseBody } from "@paypal/paypal-js";
-import {getAccessToken} from "@/utils/paypal";
+import { getAccessToken } from "@/utils/paypal";
 
 const db = getFirestore(app);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
-	if (req.method !== "POST") return res.status(404).json({ok: false, reason: "Method not supported!"});
+  if (req.method !== "POST")
-	if (!req.session.user) return res.status(401).json({ok: false});
+    return res.status(404).json({ ok: false, reason: "Method not supported!" });
+  if (!req.session.user) return res.status(401).json({ ok: false });
 
   const accessToken = await getAccessToken();
-	if (!accessToken) return res.status(401).json({ok: false, reason: "Authorization failed!"});
+  if (!accessToken)
+    return res.status(401).json({ ok: false, reason: "Authorization failed!" });
 
-	const {currencyCode, price, trackingId} = req.body as {currencyCode: string; price: number, trackingId: string};
+  const { currencyCode, price, trackingId } = req.body as {
+    currencyCode: string;
+    price: number;
+    trackingId: string;
+  };
 
-  if(!trackingId) return res.status(401).json({ok: false, reason: "Missing tracking id!"});
+  if (!trackingId)
+    return res.status(401).json({ ok: false, reason: "Missing tracking id!" });
 
-	const request = await axios.post<OrderResponseBody>(
+  const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders`;
-		`${process.env.PAYPAL_ACCESS_TOKEN_URL}/v2/checkout/orders`,
+
-		{
+  const data = {
     purchase_units: [
       {
+        invoice_id: `INV-${v4()}`,
         amount: {
           currency_code: currencyCode,
           value: price.toString(),
@@ -45,18 +53,28 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           landing_page: "LOGIN",
           shipping_preference: "NO_SHIPPING",
           user_action: "PAY_NOW",
+          brand_name: "Encoach",
         },
       },
     },
     intent: "CAPTURE",
-		},
+  };
-		{
+
+  const headers = {
     headers: {
       Authorization: `Bearer ${accessToken}`,
-        'PayPal-Client-Metadata-Id': trackingId,
+      "PayPal-Client-Metadata-Id": trackingId,
-			},
     },
+  };
+  console.log(
+    JSON.stringify({
+      url,
+      data,
+      headers,
+    })
   );
 
+  const request = await axios.post<OrderResponseBody>(url, data, headers);
+
   res.status(request.status).json(request.data);
 }

src/pages/api/paypal/raas.ts

@@ -26,24 +26,27 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   const trackingId = `${req.session.user.id}-${Date.now()}`;
 
   const url = `${process.env.PAYPAL_ACCESS_TOKEN_URL}/v1/risk/transaction-contexts/${process.env.PAYPAL_MERCHANT_ID}/${trackingId}`;
-
+  const data = {
-  try {
-    const request = await axios.put(
-      url,
-      {
     additional_data: [
       {
         key: "user_id",
         value: req.session.user.id,
       },
     ],
-      },
+  };
-      {
+
+  const headers = {
     headers: {
       Authorization: `Bearer ${accessToken}`,
     },
-      }
+  };
-    );
+  console.log(JSON.stringify({
+    url,
+    data,
+    headers,
+  }));
+  try {
+    const request = await axios.put(url, data, headers);
 
     return res.status(request.status).json({
       ok: true,