fix: misc auth issues

Author: debater-coder

api/token.mjs

@@ -2,6 +2,10 @@ import fetch from "node-fetch";
 import cookie from "cookie";
 
 export default async function handler(request, response) {
+  if (process.env.VERCEL_ENV === "development") {
+    console.log("Running in development mode...");
+  }
+
   switch (request.method) {
     case "POST":
       try {
@@ -102,17 +106,18 @@ export default async function handler(request, response) {
       let data;
 
       if (!res.ok) {
-        response.status(500).send("Bad response from server.");
-        return;
-      }
-
-      try {
-        data = await res.json();
-      } catch {
-        if (data && data?.["error"] == "invalid_grant") {
-          response.status(500).send("INVALID GRANT");
+        try {
+          const json = await res.json();
+          if (json["error"] == "invalid_grant") {
+            response.status(400).send("invalid_grant");
+            return;
+          }
+        } catch {
+          response.status(500).send("Bad json from server.");
           return;
         }
+        response.status(500).send("Bad response from server.");
+        return;
       }
 
       response.setHeader("Set-Cookie", [
@@ -132,7 +137,7 @@ export default async function handler(request, response) {
         }),
       ]);
 
-      response.status(200).send("");
+      response.status(200).send("Sucessfully refreshed token");
       break;
     }
   }

src/Auth.tsx

@@ -121,6 +121,20 @@ export class Auth {
         },
       });
 
+      try {
+        const error = await res.text();
+
+        if (error === "invalid_grant") {
+          console.log("invalid_grant");
+          this.shouldLogin = true;
+          this.refreshing = false;
+          rerender?.();
+          return;
+        }
+      } catch {
+        throw new Error("Can't read text from response");
+      }
+
       if (!res.ok) {
         throw new HTTPError(res.status);
       }

src/services/sbhsApi/fetchSbhsApi.ts

@@ -56,11 +56,10 @@ export const fetchSbhsApi = async <TSBHSAPIData>(
           new CustomEvent("onlinechange", { detail: { online: false } })
         );
         throw new NetworkError("SBHS API server is not available");
-      default:
-        if (res.status === 401) {
-          auth.shouldLogin = true;
-          throw new UnauthorizedError();
-        }
+    }
+    if (res.status === 401) {
+      auth.shouldLogin = true;
+      throw new UnauthorizedError();
     }
     throw new HTTPError(res.status);
   }

vite.config.ts

@@ -23,6 +23,8 @@ export default defineConfig({
       ],
       mode: "production", // this inlines the module imports when using yarn build
     }),
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     replace({
       is_vite_preview: true, // this is used to conditionally call Workbox's precacheAndRoute function
       preventAssignment: true,