perf: Team org ui (#3499)

* perf: org ui

* perf: org ui

packages/service/support/permission/auth/org.ts

@@ -1,20 +1,24 @@
 import { TeamPermission } from '@fastgpt/global/support/permission/user/controller';
 import { AuthModeType, AuthResponseType } from '../type';
-import { parseHeaderCert } from '../controller';
-import { getTmbInfoByTmbId } from '../../user/team/controller';
 import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';
+import { authUserPer } from '../user/auth';
+import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant';
 
+/* 
+  Team manager can control org
+*/
 export const authOrgMember = async ({
   orgIds,
-  req,
-  authToken = false,
-  authRoot = false,
-  authApiKey = false
+  ...props
 }: {
   orgIds: string | string[];
 } & AuthModeType): Promise<AuthResponseType> => {
-  const result = await parseHeaderCert({ req, authToken, authApiKey, authRoot });
-  const { teamId, tmbId, isRoot } = result;
+  const result = await authUserPer({
+    ...props,
+    per: ManagePermissionVal
+  });
+  const { teamId, tmbId, isRoot, tmb } = result;
+
   if (isRoot) {
     return {
       teamId,
@@ -28,13 +32,6 @@ export const authOrgMember = async ({
     };
   }
 
-  if (!Array.isArray(orgIds)) {
-    orgIds = [orgIds];
-  }
-
-  // const promises = orgIds.map((orgId) => getOrgMemberRole({ orgId, tmbId }));
-
-  const tmb = await getTmbInfoByTmbId({ tmbId });
   if (tmb.permission.hasManagePer) {
     return {
       ...result,
@@ -43,16 +40,4 @@ export const authOrgMember = async ({
   }
 
   return Promise.reject(TeamErrEnum.unAuthTeam);
-
-  // const targetRole = OrgMemberRole[role];
-  // for (const orgRole of orgRoles) {
-  //   if (!orgRole || checkOrgRole(orgRole, targetRole)) {
-  //     return Promise.reject(TeamErrEnum.unAuthTeam);
-  //   }
-  // }
-
-  // return {
-  //   ...result,
-  //   permission: tmb.permission
-  // };
 };

packages/service/support/permission/org/controllers.ts

@@ -1,8 +1,5 @@
 import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';
-import type {
-  OrgMemberSchemaType,
-  OrgSchemaType
-} from '@fastgpt/global/support/user/team/org/type';
+import type { OrgSchemaType } from '@fastgpt/global/support/user/team/org/type';
 import type { ClientSession } from 'mongoose';
 import { MongoOrgModel } from './orgSchema';
 import { MongoOrgMemberModel } from './orgMemberSchema';
@@ -36,16 +33,6 @@ import { MongoOrgMemberModel } from './orgMemberSchema';
 //   return compareRole(role, targetRole) >= 0;
 // };
 
-export const getOrgsByTeamId = async (teamId: string) => {
-  const orgs = await MongoOrgModel.find({
-    teamId
-  })
-    .populate<{ members: OrgMemberSchemaType }>('members')
-    .lean();
-
-  return orgs;
-};
-
 export const getOrgsByTmbId = async ({ teamId, tmbId }: { teamId: string; tmbId: string }) =>
   MongoOrgMemberModel.find({ teamId, tmbId }, 'orgId').lean();
 

packages/service/support/permission/org/orgSchema.ts

@@ -53,15 +53,10 @@ OrgSchema.virtual('permission', {
 });
 
 try {
-  OrgSchema.index(
-    {
-      teamId: 1,
-      path: 1
-    },
-    {
-      unique: true
-    }
-  );
+  OrgSchema.index({
+    teamId: 1,
+    path: 1
+  });
 } catch (error) {
   console.log(error);
 }

packages/service/support/user/team/controller.ts

@@ -33,6 +33,7 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
   return {
     userId: String(tmb.userId),
     teamId: String(tmb.teamId),
+    teamAvatar: tmb.team.avatar,
     teamName: tmb.team.name,
     memberName: tmb.name,
     avatar: tmb.team.avatar,