fix(dashboard): undo the cursed stuff I did

Author: ToastedDev

api/src/index.ts

@@ -834,39 +834,42 @@ app.get("/auth/callback", async (req, res) => {
     res.redirect(`${WEBSITE_URL}/dashboard`);
 });
 
-const userRouter = express.Router();
-
-userRouter.use(
+app.get(
+    "/auth/user",
     cors({
         origin: ["http://localhost:56413", "https://chatr.fun"],
         credentials: true,
-    })
-);
-
-userRouter.get("/", async (req, res) => {
-    const user = await getUserFromRequest(req);
-
-    if (!user) return res.status(401).json({ message: "Unauthorized" });
+    }),
+    async (req, res) => {
+        const user = await getUserFromRequest(req);
 
-    res.json({
-        ...user,
-        access_token: undefined,
-        refresh_token: undefined,
-        expires_at: undefined,
-    });
-});
+        if (!user) return res.status(401).json({ message: "Unauthorized" });
 
-userRouter.delete("/", async (req, res) => {
-    if (!(await getUserFromRequest(req))) {
-        return res.status(401).json({ message: "Unauthorized" });
+        res.json({
+            ...user,
+            access_token: undefined,
+            refresh_token: undefined,
+            expires_at: undefined,
+        });
     }
+);
 
-    res.clearCookie("token");
+app.post(
+    "/auth/logout",
+    cors({
+        origin: ["http://localhost:56413", "https://chatr.fun"],
+        credentials: true,
+    }),
+    async (req, res) => {
+        if (!(await getUserFromRequest(req))) {
+            return res.status(401).json({ message: "Unauthorized" });
+        }
 
-    return res.sendStatus(200);
-});
+        res.clearCookie("token");
 
-app.use("/user/me", userRouter);
+        return res.sendStatus(200);
+    }
+);
 
 app.get("/auth/user/guilds", async (req, res) => {
     const user = await getUserFromRequest(req);

web/components/navbar.tsx

@@ -37,8 +37,8 @@ export const Navbar = () => {
 
     const logout = useMutation({
         mutationFn: () =>
-            fetch(`${API_URL}/user/me`, {
-                method: "DELETE",
+            fetch(`${API_URL}/auth/logout`, {
+                method: "POST",
                 credentials: "include",
             }),
         onSuccess: () => {

web/pages/dashboard/[server].tsx

@@ -135,7 +135,7 @@ export default function Dashboard({
 }
 
 export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
-    const userResponse = await fetch(`${API_URL}/user/me`, {
+    const userResponse = await fetch(`${API_URL}/auth/user`, {
         headers: {
             cookie: ctx.req.headers.cookie ?? "",
         },