add openwechat enabled

Signed-off-by: jingyang <3161362058@qq.com>
labring · Feb 3, 2024 · 4488c80 · 4488c80
1 parent 54fe440
commit 4488c80
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/frontend/desktop/src/components/signin/index.tsx b/frontend/desktop/src/components/signin/index.tsx
@@ -37,9 +37,10 @@ export default function SigninComponent() {
     service_protocol_en = '',
     private_protocol_en = '',
     needPassword = false,
-    needSms = false
+    needSms = false,
+    openWechatEnabled = false
   } = platformEnv?.data || {};
-  const needTabs = needPassword && needSms;
+  const needTabs = (needPassword && needSms) || (needSms && openWechatEnabled);
 
   const disclosure = useDisclosure();
   const { t, i18n } = useTranslation();
@@ -180,9 +181,11 @@ export default function SigninComponent() {
                 <Tab px="0" _selected={{ color: 'white' }}>
                   {t('Password Login')}
                 </Tab>
-                <Tab px="0" _selected={{ color: 'white' }}>
-                  {t('Official account login')}
-                </Tab>
+                {openWechatEnabled && (
+                  <Tab px="0" _selected={{ color: 'white' }}>
+                    {t('Official account login')}
+                  </Tab>
+                )}
               </TabList>
               <TabIndicator mt="-2px" height="2px" bg="#FFFFFF" borderRadius="1px" />
             </Tabs>

diff --git a/frontend/desktop/src/pages/api/platform/getEnv.ts b/frontend/desktop/src/pages/api/platform/getEnv.ts
@@ -9,7 +9,8 @@ import {
   enableStripe,
   enableWechatRecharge,
   enableLicense,
-  enableRecharge
+  enableRecharge,
+  enableOpenWechat
 } from '@/services/enable';
 import { ApiResp, SystemEnv } from '@/types';
 
@@ -32,6 +33,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   const licenseEnabled = enableLicense();
   const rechargeEnabled = enableRecharge();
   const guideEnabled = process.env.GUIDE_ENABLED === 'true';
+  const openWechatEnabled = enableOpenWechat();
 
   jsonRes<SystemEnv>(res, {
     data: {
@@ -53,7 +55,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       wechatEnabledRecharge,
       rechargeEnabled,
       licenseEnabled,
-      guideEnabled
+      guideEnabled,
+      openWechatEnabled
     }
   });
 }
diff --git a/frontend/desktop/src/services/enable.ts b/frontend/desktop/src/services/enable.ts
@@ -22,6 +22,8 @@ export const enableGoogle = () =>
 export const enableRecharge = () => {
   return process.env.RECHARGE_ENABLED === 'true';
 };
+export const enableOpenWechat = () =>
+  !!process.env.PBULIC_WECHAT_APP_ID && !!process.env.PBULIC_WECHAT_APP_SECRET;
 export const enableSignUp = () => process.env.SIGN_UP_ENABLED === 'true';
 export const enableApi = () => process.env.API_ENABLED === 'true';
 // costcenter

diff --git a/frontend/desktop/src/types/system.ts b/frontend/desktop/src/types/system.ts
@@ -30,4 +30,5 @@ export type SystemEnv = {
   rechargeEnabled: boolean;
   licenseEnabled: boolean;
   guideEnabled: boolean;
+  openWechatEnabled: boolean;
 } & LoginProps;