Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
bc171db9
authored
Oct 31, 2024
by
Finley Ge
Committed by
GitHub
Oct 31, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: alldataset get dataset without folders. omit the permission check (#3047)
parent
eb365fef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
82 deletions
+13
-82
projects/app/src/pages/api/core/dataset/allDataset.ts
+13
-82
No files found.
projects/app/src/pages/api/core/dataset/allDataset.ts
View file @
bc171db9
...
...
@@ -3,100 +3,31 @@ import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import
{
getVectorModel
}
from
'@fastgpt/service/core/ai/model'
;
import
type
{
DatasetSimpleItemType
}
from
'@fastgpt/global/core/dataset/type.d'
;
import
{
NextAPI
}
from
'@/service/middleware/entry'
;
import
{
PerResourceTypeEnum
,
ReadPermissionVal
}
from
'@fastgpt/global/support/permission/constant'
;
import
{
MongoResourcePermission
}
from
'@fastgpt/service/support/permission/schema'
;
import
{
DatasetPermission
}
from
'@fastgpt/global/support/permission/dataset/controller'
;
import
{
ReadPermissionVal
}
from
'@fastgpt/global/support/permission/constant'
;
import
{
authUserPer
}
from
'@fastgpt/service/support/permission/user/auth'
;
import
{
DatasetDefaultPermissionVal
}
from
'@fastgpt/global/support/permission/dataset/constant'
;
import
{
getGroupsByTmbId
}
from
'@fastgpt/service/support/permission/memberGroup/controllers'
;
import
{
getGroupPer
}
from
'@fastgpt/service/support/permission/controller'
;
import
{
DatasetTypeEnum
}
from
'@fastgpt/global/core/dataset/constants'
;
/* get all dataset by teamId or tmbId */
async
function
handler
(
req
:
NextApiRequest
):
Promise
<
DatasetSimpleItemType
[]
>
{
const
{
teamId
,
tmbId
,
permission
:
myPer
}
=
await
authUserPer
({
const
{
teamId
}
=
await
authUserPer
({
req
,
authToken
:
true
,
authApiKey
:
true
,
per
:
ReadPermissionVal
});
const
myGroupIds
=
(
await
getGroupsByTmbId
({
tmbId
,
teamId
})
).
map
((
item
)
=>
String
(
item
.
_id
));
const
[
myDatasets
,
perList
]
=
await
Promise
.
all
([
MongoDataset
.
find
({
teamId
})
.
sort
({
updateTime
:
-
1
})
.
lean
(),
MongoResourcePermission
.
find
({
resourceType
:
PerResourceTypeEnum
.
dataset
,
teamId
,
resourceId
:
{
$exists
:
true
}
}).
lean
()
]);
const
filterDatasets
=
myDatasets
.
map
((
dataset
)
=>
{
const
per
=
(()
=>
{
const
myPerList
=
perList
.
filter
(
(
item
)
=>
String
(
item
.
tmbId
)
===
String
(
tmbId
)
||
myGroupIds
.
includes
(
String
(
item
.
groupId
))
);
const
getPer
=
(
id
:
string
)
=>
{
const
tmbPer
=
myPerList
.
find
(
(
item
)
=>
String
(
item
.
resourceId
)
===
id
&&
!!
item
.
tmbId
)?.
permission
;
const
groupPer
=
getGroupPer
(
myPerList
.
filter
(
(
item
)
=>
String
(
item
.
resourceId
)
===
id
&&
myGroupIds
.
includes
(
String
(
item
.
groupId
))
)
.
map
((
item
)
=>
item
.
permission
)
);
return
new
DatasetPermission
({
per
:
tmbPer
??
groupPer
??
DatasetDefaultPermissionVal
,
isOwner
:
String
(
dataset
.
tmbId
)
===
String
(
tmbId
)
||
myPer
.
isOwner
});
};
const
parentDataset
=
myDatasets
.
find
(
(
item
)
=>
String
(
item
.
_id
)
===
String
(
dataset
.
parentId
)
);
if
(
dataset
.
inheritPermission
&&
dataset
.
parentId
&&
parentDataset
)
{
return
getPer
(
parentDataset
.
_id
);
}
else
{
return
getPer
(
dataset
.
_id
);
}
})();
return
{
...
dataset
,
permission
:
per
};
const
myDatasets
=
await
MongoDataset
.
find
({
teamId
,
type
:
{
$ne
:
DatasetTypeEnum
.
folder
}
})
.
sort
({
updateTime
:
-
1
})
.
filter
((
app
)
=>
app
.
permission
.
hasReadPer
);
.
lean
(
);
return
filter
Datasets
.
map
((
item
)
=>
({
return
my
Datasets
.
map
((
item
)
=>
({
_id
:
item
.
_id
,
avatar
:
item
.
avatar
,
name
:
item
.
name
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment