From 9b12bf9ca3153c57b51813a95721f4cb4f9a93ea Mon Sep 17 00:00:00 2001
From: liushuxiang <276900785@qq.com>
Date: Mon, 22 May 2023 00:22:53 +0800
Subject: [PATCH] fix: Fix the issue of being unable to log in when binding the
 same email to both GitHub and Google.

---
 CHANGE_LOG.md                           |  7 ++-
 src/app/api/auth/[...nextauth]/route.ts |  4 ++
 src/components/auth/form.tsx            |  7 ++-
 src/components/navbar/index.tsx         | 60 +++++++++++++++----------
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
index ec42d1f..4e28b3d 100644
--- a/CHANGE_LOG.md
+++ b/CHANGE_LOG.md
@@ -2,13 +2,18 @@
 
 ## v0.4.0
 
-> 2023-05-16
+> 2023-05-21
+
+### Fixed
+
+- Fix the issue of being unable to log in when binding the same email to both GitHub and Google.
 
 ### Add
 
 - Add account system
 - Adding login guidance for users who are not logged in
 - Multi-language configuration for login email sending page
+- Display the language model currently in use on the conversation interface
 
 ### Changed
 
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
index 5c434eb..ec58020 100644
--- a/src/app/api/auth/[...nextauth]/route.ts
+++ b/src/app/api/auth/[...nextauth]/route.ts
@@ -23,10 +23,14 @@ export const authOptions: NextAuthOptions = {
     GithubProvider({
       clientId: process.env.GITHUB_ID || "",
       clientSecret: process.env.GITHUB_SECRET || "",
+      allowDangerousEmailAccountLinking: true,
     }),
     GoogleProvider({
       clientId: process.env.GOOGLE_CLIENT_ID || "",
       clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
+      httpOptions: {
+        timeout: 40000,
+      },
     }),
   ],
   secret: process.env.EMAIL_SECRET,
diff --git a/src/components/auth/form.tsx b/src/components/auth/form.tsx
index 569512d..2cd3853 100644
--- a/src/components/auth/form.tsx
+++ b/src/components/auth/form.tsx
@@ -46,18 +46,19 @@ const AuthForm: React.FC = () => {
       toast.success(t("auth-success"));
       router.push(res.url);
     } catch (error) {
+      setLoading(false);
       console.log(error, "login failed");
       toast.error(t("auth-failed"));
-    } finally {
-      setLoading(false);
     }
   };
 
   const onGithubLogin = async () => {
+    setLoading(true);
     await signIn("github", { redirect: false, callbackUrl: "/" });
   };
 
   const onGoogleLogin = async () => {
+    setLoading(true);
     await signIn("google", { redirect: false, callbackUrl: "/" });
   };
 
@@ -89,6 +90,7 @@ const AuthForm: React.FC = () => {
           <Button
             size="base"
             block
+            loading={loading}
             leftIcon={<AiFillGithub />}
             onClick={onGithubLogin}
           >
@@ -97,6 +99,7 @@ const AuthForm: React.FC = () => {
           <Button
             size="base"
             block
+            loading={loading}
             leftIcon={<FcGoogle />}
             onClick={onGoogleLogin}
           >
diff --git a/src/components/navbar/index.tsx b/src/components/navbar/index.tsx
index 9fb9423..35fd21d 100644
--- a/src/components/navbar/index.tsx
+++ b/src/components/navbar/index.tsx
@@ -5,6 +5,7 @@ import { AiOutlineMenuUnfold, AiOutlineEdit } from "react-icons/ai";
 import { useChannel, useOpenAI, useMobileMenu } from "@/hooks";
 import Avatar from "@/components/auth/avatar";
 import ChangeTitle from "./changeTitle";
+import { LLM } from "@/utils/constant";
 
 const Navbar: React.FC = () => {
   const changeTitleRef = React.useRef<any>(null);
@@ -15,6 +16,12 @@ const Navbar: React.FC = () => {
 
   const [, setMobileMenuVisible] = useMobileMenu();
 
+  const apiKey =
+    openai.openai.apiKey ||
+    openai.azure.apiKey ||
+    openai.env.OPENAI_API_KEY ||
+    openai.env.AZURE_API_KEY;
+
   const onOpenMenu = () => setMobileMenuVisible(true);
 
   const onChangeTitle = () => {
@@ -32,6 +39,22 @@ const Navbar: React.FC = () => {
     (item) => item.channel_id === channel.activeId
   );
 
+  const renderIcon = () => {
+    if (!activeChannel?.chat_list?.length) return null;
+
+    const icon = LLM.find(
+      (item) => item.value === activeChannel?.channel_model.type
+    )?.ico;
+
+    return (
+      (
+        <div className="absolute left-0 top-[50%] translate-y-[-50%]">
+          {icon}
+        </div>
+      ) || null
+    );
+  };
+
   return (
     <>
       <div
@@ -53,32 +76,23 @@ const Navbar: React.FC = () => {
         <div
           onClick={onChangeTitle}
           className={clsx(
-            "text-ellipsis group max-w-[50%] cursor-pointer whitespace-nowrap overflow-hidden relative",
-            {
-              "pr-6": !!(
-                openai.openai.apiKey ||
-                openai.azure.apiKey ||
-                openai.env.OPENAI_API_KEY ||
-                openai.env.AZURE_API_KEY
-              ),
-            },
-            "text-black/90",
-            "dark:text-white/90"
+            "text-ellipsis group max-w-[60%] cursor-pointer whitespace-nowrap overflow-hidden relative transition-colors",
+            { "pr-6": !!apiKey, "pl-6": !!renderIcon() },
+            "text-slate-700 hover:text-slate-900",
+            "dark:text-slate-400 dark:hover:text-slate-300"
           )}
         >
-          {openai.openai.apiKey ||
-          openai.azure.apiKey ||
-          openai.env.OPENAI_API_KEY ||
-          openai.env.AZURE_API_KEY
-            ? activeChannel?.channel_name || tMenu("new-conversation")
-            : tSetting("set-api-key")}
+          {renderIcon()}
+
+          {apiKey ? (
+            <span className="group-hover:underline">
+              {activeChannel?.channel_name || tMenu("new-conversation")}
+            </span>
+          ) : (
+            tSetting("set-api-key")
+          )}
 
-          {!!(
-            openai.openai.apiKey ||
-            openai.azure.apiKey ||
-            openai.env.OPENAI_API_KEY ||
-            openai.env.AZURE_API_KEY
-          ) && (
+          {!!apiKey && (
             <AiOutlineEdit
               size={18}
               className={clsx(