Fix share page whisper auth (#1161)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/api/admin/initv471.ts

@@ -0,0 +1,29 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { PgClient } from '@fastgpt/service/common/vectorStore/pg';
+
+/* pg 中的数据搬到 mongo dataset.datas 中，并做映射 */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    await authCert({ req, authRoot: true });
+
+    // 删除索引
+    await PgClient.query(`DROP INDEX IF EXISTS team_dataset_index;`);
+    await PgClient.query(`DROP INDEX IF EXISTS team_collection_index;`);
+    await PgClient.query(`DROP INDEX IF EXISTS team_id_index;`);
+
+    jsonRes(res, {
+      message: 'success'
+    });
+  } catch (error) {
+    console.log(error);
+
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}

projects/app/src/pages/api/core/dataset/collection/delete.ts

@@ -29,7 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       teamId,
       datasetId: collection.datasetId._id,
       collectionId,
-      fields: '_id teamId fileId metadata'
+      fields: '_id teamId datasetId fileId metadata'
     });
 
     // delete

projects/app/src/pages/api/core/dataset/data/insertData.ts

@@ -70,6 +70,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     // Duplicate data check
     await hasSameValue({
       teamId,
+      datasetId,
       collectionId,
       q: formatQ,
       a: formatA

projects/app/src/pages/api/core/dataset/data/list.ts

@@ -6,6 +6,7 @@ import type { GetDatasetDataListProps } from '@/global/core/api/datasetReq';
 import { authDatasetCollection } from '@fastgpt/service/support/permission/auth/dataset';
 import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
 import { PagingData } from '@/types';
+import { replaceRegChars } from '@fastgpt/global/common/string/tools';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -28,7 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       per: 'r'
     });
 
-    searchText = searchText.replace(/'/g, '');
+    searchText = replaceRegChars(searchText).replace(/'/g, '');
 
     const match = {
       teamId,

projects/app/src/pages/api/v1/audio/transcriptions.ts

@@ -9,6 +9,7 @@ import { pushWhisperUsage } from '@/service/support/wallet/usage/push';
 import { authChatCert } from '@/service/support/permission/auth/chat';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { getGuideModule, splitGuideModule } from '@fastgpt/global/core/module/utils';
+import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
 
 const upload = getUploadModel({
   maxSize: 2
@@ -20,15 +21,16 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
   try {
     const {
       file,
-      data: { appId, duration, teamId: spaceTeamId, teamToken }
-    } = await upload.doUpload<{
-      appId: string;
-      duration: number;
-      shareId?: string;
-      teamId?: string;
-      teamToken?: string;
-    }>(req, res);
+      data: { appId, duration, shareId, outLinkUid, teamId: spaceTeamId, teamToken }
+    } = await upload.doUpload<
+      OutLinkChatAuthProps & {
+        appId: string;
+        duration: number;
+      }
+    >(req, res);
 
+    req.body.shareId = shareId;
+    req.body.outLinkUid = outLinkUid;
     req.body.teamId = spaceTeamId;
     req.body.teamToken = teamToken;
 

projects/app/src/pages/app/detail/components/FlowEdit/Header.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useRef, useState } from 'react';
-import { Box, Flex, IconButton, useTheme, useDisclosure } from '@chakra-ui/react';
-import { SmallCloseIcon } from '@chakra-ui/icons';
+import { Box, Flex, IconButton, useTheme, useDisclosure, Button } from '@chakra-ui/react';
 import { ModuleItemType } from '@fastgpt/global/core/module/type';
 import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { AppSchema } from '@fastgpt/global/core/app/type.d';
@@ -18,6 +17,7 @@ import { useAppStore } from '@/web/core/app/store/useAppStore';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import { getErrText } from '@fastgpt/global/common/error/utils';
+import MyMenu from '@/components/MyMenu';
 
 const ImportSettings = dynamic(() => import('@/components/core/module/Flow/ImportSettings'));
 
@@ -143,73 +143,61 @@ const RenderHeaderContainer = React.memo(function RenderHeaderContainer({
           {app.name}
         </Box>
 
-        <MyTooltip label={t('app.Import Configs')}>
-          <IconButton
-            mr={[3, 6]}
-            size={'smSquare'}
-            icon={<MyIcon name={'common/importLight'} w={['14px', '16px']} />}
-            variant={'whitePrimary'}
-            aria-label={'save'}
-            onClick={onOpenImport}
-          />
-        </MyTooltip>
-        <MyTooltip label={t('app.Export Configs')}>
-          <IconButton
-            mr={[3, 6]}
-            icon={<MyIcon name={'export'} w={['14px', '16px']} />}
-            size={'smSquare'}
-            variant={'whitePrimary'}
-            aria-label={'save'}
-            onClick={async () => {
-              const modules = await flow2ModulesAndCheck();
-              if (modules) {
-                copyData(filterExportModules(modules), t('app.Export Config Successful'));
-              }
-            }}
-          />
-        </MyTooltip>
-
-        {testModules ? (
-          <IconButton
-            mr={[3, 6]}
-            icon={<SmallCloseIcon fontSize={'25px'} />}
-            variant={'whitePrimary'}
-            size={'smSquare'}
-            aria-label={''}
-            onClick={() => setTestModules(undefined)}
-          />
-        ) : (
-          <MyTooltip label={t('core.Chat test')}>
+        <MyMenu
+          Button={
             <IconButton
-              mr={[3, 6]}
-              icon={<MyIcon name={'core/chat/chatLight'} w={['14px', '16px']} />}
-              size={'smSquare'}
-              aria-label={'save'}
+              mr={[3, 5]}
+              icon={<MyIcon name={'more'} w={'14px'} p={2} />}
+              aria-label={''}
+              size={'sm'}
               variant={'whitePrimary'}
-              onClick={async () => {
+            />
+          }
+          menuList={[
+            { label: t('app.Import Configs'), icon: 'common/importLight', onClick: onOpenImport },
+            {
+              label: t('app.Export Configs'),
+              icon: 'export',
+              onClick: async () => {
                 const modules = await flow2ModulesAndCheck();
                 if (modules) {
-                  setTestModules(modules);
+                  copyData(filterExportModules(modules), t('app.Export Config Successful'));
                 }
-              }}
-            />
-          </MyTooltip>
-        )}
+              }
+            }
+          ]}
+        />
 
-        <MyTooltip label={t('common.Save')}>
-          <IconButton
-            icon={<MyIcon name={'common/saveFill'} w={['14px', '16px']} />}
-            size={'smSquare'}
-            isLoading={isSaving}
-            aria-label={'save'}
+        {!testModules && (
+          <Button
+            mr={[3, 5]}
+            size={'sm'}
+            leftIcon={<MyIcon name={'core/chat/chatLight'} w={['14px', '16px']} />}
+            variant={'whitePrimary'}
             onClick={async () => {
               const modules = await flow2ModulesAndCheck();
               if (modules) {
-                onclickSave(modules);
+                setTestModules(modules);
               }
             }}
-          />
-        </MyTooltip>
+          >
+            {t('core.Chat test')}
+          </Button>
+        )}
+
+        <Button
+          size={'sm'}
+          isLoading={isSaving}
+          leftIcon={<MyIcon name={'common/saveFill'} w={['14px', '16px']} />}
+          onClick={async () => {
+            const modules = await flow2ModulesAndCheck();
+            if (modules) {
+              onclickSave(modules);
+            }
+          }}
+        >
+          {t('common.Save')}
+        </Button>
       </Flex>
       {isOpenImport && <ImportSettings onClose={onCloseImport} />}
       <ConfirmModal

projects/app/src/pages/app/detail/components/OutLink/SelectUsingWayModal.tsx

@@ -88,7 +88,7 @@ const SelectUsingWayModal = ({ share, onClose }: { share: OutLinkSchema; onClose
   src="${linkUrl}"
   style="width: 100%; height: 100%;"
   frameborder="0" 
-  allow="microphone"
+  allow="*"
 />`
     },
     [UsingWayEnum.script]: {

projects/app/src/pages/chat/components/ToolMenu.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { useChatBox } from '@/components/ChatBox/hooks/useChatBox';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
-import { Menu, MenuButton, MenuList, MenuItem, Box, IconButton } from '@chakra-ui/react';
+import { Box, IconButton } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useRouter } from 'next/router';

projects/app/src/pages/plugin/edit/Header.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { Box, Flex, IconButton, useTheme, useDisclosure } from '@chakra-ui/react';
+import { Box, Flex, IconButton, useTheme, useDisclosure, Button } from '@chakra-ui/react';
 import { PluginItemSchema } from '@fastgpt/global/core/plugin/type';
 import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { useTranslation } from 'next-i18next';
@@ -14,6 +14,7 @@ import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
 import { ModuleItemType } from '@fastgpt/global/core/module/type';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
+import MyMenu from '@/components/MyMenu';
 
 const ImportSettings = dynamic(() => import('@/components/core/module/Flow/ImportSettings'));
 const PreviewPlugin = dynamic(() => import('./Preview'));
@@ -137,38 +138,37 @@ const Header = ({ plugin, onClose }: Props) => {
             }}
           />
         </MyTooltip>
-        <Box ml={[3, 6]} fontSize={['md', '2xl']} flex={1}>
+        <Box ml={[3, 5]} fontSize={['md', '2xl']} flex={1}>
           {plugin.name}
         </Box>
 
-        <MyTooltip label={t('app.Import Configs')}>
-          <IconButton
-            mr={[3, 6]}
-            icon={<MyIcon name={'common/importLight'} w={['14px', '16px']} />}
-            variant={'whitePrimary'}
-            size={'smSquare'}
-            aria-label={'save'}
-            onClick={onOpenImport}
-          />
-        </MyTooltip>
-        <MyTooltip label={t('app.Export Configs')}>
-          <IconButton
-            mr={[3, 6]}
-            icon={<MyIcon name={'export'} w={['14px', '16px']} />}
-            size={'smSquare'}
-            variant={'whitePrimary'}
-            aria-label={'save'}
-            onClick={async () => {
-              const modules = await flow2ModulesAndCheck();
-              if (modules) {
-                copyData(filterExportModules(modules), t('app.Export Config Successful'));
+        <MyMenu
+          Button={
+            <IconButton
+              mr={[3, 5]}
+              icon={<MyIcon name={'more'} w={'14px'} p={2} />}
+              aria-label={''}
+              size={'sm'}
+              variant={'whitePrimary'}
+            />
+          }
+          menuList={[
+            { label: t('app.Import Configs'), icon: 'common/importLight', onClick: onOpenImport },
+            {
+              label: t('app.Export Configs'),
+              icon: 'export',
+              onClick: async () => {
+                const modules = await flow2ModulesAndCheck();
+                if (modules) {
+                  copyData(filterExportModules(modules), t('app.Export Config Successful'));
+                }
               }
-            }}
-          />
-        </MyTooltip>
+            }
+          ]}
+        />
         <MyTooltip label={t('module.Preview Plugin')}>
           <IconButton
-            mr={[3, 6]}
+            mr={[3, 5]}
             icon={<MyIcon name={'core/modules/previewLight'} w={['14px', '16px']} />}
             size={'smSquare'}
             aria-label={'save'}
@@ -181,20 +181,19 @@ const Header = ({ plugin, onClose }: Props) => {
             }}
           />
         </MyTooltip>
-        <MyTooltip label={t('module.Save Config')}>
-          <IconButton
-            icon={<MyIcon name={'save'} w={['14px', '16px']} />}
-            size={'smSquare'}
-            isLoading={isLoading}
-            aria-label={'save'}
-            onClick={async () => {
-              const modules = await flow2ModulesAndCheck();
-              if (modules) {
-                onclickSave(modules);
-              }
-            }}
-          />
-        </MyTooltip>
+        <Button
+          size={'sm'}
+          isLoading={isLoading}
+          leftIcon={<MyIcon name={'common/saveFill'} w={['14px', '16px']} />}
+          onClick={async () => {
+            const modules = await flow2ModulesAndCheck();
+            if (modules) {
+              onclickSave(modules);
+            }
+          }}
+        >
+          {t('common.Save')}
+        </Button>
       </Flex>
       {isOpenImport && <ImportSettings onClose={onCloseImport} />}
       {!!previewModules && (