Merge branch 'main' into render-on-yaml

Author: aster-void

server/prisma/sql/recommend.sql

@@ -8,13 +8,13 @@ AS overlap FROM "User" recv
 WHERE recv.id <> $1
 
 AND NOT EXISTS (
-    SELECT * FROM "Relationship" rel
+    SELECT 1 FROM "Relationship" rel
     WHERE rel."sendingUserId" IN ($1, recv.id) AND rel."receivingUserId" IN ($1, recv.id)
-    AND status = 'MATCHED'
+    AND (status = 'MATCHED' OR status = 'REJECTED')
 )
 
 AND NOT EXISTS (
-    SELECT * FROM  "Relationship" rel_pd
+    SELECT 1 FROM  "Relationship" rel_pd
     WHERE rel_pd."sendingUserId" = $1 AND rel_pd."receivingUserId" = recv.id
     AND status = 'PENDING'
 )

web/src/firebase/auth/lib.ts

@@ -1,29 +1,29 @@
 import { getAuth, onAuthStateChanged } from "firebase/auth";
 import type { User } from "firebase/auth";
 import type { IDToken } from "../../common/types";
+import { app } from "../config";
 
 export class ErrUnauthorized extends Error {}
 
-export async function getIdToken(): Promise<IDToken> {
-  const auth = getAuth();
-  const user = await new Promise<User>((resolve) => {
-    const unsubscribe = onAuthStateChanged(auth, (user: User | null) => {
-      if (user != null) {
-        resolve(user);
-        unsubscribe();
-      } else {
-        console.error("getIdToken: user is null");
-      }
-    });
-  });
-
-  if (user == null) {
-    throw new Error(
-      "Client Error: firebase/auth/lib.ts: current user not found",
-    );
+let user: User;
+let token: string;
+
+const auth = getAuth(app);
+onAuthStateChanged(auth, async (u: User | null) => {
+  if (u != null) {
+    user = u;
+    token = await user.getIdToken();
   }
+});
+
+async function refreshToken() {
+  token = await user.getIdToken(true);
+}
 
-  return await user.getIdToken(true);
+export async function getIdToken(): Promise<IDToken> {
+  if (token) return token;
+  await refreshToken();
+  return token;
 }
 
 type RequestMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
@@ -48,9 +48,11 @@ export async function credFetch(
     };
   }
 
-  const res = await fetch(`${path}?token=${idToken}`, init);
+  let res = await fetch(`${path}?token=${idToken}`, init);
+  if (res.status === 401) {
+    await refreshToken();
+    res = await fetch(`${path}?token=${idToken}`);
+  }
 
-  // if (res.status === 401) throw new ErrUnauthorized();
-  // if (!res.ok) throw new Error("response was not ok");
   return res;
 }