Googleアカウントでログインした場合は初回のみアカウント情報を登録するように変更

functions/src/routers/userRouter.ts

@@ -90,13 +90,13 @@ router.route("/").post(async (req: Request, res: Response) => {
   }
 
   // 既に同じ名前のuserが存在する場合はエラーを返す
-  const userSnapshot = await getUserFromName(name);
+  // const userSnapshot = await getUserFromName(name);
 
-  if (!userSnapshot.empty) {
-    return res.status(409).json({
-      message: `A user with the same user name '${name}' already exists`,
-    });
-  }
+  // if (!userSnapshot.empty) {
+  //   return res.status(409).json({
+  //     message: `A user with the same user name '${name}' already exists`,
+  //   });
+  // }
 
   try {
     // userIdをドキュメント名として使用してデータを保存

src/utils/createUserAuth.ts

@@ -22,8 +22,7 @@ export const createUser = (email: string, password: string, name: string) => {
       // TODO: ログイン状態の維持
     })
     .catch((error) => {
-      const errorCode = error.code ?? "unknown";
-      const errorMessage = error.message;
-      throw { errorCode, errorMessage };
+      console.error("errorCode:", (error as any)?.errorCode);
+      console.error("errorMessage:", (error as any)?.errorMessage);
     });
 };

src/utils/loginUserAuth.ts

@@ -20,9 +20,8 @@ export const loginUser = (email: string, password: string) => {
       console.log(user.uid, userData);
     })
     .catch((error) => {
-      const errorCode = error.code;
-      const errorMessage = error.message;
-      throw new Error(`Error ${errorCode}: ${errorMessage}`);
+      console.error("errorCode:", (error as any)?.errorCode);
+      console.error("errorMessage:", (error as any)?.errorMessage);
     });
   return null;
 };

src/utils/signInAnonymously.ts

@@ -8,11 +8,10 @@ import { signInAnonymously } from "firebase/auth";
 export const signInAsGuest = async () => {
   try {
     const result = await signInAnonymously(auth);
-    console.log("Guest login successful:", result.user);
+    // console.log("Guest login successful:", result.user);
     console.log("Guest login successful");
   } catch (error) {
-    const errorCode = (error as any).code;
-    const errorMessage = (error as any).message;
-    throw new Error(`Error ${errorCode}: ${errorMessage}`);
+    console.error("errorCode:", (error as any)?.errorCode);
+    console.error("errorMessage:", (error as any)?.errorMessage);
   }
 };

src/utils/signInWithGoogleAccount.ts

@@ -1,5 +1,5 @@
 import { auth, googleProvider } from "@/app/firebase";
-import { signInWithPopup } from "firebase/auth";
+import { getAdditionalUserInfo, signInWithPopup } from "firebase/auth";
 import { createUserAPI } from "./createUserAPI";
 
 /**
@@ -10,16 +10,18 @@ export const signInWithGoogleAccount = async () => {
   try {
     const result = await signInWithPopup(auth, googleProvider);
 
-    await createUserAPI(
-      result.user.displayName ?? "Anonymous",
-      result.user.uid
-    );
+    // 初めての時だけユーザー情報を登録する
+    if (getAdditionalUserInfo(result)?.isNewUser) {
+      await createUserAPI(
+        result.user.displayName ?? "no name",
+        result.user.uid
+      );
+    }
 
     console.log("Google login successful");
     // console.log("Google login successful:", result.user);
   } catch (error) {
-    const errorCode = (error as any).code;
-    const errorMessage = (error as any).message;
-    throw new Error(`Error ${errorCode}: ${errorMessage}`);
+    console.error("errorCode:", (error as any)?.errorCode);
+    console.error("errorMessage:", (error as any)?.errorMessage);
   }
 };