bug fix + use id instead of username for lookup

pages/api/auth/[...nextauth].ts

@@ -110,7 +110,6 @@ export const authOptions: AuthOptions = {
         PRICE_ID &&
         (trigger || subscriptionIsTimesUp || !token.isSubscriber)
       ) {
-        console.log("EXECUTED!!!");
         const subscription = await checkSubscription(
           STRIPE_SECRET_KEY,
           token.email as string,

pages/api/avatar/[id].ts

@@ -8,10 +8,10 @@ export default async function Index(req: NextApiRequest, res: NextApiResponse) {
   const session = await getServerSession(req, res, authOptions);
 
   const userId = session?.user.id;
-  const userName = session?.user.username?.toLowerCase();
+  const username = session?.user.username?.toLowerCase();
   const queryId = Number(req.query.id);
 
-  if (!userId || !userName)
+  if (!userId || !username)
     return res
       .setHeader("Content-Type", "text/plain")
       .status(401)
@@ -37,7 +37,7 @@ export default async function Index(req: NextApiRequest, res: NextApiResponse) {
 
     if (
       targetUser?.isPrivate &&
-      !targetUser.whitelistedUsers.includes(userName)
+      !targetUser.whitelistedUsers.includes(username)
     ) {
       return res
         .setHeader("Content-Type", "text/plain")

pages/api/payment/index.ts

@@ -8,7 +8,7 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
   const PRICE_ID = process.env.PRICE_ID;
   const session = await getServerSession(req, res, authOptions);
 
-  if (!session?.user?.username)
+  if (!session?.user?.id)
     return res.status(401).json({ response: "You must be logged in." });
   else if (!STRIPE_SECRET_KEY || !PRICE_ID) {
     return res.status(400).json({ response: "Payment is disabled." });
@@ -18,7 +18,6 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
     const users = await paymentCheckout(
       STRIPE_SECRET_KEY,
       session?.user.email,
-      "register",
       PRICE_ID
     );
     return res.status(users.status).json({ response: users.response });

pages/api/routes/collections/index.ts

@@ -12,7 +12,7 @@ export default async function collections(
 ) {
   const session = await getServerSession(req, res, authOptions);
 
-  if (!session?.user?.username) {
+  if (!session?.user?.id) {
     return res.status(401).json({ response: "You must be logged in." });
   } else if (session?.user?.isSubscriber === false)
     res.status(401).json({

pages/api/routes/links/index.ts

@@ -9,7 +9,7 @@ import updateLink from "@/lib/api/controllers/links/updateLink";
 export default async function links(req: NextApiRequest, res: NextApiResponse) {
   const session = await getServerSession(req, res, authOptions);
 
-  if (!session?.user?.username) {
+  if (!session?.user?.id) {
     return res.status(401).json({ response: "You must be logged in." });
   } else if (session?.user?.isSubscriber === false)
     res.status(401).json({

pages/api/routes/users/index.ts

@@ -7,7 +7,7 @@ import updateUser from "@/lib/api/controllers/users/updateUser";
 export default async function users(req: NextApiRequest, res: NextApiResponse) {
   const session = await getServerSession(req, res, authOptions);
 
-  if (!session?.user.username) {
+  if (!session?.user.id) {
     return res.status(401).json({ response: "You must be logged in." });
   } else if (session?.user?.isSubscriber === false)
     res.status(401).json({
@@ -17,7 +17,10 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
 
   const lookupUsername = (req.query.username as string) || undefined;
   const lookupId = Number(req.query.id) || undefined;
-  const isSelf = session.user.username === lookupUsername ? true : false;
+  const isSelf =
+    session.user.username === lookupUsername || session.user.id === lookupId
+      ? true
+      : false;
 
   if (req.method === "GET") {
     const users = await getUsers({
@@ -34,10 +37,3 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
     return res.status(updated.status).json({ response: updated.response });
   }
 }
-
-// {
-//   lookupUsername,
-//   lookupId,
-// },
-// isSelf,
-// session.user.username