From d2387a4c4c6a1c7bb829cc04f2339f8d1bc0e7bd Mon Sep 17 00:00:00 2001
From: archer <545436317@qq.com>
Date: Fri, 6 Sep 2024 15:37:38 +0800
Subject: [PATCH] fix: oauth login

---
 projects/app/Dockerfile                   | 12 ++++++------
 projects/app/src/pages/login/provider.tsx |  9 +++++++--
 projects/app/src/pages/login/sso.tsx      |  9 ++++++++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/projects/app/Dockerfile b/projects/app/Dockerfile
index 3cad897ef54a..43f10c95d3bc 100644
--- a/projects/app/Dockerfile
+++ b/projects/app/Dockerfile
@@ -1,5 +1,5 @@
 # --------- install dependence -----------
-FROM node:20.14.0-alpine AS mainDeps
+FROM node:20.14.0-alpine AS maindeps
 WORKDIR /app
 
 ARG proxy
@@ -26,10 +26,10 @@ ARG proxy
 
 # copy common node_modules and one project node_modules
 COPY package.json pnpm-workspace.yaml .npmrc tsconfig.json ./
-COPY --from=mainDeps /app/node_modules ./node_modules
-COPY --from=mainDeps /app/packages ./packages
+COPY --from=maindeps /app/node_modules ./node_modules
+COPY --from=maindeps /app/packages ./packages
 COPY ./projects/app ./projects/app
-COPY --from=mainDeps /app/projects/app/node_modules ./projects/app/node_modules
+COPY --from=maindeps /app/projects/app/node_modules ./projects/app/node_modules
 
 RUN [ -z "$proxy" ] || sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 
@@ -63,9 +63,9 @@ COPY --from=builder --chown=nextjs:nodejs /app/projects/app/.next/server/chunks
 COPY --from=builder --chown=nextjs:nodejs /app/projects/app/.next/server/worker /app/projects/app/.next/server/worker
 
 # copy standload packages
-COPY --from=mainDeps /app/node_modules/tiktoken ./node_modules/tiktoken
+COPY --from=maindeps /app/node_modules/tiktoken ./node_modules/tiktoken
 RUN rm -rf ./node_modules/tiktoken/encoders
-COPY --from=mainDeps /app/node_modules/@zilliz/milvus2-sdk-node ./node_modules/@zilliz/milvus2-sdk-node
+COPY --from=maindeps /app/node_modules/@zilliz/milvus2-sdk-node ./node_modules/@zilliz/milvus2-sdk-node
 
 
 # copy package.json to version file
diff --git a/projects/app/src/pages/login/provider.tsx b/projects/app/src/pages/login/provider.tsx
index eeca4618d410..20871c9c784f 100644
--- a/projects/app/src/pages/login/provider.tsx
+++ b/projects/app/src/pages/login/provider.tsx
@@ -11,7 +11,6 @@ import Loading from '@fastgpt/web/components/common/MyLoading';
 import { serviceSideProps } from '@/web/common/utils/i18n';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useTranslation } from 'next-i18next';
-import { useMount } from 'ahooks';
 
 const provider = () => {
   const { t } = useTranslation();
@@ -104,9 +103,15 @@ const provider = () => {
     } else {
       authCode(code);
     }
-  }, [code, error, loginStore, state]);
+  }, []);
 
   return <Loading />;
 };
 
 export default provider;
+
+export async function getServerSideProps(context: any) {
+  return {
+    props: { ...(await serviceSideProps(context)) }
+  };
+}
diff --git a/projects/app/src/pages/login/sso.tsx b/projects/app/src/pages/login/sso.tsx
index 50b5eef770f9..3107b514dbea 100644
--- a/projects/app/src/pages/login/sso.tsx
+++ b/projects/app/src/pages/login/sso.tsx
@@ -8,6 +8,7 @@ import { ssoLogin } from '@/web/support/user/api';
 import Loading from '@fastgpt/web/components/common/MyLoading';
 import { useTranslation } from 'next-i18next';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 
 const provider = () => {
   const { t } = useTranslation();
@@ -39,9 +40,15 @@ const provider = () => {
       clearToken();
       handleSSO();
     }
-  }, [handleSSO, query]);
+  }, []);
 
   return <Loading />;
 };
 
 export default provider;
+
+export async function getServerSideProps(context: any) {
+  return {
+    props: { ...(await serviceSideProps(context)) }
+  };
+}